From 7d81e7b665f50a5c1958b5b9d098234f8d2f55b7 Mon Sep 17 00:00:00 2001
From: Gottfried Gaisbauer <gogo@servus.at>
Date: Tue, 13 Aug 2019 17:14:56 +0200
Subject: [PATCH] added switch for using testdata
---
aura.py | 33 +++++++--------------------------
modules/scheduling/calendar.py | 2 +-
2 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/aura.py b/aura.py
index 1bbbb019..3bd4d508 100755
--- a/aura.py
+++ b/aura.py
@@ -47,19 +47,9 @@ class Aura(AuraLogger):
def __init__(self):
super(Aura, self).__init__()
- def test_yourself(self):
- self.run_test(TestConfig)
- self.run_test(TestLogger)
-
- def run_test(self, testingClass):
- runner = unittest.TextTestRunner()
- result = runner.run(unittest.makeSuite(testingClass))
-
def startup(self):
- server = object
-
- # self.controller = AuraController(self.config)
+ # self.controller = AuraController(self.config)
# create scheduler and ls_communicator
self.liquidsoapcommunicator = LiquidSoapCommunicator(self.config)
self.scheduler = AuraScheduler(self.config)
@@ -73,16 +63,8 @@ class Aura(AuraLogger):
self.messenger.scheduler = self.scheduler
self.messenger.liquidsoapcommunicator = self.liquidsoapcommunicator
- self.diskspace_watcher = DiskSpaceWatcher(self.config, self.logger, self.liquidsoapcommunicator)
- self.diskspace_watcher.start()
-
-
-
- def receive_signal(signum, stack):
- print("received signal")
- server.reload()
-
- signal.signal(signal.SIGUSR1, receive_signal)
+ #self.diskspace_watcher = DiskSpaceWatcher(self.config, self.logger, self.liquidsoapcommunicator)
+ #self.diskspace_watcher.start()
# and finally wait for redis message
self.join_comm()
@@ -91,7 +73,6 @@ class Aura(AuraLogger):
self.start_web_service()
-
def join_comm(self):
# start listener thread
self.messenger.start()
@@ -112,10 +93,10 @@ class Aura(AuraLogger):
def main():
aura = Aura()
- if len(sys.argv) >= 2 and sys.argv[1] == "--na-gspiast-di-?":
- aura.test_yourself()
- else:
- aura.startup()
+ if len(sys.argv) >= 2 and "--use-test-data" in sys.argv:
+ aura.config.set("use_test_data", True)
+
+ aura.startup()
# # ## ## ## ## ## ## # #
diff --git a/modules/scheduling/calendar.py b/modules/scheduling/calendar.py
index 83fa1880..1a5e06ba 100644
--- a/modules/scheduling/calendar.py
+++ b/modules/scheduling/calendar.py
@@ -312,7 +312,7 @@ class AuraCalendarService(threading.Thread):
# fetch data from importer
json_response = self.__fetch_data__(servicetype)
- if not json_response:
+ if not json_response and self.config.get("use_test_data"):
use_testdata = True
# if a playlist is already fetched, do not fetch it again
--
GitLab