From 75a9cccf1ef114a3e0a18b7a7eee647e972d2ccb Mon Sep 17 00:00:00 2001 From: langolierz Date: Mon, 9 Dec 2019 21:54:22 +0100 Subject: [PATCH 1/9] Update shaders.py --- video_centre/shaders.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/video_centre/shaders.py b/video_centre/shaders.py index 0d93ae6..1b49825 100644 --- a/video_centre/shaders.py +++ b/video_centre/shaders.py @@ -155,7 +155,7 @@ class Shaders(object): if layer_offset is None: start_layer = self.data.shader_layer layer_offset = 0 - layer = start_layer + layer_offset % 4 + layer = start_layer + layer_offset % 3 if self.data.settings['shader']['X3_AS_SPEED']['value'] == 'enabled' and param == 3: self.set_speed_to_amount(amount, layout_offset=layout_offset) else: @@ -163,7 +163,7 @@ class Shaders(object): self.selected_param_list[layer][param] = amount def set_speed_to_amount(self, amount, layer_offset=0): - layer = self.data.shader_layer + layer_offset % 4 + layer = self.data.shader_layer + layer_offset % 3 self.osc_client.send_message("/shader/{}/speed".format(str(layer)), amount ) self.selected_speed_list[layer] = amount From da30da917616d0418e123ab837fe8e89ff21f0be Mon Sep 17 00:00:00 2001 From: langolierz Date: Mon, 9 Dec 2019 21:55:41 +0000 Subject: [PATCH 2/9] fix midi bug --- video_centre/shaders.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/video_centre/shaders.py b/video_centre/shaders.py index 1b49825..317cac1 100644 --- a/video_centre/shaders.py +++ b/video_centre/shaders.py @@ -155,15 +155,15 @@ class Shaders(object): if layer_offset is None: start_layer = self.data.shader_layer layer_offset = 0 - layer = start_layer + layer_offset % 3 + layer = (start_layer + layer_offset) % 3 if self.data.settings['shader']['X3_AS_SPEED']['value'] == 'enabled' and param == 3: - self.set_speed_to_amount(amount, layout_offset=layout_offset) + self.set_speed_to_amount(amount, layer_offset=layer_offset) else: self.osc_client.send_message("/shader/{}/param".format(str(layer)), [param, amount] ) self.selected_param_list[layer][param] = amount def set_speed_to_amount(self, amount, layer_offset=0): - layer = self.data.shader_layer + layer_offset % 3 + layer = (self.data.shader_layer + layer_offset) % 3 self.osc_client.send_message("/shader/{}/speed".format(str(layer)), amount ) self.selected_speed_list[layer] = amount From 641ef046d00b02b6c0bc2bc6767c53baab58c537 Mon Sep 17 00:00:00 2001 From: langolierz Date: Wed, 11 Dec 2019 19:10:19 +0000 Subject: [PATCH 3/9] fixed update code --- actions.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/actions.py b/actions.py index 1e44d57..9e14622 100644 --- a/actions.py +++ b/actions.py @@ -830,8 +830,9 @@ class Actions(object): current_recur_hash = recur_repo.head.object.hexsha current_conjur_hash = conjur_repo.head.object.hexsha current_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha - os.remove('/home/pi/r_e_c_u_r/json_objects/settings.json') - os.remove(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) + + try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) + try_remove_file(PATH_TO_DEFAULT_CONJUR_DATA) try: recur_repo.remotes.origin.pull() conjur_repo.remotes.origin.pull() @@ -868,5 +869,7 @@ class Actions(object): self.message_handler.clear_all_messages() - - + @staticmethod + def try_remove_file(path): + os.path.exists(path): + os.remove(filePath) From 6f4ffa7f72c3427eaec53be6433b561eee46ecdf Mon Sep 17 00:00:00 2001 From: langolierz Date: Wed, 11 Dec 2019 19:12:27 +0000 Subject: [PATCH 4/9] fix update code --- actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions.py b/actions.py index 9e14622..0e20598 100644 --- a/actions.py +++ b/actions.py @@ -871,5 +871,5 @@ class Actions(object): @staticmethod def try_remove_file(path): - os.path.exists(path): + if os.path.exists(path): os.remove(filePath) From 87425a13e0b65327cda0f4372d66a2a90b9262ff Mon Sep 17 00:00:00 2001 From: langolierz Date: Wed, 11 Dec 2019 20:17:33 +0100 Subject: [PATCH 5/9] Create README.md --- enclosure/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 enclosure/README.md diff --git a/enclosure/README.md b/enclosure/README.md new file mode 100644 index 0000000..4ed7466 --- /dev/null +++ b/enclosure/README.md @@ -0,0 +1 @@ +gonna explain a little about the enclosure options here : From b5c772f467b59333930345b45cbaf9c5ef6c5615 Mon Sep 17 00:00:00 2001 From: langolierz Date: Wed, 11 Dec 2019 19:21:09 +0000 Subject: [PATCH 6/9] finally fixd updatecode --- actions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions.py b/actions.py index 0e20598..b210799 100644 --- a/actions.py +++ b/actions.py @@ -831,8 +831,8 @@ class Actions(object): current_conjur_hash = conjur_repo.head.object.hexsha current_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha - try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) - try_remove_file(PATH_TO_DEFAULT_CONJUR_DATA) + self.try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) + self.try_remove_file(self.data.PATH_TO_DEFAULT_CONJUR_DATA) try: recur_repo.remotes.origin.pull() conjur_repo.remotes.origin.pull() @@ -872,4 +872,4 @@ class Actions(object): @staticmethod def try_remove_file(path): if os.path.exists(path): - os.remove(filePath) + os.remove(path) From 6e6f2015dc632566a9fe49f4058043dd7989a438 Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Sat, 14 Dec 2019 14:14:25 +0000 Subject: [PATCH 7/9] sort files & folders alphabetically --- display_centre/menu.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/display_centre/menu.py b/display_centre/menu.py index 76f6ad7..8ab325a 100644 --- a/display_centre/menu.py +++ b/display_centre/menu.py @@ -103,7 +103,7 @@ class BrowserMenu(Menu): root, dirs, files = next(os.walk(current_path)) indent = ' ' * 4 * (current_level) - for folder in dirs: + for folder in sorted(dirs): is_open, char = self._check_folder_state(folder) self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x')) if (is_open): @@ -111,6 +111,7 @@ class BrowserMenu(Menu): next_level = current_level + 1 self._add_folder_to_browser_list(next_path, next_level) + files.sort() for f in files: split_name = os.path.splitext(f) if (split_name[1] in ['.mp4', '.mkv', '.avi', '.mov']): From 6c3848cf6cf33816cbeff0819edb17cccd966bbd Mon Sep 17 00:00:00 2001 From: Tristan Rowley Date: Sat, 14 Dec 2019 14:19:01 +0000 Subject: [PATCH 8/9] merged and sorts shaders now too --- display_centre/menu.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/display_centre/menu.py b/display_centre/menu.py index fe62013..1381b3c 100644 --- a/display_centre/menu.py +++ b/display_centre/menu.py @@ -203,7 +203,7 @@ class ShadersMenu(Menu): root, dirs, files = next(os.walk(current_path)) indent = ' ' * 4 * (current_level) - for folder in dirs: + for folder in sorted(dirs): is_open, char = self._check_folder_state(folder) self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False)) if (is_open): @@ -211,6 +211,7 @@ class ShadersMenu(Menu): next_level = current_level + 1 self._add_folder_to_shaders_list(next_path, next_level) + files.sort() for f in files: split_name = os.path.splitext(f) if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']): From 9935f1a98bf308b1563e54ca8551ac16854bda9e Mon Sep 17 00:00:00 2001 From: langolierz Date: Sun, 15 Dec 2019 13:17:35 +0000 Subject: [PATCH 9/9] fix boot bug --- actions.py | 9 +++------ data_centre/data.py | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/actions.py b/actions.py index b210799..bb77778 100644 --- a/actions.py +++ b/actions.py @@ -831,8 +831,8 @@ class Actions(object): current_conjur_hash = conjur_repo.head.object.hexsha current_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha - self.try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) - self.try_remove_file(self.data.PATH_TO_DEFAULT_CONJUR_DATA) + self.data.try_remove_file(self.data.PATH_TO_DATA_OBJECTS + self.data.SETTINGS_JSON ) + self.data.try_remove_file(self.data.PATH_TO_DEFAULT_CONJUR_DATA) try: recur_repo.remotes.origin.pull() conjur_repo.remotes.origin.pull() @@ -869,7 +869,4 @@ class Actions(object): self.message_handler.clear_all_messages() - @staticmethod - def try_remove_file(path): - if os.path.exists(path): - os.remove(path) + diff --git a/data_centre/data.py b/data_centre/data.py index 7c18d20..58e6d88 100644 --- a/data_centre/data.py +++ b/data_centre/data.py @@ -57,7 +57,7 @@ class Data(object): ### persisted data (use default if doesnt exits): if not os.path.isfile(self.PATH_TO_CONJUR_DATA): - os.remove(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON ) # keep the, in sync + self.try_remove_file(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON ) # keep the, in sync copyfile(self.PATH_TO_DEFAULT_CONJUR_DATA, self.PATH_TO_CONJUR_DATA) self.bank_data = [self.create_empty_bank()] @@ -405,3 +405,7 @@ class Data(object): else: return [] + @staticmethod + def try_remove_file(path): + if os.path.exists(path): + os.remove(path)