eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-05 16:00:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed bankslot persist

Browse Source
This commit is contained in:
langolierz
2019-08-04 15:59:41 +00:00
parent 8cf4d6ae6d
commit 83afd33545
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
data_centre/data.py
View File

@@ -13,8 +13,6 @@ from omxplayer.player import OMXPlayer
class Data(object):
BANK_DATA_JSON = 'display_data.json'
NEXT_BANKSLOT_JSON = 'next_bankslot_number.json'
CURRENT_BANKSLOT_JSON = 'current_bankslot_number.json'
SETTINGS_JSON = 'settings.json'
DEFAULT_SETTINGS_JSON = 'settings_default.json'
KEYPAD_MAPPING_JSON = 'keypad_action_mapping.json'
@@ -54,11 +52,7 @@ class Data(object):
self.bank_data = self._read_json(self.BANK_DATA_JSON)
self.next_bankslot = '0-0'
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.NEXT_BANKSLOT_JSON):
self.next_bankslot = self._read_json(self.NEXT_BANKSLOT_JSON)
self.current_bankslot = '0-0'
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.CURRENT_BANKSLOT_JSON):
self.next_bankslot = self._read_json(self.CURRENT_BANKSLOT_JSON)
self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON)
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON):
@@ -145,11 +139,9 @@ class Data(object):
return False
elif is_current:
self.current_bankslot = '{}-{}'.format(self.bank_number,new_value)
self._update_json(self.CURRENT_BANKSLOT_JSON,self.current_bankslot)
return True
else:
self.next_bankslot = '{}-{}'.format(self.bank_number,new_value)
self._update_json(self.NEXT_BANKSLOT_JSON,self.next_bankslot)
return True
def update_setting_value(self, setting_folder, setting_name, setting_value):
@@ -233,11 +225,9 @@ class Data(object):
if is_current:
self.current_bankslot = '{}-{}'.format(self.bank_number,next_slot)
self._update_json(self.CURRENT_BANKSLOT_JSON,self.current_bankslot)
else:
self.next_bankslot = '{}-{}'.format(self.bank_number,next_slot)
self._update_json(self.NEXT_BANKSLOT_JSON,self.next_bankslot)
def _get_list_of_loaded_slots_in_current_bank(self):
list_of_loaded_slots = []
for index, slot in enumerate(self.bank_data[self.bank_number]):

7
display_centre/display.py
View File

@@ -112,7 +112,12 @@ class Display(object):
if self.data.is_this_path_broken(slot['location']):
self.display_text.tag_add("BROKEN_PATH", self.ROW_OFFSET + index,
self.ROW_OFFSET + self.SELECTOR_WIDTH + index)
current_bank , current_slot = self.data.split_bankslot_number(self.video_driver.current_player.bankslot_number)
# highlight the slot of the selected player
if self.data.player_mode == 'next':
bank_slot = self.video_driver.next_player.bankslot_number
else:
bank_slot = self.video_driver.current_player.bankslot_number
current_bank , current_slot = self.data.split_bankslot_number(bank_slot)
if current_bank is self.data.bank_number:
self._highlight_this_row(current_slot)

1
json_objects/current_bankslot_number.json
View File

@@ -1 +0,0 @@
"0-9"