migrate main code to blueprint

Author: fybedev

app.py

@@ -11,8 +11,12 @@
 
 from tools.utils import redirect
 from lightdb import LightDB
+
+# Blueprints
 from tools.geo_loc import geo_loc_bp
 from tools.auth import auth_bp
+from tools.index import index_bp
+
 from tools.db_auth import is_admin_user
 
 from werkzeug.exceptions import RequestEntityTooLarge
@@ -32,12 +36,14 @@
 app.config['MAX_CONTENT_LENGTH'] = 1000000 * 1024 * 1024
 app.config['SECRET_KEY'] = str(random.randint(99999, 9999999))
 app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1)
+
 app.register_blueprint(geo_loc_bp)
 app.register_blueprint(auth_bp)
+app.register_blueprint(index_bp)
 
 @app.route('/')
 def index():
-    # return redirect(url_for('upload'))
+    # return redirect(url_for('index.upload'))
     return render_template('index.html')
 
 @app.route('/dashboard')
@@ -47,7 +53,7 @@ def dashboard():
 
     if session.get('loggedIn', False) == False:
         flash('You must be signed in to view the dashboard!', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     username = session.get('username')
     userfiles = []
@@ -57,7 +63,7 @@ def dashboard():
         flash('An error occurred. Please sign in again.', 'error')
         session['loggedIn'] = False
         session.pop('username', None)
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     for file in db:
         if db[file].get('owner') == username:
@@ -82,81 +88,6 @@ def dashboard():
         quota_usage=quota_usage_gb,
         is_admin=is_admin_user(username)
     )
-
-@app.route('/upload')
-def upload():
-    db = l_db['files']
-    udb = l_db['users']
-    loggedIn = session.get('loggedIn', False)
-    username = session.get('username', '')
-    quota_gb = None
-    quota_usage_gb = 0.0
-    try:
-        if loggedIn and username:
-            user_rec = None
-            for u in udb:
-                if u.get('username') == username:
-                    user_rec = u
-                    break
-            if user_rec:
-                quota_gb = user_rec.get('quota_gb', 0)
-            else:
-                quota_gb = 0
-            userfiles = []
-            for file in db:
-                if db[file].get('owner') == username:
-                    userfiles.append(db[file])
-            for userfile in userfiles:
-                usf_mb = userfile.get('size_megabytes', 0)
-                if usf_mb:
-                    quota_usage_gb += usf_mb / 1024
-            quota_usage_gb = round(quota_usage_gb, 1)
-        else:
-            quota_gb = 5.0
-            quota_usage_gb = 0.0
-    except Exception:
-        quota_gb = quota_gb or 0
-        quota_usage_gb = quota_usage_gb or 0.0
-
-    return render_template('upload.html', loggedIn=loggedIn, username=username, quota_gb=quota_gb, quota_usage=quota_usage_gb)
-
-@app.route('/upload_kr')
-def upload_kr():
-    db = l_db['files']
-    udb = l_db['users']
-    loggedIn = session.get('loggedIn', False)
-    username = session.get('username', '')
-    quota_gb = None
-    quota_usage_gb = 0.0
-    try:
-        if loggedIn and username:
-            user_rec = None
-            for u in udb:
-                if u.get('username') == username:
-                    user_rec = u
-                    break
-            if user_rec:
-                quota_gb = user_rec.get('quota_gb', 0)
-            else:
-                quota_gb = 0
-            userfiles = []
-            for file in db:
-                if db[file].get('owner') == username:
-                    userfiles.append(db[file])
-            for userfile in userfiles:
-                usf_mb = userfile.get('size_megabytes', 0)
-                if usf_mb:
-                    quota_usage_gb += usf_mb / 1024
-            quota_usage_gb = round(quota_usage_gb, 1)
-        else:
-            quota_gb = 5.0
-            quota_usage_gb = 0.0
-    except Exception:
-        quota_gb = quota_gb or 0
-        quota_usage_gb = quota_usage_gb or 0.0
-
-    return render_template('upload_kr.html', loggedIn=loggedIn, username=username, quota_gb=quota_gb, quota_usage=quota_usage_gb)
-
 @app.route('/sendfile', methods=['POST'])
 def sendfile():
         db = l_db['files']
@@ -226,7 +157,7 @@ def sendfile():
                 else:
                     flash('1-Time Download code: ' + fileid, 'info')
 
-                return redirect(url_for('upload'))
+                return redirect(url_for('index.upload'))
 
             except RequestEntityTooLarge:
                 return 'File is larger than the size limit.'
@@ -239,7 +170,7 @@ def delete(code):
         if file.split('_')[-1] == code:
             if db[file].get('owner') != session.get('username'):
                 flash('You do not own this file and cannot delete it.', 'error')
-                return redirect(url_for('upload'))
+                return redirect(url_for('index.upload'))
             try:
                 os.remove('uploads/' + file)
             except FileNotFoundError:
@@ -255,7 +186,7 @@ def delete(code):
 @app.route('/download')
 def download_without_code():
     flash('No code provided!', 'error')
