code format and pylint fixes

Author: FoamyGuy

PyPortal_Winamp_Player/PyPortal_Winamp_Skin_Converter/convert_winamp_skin.py

@@ -4,9 +4,9 @@
 """
 PyPortal winamp skin converter.
 """
-from PIL import Image, ImageDraw
 import sys
 import json
+from PIL import Image, ImageDraw
 
 # get input filename from terminal args
 if len(sys.argv) >= 2:
@@ -34,20 +34,17 @@
 
 # scan pixel for backdrop color
 back_drop_color = im.getpixel((120, 29))
-for color in find_text_color_dict.keys():
+for color in find_text_color_dict:
     if not highest_pixel_count:
         highest_pixel_count = find_text_color_dict[color]
         text_color = color
     elif highest_pixel_count < find_text_color_dict[color]:
         highest_pixel_count = find_text_color_dict[color]
         text_color = color
 
-#print("backdrop: {}".format(back_drop_color))
+# print("backdrop: {}".format(back_drop_color))
 time_color = text_color
-config_data = {
-    "text_color": text_color,
-    "time_color": time_color
-}
+config_data = {"text_color": text_color, "time_color": time_color}
 
 find_text_color_dict = {}
 for i in range(21):
@@ -68,15 +65,24 @@
 for x_loc in time_shape_x_locs:
     _cur_time_shape_loc = (x_loc, 26)
     _cur_time_shape = (
-        _cur_time_shape_loc, (_cur_time_shape_loc[0] + time_shape_size[0], _cur_time_shape_loc[1] + time_shape_size[1]))
+        _cur_time_shape_loc,
+        (
+            _cur_time_shape_loc[0] + time_shape_size[0],
+            _cur_time_shape_loc[1] + time_shape_size[1],
+        ),
+    )
     img_draw.rectangle(_cur_time_shape, fill=back_drop_color)
 
 # rectangle cutout for playlist display
 playlist_shape_size = (244, 48)
 playlist_shape_loc = (12, 257)
 playlist_shape = (
     playlist_shape_loc,
-    (playlist_shape_loc[0] + playlist_shape_size[0], playlist_shape_loc[1] + playlist_shape_size[1]))
+    (
+        playlist_shape_loc[0] + playlist_shape_size[0],
+        playlist_shape_loc[1] + playlist_shape_size[1],
+    ),
+)
 
 img_draw.rectangle(playlist_shape, fill=back_drop_color)
 

PyPortal_Winamp_Player/code.py

@@ -5,9 +5,8 @@
 PyPortal winamp player
 """
 import time
-import storage
 import sys
-import os
+import storage
 import board
 import busio
 import digitalio
@@ -62,7 +61,7 @@
 sys.path.append("/sd")
 
 # debugging, print files that exist on SDCard
-#print(os.listdir("/sd"))
+# print(os.listdir("/sd"))
 
 # get reference to the display
 display = board.DISPLAY
@@ -74,7 +73,7 @@
 winamp_application = WinampApplication(
     playlist_file=PLAYLIST_FILE,
     skin_image=SKIN_IMAGE,
-    skin_config_file=SKIN_CONFIG_FILE
+    skin_config_file=SKIN_CONFIG_FILE,
 )
 
 # Add the Group to the Display
@@ -110,7 +109,7 @@
                 else:
                     winamp_application.previous_track()
             # if touch is on top half
-            elif p[1] <= 240 //2:
+            elif p[1] <= 240 // 2:
                 # if currently playing song
                 if winamp_application.CURRENT_STATE == winamp_application.STATE_PLAYING:
                     print("pausing")

PyPortal_Winamp_Player/winamp_helpers.py

@@ -5,11 +5,10 @@
 PyPortal winamp displayio widget classes.
 """
 import time
-
+import json
 import board
 import displayio
 import terminalio
-import json
 from audioio import AudioOut
 from audiomp3 import MP3Decoder
 from adafruit_display_text import bitmap_label, scrolling_label
