playlist history now works for local playlists

Author: s-n-g

Changelog

@@ -1,16 +1,20 @@
-2019-11-15
+2019-12-02 s-n-g
+    * Adding playlist history (for local playlists)
+    * WINDOWS: Volume will be saved when mplayer is installed in %APPDATA%\pyradio
+
+2019-11-15 s-n-g
     * PyRadio will not crush with mpv 0.30.0
       Changing mpv's volume is still possible, but no info will be
       presented on the Status Bar.
       Furthermore, saving mpv's volume will not be possible
       ( mpv issue #7153: https://github.com/mpv-player/mpv/issues/7153 )
 
-2019-11-12
+2019-11-12 s-n-g
     * When default played is changed in the config, a message to restart
       the application is presented to the user
     * Config / Default station: pading fixed
 
-2019-11-10
+2019-11-10 s-n-g
     * Fixing vlc returned volume parsing (due to locales decimal separator)
 
 2019-10-29 s-n-g

pyradio/config.py

@@ -71,8 +71,6 @@ class PyRadioStations(object):
 
     jump_tag = -1
 
-    _browsing_station_service = False
-
     # station directory service object
     _online_browser = None
 
@@ -133,11 +131,35 @@ def playlist_version(self, value):
 
     @property
     def browsing_station_service(self):
-        return self._browsing_station_service
+        return self._ps.browsing_station_service
 
     @browsing_station_service.setter
     def browsing_station_service(self, value):
-        self._browsing_station_service = value
+        self._ps.browsing_station_service = value
+
+    @property
+    def history_selection(self):
+        return self._ps.selection
+
+    @history_selection.setter
+    def history_selection(self, value):
+        self._ps.selection = value
+
+    @property
+    def history_startPos(self):
+        return self._ps.startPos
+
+    @history_startPos.setter
+    def history_startPos(self, value):
+        self._ps.startPos = value
+
+    @property
+    def browsing_station_service(self):
+        return self._ps.browsing_station_service
+
+    @browsing_station_service.setter
+    def browsing_station_service(self, value):
+        self._ps.browsing_station_service = value
 
     @property
     def stations_file(self):
@@ -157,7 +179,7 @@ def stations_filename_only(self, value):
 
     @property
     def stations_filename_only_no_extension(self):
-        return self._ps.stations_filename_only
+        return self._ps.stations_filename_only_no_extension
 
     @stations_filename_only_no_extension.setter
     def stations_filename_only_no_extension(self, value):
@@ -172,7 +194,7 @@ def can_go_back_in_time(self, value):
         raise ValueError('property is read only')
 
     def url(self, id_in_list):
-        if self._browsing_station_service:
+        if self._ps.browsing_station_service:
             # TODO get browser url
             return self._online_browser.url(id_in_list)
             #return self.stations[id_in_list][1].strip()
@@ -511,17 +533,24 @@ def _set_playlist_elements(self, a_playlist, a_title=''):
 
     def add_to_playlist_history(self, stations_file='',
             stations_filename_only='',
-            stations_filename_only_no_extension=''):
+            stations_filename_only_no_extension='',
+            startPos=0, selection=0, playing=-1,
+            browsing_station_service=False):
         self._ps.add(stations_file,
                 stations_filename_only,
-                stations_filename_only_no_extension)
+                stations_filename_only_no_extension,
+                startPos, selection, playing,
+                browsing_station_service)
 
     def reset_playlist_history(self):
         self._ps.reset()
 
     def remove_from_playlist_history(self):
         return self._ps.pop()
 
+    def copy_playlist_history(self):
+        return self._ps.copy()
+
     def _bytes_to_human(self, B):
         ''' Return the given bytes as a human friendly KB, MB, GB, or TB string '''
         KB = float(1024)
@@ -713,10 +742,11 @@ def open_browser(self, url):
             self.number_of_stations = len(self.stations)
             self.dirty_playlist = False
 
-    def save_station_position(self, startPos, selection):
+    def save_station_position(self, startPos, selection, playing):
         logger.error('DE startPos = {0}, selection = {1}'.format(startPos, selection))
         self._ps.startPos = startPos
         self._ps.selection = selection
+        self._ps.playing = playing
         logger.error('\n\nDE {}\n\n'.format(self._ps._p))
 
 class PyRadioConfig(PyRadioStations):
@@ -892,7 +922,7 @@ def _check_config_file(self, usr):
             copyfile(package_config_file, user_config_file)
 
     def internal_header_height(self):
