Skip to content

Commit 6fbf308

Browse files
committed
- version 0.9.3.11.2 - 0.9.3.12-beta2
- fixing saving keyboard.json - updating docs
1 parent a5b6e66 commit 6fbf308

File tree

8 files changed

+121
-82
lines changed

8 files changed

+121
-82
lines changed

Changelog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2024-12-04 s-n-g
1+
2024-12-05 s-n-g
22
* version 0.9.3.11.2 - 0.9.3.12-beta2
33
* Implementing the Shortcuts Window, making it possible to customize
44
PyRadio's key bindings

devel/update_win_players

+6-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ function get_mplayer(){
2828

2929
echo -en " Reading published ${cMagenta}MPlayer${cReset} versions ... "
3030

31-
FOUND=$(curl -s -L 'https://sourceforge.net/projects/mplayerwin/files/MPlayer-MEncoder' 2>/dev/null | grep '<tr title' | sed -e 's/<tr title="//' -e 's/".*//'|grep -e '^r')
31+
FOUND=$(curl -s -L 'https://sourceforge.net/projects/mplayerwin/files/MPlayer-MEncoder' 2>/dev/null | \
32+
grep '<tr title' | \
33+
sed -e 's/.*<tr title="//' \
34+
-e 's/".*//' | \
35+
sed -n 1p
36+
)
3237

3338
if [ $? -ne 0 ]
3439
then

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-12-04 s-n-g
190+
2024-12-05 s-n-g
191191
* version 0.9.3.11.2 - 0.9.3.12-beta2
192192
* Implementing the Shortcuts Window, making it possible to customize
193193
PyRadio's key bindings

docs/pyradio.1

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ not exist. Not available on Windows.
3030
.IP\ \fB-p\fR\ [\fISTATION_NUMBER\fR],\ \fB--play\fR\ [\fISTATION_NUMBER\fR]
3131
Start and play. The value is num station or empty for
3232
random.
33+
.IP\ \fB-x\fR,\ \fB--external-player\fR
34+
Play station in external player. Can be combined with \fB--play\fR.
3335
.IP\ \fB-u\fR\ \fIPLAYER\fR,\ \fB--use\fR\fB-player\fR\ \fIPLAYER\fR
3436
Use specified player. A comma-separated list can be
3537
used to specify detection order. Supported players:

pyradio/config_window.py

+100-67
Large diffs are not rendered by default.

pyradio/keyboard.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,15 @@ def read_keyboard_shortcuts(file_path, reset=False):
250250
global kbkey # Declare kbkey as global since we're reassigning it
251251
if reset:
252252
kbkey = populate_dict() # Reassign kbkey with a new OrderedDict
253-
else:
254-
data = None
255-
try:
256-
with open(file_path, 'r', encoding='utf-8', errors='ignore') as json_file:
257-
data = json.load(json_file)
258-
except (FileNotFoundError, json.JSONDecodeError, TypeError, IOError):
259-
pass
260-
if data is not None:
261-
for n in data.keys():
262-
kbkey[n] = data[n] # Modify the existing kbkey
253+
data = None
254+
try:
255+
with open(file_path, 'r', encoding='utf-8', errors='ignore') as json_file:
256+
data = json.load(json_file)
257+
except (FileNotFoundError, json.JSONDecodeError, TypeError, IOError):
258+
pass
259+
if data is not None:
260+
for n in data.keys():
261+
kbkey[n] = data[n] # Modify the existing kbkey
263262

264263
def read_localized_keyboard(file_path, keyboard_path):
265264
''' read file_path which is {'keyboard': 'name of country'},

pyradio/messages_system.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ def set_text(self, parent, *args):
14911491
__|Esc| |*|Exit |editing mode|.
14921492
__|0| |*| Switch between |c|ocnflicting items.
14931493
|*|Available in |editing mode| as well.
1494-
__|{h}| |*|Display this help screen.
1494+
__|{?}| |*|Display this help screen.
14951495
''')) + r'''
14961496
14971497
To change a |Keyboard Shortcut|, just enter the |editing mode|. This will

pyradio/radio.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6083,7 +6083,7 @@ def keypress(self, char):
60836083
# # logger.error('\n\nbackup params\n{}\n\n'.format(self._cnf.backup_player_params))
60846084
# if char == curses.KEY_RESIZE:
60856085
# logger.error('\n\nRESIZE\n\n')
6086-
logger.error('\n\nchar = {}\n\n'.format(char))
6086+
# logger.error('\n\nchar = {}\n\n'.format(char))
60876087
# letter = get_unicode_and_cjk_char(self.outerBodyWin, char)
60886088
# logger.error('\n\nletter = {}\n\n'.format(letter))
60896089
if char in (curses.KEY_RESIZE, ):

0 commit comments

Comments
 (0)