@@ -25,12 +24,16 @@ class WinampApplication(displayio.Group):
     :param skin_image: BMP image file for skin background
     :param skin_config_file: json file containing color values
     """
+
     STATE_PLAYING = 0
     STATE_PAUSED = 1
 
-    def __init__(self, playlist_file="playlist.json",
-                 skin_image="/base_240x320.bmp",
-                 skin_config_file="base_config.json"):
+    def __init__(
+        self,
+        playlist_file="playlist.json",
+        skin_image="/base_240x320.bmp",
+        skin_config_file="base_config.json",
+    ):
         self.SKIN_IMAGE = skin_image
         self.SKIN_CONFIG_FILE = skin_config_file
         self.PLAYLIST_FILE = playlist_file
@@ -51,7 +54,9 @@ def __init__(self, playlist_file="playlist.json",
         self.clock_display.y = 22
 
         # initialize playlist display
-        self.playlist_display = PlaylistDisplay(text_color=self.CONFIG_DATA["text_color"])
+        self.playlist_display = PlaylistDisplay(
+            text_color=self.CONFIG_DATA["text_color"]
+        )
         self.playlist_display.x = 13
         self.playlist_display.y = 234
 
@@ -60,21 +65,27 @@ def __init__(self, playlist_file="playlist.json",
         self.playlist_display.current_track_number = 1
 
         # get name of current song
-        self.current_song_file_name = self.PLAYLIST["playlist"]["files"][self.playlist_display.current_track_number - 1]
+        self.current_song_file_name = self.PLAYLIST["playlist"]["files"][
+            self.playlist_display.current_track_number - 1
+        ]
 
         # initialize ScrollingLabel for track name
-        self.current_song_lbl = scrolling_label.ScrollingLabel(terminalio.FONT,
-                                                               text=self.playlist_display.current_track_title,
-                                                               color=self.CONFIG_DATA["text_color"], max_characters=22)
+        self.current_song_lbl = scrolling_label.ScrollingLabel(
+            terminalio.FONT,
+            text=self.playlist_display.current_track_title,
+            color=self.CONFIG_DATA["text_color"],
+            max_characters=22,
+        )
         self.current_song_lbl.anchor_point = (0, 0)
         self.current_song_lbl.anchored_position = (98, 19)
 
         # Setup the skin image file as the bitmap data source
         self.background_bitmap = displayio.OnDiskBitmap(self.SKIN_IMAGE)
 
         # Create a TileGrid to hold the bitmap
-        self.background_tilegrid = displayio.TileGrid(self.background_bitmap,
-                                                      pixel_shader=self.background_bitmap.pixel_shader)
+        self.background_tilegrid = displayio.TileGrid(
+            self.background_bitmap, pixel_shader=self.background_bitmap.pixel_shader
+        )
 
         # initialize parent displayio.Group
         super().__init__()
@@ -116,7 +127,6 @@ def update(self):
         if self.CURRENT_STATE == self.STATE_PLAYING:
             # if it's time to increase the time on the ClockDisplay
             if self._cur_time >= self._last_increment_time + 1:
-
                 # increase ClockDisplay by 1 second
                 self._seconds_elapsed += 1
                 self._last_increment_time = self._cur_time
@@ -125,7 +135,6 @@ def update(self):
         # update the track label (scrolling)
         self.current_song_lbl.update()
 
-
         if self.CURRENT_STATE == self.STATE_PLAYING:
             # if we are supposed to be playing but aren't
             # it means the track ended.
@@ -136,7 +145,6 @@ def update(self):
         # store time for comparison later
         self._prev_time = self._cur_time
 
-
     def play_current_track(self):
         """
         Update the track label and begin playing the song for current
@@ -159,7 +167,9 @@ def play_current_track(self):
         self.current_song_file.close()
 
         # open new song file
-        self.current_song_file_name = self.PLAYLIST["playlist"]["files"][self.playlist_display.current_track_number - 1]
+        self.current_song_file_name = self.PLAYLIST["playlist"]["files"][
+            self.playlist_display.current_track_number - 1
+        ]
         self.current_song_file = open(self.current_song_file_name, "rb")
         self.decoder.file = self.current_song_file
 
@@ -171,7 +181,6 @@ def play_current_track(self):
             # pause so it's loaded, and ready to resume
             self.audio.pause()
 
-
     def next_track(self):
         """
         Advance to the next track.
@@ -187,7 +196,6 @@ def next_track(self):
         # start playing track
         self.play_current_track()
 
-
     def previous_track(self):
         """
         Go back to previous track.
@@ -204,7 +212,6 @@ def previous_track(self):
         # start playing track
         self.play_current_track()
 
-
     def pause(self):
         """
         Stop playing song and wait until resume function.
@@ -215,7 +222,6 @@ def pause(self):
             self.audio.pause()
         self.CURRENT_STATE = self.STATE_PAUSED
 
-
     def resume(self):
         """
         Resume playing song after having been paused.
@@ -240,9 +246,12 @@ class PlaylistDisplay(displayio.Group):
     :param song_list: Song names in the list
     :param current_track_number: initial track number shown at the top of the list.
     """
-    def __init__(self, text_color, song_list=[], current_track_number=0):
+
+    def __init__(self, text_color, song_list=None, current_track_number=0):
         super().__init__()
 
+        if song_list is None:
+            song_list = []
         self._song_list = song_list
         self._current_track_number = current_track_number
 
@@ -265,7 +274,9 @@ def update_display(self):
         """
 
         # get the current track plus the following 2
-        _showing_songs = self.song_list[self.current_track_number - 1:self.current_track_number + 3 - 1]
+        _showing_songs = self.song_list[
+            self.current_track_number - 1 : self.current_track_number + 3 - 1
+        ]
 
         # format the track titles into a single string with newlines
         _showing_string = ""
@@ -335,7 +346,9 @@ def current_track_title(self):
         if self.current_track_number == 0:
             return "1. {}".format(self.song_list[0])
         else:
-            return "{}. {}".format(self.current_track_number, self.song_list[self.current_track_number - 1])
+            return "{}. {}".format(
+                self.current_track_number, self.song_list[self.current_track_number - 1]
+            )
 
 
 class ClockDisplay(displayio.Group):
@@ -346,6 +359,7 @@ class ClockDisplay(displayio.Group):
 
     :param text_color: Hex color code for the clock text
     """
+
     def __init__(self, text_color):
         super().__init__()
 
@@ -411,8 +425,8 @@ def update_display(self):
         _seconds = self.seconds % 60
 
         # zero pad the values and format into strings
-        _minutes_str = f'{_minutes:02}'
-        _seconds_str = f'{_seconds:02}'
+        _minutes_str = f"{_minutes:02}"
+        _seconds_str = f"{_seconds:02}"
 
         # update the text in the minutes labels
         if self.first_digit.text != _minutes_str[0]: