From c805d3bfefda04b667becd9d38876bee1f803462 Mon Sep 17 00:00:00 2001
From: Lane Jennison <lane@lane-fu.com>
Date: Sun, 26 Jul 2020 10:09:01 -0400
Subject: [PATCH] support new userdata.csv format

---
 app/download_image_map.py | 11 ++++++-----
 app/main.py               |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/download_image_map.py b/app/download_image_map.py
index cbe4612..71187ff 100644
--- a/app/download_image_map.py
+++ b/app/download_image_map.py
@@ -18,18 +18,19 @@ class Parser():
     def transform_csv_data(self, data):
         transformed = {}
         key = ""
+        row_counter = 0
         for line in data:
             try:
-                key = '/'.join(line[0:2])
-                transformed[key] = '/'.join(line[2:5])
+                row_counter = row_counter + 1
+                key = line[0]
+                transformed[key] = line[1]
             except IndexError as e:
-                print("Missing fields in data '{0}'. Error: '{1}'".format(line, e))
-                break
+                print("userdata.csv line {}: Malformed or Missing fields in data '{}'. Error: '{}'".format(row_counter, line, e))
         return transformed
 
     def import_csv(self):
         with open(self.csv_file) as f:
-            csvreader = csv.reader(f, delimiter='/')
+            csvreader = csv.reader(f, delimiter='|')
             data = list(csvreader)
         return data
 
diff --git a/app/main.py b/app/main.py
index 00323a5..9c03e13 100644
--- a/app/main.py
+++ b/app/main.py
@@ -21,7 +21,7 @@ app = Flask(__name__)
 def get_redirect(path, IP):
     split_path = path.split('/')
     if len(split_path) == 2:
-        key = "{}/{}".format(split_path[0], split_path[1])
+        key = "/{}/{}".format(split_path[0], split_path[1])
         new_path = dl_map.get(key, path)
         return "{}/{}".format(mirror.next(), new_path)
     if path == '':