install 7-Zip on Windows

Author: s-n-g

Changelog

@@ -1,3 +1,8 @@
+2022-08-14 s-n-g
+    * version 0.8.9.26 (0.9-beta23)
+    * Windows installation will try to install 7-Zip, if not
+      already installed
+
 2022-08-14 s-n-g
     * version 0.8.9.25 (0.9-beta22)
     * fixing global shorcuts inside RadioBrowser search window

README.html

@@ -174,6 +174,11 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <pre style="height: 200px;">
 
+2022-08-14 s-n-g
+    * version 0.8.9.26 (0.9-beta23)
+    * Windows installation will try to install 7-Zip, if not
+      already installed
+
 2022-08-14 s-n-g
     * version 0.8.9.25 (0.9-beta22)
     * fixing global shorcuts inside RadioBrowser search window

pyradio/player.py

@@ -113,9 +113,10 @@ def _access_check(fn, mode):
 
 def find_vlc_on_windows(config_dir=None):
     PLAYER_CMD = ''
-    for path in ('C:\\Program Files\\VideoLAN\\VLC\\vlc.exe',
-                'C:\\Program Files (x86)\\VideoLAN\\VLC\\vlc.exe'
-                ):
+    for path in (
+        os.path.join(os.getenv('PROGRAMFILES'), 'VideoLAN', 'VLC', 'vlc.exe'),
+        os.path.join(os.getenv('PROGRAMFILES') + ' (x86)', 'VideoLAN', 'VLC', 'vlc.exe'),
+    ):
         if os.path.exists(path):
             PLAYER_CMD = path
             break

pyradio/radio.py

@@ -4112,7 +4112,7 @@ def _set_active_stations(self):
                     self.active_stations = [
                             ['', self.selection],
                             ['', -1]]
-        # logger.error('DE active_stations = \n\n{}\n\n'.format(self.active_stations))
+        logger.error('DE active_stations = \n\n{}\n\n'.format(self.active_stations))
 
     def _set_rename_stations(self):
         if self.stations:
@@ -4130,7 +4130,7 @@ def _set_rename_stations(self):
                     self.rename_stations = [
                             ['', self.selection],
                             ['', -1]]
-        # logger.error('DE rename_stations = \n\n{}\n\n'.format(self.rename_stations))
+        logger.error('DE rename_stations = \n\n{}\n\n'.format(self.rename_stations))
 
     def get_active_encoding(self, an_encoding):
         if an_encoding:
@@ -7085,6 +7085,7 @@ def keypress(self, char):
 
             if self.ws.operation_mode == self.ws.NORMAL_MODE:
                 if char == ord('<'):
+                    self._update_status_bar_right(status_suffix='')
                     if int(self._cnf.connection_timeout_int) == 0:
                         self._show_stations_history_notification(0)
                     else:
@@ -7094,6 +7095,7 @@ def keypress(self, char):
                             self._cnf.play_from_history = True
                             self._cnf.stations_history.play_previous()
                 elif char == ord('>'):
+                    self._update_status_bar_right(status_suffix='')
                     if int(self._cnf.connection_timeout_int) == 0:
                         self._show_stations_history_notification(0)
                     else:
@@ -7266,6 +7268,7 @@ def keypress(self, char):
                     return
 
                 elif char in (ord('o'), ):
+                    self._update_status_bar_right(status_suffix='')
                     self._reset_status_bar_right()
                     self._set_rename_stations()
                     self._cnf.open_register_list = False
@@ -7422,6 +7425,7 @@ def keypress(self, char):
                         if logger.isEnabledFor(logging.DEBUG):
                             logger.debug('Loading playlist: "{}"'.format(self.stations[self.selection][-1]))
                         playlist_to_try_to_open = self.stations[self.selection][-1]
+                        logger.error('\n\nplaylist_to_try_to_open = "{}"\n\n'.format(playlist_to_try_to_open))
                         ret = self._cnf.read_playlist_file(stationFile=playlist_to_try_to_open)
                         logger.error('DE playlist_selections = {}'.format(playlist_to_try_to_open))
 
