Misc cleanup (#73)

* Stop previously running zeroconf instances

* Lots of formatting fixes

* Use f-strings for time delta

* More line fixes

* Update requirements.txt

* More misc cleanup

* Simplify README.md

src/api/add_job_helpers.py

@@ -86,7 +86,6 @@ def download_project_from_url(project_url):
     # This nested function is to handle downloading from a URL
     logger.info(f"Downloading project from url: {project_url}")
     referred_name = os.path.basename(project_url)
-    downloaded_file_url = None
 
     try:
         response = requests.get(project_url, stream=True)
@@ -156,7 +155,7 @@ def process_zipped_project(zip_path):
     return extracted_project_path
 
 
-def create_render_jobs(jobs_list, loaded_project_local_path, job_dir):
+def create_render_jobs(jobs_list, loaded_project_local_path):
     """
     Creates render jobs.
 
@@ -166,7 +165,6 @@ def create_render_jobs(jobs_list, loaded_project_local_path, job_dir):
     Args:
         jobs_list (list): A list of job data.
         loaded_project_local_path (str): The local path to the loaded project.
-        job_dir (str): The job directory.
 
     Returns:
         list: A list of results from creating the render jobs.

src/api/api_server.py

@@ -181,7 +181,7 @@ def make_job_ready(job_id):
             RenderQueue.save_state()
             return found_job.json(), 200
     except Exception as e:
-        return "Error making job ready: {e}", 500
+        return f"Error making job ready: {e}", 500
     return "Not valid command", 405
 
 
@@ -213,8 +213,8 @@ def download_all(job_id):
 def presets():
     presets_path = system_safe_path('config/presets.yaml')
     with open(presets_path) as f:
-        presets = yaml.load(f, Loader=yaml.FullLoader)
-    return presets
+        loaded_presets = yaml.load(f, Loader=yaml.FullLoader)
+    return loaded_presets
 
 
 @server.get('/api/full_status')
@@ -268,7 +268,7 @@ def add_job_handler():
         if loaded_project_local_path.lower().endswith('.zip'):
             loaded_project_local_path = process_zipped_project(loaded_project_local_path)
 
-        results = create_render_jobs(jobs_list, loaded_project_local_path, referred_name)
+        results = create_render_jobs(jobs_list, loaded_project_local_path)
         for response in results:
             if response.get('error', None):
                 return results, 400
@@ -376,7 +376,8 @@ def renderer_info():
         if installed_versions:
             # fixme: using system versions only because downloaded versions may have permissions issues
             system_installed_versions = [x for x in installed_versions if x['type'] == 'system']
-            install_path = system_installed_versions[0]['path'] if system_installed_versions else installed_versions[0]['path']
+            install_path = system_installed_versions[0]['path'] if system_installed_versions else (
+                installed_versions)[0]['path']
             renderer_data[engine.name()] = {'is_available': RenderQueue.is_available_for_job(engine.name()),
                                             'versions': installed_versions,
                                             'supported_extensions': engine.supported_extensions(),
@@ -482,7 +483,7 @@ def start_server():
     flask_log = logging.getLogger('werkzeug')
     flask_log.setLevel(Config.flask_log_level.upper())
 
-    # check for updates for render engines if config'd or on first launch
+    # check for updates for render engines if configured or on first launch
     if Config.update_engines_on_launch or not EngineManager.all_engines():
         EngineManager.update_all_engines()
 

src/api/serverproxy_manager.py

@@ -32,4 +32,3 @@ class ServerProxyManager:
             cls.server_proxys[hostname] = new_proxy
             found_proxy = new_proxy
         return found_proxy
-