refactor code

app.py

@@ -29,32 +29,39 @@ if not os.path.exists(OUT_FOLDER):
     os.makedirs(OUT_FOLDER)
 
 
+def get_anno_path(user_id):
+    return os.path.join(OUT_FOLDER, f'{user_id}.csv')
+
+
+def get_images_directory(user_id):
+    return os.path.join(UPLOAD_FOLDER, f'{user_id}')
+
+
 @app.route('/', methods=['GET', 'POST'])
 def index():
-    # user_id = session.get('_id')
-    user_id = request.cookies.get('session')
+    user_id = session.get('_id')
+    # user_id = request.cookies.get('session')
     if user_id is None:
         user_id = uuid.uuid4()
         session['_id'] = user_id
         logger.info(user_id)
-        file_path = os.path.join(OUT_FOLDER, f'{user_id}.csv')
-        with open(file_path, 'w') as f:
+        anno_path = get_anno_path(user_id)
+        with open(anno_path, 'w') as f:
             f.write("image,id,name,xMin,xMax,yMin,yMax\n")
-    print(user_id)
 
     if request.method == 'POST':
         if 'file' not in request.files:
             flash('No files selected')
             return redirect('/')
-        img_folder = os.path.join(UPLOAD_FOLDER, f'{user_id}')
+        img_dir = get_images_directory(user_id)
         try:
-            os.makedirs(img_folder)
+            os.makedirs(img_dir)
         except FileExistsError:
             logger.info('user already has an active session')
         files = request.files.getlist("file")
         filenames = []
         for f in files:
-            f.save(os.path.join(img_folder, f.filename))
+            f.save(os.path.join(img_dir, f.filename))
             filenames.append(f.filename)
         app.config["FILES"] = filenames
         # logger.info(app.config["FILES"], app.config["HEAD"])
@@ -70,12 +77,11 @@ def tagger():
         app.config["HEAD"] = 0
         return redirect(url_for('final'))
     user_id = session.get('_id')
-    directory = app.config["IMAGES"] + f'/{user_id}'
+    img_dir = get_images_directory(user_id)  # app.config["IMAGES"] + f'/{user_id}'
     image = app.config["FILES"][app.config["HEAD"]]
     labels = app.config["LABELS"]
     not_end = not(app.config["HEAD"] == len(app.config["FILES"]) - 1)
-    # print(not_end)
-    return render_template('tagger.html', not_end=not_end, directory=directory, image=image, labels=labels, head=app.config["HEAD"] + 1, len=len(app.config["FILES"]))
+    return render_template('tagger.html', not_end=not_end, directory=img_dir, image=image, labels=labels, head=app.config["HEAD"] + 1, len=len(app.config["FILES"]))
 
 
 @app.route('/next')
@@ -83,7 +89,8 @@ def next():
     image = app.config["FILES"][app.config["HEAD"]]
     app.config["HEAD"] = app.config["HEAD"] + 1
     user_id = session.get("_id")
-    with open(f"{app.config['OUT']}/{user_id}.csv", 'a+') as f:
+    anno_path = get_anno_path(user_id)
+    with open(anno_path, 'a+') as f:
         for label in app.config["LABELS"]:
             f.write(image + "," +
             label["id"] + "," +
@@ -124,22 +131,18 @@ def label(id):
 
 @app.route('/image/<f>')
 def images(f):
-    #user_id = session.get('_id')
-    user_id = request.cookies.get('session')
-    # images = app.config["IMAGES"] + f'/{user_id}'
-    img_path = os.path.join(UPLOAD_FOLDER, f'{user_id}/{f}')
-    print(img_path)
-    # print(images, '/', f)
-    # return send_file(images +'/'+f)
+    user_id = session.get('_id')
+    img_dir = get_images_directory(user_id)
+    img_path = os.path.join(img_dir, f'{f}')
     return send_file(img_path)
 
 @app.route('/download')
 def download():
     user_id = session.get('_id')
-    anno_path = f"{app.config['OUT']}/{user_id}.csv"
-    directory = app.config["IMAGES"] + f'/{user_id}'
-    shutil.copyfile(anno_path, f'{directory}/annotations.csv')
-    shutil.make_archive('final', 'zip', directory)
+    anno_path = get_anno_path(user_id)
+    img_dir = get_images_directory(user_id)
+    shutil.copyfile(anno_path, f'{img_dir}/annotations.csv')
+    shutil.make_archive('final', 'zip', img_dir)
     return send_file('final.zip',
                      mimetype='text/csv',
                      download_name='final.zip',