Sourcery refactored main branch

Extras/HouseOfDust/HouseOfDust.py

@@ -100,6 +100,11 @@ def exithandler(signum, frame):
     'PEOPLE WHO LOVE TO READ',
     ]
 
+ruleCount = 8
+
+tab = '   '
+lineSpacing = 2
+
 while 1:
     color = (55, 65, 65)
 
@@ -110,14 +115,9 @@ def exithandler(signum, frame):
     # font = ImageFont.truetype("dotmatrix.TTF", 24)
 
     font = ImageFont.truetype('daisywhl.otf', 28)
-    ruleCount = 8
-
-    tab = '   '
     tabSize = font.getsize(tab)[0]  # six spaces for a tab
     lineHeight = font.getsize('M')[1]
     charWidth = font.getsize('M')[0]
-    lineSpacing = 2
-
     ruleHeight = lineHeight * lineSpacing / ruleCount
     rules = int(size[1] / ruleHeight)
     for x in range(rules):
@@ -137,11 +137,12 @@ def exithandler(signum, frame):
 
     for x in range(4):
         x_text = 20
-        text = ['A HOUSE OF ' + material[x]]
-        text.append(location[x])
-        text.append('USING ' + light_source[x])
-        text.append('INHABITED BY ' + inhabitants[x])
-
+        text = [
+            f'A HOUSE OF {material[x]}',
+            location[x],
+            f'USING {light_source[x]}',
+            f'INHABITED BY {inhabitants[x]}',
+        ]
         for line in text:
             columns = int((size[0] - x_text) / charWidth)
             lines = textwrap.wrap(line, width=columns, replace_whitespace=False)

Extras/Nees/nees.py

@@ -54,7 +54,7 @@ def exithandler(signum, frame):
     d = ImageDraw.Draw(img)
 
     def clip(val, min_, max_):
-        return (min_ if val < min_ else (max_ if val > max_ else val))
+        return min_ if val < min_ else min(val, max_)
 
     if type == 0:
         for x in range(0, gridX):

slowmovie.py

@@ -164,16 +164,15 @@ def get_next_video(viddir, currentVideo=None):
     if currentVideo:
         nextIndex = videos.index(currentVideo) + 1
         # If we're not wrapping around
-        if not nextIndex >= len(videos):
+        if nextIndex < len(videos):
             return os.path.join(viddir, videos[nextIndex])
     # Wrapping around or no current video: return first video
     return os.path.join(viddir, videos[0])
 
 
 # Returns a random video from the videos directory
 def get_random_video(viddir):
-    videos = list(filter(supported_filetype, os.listdir(viddir)))
-    if videos:
+    if videos := list(filter(supported_filetype, os.listdir(viddir))):
         return os.path.join(viddir, random.choice(videos))
 
 
@@ -186,25 +185,22 @@ def estimate_runtime(delay, increment, frames, all=False):
     days = hours / 24
 
     if all:
-        output = f"{seconds:.1f} second(s) / {minutes:.1f} minute(s) / {hours:.1f} hour(s) / {days:.2f} day(s)"
+        return f"{seconds:.1f} second(s) / {minutes:.1f} minute(s) / {hours:.1f} hour(s) / {days:.2f} day(s)"
+    elif minutes < 1:
+        return f"{seconds:.1f} second(s)"
+    elif hours < 1:
+        return f"{minutes:.1f} minute(s)"
+    elif days < 1:
+        return f"{hours:.1f} hour(s)"
     else:
-        if minutes < 1:
-            output = f"{seconds:.1f} second(s)"
-        elif hours < 1:
-            output = f"{minutes:.1f} minute(s)"
-        elif days < 1:
-            output = f"{hours:.1f} hour(s)"
-        else:
-            output = f"{days:.2f} day(s)"
-
-    return output
+        return f"{days:.2f} day(s)"
 
 
 # Check for a matching subtitle file
 def find_subtitles(file):
     if args.subtitles:
         name, _ = os.path.splitext(file)
-        for i in glob.glob(name + ".*"):
+        for i in glob.glob(f"{name}.*"):
             _, ext = os.path.splitext(i)
             if ext.lower() in subtitle_fileTypes:
                 logger.debug(f"Found subtitle file '{i}'")
@@ -277,10 +273,7 @@ def error(self, message):
 height = epd.height
 
 # Set path of Videos directory and logs directory. Videos directory can be specified by CLI --directory
-if args.directory:
-    viddir = args.directory
-else:
-    viddir = "Videos"
+viddir = args.directory if args.directory else "Videos"
 progressdir = "progress"
 
 # Create progress and Videos directories if missing