code refactoring

Author: Tomasz Scislo

piFaceBitmaps.py

@@ -2,12 +2,11 @@
 
 cad = pifacecad.PiFaceCAD()
 
-bitmaps = {}
-bitmaps['PLAY'] = {'idx': 0, 'bitmap': pifacecad.LCDBitmap([0x10, 0x18, 0x1c, 0x1e, 0x1c, 0x18, 0x10, 0x0])}
-bitmaps['PAUSE'] = {'idx': 1, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x0, 0x0])}
-bitmaps['STOP'] = {'idx': 2, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0, 0x0])}
-bitmaps['ERROR'] = {'idx': 3, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1b, 0xe, 0x4, 0xe, 0x1b, 0x0, 0x0])}
-bitmaps['CLOCK'] = {'idx': 4, 'bitmap': pifacecad.LCDBitmap([0x0, 0xe, 0x15, 0x17, 0x11, 0xe, 0x0, 0x0])}
+bitmaps = {'PLAY': {'idx': 0, 'bitmap': pifacecad.LCDBitmap([0x10, 0x18, 0x1c, 0x1e, 0x1c, 0x18, 0x10, 0x0])},
+           'PAUSE': {'idx': 1, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x0, 0x0])},
+           'STOP': {'idx': 2, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0, 0x0])},
+           'ERROR': {'idx': 3, 'bitmap': pifacecad.LCDBitmap([0x0, 0x1b, 0xe, 0x4, 0xe, 0x1b, 0x0, 0x0])},
+           'CLOCK': {'idx': 4, 'bitmap': pifacecad.LCDBitmap([0x0, 0xe, 0x15, 0x17, 0x11, 0xe, 0x0, 0x0])}}
 
 for bitmap in bitmaps:
     cad.lcd.store_custom_bitmap(bitmaps[bitmap]['idx'], bitmaps[bitmap]['bitmap'])

radioControl.py

@@ -28,13 +28,13 @@ def getCurrentListItem(self):
         return self.streams.get()[self.stationIdx]
 
     def nextOnList(self):
-        if self.getCurrentListItem()['isRadio'] == False:
+        if not self.getCurrentListItem()['isRadio']:
             print('Next track...')
             self.piFaceThread.enableBacklight()
             subprocess.Popen(['mocp', '-f'])
 
     def prevOnList(self):
-        if self.getCurrentListItem()['isRadio'] == False:
+        if not self.getCurrentListItem()['isRadio']:
             print('Prev track...')
             self.piFaceThread.enableBacklight()
             subprocess.Popen(['mocp', '-r'])

settings.py

@@ -3,6 +3,7 @@
 
 dir_path = os.path.dirname(os.path.abspath(__file__))
 
+
 class Settings():
     def __init__(self):
         self.loadedJson = None

threads/piFaceThread.py

@@ -97,10 +97,10 @@ def handleDisplay(self):
                 self.scrollCounter = 0
             else:
                 self.scrollCounter += 1
-        if self.firstLine['state'] != None:
+        if self.firstLine['state'] is not None:
             cad.lcd.set_cursor(0, 0)
             cad.lcd.write_custom_bitmap(self.firstLine['state'])
-        if self.firstLine['radioStation'] != None:
+        if self.firstLine['radioStation'] is not None:
             cad.lcd.set_cursor(2, 0)
             cad.lcd.write(self.firstLine['radioStation'])
 

threads/standbyThread.py

@@ -20,7 +20,7 @@ def isDisabled(self):
             return False
 
     def run(self):
-        while (True):
+        while True:
             if self.state == "ENABLED":
                 self.now = datetime.datetime.now()
                 self.piFaceThread.writeFirstLine(bitmaps['CLOCK']['idx'], self.now.strftime("%H:%M:%S"))

threads/statusThread.py

@@ -14,7 +14,7 @@ def __init__(self):
         self.daemon = True
 
     def run(self):
-        while (True):
+        while True:
             if self.state == "ENABLED":
                 self.getPlaybackState()
             time.sleep(0.2)