Skip to content

Commit bbbd6a3

Browse files
s-n-gs-n-g
committed
Version 0.8.8.5 (BUG FIX release)
commenting out log error messages
1 parent e848cae commit bbbd6a3

File tree

9 files changed

+131
-128
lines changed

9 files changed

+131
-128
lines changed

‎Changelog‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
2021-02-27 s-n-g
2+
* Version 0.8.8.5 (BUG FIX release)
3+
* Fixing -ap value not activated by player
4+
* Commenting out excessive error log messages
5+
6+
2021-02-27 s-n-g
7+
* Version 0.8.8.4 (BUG FIX release)
28
* Fixing double click behavior (while in playback
39
double clicking to a different station will start it.
410
* vcl will not start muted (volume = 0)
11+
512
2021-02-26 s-n-g
13+
* Version 0.8.8.3
614
* Basic mouse support implemented
715
* Config option to enable mouse support added
816
* Implementing players extra parameters set.
@@ -14,15 +22,11 @@
1422
changes (encoding, connection type, player parameters).
1523
* When restarting playback, play the correct station
1624
not the selected one.
17-
* Fixing several minor bugs.
18-
19-
2021-01-09 s-n-g
2025
* adding autostart BAT file on Windows to
2126
prevent session locking when Windows
2227
terminate while PyRadio is still running
23-
24-
2020-12-24 s-n-g
2528
* pyradio will always use a profile
29+
* Fixing several minor bugs.
2630

2731
2020-12-21 s-n-g
2832
* Theme selection window will not crash when resizing

‎pyradio/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" pyradio -- Console radio player. "
22

3-
version_info = (0, 8, 8, 4)
3+
version_info = (0, 8, 8, 5)
44

55
# Application state:
66
# New stable version: ''

‎pyradio/config.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ def read_playlist_file(self, stationFile='', is_register=False):
443443
return -1
444444

445445
self.stations = list(self._reading_stations)
446-
#logger.error('DE stations\n{}\n\n'.format(self.stations))
446+
# logger.error('DE stations\n{}\n\n'.format(self.stations))
447447
self._reading_stations = []
448448
self._ps.add(is_register=self._open_register_list or is_register)
449449
self._set_playlist_elements(stationFile)
@@ -760,7 +760,7 @@ def remove_station(self, target):
760760
def insert_station(self, station, target):
761761
''' Insert a station in the list at index target
762762
It is inserted ABOVE old target (old target becomes old target + 1)'''
763-
#logger.error('DE target= {0}, number_of_stations = {1}'.format(target, self.number_of_stations))
763+
# logger.error('DE target= {0}, number_of_stations = {1}'.format(target, self.number_of_stations))
764764
if target < 0 or \
765765
target > self.number_of_stations or \
766766
self.number_of_stations == 0:
@@ -777,21 +777,21 @@ def insert_station(self, station, target):
777777
self.stations = list(d)
778778
self.dirty_playlist = True
779779
self.number_of_stations = len(self.stations)
780-
#logger.error('DE number_of_stations = {}'.format(self.number_of_stations))
780+
# logger.error('DE number_of_stations = {}'.format(self.number_of_stations))
781781
return True, self.number_of_stations
782782

783783
def move_station(self, source, target):
784784
''' Moves a station in the list from index source to index target
785785
It is moved ABOVE old target (old target becomes old target + 1)'''
786-
#logger.error('DE source = {0}, target = {1}'.format(source, target))
787-
#logger.error('DE number_of_stations = {}'.format(self.number_of_stations))
786+
# logger.error('DE source = {0}, target = {1}'.format(source, target))
787+
# logger.error('DE number_of_stations = {}'.format(self.number_of_stations))
788788
if source == target or \
789789
source < 0 or \
790790
target < 0 or \
791791
source >= self.number_of_stations or \
792792
target >= self.number_of_stations or \
793793
self.number_of_stations == 0:
794-
#logger.error('\n\nreturning False\n\n')
794+
# logger.error('\n\nreturning False\n\n')
795795
return False
796796
if source < target:
797797
step = 1
@@ -800,7 +800,7 @@ def move_station(self, source, target):
800800
d = collections.deque(self.stations)
801801
d.rotate(-source)
802802
source_item = d.popleft()
803-
#logger.error('DE source_item = "{}"'.format(source_item))
803+
# logger.error('DE source_item = "{}"'.format(source_item))
804804
d.rotate(source)
805805
d.rotate(-target)
806806
d.appendleft(source_item)
@@ -890,11 +890,11 @@ def open_browser(self, url):
890890
self.dirty_playlist = False
891891

892892
def save_station_position(self, startPos, selection, playing):
893-
#logger.error('DE startPos = {0}, selection = {1}'.format(startPos, selection))
893+
# logger.error('DE startPos = {0}, selection = {1}'.format(startPos, selection))
894894
self._ps.startPos = startPos
895895
self._ps.selection = selection
896896
self._ps.playing = playing
897-
#logger.error('DE self._ps._p\n\n{}\n\n'.format(self._ps._p))
897+
# logger.error('DE self._ps._p\n\n{}\n\n'.format(self._ps._p))
898898

899899
def append_to_register(self, register, station):
900900
reg_file = path.join(self.registers_dir, 'register_' + register + '.csv')
@@ -1516,7 +1516,7 @@ def _config_to_params(self, a_param):
15161516

15171517
def check_parameters(self):
15181518
''' Config parameters check '''
1519-
#logger.error('DE check_params: params = {}'.format(self.params))
1519+
# logger.error('DE check_params: params = {}'.format(self.params))
15201520

15211521
for a_key in self.saved_params.keys():
15221522
if self.saved_params[a_key] != self.params[a_key]:
@@ -1898,7 +1898,7 @@ def add(self, station_path='',
18981898
startPos, selection, playing,
18991899
is_register,
19001900
browsing_station_service])
1901-
#logger.error('DE playlist history\n{}\n'.format(self._p))
1901+
# logger.error('DE playlist history\n{}\n'.format(self._p))
19021902

19031903
def get_item_member(self, member, item_id=-1):
19041904
if member in self._id.keys():

‎pyradio/config_window.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,6 @@ def _dict_to_list(self):
947947
self._selections[a_param_set][2] = int(a_param) - 1
948948
else:
949949
self._items_dict[a_param_set].append(a_param)
950-
logger.error('DE selections = {}'.format(self._selections))
951950

952951
def _list_to_dict(self):
953952
''' convert self._items_dict to self._working_params '''
@@ -1979,9 +1978,9 @@ def refresh_win(self, resizing=False):
19791978

19801979
def refresh_selection(self, resizing=False):
19811980
pad = len(str(self.startPos + self.maxY - 2 - self.pad_adjustment))
1982-
#logger.error('DE \n\npos = {0}, pad = {1}\n\n'.format(self.startPos + self.maxY - 2 - self.pad_adjustment, pad))
1981+
# logger.error('DE \n\npos = {0}, pad = {1}\n\n'.format(self.startPos + self.maxY - 2 - self.pad_adjustment, pad))
19831982
for i in range(0, self.maxY - 2):
1984-
#logger.error('de i = {0}, startPos = {1}'.format(i, self.startPos))
1983+
# logger.error('de i = {0}, startPos = {1}'.format(i, self.startPos))
19851984
if i + self.startPos < self._num_of_items:
19861985
line, pad = self._format_line(i, pad)
19871986
colour = self._get_color(i)

‎pyradio/edit.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -625,12 +625,12 @@ def __init__(self, filename, parent, create=False,
625625
else:
626626
self._to_path = self._from_path
627627
self._display_from_file = self._from_file
628-
logger.error('filename = {0}\nfrom path = {1}\nfrom file = {2}\nto path = {3}\ndisplay name = {4}'.format(
629-
filename,
630-
self._from_path,
631-
self._from_file,
632-
self._to_path,
633-
self._display_from_file))
628+
# logger.error('filename = {0}\nfrom path = {1}\nfrom file = {2}\nto path = {3}\ndisplay name = {4}'.format(
629+
# filename,
630+
# self._from_path,
631+
# self._from_file,
632+
# self._to_path,
633+
# self._display_from_file))
634634

635635
self._parent_win = parent
636636
self._create = create
@@ -818,7 +818,7 @@ def show(self):
818818
self.checked_checkbox = None
819819

820820

821-
#logger.error('DE \n\nmaxY = {}, maxX = {}\n\n'.format(self.maxY, self.maxX))
821+
# logger.error('DE \n\nmaxY = {}, maxX = {}\n\n'.format(self.maxY, self.maxX))
822822
if self.maxY < 22 + adjust_line_Y or self.maxX < 74:
823823
if self.maxY < 11 or self.maxX < 44:
824824
txt = ' Window too small to display content '

‎pyradio/log.py‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class Log(object):
2525

2626
_player_stopped = 0
2727

28+
_show_status_updates = False
29+
2830
def __init__(self):
2931
self.width = None
3032

@@ -118,11 +120,12 @@ def write(self,
118120
except:
119121
if logger.isEnabledFor(logging.ERROR):
120122
logger.error('Cannot update the Status Bar...')
121-
if logger.isEnabledFor(logging.DEBUG):
122-
try:
123-
logger.debug('Status: "{}"'.format(self.msg))
124-
except:
125-
pass
123+
if self._show_status_updates:
124+
if logger.isEnabledFor(logging.DEBUG):
125+
try:
126+
logger.debug('Status: "{}"'.format(self.msg))
127+
except:
128+
pass
126129

127130
self._active_width = self.width
128131

@@ -147,8 +150,9 @@ def write(self,
147150
first_print = self._do_i_print_last_char(first_print)
148151
self.cursesScreen.refresh()
149152
self._active_width -= len(d_msg)
150-
if logger.isEnabledFor(logging.DEBUG):
151-
logger.debug('Suffix: {}'.format(self.suffix))
153+
if self._show_status_updates:
154+
if logger.isEnabledFor(logging.DEBUG):
155+
logger.debug('Suffix: {}'.format(self.suffix))
152156

153157
''' display counter '''
154158
if self.counter:
@@ -166,8 +170,9 @@ def write(self,
166170
self.cursesScreen.refresh()
167171
self._active_width -= len(d_msg)
168172
self.display_help_message = False
169-
if logger.isEnabledFor(logging.DEBUG):
170-
logger.debug('Counter: {}'.format(self.counter))
173+
if self._show_status_updates:
174+
if logger.isEnabledFor(logging.DEBUG):
175+
logger.debug('Counter: {}'.format(self.counter))
171176

172177
if self.asked_to_stop:
173178
self.asked_to_stop = False
@@ -184,8 +189,9 @@ def write(self,
184189
suffix_string)
185190
self.cursesScreen.refresh()
186191
self.display_help_message = True
187-
if logger.isEnabledFor(logging.DEBUG):
188-
logger.debug('Press ? for help: yes')
192+
if self._show_status_updates:
193+
if logger.isEnabledFor(logging.DEBUG):
194+
logger.debug('Press ? for help: yes')
189195
else:
190196
if logger.isEnabledFor(logging.DEBUG):
191197
logger.debug('Press ? for help: no')

0 commit comments

Comments
 (0)