@@ -7441,6 +7445,8 @@ def keypress(self, char):
                             self._playlist_in_editor = playlist_to_try_to_open
                             self._playlist_error_message = ''
                             self.number_of_items = ret
+                            logger.error('self._playlist_in_editor = {0}\nself.number_of_items = {1}'.format(self._playlist_in_editor, self.number_of_items))
+                            logger.error('self.selcctions\n{0}\nself.playlist_selections\n{1}'.format(self.selections, self.playlist_selections))
                             if self._cnf.open_register_list:
                                 self.selections[self.ws.REGISTER_MODE] = [self.selection, self.startPos, self.playing, self._cnf.playlists]
                                 self.playlist_selections[self.ws.REGISTER_MODE] = self.selections[self.ws.REGISTER_MODE][:-1][:]
@@ -7460,6 +7466,8 @@ def keypress(self, char):
                                 self._put_selection_in_the_middle(force=True)
                                 self.refreshBody()
                             self._do_display_notify()
+                            logger.error('\n\n')
+                            logger.error('self.selcctions\n{0}\nself.playlist_selections\n{1}'.format(self.selections, self.playlist_selections))
 
                             # if self._cnf.open_last_playlist:
                             #     self._cnf.save_last_playlist()
@@ -8356,6 +8364,7 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('Activating history item: {}'.format(h_item))
 
+        num = -1
         current_playlist = self._cnf.station_file_name[:-4]
         if current_playlist == h_item[0]:
             ''' I am moving within the loaded playlist '''
@@ -8364,39 +8373,7 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
                 num = h_item[-1]
             else:
                 ''' I have to scan the playlist'''
-                if logger.isEnabledFor(logging.DEBUG):
-                    logger.error('Scanning playlist...')
-                up = down = 0
-                num = -1
-                for i in range(h_item[-1], -1, -1):
-                    up = i + 1
-                    down = i - 1
-                    if down > -1 :
-                        if self.stations[down][0] == h_item[1]:
-                            num = down
-                            break
-                    if up < self._cnf.number_of_stations:
-                        if self.stations[up][0] == h_item[1]:
-                            num = up
-                            break
-                up += 1
-                down -= 1
-                if num == -1 and down > -1:
-                    if logger.isEnabledFor(logging.DEBUG):
-                        logger.debug('Station not found... Scanning to top...')
-                    for i in range(down, -1, -1):
-                        if self.stations[i][0] == h_item[1]:
-                            num = i
-                            break
-
-                if num == -1 and up < self._cnf.number_of_stations:
-                    if logger.isEnabledFor(logging.DEBUG):
-                        logger.debug('Station not found... Scanning to bottom...')
-                    for i in range(up, self._cnf.number_of_stations - 1):
-                        if self.stations[i][0] == h_item[1]:
-                            num = i
-                            break
-
+                num = self._scan_playlist_for_station(self.stations, h_item[-1], h_item[1])
                 if num == -1:
                     ''' station not found  '''
                     if logger.isEnabledFor(logging.DEBUG):
@@ -8405,20 +8382,6 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
                         func()
                     return
 
-            if logger.isEnabledFor(logging.DEBUG):
-                logger.debug('Station "{0}" found at {1}'.format(h_item[1], num))
-            self.setStation(num)
-            if self.number_of_items > 0:
-                self.playSelection()
-                #self._goto_playing_station(changing_playlist=False)
-                self._align_stations_and_refresh(self.ws.PLAYLIST_MODE)
-            self.refreshBody()
-            self.selections[self.ws.NORMAL_MODE] = [
-                self.selection,
-                self.startPos,
-                self.playing,
-                self.stations
-            ]
         else:
             ''' I have to load a new playlist '''
             if self._cnf.dirty_playlist:
@@ -8432,10 +8395,10 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
             ret = 0
             if self._register_to_open:
                 logger.error('register_to_open = {}'.format(self._register_to_open))
-                stationFile, ret = self._get_register_filename_from_register()
+                stationFile, ret = self._cnf._get_register_filename_from_register()
                 self._is_register = True
             else:
-                stationFile, ret = self._get_playlist_abspath_from_data(stationFile=h_item[0])
+                stationFile, ret = self._cnf._get_playlist_abspath_from_data(stationFile=h_item[0])
                 logger.error('stationFile = {}'.format(stationFile))
                 self._is_register = False
             if ret > 0:
@@ -8444,5 +8407,102 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
                 return
 
             ''' playlist loaded and validated '''
+            num = self._open_and_check_station_in_playlist(stationFile, h_item[-1], h_item[1])
+            if num == -1:
+                ''' Continue going through history items '''
+                func()
+                return
+            self._set_rename_stations()
+            self._cnf.stations = list(self._reading_stations)
+            self._reading_stations = []
+            self.stations = self._cnf.stations
+            self._playlist_in_editor = stationFile
+            self.number_of_items = len(self.stations)
+            self.selection = num
+            logger.error('num = {}'.format(num))
+            return
+
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug('Station "{0}" found at {1}'.format(h_item[1], num))
+        self.setStation(num)
+        if self.number_of_items > 0:
+            self.playSelection()
+            #self._goto_playing_station(changing_playlist=False)
+            self._align_stations_and_refresh(self.ws.PLAYLIST_MODE)
+        self.refreshBody()
+        self.selections[self.ws.NORMAL_MODE] = [
+            self.selection,
+            self.startPos,
+            self.playing,
+            self.stations
+        ]
+
+    def _scan_playlist_for_station(self, stations, start, station_to_find):
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.error('Scanning playlist...')
+        up = down = 0
+        num = -1
+        for i in range(start, -1, -1):
+            up = i + 1
+            down = i - 1
+            if down > -1 :
+                if stations[down][0] == station_to_find:
+                    num = down
+                    break
+            if up < self._cnf.number_of_stations:
+                if stations[up][0] == station_to_find:
+                    num = up
+                    break
+        up += 1
+        down -= 1
+        if num == -1 and down > -1:
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('Station not found... Scanning to top...')
+            for i in range(down, -1, -1):
+                if stations[i][0] == station_to_find:
+                    num = i
+                    break
+
+        if num == -1 and up < self._cnf.number_of_stations:
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('Station not found... Scanning to bottom...')
+            for i in range(up, self._cnf.number_of_stations - 1):
+                if stations[i][0] == station_to_find:
+                    num = i
+                    break
+
+        return num
+
+    def _open_and_check_station_in_playlist(self, playlist_file, start, station_to_find):
+        ''' read a _playlist and check if a station is in it
+
+            return num = index of file in stations' list
+                   or -1 if it fails
+
+            stations are returned in self._reading_stations
+        '''
+        num = -1
+        self._reading_stations = []
+        with open(playlist_file, 'r') as cfgfile:
+            try:
+                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]
+                        self._reading_stations.append([name, url, '', ''])
+                    except:
+                        try:
+                            name, url, enc = [s.strip() for s in row]
+                            self._reading_stations.append([name, url, enc, ''])
+                        except:
+                            name, url, enc, onl = [s.strip() for s in row]
+                            self._reading_stations.append([name, url, enc, onl])
+            except:
+                self._reading_stations = []
+                return num
+
+
+        return self._scan_playlist_for_station(reading_stations, start, station_to_find)
 
 # pymode:lint_ignore=W901

pyradio/win.py

@@ -2,15 +2,15 @@
 import requests
 import subprocess
 from os.path import join, exists, isdir
-from os import environ, makedirs, listdir, replace, remove, sep
+from os import environ, makedirs, listdir, replace, remove, sep, getenv
 from time import sleep
 import site
 from shutil import rmtree
 from msvcrt import getwch
 from msvcrt import getwch
 from os import sep
 import subprocess
-
+from urllib.request import urlretrieve
 
 HAVE_PYUNPACK = True
 try:
@@ -19,10 +19,10 @@
     HAVE_PYUNPACK = False
 
 ''' This is also to be able to execute it manually'''
-try:
-    from .player import find_mpv_on_windows, find_mplayer_on_windows, find_vlc_on_windows
-except ImportError:
-    from player import find_mpv_on_windows, find_mplayer_on_windows, find_vlc_on_windows
+#try:
+#    from .player import find_mpv_on_windows, find_mplayer_on_windows, find_vlc_on_windows
+#except ImportError:
+#    from player import find_mpv_on_windows, find_mplayer_on_windows, find_vlc_on_windows
 
 def win_press_any_key_to_unintall():
     the_path = __file__.split(sep)
@@ -134,7 +134,6 @@ def _is_player_in_path(a_player):
     return in_path
 
 def _get_output_folder(package, output_folder=None, do_not_exit=False):
-
     if output_folder is None:
         a_path = _is_player_in_path(package)
         if a_path:
@@ -163,6 +162,35 @@ def _get_out_file(output_folder):
             break
     return join(output_folder, out_file)
 
+def download_seven_zip(output_folder):
+    PR = (
+        join(getenv('PROGRAMFILES'), '7-Zip', '7z.exe'),
+        join(getenv('PROGRAMFILES') + ' (x86)', '7-Zip', '7z.exe')
+    )
+    if exists(PR[0]) or exists(PR[1]):
+        return
+
+    url = 'https://sourceforge.net/projects/sevenzip/files/latest/download'
+
+    out_file = join(output_folder, '7-Zip_latest.exe')
+
+    print('7-Zip not found...\nDownloading...')
+    try:
+        urlretrieve(url, filename=out_file)
+    except:
+        print('Failed to download 7-Zip...')
+        print('Please check your internet connection and try again...')
+        print('\nIn case you want to install 7-Zip manually,')
+        print('go to https://www.7-zip.org/ to get it...')
+        sys.exit(1)
+
+    subprocess.call(
+        out_file,
+        shell=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL
+    )
+
 def download_player(output_folder=None, package=1, do_not_exit=False):
     # Parameters
     #   output_folder   : where to save files
@@ -211,6 +239,9 @@ def download_player(output_folder=None, package=1, do_not_exit=False):
         sys.exit(1)
 
     print('Extracting archive...')
+    if package == 0:
+        download_seven_zip()
+
     if not HAVE_PYUNPACK:
         for a_module in ('pyunpack', 'patool'):
             install_module(a_module, print_msg=False)

windows.html

@@ -52,7 +52,7 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <li><a href="#installing-python">Installing Python</a></li>
 <li><a href="#verifying-the-installation">Verifying the installation</a></li>
 </ul></li>
-<li><a href="#7zip-installation">7zip installation</a></li>
+<li><a href="#7-zip-installation">7-Zip installation</a></li>
 <li><a href="#player-installation">Player installation</a>
 <ul>
 <li><a href="#mpv-or-mplayer-installation">MPV or MPlayer installation</a></li>
@@ -117,8 +117,8 @@ <h4 id="verifying-the-installation">Verifying the installation</h4>
 <a href="https://members.hellug.gr/sng/pyradio/python2.jpg" target="_blank"><img src="https://members.hellug.gr/sng/pyradio/python2.jpg" alt="Python Installation Modification" /></a>
 
 <p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> If you don’t have the setup file of the original <strong>Python</strong> installation, you will have to <strong>download</strong> it from <a target="_blank" href="https://www.python.org/downloads/windows/">Python’s Windows Downloads</a>. In case you want to upgrade to the latest version, you <strong>must uninstall</strong> the one currently installed, beforehand.</p>
-<h3 id="zip-installation">7zip installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h3>
-<p>Go to <a target="_blank" href="https://www.7-zip.org/">7zip web site</a> and download and install the latest release that’s compatible with your Windows installation. Unless you are still on a 32-bit Windows 7 environment, you just go grub the first link provided.</p>
+<h3 id="zip-installation">7-Zip installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h3>
+<p><a target="_blank" href="https://www.7-zip.org/">7-Zip</a> Windows archiver is needed for MPV’s installation. <strong>PyRadio</strong> will try to download and run the installation, if <a target="_blank" href="https://www.7-zip.org/">7-Zip</a> is not already installed.</p>
 <h3 id="player-installation">Player installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h3>
 <p>As already stated <a target="_blank" href="https://mpv.io">MPV</a> will be automatically installed on a fresh installation.</p>
 <p>If the user decides to install a different player, he should have the following in mind:</p>