Added scheduler for updating game lists

Martijn085 · Jan 10, 2012 · 5456be9 · 5456be9
1 parent dad2bd7
commit 5456be9
Show file tree

Hide file tree

Showing 52 changed files with 33 additions and 7 deletions.
diff --git a/Gamez.db b/Gamez.db
diff --git a/Gamez.ini b/Gamez.ini
@@ -22,13 +22,13 @@ port = 8081
 
 [Scheduler]
 download_interval = 60
+game_list_update_interval = 86400
 
 [SystemGenerated]
 is_to_ignore_update = 0
 ignored_version = 
 api_key = "ikzFRzA1Y8I1UajNJAOQ803TbTYk1vLB64A9SxrAxAw"
 
 [Notifications]
-prowl__api = 
 prowl_api = ""
 
diff --git a/Gamez.py b/Gamez.py
@@ -13,7 +13,7 @@
 import cherrypy.process.plugins
 from cherrypy.process.plugins import Daemonizer
 from lib.ConfigFunctions import CheckConfigForAllKeys
-from lib.DBFunctions import ValidateDB
+from lib.DBFunctions import ValidateDB,AddWiiGamesIfMissing,AddXbox360GamesIfMissing
 from lib.Logger import LogEvent
 import cherrypy.lib.auth_basic
 
@@ -63,16 +63,21 @@ def RunWebServer(self,isToDaemonize):
         config = ConfigParser.RawConfigParser()
         config.read('Gamez.ini')
         interval = config.get('Scheduler','download_interval').replace('"','')
+        updateGameListInterval = config.get('Scheduler','game_list_update_interval').replace('"','')
         fInterval = float(interval)
+        fUpdateGameListInterval = float(updateGameListInterval)
         workerTask = cherrypy.process.plugins.BackgroundTask(fInterval,RunGameTask)
+        gameListUpdaterWorkTask = cherrypy.process.plugins.BackgroundTask(fUpdateGameListInterval,RunGameListUpdaterTask)
         try:
-            workerTask.start()            
+            workerTask.start()
+            gameListUpdaterWorkTask.start()
 
             LogEvent("Starting the Gamez web server")
             cherrypy.quickstart(WebRoot(app_path),'/',config=conf)
         except KeyboardInterrupt:
             LogEvent("Shutting down Gamez")
             workerTask.cancel()
+            gameListUpdaterWorkTask.cancel()
             if(isToDaemonize == 1):    
                 daemon.unsubscribe()
 
@@ -136,6 +141,19 @@ def RunGameTask():
             errorMessage = errorMessage + " - " + str(message)
         LogEvent(errorMessage)
 
+def RunGameListUpdaterTask():
+    try:
+        LogEvent("Updating Game Lists")
+        AddWiiGamesIfMissing()
+        LogEvent("Wii Game List Updated")
+        AddXbox360GamesIfMissing()
+        LogEvent("XBOX 360 Game List Updated")
+    except:
+        errorMessage = "Major error occured when running Update Game List scheduled tasks"
+        for message in sys.exc_info():
+            errorMessage = errorMessage + " - " + str(message)
+        LogEvent(errorMessage)
+
 if __name__ == '__main__':
     app_path = sys.path[0]
     ValidateDB()
@@ -147,4 +165,4 @@ def RunGameTask():
         if(param == "-d"):
             isToDaemonize = 1
 
-    RunApp().RunWebServer(isToDaemonize)
+    RunApp().RunWebServer(isToDaemonize)
diff --git a/cherrypy/__init__.pyc b/cherrypy/__init__.pyc
diff --git a/cherrypy/_cpchecker.pyc b/cherrypy/_cpchecker.pyc
diff --git a/cherrypy/_cpcompat.pyc b/cherrypy/_cpcompat.pyc
diff --git a/cherrypy/_cpconfig.pyc b/cherrypy/_cpconfig.pyc
diff --git a/cherrypy/_cpdispatch.pyc b/cherrypy/_cpdispatch.pyc
diff --git a/cherrypy/_cperror.pyc b/cherrypy/_cperror.pyc
diff --git a/cherrypy/_cplogging.pyc b/cherrypy/_cplogging.pyc
diff --git a/cherrypy/_cpreqbody.pyc b/cherrypy/_cpreqbody.pyc
diff --git a/cherrypy/_cprequest.pyc b/cherrypy/_cprequest.pyc
diff --git a/cherrypy/_cpserver.pyc b/cherrypy/_cpserver.pyc
diff --git a/cherrypy/_cptools.pyc b/cherrypy/_cptools.pyc
diff --git a/cherrypy/_cptree.pyc b/cherrypy/_cptree.pyc
diff --git a/cherrypy/_cpwsgi.pyc b/cherrypy/_cpwsgi.pyc
diff --git a/cherrypy/_cpwsgi_server.pyc b/cherrypy/_cpwsgi_server.pyc
diff --git a/cherrypy/lib/__init__.pyc b/cherrypy/lib/__init__.pyc
diff --git a/cherrypy/lib/auth.pyc b/cherrypy/lib/auth.pyc
diff --git a/cherrypy/lib/auth_basic.pyc b/cherrypy/lib/auth_basic.pyc
diff --git a/cherrypy/lib/auth_digest.pyc b/cherrypy/lib/auth_digest.pyc
diff --git a/cherrypy/lib/caching.pyc b/cherrypy/lib/caching.pyc
diff --git a/cherrypy/lib/cptools.pyc b/cherrypy/lib/cptools.pyc
diff --git a/cherrypy/lib/encoding.pyc b/cherrypy/lib/encoding.pyc
diff --git a/cherrypy/lib/httpauth.pyc b/cherrypy/lib/httpauth.pyc
diff --git a/cherrypy/lib/httputil.pyc b/cherrypy/lib/httputil.pyc
diff --git a/cherrypy/lib/jsontools.pyc b/cherrypy/lib/jsontools.pyc
diff --git a/cherrypy/lib/reprconf.pyc b/cherrypy/lib/reprconf.pyc
diff --git a/cherrypy/lib/sessions.pyc b/cherrypy/lib/sessions.pyc
diff --git a/cherrypy/lib/static.pyc b/cherrypy/lib/static.pyc
diff --git a/cherrypy/lib/xmlrpcutil.pyc b/cherrypy/lib/xmlrpcutil.pyc
diff --git a/cherrypy/process/__init__.pyc b/cherrypy/process/__init__.pyc
diff --git a/cherrypy/process/plugins.pyc b/cherrypy/process/plugins.pyc
diff --git a/cherrypy/process/servers.pyc b/cherrypy/process/servers.pyc
diff --git a/cherrypy/process/win32.pyc b/cherrypy/process/win32.pyc
diff --git a/cherrypy/process/wspbus.pyc b/cherrypy/process/wspbus.pyc
diff --git a/cherrypy/wsgiserver/__init__.pyc b/cherrypy/wsgiserver/__init__.pyc
diff --git a/cherrypy/wsgiserver/wsgiserver2.pyc b/cherrypy/wsgiserver/wsgiserver2.pyc
diff --git a/lib/ConfigFunctions.py b/lib/ConfigFunctions.py
@@ -77,6 +77,10 @@ def CheckConfigForAllKeys(app_path):
     if(config.has_option('Scheduler','download_interval') == False):
         config.set('Scheduler','download_interval','60')
         changesMade = True
