Merge pull request #43 from StuffAnThings/develop

Develop

VERSION

@@ -1 +1 @@
-2.0
+2.1

modules/util.py

@@ -31,7 +31,7 @@ def print_stacktrace():
 
 def my_except_hook(exctype, value, tb):
     for line in traceback.format_exception(etype=exctype, value=value, tb=tb):
-        print_multiline(line, critical=True)
+        print_multiline(line, 'CRITICAL')
 
 
 def centered(text, sep=" "):

qbit_manage.py

@@ -326,6 +326,11 @@ def set_cross_seed():
         total = 0
         #Track # of torrents tagged that are not cross-seeded
         t_tagged = 0
+
+        if not os.path.exists(os.path.join(cfg['directory']['cross_seed'], '')):
+            logger.error(f"Path Error: cross_seed directory not found at {os.path.abspath(os.path.join(cfg['directory']['cross_seed'], ''))}")
+            return
+
         # Only get torrent files
         cs_files = [f for f in os.listdir(os.path.join(cfg['directory']['cross_seed'], '')) if f.endswith('torrent')]
         dir_cs = os.path.join(cfg['directory']['cross_seed'], '')
@@ -530,21 +535,20 @@ def set_rem_unregistered():
                                 del_tor += 1
         if dry_run:
             if rem_unr >= 1 or del_tor >= 1:
-                logger.dryrun(f'Did not delete {rem_unr} .torrents(s) but not content files.')
-                logger.dryrun(f'Did not delete {del_tor} .torrents(s) AND content files.')
+                if rem_unr >= 1: logger.dryrun(f'Did not delete {rem_unr} .torrents(s) but not content files.')
+                if del_tor >= 1: logger.dryrun(f'Did not delete {del_tor} .torrents(s) AND content files.')
             else:
                 logger.dryrun('No unregistered torrents found.')
         else:
             if rem_unr >= 1 or del_tor >= 1:
-                logger.info(f'Deleted {rem_unr} .torrents(s) but not content files.')
-                logger.info(f'Deleted {del_tor} .torrents(s) AND content files.')
+                if rem_unr >= 1: logger.info(f'Deleted {rem_unr} .torrents(s) but not content files.')
+                if del_tor >= 1: logger.info(f'Deleted {del_tor} .torrents(s) AND content files.')   
             else:
                 logger.info('No unregistered torrents found.')
         if (len(pot_unr) > 0):
             util.separator(f"Potential Unregistered torrents", space=False, border=False, loglevel='DEBUG')
             util.print_multiline(pot_unr,"DEBUG")
 
-
 def set_rem_orphaned():
     if rem_orphaned:
         util.separator(f"Checking for Orphaned Files", space=False, border=False)