(WIP) Begin Piers work

Author: bossanova808

resources/lib/monitor.py

@@ -14,5 +14,4 @@ def onSettingsChanged(self):
         Logger.info('onSettingsChanged - reload them.')
         Store.load_config_from_settings()
 
-    def onAbortRequested(self):
-        Logger.debug('onAbortRequested')
+

resources/lib/playback_resumer.py

@@ -1,11 +1,12 @@
-from bossanova808.utilities import *
-# noinspection PyPackages
-from .store import Store
 import xbmc
 # noinspection PyPackages
 from .monitor import KodiEventMonitor
 # noinspection PyPackages
 from .player import KodiPlayer
+# noinspection PyPackages
+from .store import Store
+
+from bossanova808.logger import Logger
 
 
 def run():
@@ -14,7 +15,7 @@ def run():
 
     :return:
     """
-    footprints()
+    Logger.start()
     # load settings and create the store for our globals
     Store()
     Store.kodi_event_monitor = KodiEventMonitor(xbmc.Monitor)
@@ -26,7 +27,8 @@ def run():
 
     while not Store.kodi_event_monitor.abortRequested():
         if Store.kodi_event_monitor.waitForAbort(1):
+            Logger.debug('onAbortRequested')
             # Abort was requested while waiting. We should exit
             break
 
-    footprints(False)
+    Logger.stop()

resources/lib/player.py

@@ -2,7 +2,7 @@
 
 from bossanova808.logger import Logger
 from bossanova808.notify import Notify
-from bossanova808.utilities import *
+from bossanova808.utilities import send_kodi_json
 
 # noinspection PyPackages
 from .store import Store
@@ -17,6 +17,7 @@ class KodiPlayer(xbmc.Player):
     This class represents/monitors the Kodi video player
     """
 
+    # noinspection PyUnusedLocal
     def __init__(self, *args):
         xbmc.Player.__init__(self)
         Logger.debug('KodiPlayer __init__')
@@ -35,8 +36,8 @@ def onPlayBackStopped(self):
         Logger.info("onPlayBackStopped")
         self.update_resume_point(-2)
 
-    def onPlayBackSeek(self, time, seekOffset):
-        Logger.info(f'onPlayBackSeek time {time}, seekOffset {seekOffset}')
+    def onPlayBackSeek(self, time_to_seek, seek_offset):
+        Logger.info(f'onPlayBackSeek time {time_to_seek}, seekOffset {seek_offset}')
         try:
             self.update_resume_point(self.getTime())
         except RuntimeError:
@@ -242,7 +243,7 @@ def resume_if_was_playing(self):
                     resume_point = float(f.read())
                 except Exception:
                     Logger.error("Error reading resume point from file, therefore not resuming.")
-                    return
+                    return False
 
             # neg 1 means the video wasn't playing when Kodi ended
             if resume_point < 0:
@@ -280,9 +281,11 @@ def get_random_library_video(self):
                 and not Store.video_types_in_library['movies'] \
                 and not Store.video_types_in_library['musicvideos']:
             Logger.warning('No episodes, movies, or music videos exist in the Kodi library. Cannot autoplay a random video.')
-            return
+            return False
 
         random_int = randint(0, 2)
+        result_type = None
+        method = None
         if random_int == 0:
             result_type = 'episodes'
             method = "GetEpisodes"

resources/lib/store.py

@@ -1,10 +1,13 @@
-from bossanova808.utilities import *
-from bossanova808.logger import Logger
 import os
 import json
 import xml.etree.ElementTree as ElementTree
 
 import xbmc
+import xbmcvfs
+
+from bossanova808.constants import PROFILE, ADDON
+from bossanova808.logger import Logger
+from bossanova808.utilities import get_setting, get_setting_as_bool
 
 
 class Store: