Skip to content

Commit faef8be

Browse files
committed
- version 0.9.3.11.1 (BUG FIX) - 0.9.3.12-beta1
- fixing makedirs in radio.py - fixing patool installation in win.py
1 parent 3f2af22 commit faef8be

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

Changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2024-10-16 s-n-g
1+
2024-10-17 s-n-g
22
* version 0.9.3.11.1 (BUG FIX) - 0.9.3.12-beta1
33
* adding -sdd (--show_dirs) command line parameter
44
* fixing a couple of bugs (some reported by pylint /ruff)

docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
187187
<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>
188188
<pre style="height: 200px;">
189189

190-
2024-10-16 s-n-g
190+
2024-10-17 s-n-g
191191
* version 0.9.3.11.1 (BUG FIX) - 0.9.3.12-beta1
192192
* adding -sdd (--show_dirs) command line parameter
193193
* fixing a couple of bugs (some reported by pylint /ruff)

pyradio/radio.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -5746,8 +5746,10 @@ def _tag_a_title(self, html=False, text=False):
57465746
if self._cnf.can_like_a_station():
57475747
if not path.exists(self._cnf.recording_dir):
57485748
try:
5749-
makedirs(self._cnf.recording_dir)
5750-
except:
5749+
os.makedirs(self._cnf.recording_dir)
5750+
except (
5751+
FileExistsError, FileNotFoundError,
5752+
PermissionError, OSError):
57515753
pass
57525754
if not path.exists(self._cnf.recording_dir):
57535755
if logger.isEnabledFor(logging.ERROR):
@@ -6155,7 +6157,7 @@ def keypress(self, char):
61556157
if self._open_dir_win.dir == path.join(path.expanduser('~'), 'pyradio-recordings'):
61566158
if not path.exists(self._open_dir_win.dir):
61576159
try:
6158-
makedirs(self._open_dir_win.dir)
6160+
os.makedirs(self._open_dir_win.dir)
61596161
except:
61606162
self._show_delayed_notification(
61616163
'___|Error|: Recording dir does |not exist|!___',
@@ -9252,7 +9254,7 @@ def _start_player(self, mode=None):
92529254
if self.player.recording > 0:
92539255
if not os.path.exists(self._cnf.recording_dir):
92549256
try:
9255-
makedirs(self._cnf.recording_dir)
9257+
os.makedirs(self._cnf.recording_dir)
92569258
except:
92579259
pass
92589260
if not os.path.exists(self._cnf.recording_dir):

pyradio/win.py

+15-8
Original file line numberDiff line numberDiff line change
@@ -329,17 +329,24 @@ def download_player(output_folder=None, package=1, do_not_exit=False):
329329
download_seven_zip(output_folder)
330330

331331
if not HAVE_PYUNPACK:
332-
for a_module in ('pyunpack', 'patool'):
333-
install_module(a_module, print_msg=False)
332+
install_module('pyunpack', print_msg=False)
334333
from pyunpack import Archive
335334

336-
patool_exec = join(site.USER_SITE.replace('site-packages', 'Scripts'), 'patool')
337-
if not exists(patool_exec):
338-
patool_exec = glob.glob(join(environ['APPDATA'], '**', 'patool.exe'), recursive=True)
339-
if patool_exec:
340-
patool_exec = patool_exec[0]
335+
count = 0
336+
while True:
337+
patool_exec = join(site.USER_SITE.replace('site-packages', 'Scripts'), 'patool')
338+
if exists(patool_exec):
339+
break
341340
else:
342-
patool_exec = None
341+
patool_exec = glob.glob(join(environ['APPDATA'], '**', 'patool.exe'), recursive=True)
342+
if patool_exec:
343+
patool_exec = patool_exec[0]
344+
break
345+
else:
346+
install_module('patool', print_msg=False)
347+
count += 1
348+
if count > 2:
349+
break
343350
try:
344351
Archive(out_file).extractall(join(output_folder, 'mpv' if package==0 else ''),
345352
auto_create_dir=True,

0 commit comments

Comments
 (0)