-        if self._browsing_station_service:
+        if self.browsing_station_service:
             return self.online_browser.internal_header_height
         else:
             return 0
@@ -1107,15 +1137,32 @@ class PyRadioPlaylistStack(object):
     _p = []
 
     _id = {'stations_file': 0,
+           'path': 0,
            'stations_filename_only': 1,
+           'filename': 1,
            'stations_filename_only_no_extension': 2,
+           'title': 2,
            'startPos': 3,
            'selection': 4,
+           'playing' : 5,
+           'browsing_station_service': 6,
            }
 
     def __init__(self):
         pass
 
+    @property
+    def browsing_station_service(self):
+        if self._p:
+            return self._p[-1][self._id['browsing_station_service']]
+        else:
+            return False
+
+    @browsing_station_service.setter
+    def browsing_station_service(self, value):
+        if self._p:
+            self._p[-1][self._id['browsing_station_service']] = value
+
     @property
     def stations_file(self):
         if self._p:
@@ -1157,7 +1204,7 @@ def selection(self):
         if self._p:
             return self._p[-1][self._id['selection']]
         else:
-            return ''
+            return 0
 
     @selection.setter
     def selection(self, value):
@@ -1169,13 +1216,25 @@ def startPos(self):
         if self._p:
             return self._p[-1][self._id['startPos']]
         else:
-            return ''
+            return 0
 
     @startPos.setter
     def startPos(self, value):
         if self._p:
             self._p[-1][self._id['startPos']] = value
 
+    @property
+    def playing(self):
+        if self._p:
+            return self._p[-1][self._id['playing']]
+        else:
+            return -1
+
+    @playing.setter
+    def playing(self, value):
+        if self._p:
+            self._p[-1][self._id['playing']] = value
+
     def remove_duplicates(self):
         if len(self._p) > 1:
             val1 = self._p[-1][self._id['stations_filename_only']]
@@ -1189,7 +1248,9 @@ def remove_duplicates(self):
 
     def add(self, stations_file='',
             stations_filename_only='',
-            stations_filename_only_no_extension=''):
+            stations_filename_only_no_extension='',
+            startPos=0, selection=0, playing=-1,
+            browsing_station_service=False):
         if len(self._p) > 1 and stations_file:
             if self._p[-2][self._id['stations_file']] == stations_file:
                 if logger.isEnabledFor(logging.DEBUG):
@@ -1198,7 +1259,8 @@ def add(self, stations_file='',
         self._p.append([stations_file,
             stations_filename_only,
             stations_filename_only_no_extension,
-            0, 0])
+            startPos, selection, playing,
+            browsing_station_service])
 
     def get_member(self, member):
         if member in self._id.keys():
@@ -1208,13 +1270,22 @@ def get_member(self, member):
 
     def pop(self):
         if len(self._p) > 1:
-            self._p.pop()
-            return True
+            return self._p.pop()
         else:
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('Refusing to remove first entry')
-            return False
+            return self._p[0]
+
+    def set(self, a_list):
+        if a_list:
+            self._p = a_list[:]
+        else:
+            raise ValueError('playlist history cannot be empty')
 
     def reset(self):
         if self._p:
-            iself._p = self._p[:1]
+            self._p = self._p[:1]
+
+    def copy(self):
+        return self._p[:]
+

pyradio/player.py

@@ -62,7 +62,7 @@ def save_volume(self):
     def _do_save_volume(self, config_string):
         if not self.config_files:
             if logger.isEnabledFor(logging.DEBUG):
-                logger.debug('Volume not daved!!! (config file not found!!!)')
+                logger.debug('Volume not saved!!! (config file not found!!!)')
             return 'Volume not saved!!!'
         ret_strings = ('Volume: already saved...',
                     'Volume: {}% saved',
@@ -617,6 +617,8 @@ class MpPlayer(Player):
             config_files[0] = 'C:\\mplayer\mplayer\\config'
         elif os.path.exists(os.path.join(os.getenv('USERPROFILE'), "mplayer", "mplayer.exe")):
             config_files[0] = os.path.join(os.getenv('USERPROFILE'), "mplayer", "mplayer", "config")
+        elif os.path.exists(os.path.join(os.getenv('APPDATA'), "pyradio", "mplayer", "mplayer.exe")):
+            config_files[0] = os.path.join(os.getenv('APPDATA'), "pyradio", "mplayer", "mplayer", "config")
         else:
             config_files = []
     else: