Bug/issue-138/correct-bad-loglevels

resolve_proxy_encoder/app/checks.py

@@ -22,14 +22,6 @@ def check_worker_presence():
     """Warn user if no celery workers are available"""
 
     online_workers = celery_app.control.inspect().active_queues()
-
-    if not online_workers:
-
-        logger.warning(
-            "[yellow]There are no workers currently online to process jobs!\n"
-            "Make sure you start at least one."
-        )
-
     logger.debug(f"[magenta]Online workers:[/]\n{online_workers}")
     return online_workers
 
@@ -105,7 +97,7 @@ def check_for_updates(github_url: str, package_name: str) -> Union[dict, None]:
     }
 
 
-def check_worker_compatability(online_workers):
+def check_worker_compatibility(online_workers):
 
     if settings["app"]["disable_version_constrain"]:
         logger.warning(
@@ -115,7 +107,7 @@ def check_worker_compatability(online_workers):
         return
 
     spinner = yaspin(
-        text="Checking worker compatability...",
+        text="Checking worker compatibility...",
         color="cyan",
     )
 
@@ -124,12 +116,14 @@ def check_worker_compatability(online_workers):
 
         spinner.fail("❌ ")
         logger.warning(
-            "[yellow]No workers found. Can't check compatability.\n"
+            "[yellow]No workers found. Can't check compatibility.\n"
             + "Jobs may not be received if no compatible workers are available!\n[/]"
             + "[red]CONTINUE AT OWN RISK![/]\n"
         )
 
-        if not Confirm.ask("[cyan]Do you wish to continue?[/]"):
+        if not Confirm.ask(
+            "[yellow]No workers found.[/] [cyan]Do you wish to continue?[/]"
+        ):
             core.app_exit(1, -1)
 
         return

resolve_proxy_encoder/app/cli.py

@@ -58,7 +58,7 @@ def queue():
     DaVinci Resolve timeline
     """
 
-    checks.check_worker_compatability(settings["online_workers"])
+    checks.check_worker_compatibility(settings["online_workers"])
 
     print("\n")
     console.rule(

resolve_proxy_encoder/app/utils/core.py

@@ -37,7 +37,7 @@ def install_rich_tracebacks(show_locals=False):
     install(show_locals=show_locals)
 
 
-def app_exit(level: int = 0, timeout: int = -1, cleanup_funcs: list = []):
+def app_exit(level: int = 0, timeout: int = 0, cleanup_funcs: list = []):
 
     """
     Exit function to allow time to

resolve_proxy_encoder/queuer/link.py

@@ -28,7 +28,7 @@ def get_proxy_path():
     f = Prompt.ask("Enter path to search for proxies")
     if f is None:
         print("User cancelled. Exiting.")
-        exit(0)
+        core.app_exit(0, 0)
     return f
 
 

resolve_proxy_encoder/queuer/queue.py

@@ -142,8 +142,7 @@ def main():
 
     except Exception as e:
 
-        print("[red]Couldn't link jobs. Link manually:[/]")
-        print(e)
+        logger.error(f"[red]Couldn't link jobs. Link manually.[/]\nError: {e}")
         core.app_exit(1, -1)
 
 

resolve_proxy_encoder/queuer/resolve.py

@@ -56,7 +56,7 @@ def _populate_variables(self):
 
         except:
 
-            logger.warning(
+            logger.critical(
                 "[red] :warning: Couldn't access the Resolve Python API. Is DaVinci Resolve running?[/]"
             )
             core.app_exit(1, -1)
@@ -69,7 +69,7 @@ def _populate_variables(self):
 
         except:
 
-            logger.warning(
+            logger.critical(
                 "[red] :warning: Couldn't get current project. Is a project open in Resolve?[/]"
             )
             core.app_exit(1, -1)
@@ -81,7 +81,7 @@ def _populate_variables(self):
                 raise TypeError
         except:
 
-            logger.warning(
+            logger.critical(
                 "[red] :warning: Couldn't get current timeline. Is a timeline open in Resolve?[/]"
             )
             core.app_exit(1, -1)
@@ -94,7 +94,7 @@ def _populate_variables(self):
 
         except:
 
-            logger.warning("[red] :warning: Couldn't get Resolve's media pool.[/]")
+            logger.critical("[red] :warning: Couldn't get Resolve's media pool.[/]")
             core.app_exit(1, -1)
 
 

resolve_proxy_encoder/settings/manager.py

@@ -176,7 +176,7 @@ def _ensure_user_file(self):
                 except OSError:
 
                     self.spinner.fail("❌ ")
-                    logger.error("[red]Error creating directory![/]")
+                    logger.critical("[red]Error creating directory![/]")
                     core.app_exit(1, -1)
 
                 try:
@@ -187,7 +187,7 @@ def _ensure_user_file(self):
                 except:
 
                     self.spinner.fail("❌ ")
-                    print(
+                    logger.error(
                         f"[red]Couldn't copy default settings to {self.user_file}![/]"
                     )
                     core.app_exit(1, -1)

resolve_proxy_encoder/worker/ffmpeg/ffmpeg_process.py

@@ -136,9 +136,7 @@ def run(self, logfile):
         except KeyboardInterrupt:
             progress_bar.stop()
             process.kill()
-            logger.warning(
-                "[yellow][KeyboardInterrupt] FFmpeg process killed. Exiting...[/]"
-            )
+            print("[yellow][KeyboardInterrupt] FFmpeg process killed. Exiting...[/]")
             core.app_exit(0)
 
         except Exception as e:

resolve_proxy_encoder/worker/launch_workers.py

@@ -94,7 +94,7 @@ def get_celery_binary_path():
         if celery_bin:
             return celery_bin
         logger.warning(
-            "[yellow]Using Celery on path." + "Please ensure version compatability![/]"
+            "[yellow]Using Celery on path." + "Please ensure version compatibility![/]"
         )
 
         logger.error("[red]Couldn't find celery binary! Is it installed?[/]")

resolve_proxy_encoder/worker/utils.py

@@ -51,7 +51,7 @@ def get_queue():
 
         logger.warning(
             "[yellow]Version constrain is disabled!\n"
-            "You [bold]must[/] ensure routing and version compatability yourself!"
+            "You [bold]must[/] ensure routing and version compatibility yourself!"
         )
 
         return "celery"