- New stations will be integrated into user's stations file, after

  confirmation is given
- Fixing install.py

Author: s-n-g

Changelog

@@ -1,8 +1,9 @@
-2021-03-30 s-n-g
+2021-04-02 s-n-g
     * Implemented a simplified method to install, update, uninstall.
     * PyRadio will detect its player abnormal termination.
     * Player's connection timeout can now be disabled. Once a player is
       started, it will be considered to be connected immediately.
+    * stations.csv changes can now be integrated into user's stations.csv
     * BUG FIX: Active players parameter list is always synchronized to saved.
     * BUG FIX: Clicking on empty space (past last station) will not crash pyradio.
 

README.html

@@ -7,6 +7,7 @@
   <title>PyRadio README</title>
     <style> 
     html {margin: 2em;} 
+    body {width: 750px; margin: auto;} 
     h2 {margin-top: 2.5em; border-bottom:1px solid SaddleBrown; color: SaddleBrown;} 
     h3 {margin-top: 2em; color: SaddleBrown;} 
     h4 {margin-top: 2em; color: SaddleBrown;} 
@@ -33,16 +34,17 @@ <h1 style="color: SaddleBrown"id="pyradio">PyRadio</h1>
 <p>Command line internet radio player.</p>
 <p>Ben Dowling - <a target="_blank" href="https://github.com/coderholic">https://github.com/coderholic</a></p>
 <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
+<h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <!-- vim-markdown-toc Marked -->
 <ul>
-<li><a href="#requirements">Requirements</a></li>
 <li><a href="#installation">Installation</a></li>
 <li><a href="#command-line-options">Command line options</a></li>
 <li><a href="#controls">Controls</a></li>
 <li><a href="#pyradio&#39;s-modes">PyRadio’s Modes</a></li>
 <li><a href="#config-file">Config file</a></li>
 <li><a href="#about-playlist-files">About Playlist files</a>
 <ul>
+<li><a href="#integrating-new-stations">Integrating new stations</a></li>
 <li><a href="#specifying-a-playlist-to-load-(command-line)">Specifying a playlist to load (command line)</a></li>
 <li><a href="#managing-playlists-(within-pyradio)">Managing playlists (within PyRadio)</a></li>
 <li><a href="#managing-%22foreign%22-playlists">Managing “foreign” playlists</a></li>
@@ -95,13 +97,12 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <li><a href="#acknowledgment">Acknowledgment</a></li>
 </ul>
 <!-- vim-markdown-toc -->
-<h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <ul>
-<li>python 2.7+/3.5+
+<li>python 2.7/3.5+
 <ul>
 <li>requests</li>
 </ul></li>
-<li>MPV, MPlayer or VLC installed and in your path.</li>
+<li>MPV, MPlayer or VLC installed and in your path</li>
 </ul>
 <h2 id="installation">Installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p>The best way to install <strong>PyRadio</strong> is via a distribution package, if one exists (e.g. <em>Arch Linux</em> and derivatives can install <a target="_blank" href="https://aur.archlinux.org/packages/pyradio-git/">pyradio-git</a> from AUR).</p>
@@ -229,8 +230,12 @@ <h2 id="about-playlist-files">About Playlist files <span style="padding-left: 10
 <p><strong>PyRadio</strong> reads the stations to use from a CSV file, where each line contains two columns, the first being the station name and the second being the stream URL.</p>
 <p>Optionally, a third column can be inserted, stating the encoding used by the station (more on this at <a href="#specifying-stations-encoding">Specifying stations’ encoding</a>).</p>
 <p><strong>PyRadio</strong> will by default load the user’s stations file (e.g. <em>~/.config/pyradio/stations.csv</em>) to read the stations from. If this file is not found, it will be created and populated with a default set of stations.</p>
-<p style="margin: 1.5em 4em 0 4em; text-indent: -2em;"><strong>Tip:</strong> If you already have a custom <em>stations.csv</em> file, but want to update it with <strong>PyRadio</strong>’s default one, you just rename it, run <strong>PyRadio</strong> (so that the default one get created) and then merge the two files.</p>
 <p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> Older versions used to use <strong>~/.pyradio</strong> as default stations file. If this file is found, it will be copied to use’s config directory (e.g. <strong>~/.config/pyradio</strong>) and renamed to <strong>stations.csv</strong> or if this file exists, to <strong>pyradio.csv</strong>. In this case, this file will be the default one.</p>