-    return redirect(url_for('upload'))
+    return redirect(url_for('index.upload'))
 
 @app.route('/download/<code>', methods=['GET', 'POST'])
 def download(code):
@@ -281,7 +212,7 @@ def download(code):
                     print(f"Deleted! DB now has {len(db)} files")
                     break
             flash('Invalid code! Check if you typed the correct code, and for one-time codes, make sure nobody else entered the code before you did.', 'error')
-            return redirect(url_for('upload'))
+            return redirect(url_for('index.upload'))
         else:
             # Get original filename from database if it exists
             original_filename = db[filename].get('original_filename', filename.replace(f'_{code}', ''))
@@ -307,18 +238,18 @@ def backRename():
         import traceback
         traceback.print_exc()
         flash('Invalid code! Check if you typed the correct code, and for one-time codes, make sure nobody else entered the code before you did.', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
 @app.route('/admin')
 def admin():
     if not session.get('loggedIn', False):
         flash('You must be signed in to access the admin panel!', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     username = session.get('username')
     if not is_admin_user(username):
         flash('Access denied. Admin privileges required.', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     db = l_db['files']
     udb = l_db['users']
@@ -366,7 +297,7 @@ def admin():
 def admin_update_quota():
     if not session.get('loggedIn', False) or not is_admin_user(session.get('username')):
         flash('Access denied.', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     target = request.form.get('username')
     try:
@@ -392,7 +323,7 @@ def admin_update_quota():
 def admin_delete_user():
     if not session.get('loggedIn', False) or not is_admin_user(session.get('username')):
         flash('Access denied.', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     target = request.form.get('username')
     if target == session.get('username'):
@@ -424,7 +355,7 @@ def admin_delete_user():
 def admin_toggle_admin():
     if not session.get('loggedIn', False) or not is_admin_user(session.get('username')):
         flash('Access denied.', 'error')
-        return redirect(url_for('upload'))
+        return redirect(url_for('index.upload'))
 
     target = request.form.get('username')
     if target == session.get('username'):

tools/index.py

@@ -0,0 +1,87 @@
+from flask import (
+    Blueprint, render_template, session
+)
+
+from ..lightdb import LightDB
+
+index_bp = Blueprint('index', __name__)
+l_db = LightDB()
+
+@index_bp.route('/')
+def index():
+    # return redirect(url_for('upload'))
+    return render_template('index.html')
+
+@index_bp.route('/upload')
+def upload():
+    db = l_db['files']
+    udb = l_db['users']
+    loggedIn = session.get('loggedIn', False)
+    username = session.get('username', '')
+    quota_gb = None
+    quota_usage_gb = 0.0
+    try:
+        if loggedIn and username:
+            user_rec = None
+            for u in udb:
+                if u.get('username') == username:
+                    user_rec = u
+                    break
+            if user_rec:
+                quota_gb = user_rec.get('quota_gb', 0)
+            else:
+                quota_gb = 0
+            userfiles = []
+            for file in db:
+                if db[file].get('owner') == username:
+                    userfiles.append(db[file])
+            for userfile in userfiles:
+                usf_mb = userfile.get('size_megabytes', 0)
+                if usf_mb:
+                    quota_usage_gb += usf_mb / 1024
+            quota_usage_gb = round(quota_usage_gb, 1)
+        else:
+            quota_gb = 5.0
+            quota_usage_gb = 0.0
+    except Exception:
+        quota_gb = quota_gb or 0
+        quota_usage_gb = quota_usage_gb or 0.0
+
+    return render_template('upload.html', loggedIn=loggedIn, username=username, quota_gb=quota_gb, quota_usage=quota_usage_gb)
+
+@app.route('/upload_kr')
+def upload_kr():
+    db = l_db['files']
+    udb = l_db['users']
+    loggedIn = session.get('loggedIn', False)
+    username = session.get('username', '')
+    quota_gb = None
+    quota_usage_gb = 0.0
+    try:
+        if loggedIn and username:
+            user_rec = None
+            for u in udb:
+                if u.get('username') == username:
+                    user_rec = u
+                    break
+            if user_rec:
+                quota_gb = user_rec.get('quota_gb', 0)
+            else:
+                quota_gb = 0
+            userfiles = []
+            for file in db:
+                if db[file].get('owner') == username:
+                    userfiles.append(db[file])
+            for userfile in userfiles:
+                usf_mb = userfile.get('size_megabytes', 0)
+                if usf_mb:
+                    quota_usage_gb += usf_mb / 1024
+            quota_usage_gb = round(quota_usage_gb, 1)
+        else:
+            quota_gb = 5.0
+            quota_usage_gb = 0.0
+    except Exception:
+        quota_gb = quota_gb or 0
+        quota_usage_gb = quota_usage_gb or 0.0
+
+    return render_template('upload_kr.html', loggedIn=loggedIn, username=username, quota_gb=quota_gb, quota_usage=quota_usage_gb)