diff --git a/tunictracker/tracker/static/tracker/assets/refresh.js b/tunictracker/tracker/static/tracker/assets/refresh.js index 0ffc4a3..1073c93 100644 --- a/tunictracker/tracker/static/tracker/assets/refresh.js +++ b/tunictracker/tracker/static/tracker/assets/refresh.js @@ -29,7 +29,22 @@ function show_breakdown(scene) { Array.from(document.getElementById("breakdown-list").children).forEach( (breakdown) => { if (breakdown.id == `${scene}-breakdown`) { - breakdown.classList.remove("hidden"); + console.log( + `${ + document + .getElementById("breakdown-current") + .querySelector(".breakdown-block-title").textContent + }, ${scene}` + ); + if ( + !( + document + .getElementById("breakdown-current") + .querySelector(".breakdown-block-title").textContent == scene + ) + ) { + breakdown.classList.remove("hidden"); + } } else { breakdown.classList.add("hidden"); } diff --git a/tunictracker/tracker/views.py b/tunictracker/tracker/views.py index 9898ed3..8381c77 100644 --- a/tunictracker/tracker/views.py +++ b/tunictracker/tracker/views.py @@ -15,7 +15,6 @@ defaults = { 'backend_filepath': '', 'backend_filepath_updated': False, } -# default_address = 'http://localhost:8000/' # logging.basicConfig(encoding='utf-8', level=logging.DEBUG) @@ -40,7 +39,14 @@ def index(request): try: request_data = requests.get( f'{listen_address}spoiler', timeout=5, verify=True).text - logger.info(f'{request_data}') + if (loads(request_data)['Scenes'] == None): + with open('empty_spoiler.json', 'r') as t: + try: + request_data = t.read() + is_hidden = False + + except: + return except: with open('empty_spoiler.json', 'r') as t: try: @@ -65,6 +71,7 @@ def index(request): 'R', '➡️').strip() for k, l in temp_codes[x].items()} for x in temp_codes.keys()} except: return + tracker_debug = tracker_output['Debug'] tracker_totals = tracker_output['Totals'] tracker_current_scene = tracker_output['Current']['Scene'] @@ -85,6 +92,7 @@ def index(request): server_address_form.fields['server_address_form'].initial = listen_address backend_filepath_form = BackendFilepathForm() backend_filepath_form.fields['backend_filepath_form'].initial = backend_filepath + logging.info(tracker_scenes) context = { 'backend_filepath': backend_filepath, 'server_address': listen_address,