+<h3 id="integrating-new-stations">Integrating new stations</h3>
+<p>When the package’s “<em>stations.csv</em>” files is updated, the changes it has will not automatically appear in the user’s stations file.</p>
+<p>What <strong>PyRadio</strong> will do is inform the user that these changes do exist and give him a chance to <strong>integrate</strong> these changes to his stations file, by appending the new stations to the file.</p>
+<p>When this is done, the first added station will be selected so that the user can inspect the changes and decide to keep or delete the new stations.</p>
+<p><strong>PyRadio</strong> will only add stations to the user’s stations file; no station will be deleted as a result of this procedure.</p>
 <h3 id="specifying-a-playlist-to-load-command-line">Specifying a playlist to load (command line)</h3>
 <p><strong>PyRadio</strong> will normally load its default playlist file, as described above, upon its execution. A different file can be loaded when the <strong>-s</strong> command line option is used.</p>
 <p>The <strong>-s</strong> option will accept:</p>
@@ -577,8 +582,8 @@ <h2 id="todo">TODO <span style="padding-left: 10px;"><sup style="font-size: 50%"
 Players extra parameters (<a target="_blank" href="https://github.com/coderholic/pyradio/issues/118">#118</a>) - v. 0.8.8.3</li>
 <li><input type="checkbox" disabled="" checked="" />
 New player selection configuration window (<a target="_blank" href="https://github.com/coderholic/pyradio/issues/118">#118</a>) - v. 0.8.8.3</li>
-<li><input type="checkbox" disabled="" />
-Notify the user that the package’s stations.csv has changed</li>
+<li><input type="checkbox" disabled="" checked="" />
+Notify the user that the package’s stations.csv has changed -v 0.8.9</li>
 <li><input type="checkbox" disabled="" checked="" />
 Update / uninstall using command line parameters (-U / -R) - v. 0.8.9</li>
 <li><input type="checkbox" disabled="" />

README.md

@@ -5,16 +5,16 @@ Command line internet radio player.
 Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
 ## Table of Contents
-
+## Requirements
 <!-- vim-markdown-toc Marked -->
 
-* [Requirements](#requirements)
 * [Installation](#installation)
 * [Command line options](#command-line-options)
 * [Controls](#controls)
 * [PyRadio's Modes](#pyradio's-modes)
 * [Config file](#config-file)
 * [About Playlist files](#about-playlist-files)
+    * [Integrating new stations](#integrating-new-stations)
     * [Specifying a playlist to load (command line)](#specifying-a-playlist-to-load-(command-line))
     * [Managing playlists (within PyRadio)](#managing-playlists-(within-pyradio))
     * [Managing "foreign" playlists](#managing-"foreign"-playlists)
@@ -53,11 +53,9 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
 <!-- vim-markdown-toc -->
 
-## Requirements
-
-* python 2.7+/3.5+
+* python 2.7/3.5+
     - requests
-* MPV, MPlayer or VLC installed and in your path.
+* MPV, MPlayer or VLC installed and in your path
 
 ## Installation
 
@@ -219,10 +217,18 @@ Optionally, a third column can be inserted, stating the encoding used by the sta
 
 **PyRadio** will by default load the user's stations file (e.g. *~/.config/pyradio/stations.csv*) to read the stations from. If this file is not found, it will be created and populated with a default set of stations.
 
-**Tip:** If you already have a custom *stations.csv* file, but want to update it with **PyRadio**'s default one, you just rename it, run **PyRadio** (so that the default one get created) and then merge the two files.
+**Note:** Older versions used to use **~/.pyradio** as default stations file. If this file is found, it will be copied to use's config directory (e.g. **~/.config/pyradio**) and renamed to **stations.csv** or if this file exists, to **pyradio.csv**. In this case, this file will be the default one.
+
 
+### Integrating new stations
 
-**Note:** Older versions used to use **~/.pyradio** as default stations file. If this file is found, it will be copied to use's config directory (e.g. **~/.config/pyradio**) and renamed to **stations.csv** or if this file exists, to **pyradio.csv**. In this case, this file will be the default one.
+When the package's "*stations.csv*" files is updated, the changes it has will not automatically appear in the user's stations file.
+
+What **PyRadio** will do is inform the user that these changes do exist and give him a chance to **integrate** these changes to his stations file, by appending the new stations to the file.
+
+When this is done, the first added station will be selected so that the user can inspect the changes and decide to keep or delete the new stations.
+
+**PyRadio** will only add stations to the user's stations file; no station will be deleted as a result of this procedure.
 
 ### Specifying a playlist to load (command line)
 
@@ -750,7 +756,7 @@ Having said that, if you are not packaging for a specific distribution, please d
 - [x] Basic mouse support ([#119](https://github.com/coderholic/pyradio/issues/119)) - v. 0.8.8.3
 - [x] Players extra parameters ([#118](https://github.com/coderholic/pyradio/issues/118)) - v. 0.8.8.3
 - [x] New player selection configuration window ([#118](https://github.com/coderholic/pyradio/issues/118)) - v. 0.8.8.3
-- [ ] Notify the user that the package's stations.csv has changed
+- [x] Notify the user that the package's stations.csv has changed -v 0.8.9
 - [x] Update / uninstall using command line parameters (-U / -R) - v. 0.8.9
 - [ ] Use Radio Browser service ([#80](https://github.com/coderholic/pyradio/issues/80) [#93](https://github.com/coderholic/pyradio/issues/93) [#112](https://github.com/coderholic/pyradio/issues/112))
 

build.html

@@ -7,6 +7,7 @@
   <title>PyRadio Build Instructions</title>
     <style> 
     html {margin: 2em;} 
+    body {width: 750px; margin: auto;} 
     h2 {margin-top: 2.5em; border-bottom:1px solid SaddleBrown; color: SaddleBrown;} 
     h3 {margin-top: 2em; color: SaddleBrown;} 
     h4 {margin-top: 2em; color: SaddleBrown;} 

devel/pre-commit

@@ -1,6 +1,17 @@
 #!/bin/bash
+# update stations_updated in __init.py
+ST=$(git status | grep pyradio/stations.csv)
+if [ -z "$ST" ];then
+    sed -i 's/stations_updated = .*/stations_updated = False/' pyradio/__init__.py
+else
+    sed -i 's/stations_updated = .*/stations_updated = True/' pyradio/__init__.py
+fi
+
+
 # convert TABs to SPACEs in Changelog
 sed -i 's/\t/    /g' Changelog
+
+
 # Create HTML file from md files
 for afile in README.md build.md windows.md windows-mplayer.md
 do
@@ -29,6 +40,7 @@ do
     sed -i '/<title>/a \
     <style> \
     html {margin: 2em;} \
+    body {width: 750px; margin: auto;} \
     h2 {margin-top: 2.5em; border-bottom:1px solid SaddleBrown; color: SaddleBrown;} \
     h3 {margin-top: 2em; color: SaddleBrown;} \
     h4 {margin-top: 2em; color: SaddleBrown;} \

pyradio/__init__.py

@@ -10,7 +10,7 @@
 
 # Set it to True if new stations have been
 # added to the package's stations.csv
-stations_updated = True
+stations_updated = False
 
 
 __version__ = version = '.'.join(map(str, version_info))

pyradio/config

@@ -80,7 +80,7 @@ theme = dark
 # Transparency setting
 # If False, theme colors will be used.
 # If True and a compositor is running, the stations' window
-# background will be transparent. If True and a compositor is 
+# background will be transparent. If True and a compositor is
 # not running, the terminal's background color will be used.
 # Valid values: True, true, False, false
 # Default value: False

pyradio/config.py

@@ -12,7 +12,7 @@
 from shutil import copyfile, move
 import threading
 from copy import deepcopy
-from pyradio import version, app_state
+from pyradio import version, app_state, stations_updated
 
 from .browser import PyRadioStationsBrowser, probeBrowsers
 HAS_REQUESTS = True
@@ -90,6 +90,9 @@ class PyRadioStations(object):
     ''' set to True if a stations.csv is found in user's folder '''
     _user_csv_found = False
 
+    ''' mark changed package stations.csv  '''
+    _integrate_stations = False
+
     def __init__(self, stationFile=''):
         if platform.startswith('win'):
             self._open_string_id = 1
@@ -123,6 +126,22 @@ def __init__(self, stationFile=''):
             self._move_old_csv(self.stations_dir)
             self._check_stations_csv(self.stations_dir, self.root_path)
 
+    @property
+    def integrate_stations(self):
+        return self._integrate_stations
+
+    @integrate_stations.setter
+    def user_has_stations_csv(self, val):
+        raise ValueError('parameter is read only')
+
+    @property
+    def user_has_stations_csv(self):
+        return self._user_csv_found
+
+    @user_has_stations_csv.setter
+    def user_has_stations_csv(self, val):
+        raise ValueError('parameter is read only')
+
     @property
     def is_register(self):
         return self._ps.is_register
@@ -380,6 +399,40 @@ def _get_playlist_abspath_from_data(self, stationFile=''):
             else:
                 return '', -2
 
+    def _package_stations(self):
+        ''' read package stations.csv file '''
+        with open(self.root_path, 'r') as cfgfile:
+            for row in csv.reader(filter(lambda row: row[0]!='#', cfgfile), skipinitialspace=True):
+                if not row:
+                    continue
+                try:
+                    name, url = [s.strip() for s in row]
+                    yield [name, url, '', '']
+                except:
+                    try:
+                        name, url, enc = [s.strip() for s in row]
+                        yield [name, url, enc, '']
+                    except:
+                        name, url, enc, onl = [s.strip() for s in row]
+                        yield [name, url, enc, onl]
+
+    def integrate_playlists(self):
+        ''''''
+
+        ''' get user station urls '''
+        self.added_stations = 0
+        urls = []
+        for n in self.stations:
+            urls.append(n[1])
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug('----==== Stations integration ====----')
+        for a_pkg_station in self._package_stations():
+            if a_pkg_station[1] not in urls:
+                self.stations.append(a_pkg_station)
+                self.added_stations += 1
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug('Added: {0} - {1}'.format(self.added_stations, a_pkg_station))
+
     def read_playlist_file(self, stationFile='', is_register=False):
         ''' Read a csv file
             Returns: number
@@ -460,6 +513,37 @@ def read_playlist_file(self, stationFile='', is_register=False):
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('read_playlist_file: Playlist version: {}'.format(self._playlist_version_to_string[self._playlist_version]))
         self.jump_tag = -1
+
+        ''' check for package's stations.csv change '''
+        delete_ver_files = False
+        if self._user_csv_found:
+            if stationFile == path.join(self.stations_dir, 'stations.csv'):
+                if self.current_pyradio_version is None:
+                    self.get_pyradio_version()
+                ver_file = path.join(self.stations_dir, '.' + self.current_pyradio_version + '.ver')
+                if stations_updated:
+                    if not path.exists(ver_file):
+                        import filecmp
+                        if not filecmp.cmp(stationFile, self.root_path):
+                            ''' need to ask the user to integrate stations '''
+                            self._integrate_stations = True
+                            delete_ver_files = True
+                            if logger.isEnabledFor(logging.DEBUG):
+                                logger.debug('Stations integration is due!')
+                else:
+                    ''' delete all ver files and create current '''
+                    delete_ver_files = True
+        if delete_ver_files:
+            files = glob.glob(path.join(self.stations_dir, '.*.ver'))
+            if files:
+                for a_file in files:
+                    try:
+                        remove(a_file)
+                    except:
+                        pass
+            with open(ver_file, 'a') as f:
+                pass
+
         return self.number_of_stations
 
     def _recover_backed_up_playlist(self, stationFile):
@@ -1284,7 +1368,7 @@ def get_pyradio_version(self):
             Retrurns
                 self.info
                     The string to display at left top corner of main window
-                self.current_pyradio_version
+                self.get_current_pyradio_version
                     The version to use when checking for updates
         '''
         ret = None
@@ -1312,7 +1396,7 @@ def get_pyradio_version(self):
                                 ret = "RyRadio built from git: https://github.com/coderholic/pyradio/commit/{0} (rev. {1})".format(git_info[-1], git_info[1])
                         except:
                             pass
-        self.current_pyradio_version = self.info.replace(' PyRadio ', '')
+        self.current_pyradio_version = self.info.replace(' PyRadio ', '').replace(' ', '')
         # if self._distro != 'None':
         #     self.info += '({})'.format(self._distro)
         return ret

pyradio/install.py

@@ -43,7 +43,7 @@ def isRunning():
         sleep(1)
     print('')
 
-def version_string_to_tuple(this_version):
+def version_string_to_list(this_version):
     a_v = this_version.replace('-', '.').lower()
     a_l = a_v.split('.')
     while len(a_l) < 4:
@@ -413,9 +413,11 @@ def _do_it(self, mode='update'):
                             epilog='When executed without an argument, it installs PyRario.')
     parser.add_argument('-U', '--update', action='store_true',
                         help='Update PyRadio.')
-    if platform.startswith('linux'):
+    if platform.system().lower().startswith('linux'):
         parser.add_argument('--user', action='store_true',
                             help='Install only for current user (linux only).')
+    parser.add_argument('--python2', action='store_true',
+                        help='Install using python 2.')
     parser.add_argument('-R', '--uninstall', action='store_true',
                         help='Uninstall PyRadio.')
 

pyradio/main.py

@@ -10,7 +10,7 @@
 
 from .radio import PyRadio
 from .config import PyRadioConfig, SUPPORTED_PLAYERS
-from .install import PyRadioUpdate, PyRadioUpdateOnWindows, is_pyradio_user_installed, version_string_to_tuple, get_github_tag
+from .install import PyRadioUpdate, PyRadioUpdateOnWindows, is_pyradio_user_installed, version_string_to_list, get_github_tag
 
 PATTERN = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 
@@ -152,7 +152,7 @@ def shell():
                 if last_tag:
                     print('Released version   :  {}'.format(last_tag))
                     print('Installed version  :  {}'.format(pyradio_config.current_pyradio_version))
-                    if version_string_to_tuple(last_tag) <= version_string_to_tuple(pyradio_config.current_pyradio_version):
+                    if version_string_to_list(last_tag) <= version_string_to_list(pyradio_config.current_pyradio_version):
                         print('Latest version already installed. Nothing to do....')
                         sys.exit()
                 else: