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-06 00:10:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing update code

Browse Source
This commit is contained in:
langolierz
2019-12-06 15:52:27 +00:00
parent 0d32e5aa1a
commit 7507cbe4e4
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actions.py
View File

@@ -7,7 +7,6 @@ import os
from pythonosc import osc_message_builder from pythonosc import osc_message_builder
from pythonosc import dispatcher from pythonosc import dispatcher
from pythonosc import osc_server from pythonosc import osc_server
from pythonosc import dispatcher
import git import git
import threading import threading
import argparse import argparse
@@ -557,7 +556,6 @@ class Actions(object):
self.change_hdmi_settings('CEA 4 HDMI') self.change_hdmi_settings('CEA 4 HDMI')
def check_dev_mode(self): def check_dev_mode(self):
#### check if in dev mode:(ie not using the lcd screen) #### check if in dev mode:(ie not using the lcd screen)
with open('/boot/config.txt', 'r') as config: with open('/boot/config.txt', 'r') as config:
@@ -832,6 +830,8 @@ class Actions(object):
current_recur_hash = recur_repo.head.object.hexsha current_recur_hash = recur_repo.head.object.hexsha
current_conjur_hash = conjur_repo.head.object.hexsha current_conjur_hash = conjur_repo.head.object.hexsha
current_ofxVideoArtTools_hash = ofxVideoArtTools_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: try:
recur_repo.remotes.origin.pull() recur_repo.remotes.origin.pull()
conjur_repo.remotes.origin.pull() conjur_repo.remotes.origin.pull()
@@ -852,7 +852,6 @@ class Actions(object):
new_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha new_ofxVideoArtTools_hash = ofxVideoArtTools_repo.head.object.hexsha
if current_recur_hash != new_recur_hash or current_conjur_hash != new_conjur_hash or current_ofxVideoArtTools_hash != new_ofxVideoArtTools_hash : if current_recur_hash != new_recur_hash or current_conjur_hash != new_conjur_hash or current_ofxVideoArtTools_hash != new_ofxVideoArtTools_hash :
#something has changed! #something has changed!
os.remove('/home/pi/r_e_c_u_r/json_objects/settings.json')
self.restart_the_program() self.restart_the_program()
else: else:
self.message_handler.set_message('INFO', 'up to date !') self.message_handler.set_message('INFO', 'up to date !')

9
data_centre/data.py
View File

@@ -6,7 +6,7 @@ from random import randint
import inspect import inspect
from itertools import cycle from itertools import cycle
from omxplayer.player import OMXPlayer from omxplayer.player import OMXPlayer
from shutil import copyfile
@@ -24,6 +24,7 @@ class Data(object):
PATH_TO_EXTERNAL_DEVICES = '/media/pi' PATH_TO_EXTERNAL_DEVICES = '/media/pi'
PATH_TO_OPENFRAMEWORKS = '/home/pi/openframeworks10.1/' PATH_TO_OPENFRAMEWORKS = '/home/pi/openframeworks10.1/'
PATH_TO_CONJUR_DATA = PATH_TO_OPENFRAMEWORKS + 'apps/myApps/c_o_n_j_u_r/bin/data/settings.xml' PATH_TO_CONJUR_DATA = PATH_TO_OPENFRAMEWORKS + 'apps/myApps/c_o_n_j_u_r/bin/data/settings.xml'
PATH_TO_DEFAULT_CONJUR_DATA = PATH_TO_OPENFRAMEWORKS + 'apps/myApps/c_o_n_j_u_r/bin/data/settings_default.xml'
def __init__(self, message_handler): def __init__(self, message_handler):
self.message_handler = message_handler self.message_handler = message_handler
@@ -55,6 +56,10 @@ class Data(object):
self.shader_layer = 0 self.shader_layer = 0
### persisted data (use default if doesnt exits): ### 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
copyfile(self.PATH_TO_DEFAULT_CONJUR_DATA, self.PATH_TO_CONJUR_DATA)
self.bank_data = [self.create_empty_bank()] self.bank_data = [self.create_empty_bank()]
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.BANK_DATA_JSON): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.BANK_DATA_JSON):
self.bank_data = self._read_json(self.BANK_DATA_JSON) self.bank_data = self._read_json(self.BANK_DATA_JSON)
@@ -62,8 +67,8 @@ class Data(object):
self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)] self.shader_bank_data = [self.create_empty_shader_bank() for i in range(3)]
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SHADER_BANK_DATA_JSON):
self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON) self.shader_bank_data = self._read_json(self.SHADER_BANK_DATA_JSON)
self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON) self.settings = self._read_json(self.DEFAULT_SETTINGS_JSON)
if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON): if os.path.isfile(self.PATH_TO_DATA_OBJECTS + self.SETTINGS_JSON):
self.settings = self._read_json(self.SETTINGS_JSON) self.settings = self._read_json(self.SETTINGS_JSON)