Minor changes

Sergio00166 · Oct 1, 2024 · c2c7e25 · c2c7e25
1 parent 1b833fa
commit c2c7e25
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 57 deletions.
diff --git a/scripts/run.py b/scripts/run.py
@@ -2,61 +2,62 @@
 #Code by Sergio00166
 
 
-from ipaddress import IPv4Address,IPv6Address
-from logging import getLogger,WARNING,INFO
-from os.path import exists,isdir,abspath
-from argparse import ArgumentParser
-from time import sleep as delay
-from threading import Thread
-from os import environ,sep
-from sys import modules
-from sys import path
-
-
-def is_valid_ip(ip):
-    try: IPv4Address(ip); return True
-    except:
-        try: IPv6Address(ip); return True
-        except: return False
-
-def init():
-    # Parse all CLI arguments
-    parser = ArgumentParser(description="Arguments for the webFILE")
-    parser.add_argument("-b", "--bind", type=str, required=True, help="Specify IP address to bind", metavar="IP")
-    parser.add_argument("-p", "--port", type=str, required=True, help="Specify port number")
-    parser.add_argument("-d", "--dir", type=str, required=True, help="Specify directory to share")
-    parser.add_argument("--dirsize", action="store_true", help="Show folder size")
-    args,exit_err = parser.parse_args(),False
-    if not is_valid_ip(args.bind):
-        print("THE IP IS NOT VALID")
-        exit_err = True   
-    try:
-        x = int(args.port)
-        if     1>=x: raise ValueError
-        if 65536<=x: raise ValueError
-    except:
-        print("THE PORT IS NOT VALID")
-        exit_err = True     
-    if not (exists(args.dir) and isdir(args.dir)):
-        print("THE FOLDER PATH IS NOT VALID")
-        exit_err = True   
-    if exit_err: exit(1)
-
-    return args.port, args.bind, args.dir, args.dirsize
-
 if __name__ == "__main__":
-    # Get the values from the initor (args from cli)
-    port, listen, root, folder_size = init()
-    environ['FOLDER'] = root
-    environ['SHOWSIZE'] = str(folder_size).upper()
-    path[0] = abspath(path[0]+sep+".."+sep+"app")
-    from app import *  # Import main flask app
-    # Disable every shit that flask prints
-    log = getLogger('werkzeug'); log.setLevel(WARNING)
-    # Hide the banner that flask prints
-    modules['flask.cli'].show_server_banner = lambda *x: print(end="")
-    # Change logging to default after app is running
-    Thread(target=lambda: (delay(0.1), log.setLevel(INFO))).start()
-    # Run the main app with the custom args
-    app.run(host=listen, port=int(port), debug=False)
+    try:
+        from ipaddress import IPv4Address,IPv6Address
+        from logging import getLogger,WARNING,INFO
+        from os.path import exists,isdir,abspath
+        from argparse import ArgumentParser
+        from time import sleep as delay
+        from threading import Thread
+        from sys import modules,path
+        from os import environ,sep
+
+        def is_valid_ip(ip):
+            try: IPv4Address(ip); return True
+            except:
+                try: IPv6Address(ip); return True
+                except: return False
+
+        def init():
+            # Parse all CLI arguments
+            parser = ArgumentParser(description="Arguments for the webFILE")
+            parser.add_argument("-b", "--bind", type=str, required=True, help="Specify IP address to bind", metavar="IP")
+            parser.add_argument("-p", "--port", type=str, required=True, help="Specify port number")
+            parser.add_argument("-d", "--dir", type=str, required=True, help="Specify directory to share")
+            parser.add_argument("--dirsize", action="store_true", help="Show folder size")
+            args,exit_err = parser.parse_args(),False
+            if not is_valid_ip(args.bind):
+                print("THE IP IS NOT VALID")
+                exit_err = True   
+            try:
+                x = int(args.port)
+                if     1>=x: raise ValueError
+                if 65536<=x: raise ValueError
+            except:
+                print("THE PORT IS NOT VALID")
+                exit_err = True     
+            if not (exists(args.dir) and isdir(args.dir)):
+                print("THE FOLDER PATH IS NOT VALID")
+                exit_err = True   
+            if exit_err: exit(1)
+
+            return args.port, args.bind, args.dir, args.dirsize
+
+        # Get the values from the initor (args from cli)
+        port, listen, root, folder_size = init()
+        environ['FOLDER'] = root
+        environ['SHOWSIZE'] = str(folder_size).upper()
+        path[0] = abspath(path[0]+sep+".."+sep+"app")
+        from app import *  # Import main flask app
+        # Disable every shit that flask prints
+        log = getLogger('werkzeug'); log.setLevel(WARNING)
+        # Hide the banner that flask prints
+        modules['flask.cli'].show_server_banner = lambda *x: print(end="")
+        # Change logging to default after app is running
+        Thread(target=lambda: (delay(0.1), log.setLevel(INFO))).start()
+        # Run the main app with the custom args
+        app.run(host=listen, port=int(port), debug=False)
+
+    except: exit()
 
diff --git a/scripts/start.py b/scripts/start.py
@@ -149,7 +149,7 @@ def main():
 
     try: # Wait until Ctrl+C
         while True: delay(1)
-    except KeyboardInterrupt: exit(1)
+    except KeyboardInterrupt: exit()
 
 
 if __name__=="__main__": main()