+
+    if(config.has_option('Scheduler','game_list_update_interval') == False):
+        config.set('Scheduler','game_list_update_interval','86400')
+        changesMade = True
 
     if(config.has_option('SystemGenerated','is_to_ignore_update') == False):
         config.set('SystemGenerated','is_to_ignore_update','0')

diff --git a/lib/ConfigFunctions.pyc b/lib/ConfigFunctions.pyc
diff --git a/lib/Constants.py b/lib/Constants.py
@@ -1,2 +1,2 @@
 def VersionNumber():
-    return "1.1.6.0"
+    return "1.1.7.0"
diff --git a/lib/Constants.pyc b/lib/Constants.pyc
diff --git a/lib/DBFunctions.pyc b/lib/DBFunctions.pyc
diff --git a/lib/GameTasks.pyc b/lib/GameTasks.pyc
diff --git a/lib/Logger.pyc b/lib/Logger.pyc
diff --git a/lib/Notifications.pyc b/lib/Notifications.pyc
diff --git a/lib/UpgradeFunctions.pyc b/lib/UpgradeFunctions.pyc
diff --git a/lib/WebRoot.py b/lib/WebRoot.py
@@ -338,6 +338,9 @@ def settings(self):
                 <label>Download Interval (In Seconds)</label>
                 <input type="text" name="downloadInterval" id="downloadInterval" value='""" + config.get('Scheduler','download_interval').replace('"','') +  """' />
 
+                <label>Game List Update Interval (In Seconds)</label>
+                <input type="text" name="gameListUpdateInterval" id="gameListUpdateInterval" value='""" + config.get('Scheduler','game_list_update_interval').replace('"','') +  """' />
+
                 <label>Gamez API Key</label>
                 <input type="text" name="gamezApiKey" id="gamezApiKey" value='""" + config.get('SystemGenerated','api_key').replace('"','') +  """' />
 
@@ -548,7 +551,7 @@ def upgradetolatestversion(self,verification):
             raise cherrypy.InternalRedirect("/?status_message=" + status)
 
     @cherrypy.expose
-    def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=3600, sabPort='', nzbMatrixApi='', sabApi='', cherrypyPort='', sabHost='',gamezApiKey='',newznabHost='',newznabPort='',newznabApi='',newznabWiiCat='',newznabXbox360Cat='',prowlApi='',gamezUsername='',gamezPassword=''):
+    def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=3600, sabPort='', nzbMatrixApi='', sabApi='', cherrypyPort='', sabHost='',gamezApiKey='',newznabHost='',newznabPort='',newznabApi='',newznabWiiCat='',newznabXbox360Cat='',prowlApi='',gamezUsername='',gamezPassword='',gameListUpdateInterval=''):
         cherrypyHost = '"' + cherrypyHost + '"'
         nzbMatrixUsername = '"' + nzbMatrixUsername + '"'
         nzbMatrixApi = '"' + nzbMatrixApi + '"'
@@ -575,6 +578,7 @@ def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=36
         config.set('Sabnzbd','port',sabPort)
         config.set('Sabnzbd','api_key',sabApi)
         config.set('Scheduler','download_interval',downloadInterval)
+        config.set('Scheduler','game_list_update_interval',gameListUpdateInterval)
         config.set('SystemGenerated','api_key',gamezApiKey)
         config.set('Newznab','host',newznabHost)
         config.set('Newznab','port',newznabPort)
@@ -624,4 +628,4 @@ def updategamelist(self):
         AddWiiGamesIfMissing()
         AddXbox360GamesIfMissing()
         status = "Game list has been updated successfully"
-        raise cherrypy.InternalRedirect("/?status_message=" + status)
+        raise cherrypy.InternalRedirect("/?status_message=" + status)
diff --git a/lib/WebRoot.pyc b/lib/WebRoot.pyc
diff --git a/lib/__init__.pyc b/lib/__init__.pyc
diff --git a/prowlpy/__init__.pyc b/prowlpy/__init__.pyc
diff --git a/prowlpy/prowlpy.pyc b/prowlpy/prowlpy.pyc