diff --git a/API.md b/API.md index 8ac0831..5d41ed7 100644 --- a/API.md +++ b/API.md @@ -38,8 +38,12 @@ Examples: ***GETREQUESTED***
-To Be Added -

+This mode returns a list of the games that have been requested. The result is in the same format as the SEARCH mode. No additional parameters are needed. + +Examples: +
+   Get Requested Games: http://127.0.0.1:8085/api?api_key=ikzFRzA1Y8I1UajNJAOQ803TbTYk1vLB64A9SxrAxAw&mode=GETREQUESTED +
***ADDREQUESTED***
To Be Added diff --git a/Gamez.db b/Gamez.db index 76e02a6..16f9dce 100644 Binary files a/Gamez.db and b/Gamez.db differ diff --git a/Gamez.ini b/Gamez.ini index e230ad5..7202245 100644 --- a/Gamez.ini +++ b/Gamez.ini @@ -1,25 +1,25 @@ [global] server.socket_host = "127.0.0.1" server.socket_port = 8085 -user_name = -password = +user_name = "" +password = "" [NZBMatrix] -username = -api_key = +username = "" +api_key = "" [Newznab] -api_key = +api_key = "" wii_category_id = "1030" xbox360_category_id = "1050" -host = +host = "" port = [Sabnzbd] -api_key = +api_key = "" host = "127.0.0.1" port = 8081 -category = +category = "" [Scheduler] download_interval = 900 @@ -47,21 +47,21 @@ process_download_folder_xbox360_enabled = 0 nzb_completed = 0 [Notifications] -prowl_api = -growl_host = +prowl_api = "" +growl_host = "" growl_port = 23053 -growl_password = -notifo_username = -notifo_apikey = +growl_password = "" +notifo_username = "" +notifo_apikey = "" [Blackhole] -nzb_blackhole_path = -torrent_blackhole_path = +nzb_blackhole_path = "" +torrent_blackhole_path = "" [Folders] torrent_completed = "" nzb_completed = "" sabnzbd_completed = "" -wii_destination = -xbox360_destination = +wii_destination = "" +xbox360_destination = "c:\\xbox360" diff --git a/Gamez.py b/Gamez.py index 62f4687..c949475 100644 --- a/Gamez.py +++ b/Gamez.py @@ -17,6 +17,7 @@ from lib.DBFunctions import ValidateDB,AddWiiGamesIfMissing,AddXbox360GamesIfMissing,AddComingSoonGames from lib.Logger import LogEvent import cherrypy.lib.auth_basic +from lib.FolderFunctions import * app_path = os.path.dirname(os.path.abspath("__FILE__")) config_path = os.path.join(app_path,'Gamez.ini') @@ -35,7 +36,7 @@ def RunWebServer(self,isToDaemonize): theme_path = os.path.join(css_path,'redmond') theme_images_path = os.path.join(theme_path,'images') config = ConfigParser.RawConfigParser() - config.read('Gamez.ini') + config.read('Gamez.ini') username = config.get('global','user_name').replace('"','') password = config.get('global','password').replace('"','') useAuth = False @@ -70,16 +71,16 @@ def RunWebServer(self,isToDaemonize): updateGameListInterval = config.get('Scheduler','game_list_update_interval').replace('"','') fInterval = float(interval) fUpdateGameListInterval = float(updateGameListInterval) - #thread.start_new_thread(ScheduleGameTasks,(fInterval,)) - #workerTask = cherrypy.process.plugins.BackgroundTask(fInterval,RunGameTask) - #gameListUpdaterWorkTask = cherrypy.process.plugins.BackgroundTask(fUpdateGameListInterval,RunGameListUpdaterTask) try: LogEvent("Setting up download scheduler") gameTasksScheduler = cherrypy.process.plugins.Monitor(cherrypy.engine,RunGameTask,fInterval) - gameTasksScheduler.subscribe() - LogEvent("Setting up game list update scheduler") - gameListUpdaterScheduler = cherrypy.process.plugins.Monitor(cherrypy.engine,RunGameListUpdaterTask,fUpdateGameListInterval) - gameListUpdaterScheduler.subscribe() + gameTasksScheduler.subscribe() + LogEvent("Setting up game list update scheduler") + gameListUpdaterScheduler = cherrypy.process.plugins.Monitor(cherrypy.engine,RunGameListUpdaterTask,fUpdateGameListInterval) + gameListUpdaterScheduler.subscribe() + LogEvent("Setting up folder processing scheduler") + folderProcessingScheduler = cherrypy.process.plugins.Monitor(cherrypy.engine,RunFolderProcessingTask,float(900)) + folderProcessingScheduler.subscribe() LogEvent("Starting the Gamez web server") cherrypy.quickstart(WebRoot(app_path),'/',config=conf) except KeyboardInterrupt: @@ -103,6 +104,8 @@ def GenerateSabPostProcessScript(): file.write("\n") file.write('import urllib') file.write("\n") + file.write("filePath = str(sys.argv[1])") + file.write("\n") file.write('fields = str(sys.argv[3]).split("-")') file.write("\n") file.write('gamezID = fields[0].replace("[","").replace("]","").replace(" ","")') @@ -115,7 +118,7 @@ def GenerateSabPostProcessScript(): file.write("\n") file.write(" downloadStatus = 'Downloaded'") file.write("\n") - file.write('url = "' + gamezBaseUrl + 'updatestatus?game_id=" + gamezID + "&status=" + downloadStatus') + file.write('url = "' + gamezBaseUrl + 'updatestatus?game_id=" + gamezID + "&filePath=" + urllib.quote(filePath) + "&status=" + downloadStatus') file.write("\n") file.write('responseObject = urllib.FancyURLopener({}).open(url)') file.write("\n") @@ -125,6 +128,9 @@ def GenerateSabPostProcessScript(): file.write("\n") file.write('print("Processing Completed Successfully")') file.close + LogEvent("Setting permissions on post process script") + cmd = "chmod +x '" + postProcessScript + "'" + os.system(cmd) def RunGameTask(): try: @@ -172,10 +178,20 @@ def RunGameListUpdaterTask(): errorMessage = errorMessage + " - " + str(message) LogEvent(errorMessage) +def RunFolderProcessingTask(): + try: + ScanFoldersToProcess() + except: + errorMessage = "Error occurred while processing folders" + for message in sys.exc_info(): + errorMessage = errorMessage + " - " + str(message) + LogEvent(errorMessage) + if __name__ == '__main__': app_path = sys.path[0] LogEvent("Checking DB") ValidateDB() + LogEvent("Checking config file for completeness") CheckConfigForAllKeys(app_path) config = ConfigParser.RawConfigParser() configFilePath = os.path.join(app_path,'Gamez.ini') @@ -190,8 +206,7 @@ def RunGameListUpdaterTask(): config.set('Folders','sabnzbd_completed','"' + sabCompleted + '"') LogEvent("Trying to save") with open(configFilePath,'wb') as configFile: - config.write(configFile) - LogEvent("Checking config file for completeness") + config.write(configFile) isToDaemonize = 0 params = sys.argv for param in params: diff --git a/Gamez.pyproj b/Gamez.pyproj new file mode 100644 index 0000000..ae836b7 --- /dev/null +++ b/Gamez.pyproj @@ -0,0 +1,26 @@ + + + + Debug + 2.0 + {00000000-0000-0000-0000-000000000000} + . + + + + + . + . + Gamez + Gamez + + + true + false + + + true + false + + + \ No newline at end of file diff --git a/Gamez.suo b/Gamez.suo new file mode 100644 index 0000000..5e0155c Binary files /dev/null and b/Gamez.suo differ diff --git a/_ReSharper.Gamez/BuildScriptCache/.crc b/_ReSharper.Gamez/BuildScriptCache/.crc new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/_ReSharper.Gamez/BuildScriptCache/.crc differ diff --git a/_ReSharper.Gamez/BuildScriptCache/.version b/_ReSharper.Gamez/BuildScriptCache/.version new file mode 100644 index 0000000..f66c9cf Binary files /dev/null and b/_ReSharper.Gamez/BuildScriptCache/.version differ diff --git a/_ReSharper.Gamez/JavaScriptCache/.crc b/_ReSharper.Gamez/JavaScriptCache/.crc new file mode 100644 index 0000000..458113f --- /dev/null +++ b/_ReSharper.Gamez/JavaScriptCache/.crc @@ -0,0 +1 @@ +¡¥8 \ No newline at end of file diff --git a/_ReSharper.Gamez/JavaScriptCache/.version b/_ReSharper.Gamez/JavaScriptCache/.version new file mode 100644 index 0000000..b4e8a90 Binary files /dev/null and b/_ReSharper.Gamez/JavaScriptCache/.version differ diff --git a/_ReSharper.Gamez/JavaScriptCache/8/2767ed7e.dat b/_ReSharper.Gamez/JavaScriptCache/8/2767ed7e.dat new file mode 100644 index 0000000..27079a1 Binary files /dev/null and b/_ReSharper.Gamez/JavaScriptCache/8/2767ed7e.dat differ diff --git a/_ReSharper.Gamez/MVC/.crc b/_ReSharper.Gamez/MVC/.crc new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/_ReSharper.Gamez/MVC/.crc differ diff --git a/_ReSharper.Gamez/MVC/.version b/_ReSharper.Gamez/MVC/.version new file mode 100644 index 0000000..f66c9cf Binary files /dev/null and b/_ReSharper.Gamez/MVC/.version differ diff --git a/_ReSharper.Gamez/NamedArguments/.crc b/_ReSharper.Gamez/NamedArguments/.crc new file mode 100644 index 0000000..646178e --- /dev/null +++ b/_ReSharper.Gamez/NamedArguments/.crc @@ -0,0 +1 @@ +—Lž \ No newline at end of file diff --git a/_ReSharper.Gamez/NamedArguments/.version b/_ReSharper.Gamez/NamedArguments/.version new file mode 100644 index 0000000..f66c9cf Binary files /dev/null and b/_ReSharper.Gamez/NamedArguments/.version differ diff --git a/_ReSharper.Gamez/NamedArguments/5/5706720e.dat b/_ReSharper.Gamez/NamedArguments/5/5706720e.dat new file mode 100644 index 0000000..fbe1bcf Binary files /dev/null and b/_ReSharper.Gamez/NamedArguments/5/5706720e.dat differ diff --git a/_ReSharper.Gamez/Resources/.crc b/_ReSharper.Gamez/Resources/.crc new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/_ReSharper.Gamez/Resources/.crc differ diff --git a/_ReSharper.Gamez/Resources/.version b/_ReSharper.Gamez/Resources/.version new file mode 100644 index 0000000..ea2c20a Binary files /dev/null and b/_ReSharper.Gamez/Resources/.version differ diff --git a/_ReSharper.Gamez/SymbolCache.bin b/_ReSharper.Gamez/SymbolCache.bin new file mode 100644 index 0000000..0a56f4d Binary files /dev/null and b/_ReSharper.Gamez/SymbolCache.bin differ diff --git a/_ReSharper.Gamez/TagPrefixes/.crc b/_ReSharper.Gamez/TagPrefixes/.crc new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/_ReSharper.Gamez/TagPrefixes/.crc differ diff --git a/_ReSharper.Gamez/TagPrefixes/.version b/_ReSharper.Gamez/TagPrefixes/.version new file mode 100644 index 0000000..f66c9cf Binary files /dev/null and b/_ReSharper.Gamez/TagPrefixes/.version differ diff --git a/_ReSharper.Gamez/TodoCache/.crc b/_ReSharper.Gamez/TodoCache/.crc new file mode 100644 index 0000000..db12219 --- /dev/null +++ b/_ReSharper.Gamez/TodoCache/.crc @@ -0,0 +1 @@ +7£Pû \ No newline at end of file diff --git a/_ReSharper.Gamez/TodoCache/.version b/_ReSharper.Gamez/TodoCache/.version new file mode 100644 index 0000000..38424fc Binary files /dev/null and b/_ReSharper.Gamez/TodoCache/.version differ diff --git a/_ReSharper.Gamez/TodoCache/8/2767ed7e.dat b/_ReSharper.Gamez/TodoCache/8/2767ed7e.dat new file mode 100644 index 0000000..40b2a52 Binary files /dev/null and b/_ReSharper.Gamez/TodoCache/8/2767ed7e.dat differ diff --git a/_ReSharper.Gamez/WebSymbols/.crc b/_ReSharper.Gamez/WebSymbols/.crc new file mode 100644 index 0000000..593f470 Binary files /dev/null and b/_ReSharper.Gamez/WebSymbols/.crc differ diff --git a/_ReSharper.Gamez/WebSymbols/.version b/_ReSharper.Gamez/WebSymbols/.version new file mode 100644 index 0000000..2cf9f20 Binary files /dev/null and b/_ReSharper.Gamez/WebSymbols/.version differ diff --git a/_ReSharper.Gamez/WordIndex/.crc b/_ReSharper.Gamez/WordIndex/.crc new file mode 100644 index 0000000..b0ee079 --- /dev/null +++ b/_ReSharper.Gamez/WordIndex/.crc @@ -0,0 +1 @@ +IŒEä \ No newline at end of file diff --git a/_ReSharper.Gamez/WordIndex/.version b/_ReSharper.Gamez/WordIndex/.version new file mode 100644 index 0000000..59c36c6 Binary files /dev/null and b/_ReSharper.Gamez/WordIndex/.version differ diff --git a/_ReSharper.Gamez/WordIndex/5/5706720e.dat b/_ReSharper.Gamez/WordIndex/5/5706720e.dat new file mode 100644 index 0000000..36cc3c8 Binary files /dev/null and b/_ReSharper.Gamez/WordIndex/5/5706720e.dat differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Contracts.xml/66A824C4.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Contracts.xml/66A824C4.bin new file mode 100644 index 0000000..a735f85 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Contracts.xml/66A824C4.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Nullness.Generated.xml/DC3AC194.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Nullness.Generated.xml/DC3AC194.bin new file mode 100644 index 0000000..0c37b49 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Nullness.Generated.xml/DC3AC194.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Pure.xml/1483EF57.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Pure.xml/1483EF57.bin new file mode 100644 index 0000000..0d1223e Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.0.0.Pure.xml/1483EF57.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Contracts.xml/CE67B5C1.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Contracts.xml/CE67B5C1.bin new file mode 100644 index 0000000..8c27d0c Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Contracts.xml/CE67B5C1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Nullness.Generated.xml/BB3880B1.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Nullness.Generated.xml/BB3880B1.bin new file mode 100644 index 0000000..43ba0b2 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Nullness.Generated.xml/BB3880B1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Pure.xml/0084D572.bin b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Pure.xml/0084D572.bin new file mode 100644 index 0000000..1f51a38 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.2.0.5.0.Pure.xml/0084D572.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Contracts.xml/13330442.bin b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Contracts.xml/13330442.bin new file mode 100644 index 0000000..dec0f36 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Contracts.xml/13330442.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Nullness.Generated.xml/DB26F0D2.bin b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Nullness.Generated.xml/DB26F0D2.bin new file mode 100644 index 0000000..cb915df Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Nullness.Generated.xml/DB26F0D2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Pure.xml/C2054711.bin b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Pure.xml/C2054711.bin new file mode 100644 index 0000000..e37a464 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.4.0.0.0.Pure.xml/C2054711.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Contracts.xml/A5A97A44.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Contracts.xml/A5A97A44.bin new file mode 100644 index 0000000..3136dcb Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Contracts.xml/A5A97A44.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Nullness.Generated.xml/13D44714.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Nullness.Generated.xml/13D44714.bin new file mode 100644 index 0000000..a3c4b1d Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Nullness.Generated.xml/13D44714.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Pure.xml/FA79D4D7.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Pure.xml/FA79D4D7.bin new file mode 100644 index 0000000..481c674 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.2.0.0.0.Pure.xml/FA79D4D7.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Contracts.xml/523459C2.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Contracts.xml/523459C2.bin new file mode 100644 index 0000000..d0cc95f Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Contracts.xml/523459C2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Nullness.Generated.xml/12C07652.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Nullness.Generated.xml/12C07652.bin new file mode 100644 index 0000000..77a5514 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Nullness.Generated.xml/12C07652.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Pure.xml/A7FB2C91.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Pure.xml/A7FB2C91.bin new file mode 100644 index 0000000..eea8e11 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.4.0.0.0.Pure.xml/A7FB2C91.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Configuration.xml/092A1070.bin b/_ReSharper.Gamez/XmlIndex/System.Configuration.xml/092A1070.bin new file mode 100644 index 0000000..e1d62fa Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Configuration.xml/092A1070.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Contracts.xml/D5B29261.bin b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Contracts.xml/D5B29261.bin new file mode 100644 index 0000000..d7b2d07 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Contracts.xml/D5B29261.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Nullness.Generated.xml/74EC8511.bin b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Nullness.Generated.xml/74EC8511.bin new file mode 100644 index 0000000..133c7b8 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Nullness.Generated.xml/74EC8511.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Pure.xml/DB1DE692.bin b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Pure.xml/DB1DE692.bin new file mode 100644 index 0000000..328500f Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.2.0.5.0.Pure.xml/DB1DE692.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Contracts.xml/EA155060.bin b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Contracts.xml/EA155060.bin new file mode 100644 index 0000000..7d72c8f Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Contracts.xml/EA155060.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Nullness.Generated.xml/FF82B2F0.bin b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Nullness.Generated.xml/FF82B2F0.bin new file mode 100644 index 0000000..8b02e4b Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Nullness.Generated.xml/FF82B2F0.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Pure.xml/00A63FF3.bin b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Pure.xml/00A63FF3.bin new file mode 100644 index 0000000..c5ee49e Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.3.5.0.0.Pure.xml/00A63FF3.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Contracts.xml/9A26A5E2.bin b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Contracts.xml/9A26A5E2.bin new file mode 100644 index 0000000..efff8af Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Contracts.xml/9A26A5E2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Nullness.Generated.xml/FEF514B2.bin b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Nullness.Generated.xml/FEF514B2.bin new file mode 100644 index 0000000..8a2e953 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Nullness.Generated.xml/FEF514B2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Pure.xml/0304D931.bin b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Pure.xml/0304D931.bin new file mode 100644 index 0000000..6107d0c Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.4.0.0.0.Pure.xml/0304D931.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.LinqTunnel.xml/6C84E315.bin b/_ReSharper.Gamez/XmlIndex/System.Core.LinqTunnel.xml/6C84E315.bin new file mode 100644 index 0000000..b0bd578 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.LinqTunnel.xml/6C84E315.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.Nullness.Manual.xml/6880D423.bin b/_ReSharper.Gamez/XmlIndex/System.Core.Nullness.Manual.xml/6880D423.bin new file mode 100644 index 0000000..a0cdfa7 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.Nullness.Manual.xml/6880D423.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Core.xml/11686E5B.bin b/_ReSharper.Gamez/XmlIndex/System.Core.xml/11686E5B.bin new file mode 100644 index 0000000..00d2f0c Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Core.xml/11686E5B.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.2.0.0.0.Nullness.Generated.xml/2B849E74.bin b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.2.0.0.0.Nullness.Generated.xml/2B849E74.bin new file mode 100644 index 0000000..a2aa59d Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.2.0.0.0.Nullness.Generated.xml/2B849E74.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.4.0.0.0.Nullness.Generated.xml/E59B8BB2.bin b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.4.0.0.0.Nullness.Generated.xml/E59B8BB2.bin new file mode 100644 index 0000000..1d59267 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.4.0.0.0.Nullness.Generated.xml/E59B8BB2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.xml/48CF6F29.bin b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.xml/48CF6F29.bin new file mode 100644 index 0000000..10a202b Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Data.SqlXml.xml/48CF6F29.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.I18n.xml/994AEB69.bin b/_ReSharper.Gamez/XmlIndex/System.I18n.xml/994AEB69.bin new file mode 100644 index 0000000..a004753 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.I18n.xml/994AEB69.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Nullness.Manual.xml/8EB13CC3.bin b/_ReSharper.Gamez/XmlIndex/System.Nullness.Manual.xml/8EB13CC3.bin new file mode 100644 index 0000000..cbcf355 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Nullness.Manual.xml/8EB13CC3.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Numerics.2.0.5.0.Nullness.Generated.xml/613E6391.bin b/_ReSharper.Gamez/XmlIndex/System.Numerics.2.0.5.0.Nullness.Generated.xml/613E6391.bin new file mode 100644 index 0000000..3ad851a Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Numerics.2.0.5.0.Nullness.Generated.xml/613E6391.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Numerics.4.0.0.0.Nullness.Generated.xml/EB46F332.bin b/_ReSharper.Gamez/XmlIndex/System.Numerics.4.0.0.0.Nullness.Generated.xml/EB46F332.bin new file mode 100644 index 0000000..60b5f59 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Numerics.4.0.0.0.Nullness.Generated.xml/EB46F332.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Numerics.xml/F65D6778.bin b/_ReSharper.Gamez/XmlIndex/System.Numerics.xml/F65D6778.bin new file mode 100644 index 0000000..9cd916f Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Numerics.xml/F65D6778.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Contracts.xml/132A5264.bin b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Contracts.xml/132A5264.bin new file mode 100644 index 0000000..9df0406 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Contracts.xml/132A5264.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Nullness.Generated.xml/98F7F474.bin b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Nullness.Generated.xml/98F7F474.bin new file mode 100644 index 0000000..037ab45 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Nullness.Generated.xml/98F7F474.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Pure.xml/65241177.bin b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Pure.xml/65241177.bin new file mode 100644 index 0000000..1039e92 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.2.0.0.0.Pure.xml/65241177.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Contracts.xml/14DDD2E2.bin b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Contracts.xml/14DDD2E2.bin new file mode 100644 index 0000000..153c1f7 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Contracts.xml/14DDD2E2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Nullness.Generated.xml/530EE1B2.bin b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Nullness.Generated.xml/530EE1B2.bin new file mode 100644 index 0000000..52fbd9d Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Nullness.Generated.xml/530EE1B2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Pure.xml/064BE631.bin b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Pure.xml/064BE631.bin new file mode 100644 index 0000000..9aec0f1 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.4.0.0.0.Pure.xml/064BE631.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Security.xml/55841E76.bin b/_ReSharper.Gamez/XmlIndex/System.Security.xml/55841E76.bin new file mode 100644 index 0000000..4cc66e4 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Security.xml/55841E76.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Contracts.xml/6BF6D6A4.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Contracts.xml/6BF6D6A4.bin new file mode 100644 index 0000000..37eba03 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Contracts.xml/6BF6D6A4.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Nullness.Generated.xml/6F949FB4.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Nullness.Generated.xml/6F949FB4.bin new file mode 100644 index 0000000..441bb6a Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Nullness.Generated.xml/6F949FB4.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Pure.xml/8FAAEE37.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Pure.xml/8FAAEE37.bin new file mode 100644 index 0000000..c5ad2ed Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.0.0.Pure.xml/8FAAEE37.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Contracts.xml/551647A1.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Contracts.xml/551647A1.bin new file mode 100644 index 0000000..1d374a6 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Contracts.xml/551647A1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Nullness.Generated.xml/A3D18051.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Nullness.Generated.xml/A3D18051.bin new file mode 100644 index 0000000..adecc6b Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Nullness.Generated.xml/A3D18051.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Pure.xml/0328B352.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Pure.xml/0328B352.bin new file mode 100644 index 0000000..029bee7 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.2.0.5.0.Pure.xml/0328B352.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Contracts.xml/4322B622.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Contracts.xml/4322B622.bin new file mode 100644 index 0000000..06f4c3d Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Contracts.xml/4322B622.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Nullness.Generated.xml/AAA3D1F2.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Nullness.Generated.xml/AAA3D1F2.bin new file mode 100644 index 0000000..35299e5 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Nullness.Generated.xml/AAA3D1F2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Pure.xml/3D2C46F1.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Pure.xml/3D2C46F1.bin new file mode 100644 index 0000000..d5aa4a0 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.4.0.0.0.Pure.xml/3D2C46F1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.Attributes.xml/4A781A28.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.Attributes.xml/4A781A28.bin new file mode 100644 index 0000000..552cba1 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.Attributes.xml/4A781A28.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.I18n.xml/BFE18249.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.I18n.xml/BFE18249.bin new file mode 100644 index 0000000..0ee0962 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.I18n.xml/BFE18249.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.Xml.xml/48B5EA79.bin b/_ReSharper.Gamez/XmlIndex/System.Xml.xml/48B5EA79.bin new file mode 100644 index 0000000..dde55dd Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.Xml.xml/48B5EA79.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.xml/C3B3EEEE.bin b/_ReSharper.Gamez/XmlIndex/System.xml/C3B3EEEE.bin new file mode 100644 index 0000000..2931724 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.xml/C3B3EEEE.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/System.xml/D647FF29.bin b/_ReSharper.Gamez/XmlIndex/System.xml/D647FF29.bin new file mode 100644 index 0000000..ada974a Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/System.xml/D647FF29.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Contracts.xml/5B7112C4.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Contracts.xml/5B7112C4.bin new file mode 100644 index 0000000..af80755 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Contracts.xml/5B7112C4.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Interfaces.Nullness.Generated.xml/9075ABCC.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Interfaces.Nullness.Generated.xml/9075ABCC.bin new file mode 100644 index 0000000..56add84 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Interfaces.Nullness.Generated.xml/9075ABCC.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Nullness.Generated.xml/84EF6F94.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Nullness.Generated.xml/84EF6F94.bin new file mode 100644 index 0000000..246eb72 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Nullness.Generated.xml/84EF6F94.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Pure.xml/1E801D57.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Pure.xml/1E801D57.bin new file mode 100644 index 0000000..9e57ee0 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.0.0.Pure.xml/1E801D57.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Contracts.xml/C330A3C1.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Contracts.xml/C330A3C1.bin new file mode 100644 index 0000000..7e521d4 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Contracts.xml/C330A3C1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Interfaces.Nullness.Generated.xml/56983509.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Interfaces.Nullness.Generated.xml/56983509.bin new file mode 100644 index 0000000..bad9d9b Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Interfaces.Nullness.Generated.xml/56983509.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Nullness.Generated.xml/63ED2EB1.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Nullness.Generated.xml/63ED2EB1.bin new file mode 100644 index 0000000..95b8984 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Nullness.Generated.xml/63ED2EB1.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Pure.xml/0A810372.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Pure.xml/0A810372.bin new file mode 100644 index 0000000..ef502a2 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.2.0.5.0.Pure.xml/0A810372.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Contracts.xml/07FBF242.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Contracts.xml/07FBF242.bin new file mode 100644 index 0000000..1ba3e4a Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Contracts.xml/07FBF242.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Interfaces.Nullness.Generated.xml/49D94A4A.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Interfaces.Nullness.Generated.xml/49D94A4A.bin new file mode 100644 index 0000000..8677d44 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Interfaces.Nullness.Generated.xml/49D94A4A.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Nullness.Generated.xml/83DB9ED2.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Nullness.Generated.xml/83DB9ED2.bin new file mode 100644 index 0000000..1021f98 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Nullness.Generated.xml/83DB9ED2.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Pure.xml/CC017511.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Pure.xml/CC017511.bin new file mode 100644 index 0000000..3488eec Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.4.0.0.0.Pure.xml/CC017511.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.I18n.xml/78F91969.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.I18n.xml/78F91969.bin new file mode 100644 index 0000000..83a3056 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.I18n.xml/78F91969.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.Nullness.Manual.xml/4066AAC3.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.Nullness.Manual.xml/4066AAC3.bin new file mode 100644 index 0000000..f1f4389 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.Nullness.Manual.xml/4066AAC3.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.ValueFlow.xml/447F1EBE.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.ValueFlow.xml/447F1EBE.bin new file mode 100644 index 0000000..34749d7 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.ValueFlow.xml/447F1EBE.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.xml/743ADB6C.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.xml/743ADB6C.bin new file mode 100644 index 0000000..b9ad6bb Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.xml/743ADB6C.bin differ diff --git a/_ReSharper.Gamez/XmlIndex/mscorlib.xml/D6E16D29.bin b/_ReSharper.Gamez/XmlIndex/mscorlib.xml/D6E16D29.bin new file mode 100644 index 0000000..8a6e361 Binary files /dev/null and b/_ReSharper.Gamez/XmlIndex/mscorlib.xml/D6E16D29.bin differ diff --git a/lib/ConfigFunctions.py b/lib/ConfigFunctions.py index f6c7697..1c81bcd 100644 --- a/lib/ConfigFunctions.py +++ b/lib/ConfigFunctions.py @@ -188,57 +188,57 @@ def CheckConfigForAllKeys(app_path): changesMade = True if(config.has_option('Notifications','prowl_api') == False): - config.set('Notifications','prowl_api','""') - changesMade = True + config.set('Notifications','prowl_api','""') + changesMade = True if(config.has_option('Notifications','growl_host') == False): - config.set('Notifications','growl_host','""') - changesMade = True + config.set('Notifications','growl_host','""') + changesMade = True if(config.has_option('Notifications','growl_port') == False): - config.set('Notifications','growl_port','23053') - changesMade = True - + config.set('Notifications','growl_port','23053') + changesMade = True + if(config.has_option('Notifications','growl_password') == False): - config.set('Notifications','growl_password','""') - changesMade = True - + config.set('Notifications','growl_password','""') + changesMade = True + if(config.has_option('Notifications','notifo_username') == False): - config.set('Notifications','notifo_username','""') - changesMade = True - + config.set('Notifications','notifo_username','""') + changesMade = True + if(config.has_option('Notifications','notifo_apikey') == False): - config.set('Notifications','notifo_apikey','""') - changesMade = True - + config.set('Notifications','notifo_apikey','""') + changesMade = True + if(config.has_option('Blackhole','nzb_blackhole_path') == False): - config.set('Blackhole','nzb_blackhole_path','""') - changesMade = True + config.set('Blackhole','nzb_blackhole_path','""') + changesMade = True if(config.has_option('Blackhole','torrent_blackhole_path') == False): - config.set('Blackhole','torrent_blackhole_path','""') - changesMade = True - - if(config.has_option('Folders','torrent_blackhole_path') == False): - config.set('Folders','torrent_completed','""') - changesMade = True - - if(config.has_option('Folders','torrent_blackhole_path') == False): - config.set('Folders','nzb_completed','""') - changesMade = True - - if(config.has_option('Folders','torrent_blackhole_path') == False): - config.set('Folders','sabnzbd_completed','""') - changesMade = True - + config.set('Blackhole','torrent_blackhole_path','""') + changesMade = True + + if(config.has_option('Folders','torrent_completed') == False): + config.set('Folders','torrent_completed','""') + changesMade = True + + if(config.has_option('Folders','nzb_completed') == False): + config.set('Folders','nzb_completed','""') + changesMade = True + + if(config.has_option('Folders','sabnzbd_completed') == False): + config.set('Folders','sabnzbd_completed','""') + changesMade = True + if(config.has_option('Folders','wii_destination') == False): - config.set('Folders','wii_destination','""') - changesMade = True - + config.set('Folders','wii_destination','""') + changesMade = True + if(config.has_option('Folders','xbox360_destination') == False): - config.set('Folders','xbox360_destination','""') - changesMade = True - + config.set('Folders','xbox360_destination','""') + changesMade = True + if(changesMade): with open(configFilePath,'wb') as configFile: config.write(configFile) diff --git a/lib/ConfigFunctions.pyc b/lib/ConfigFunctions.pyc index c9fec42..303b572 100644 Binary files a/lib/ConfigFunctions.pyc and b/lib/ConfigFunctions.pyc differ diff --git a/lib/DBFunctions.py b/lib/DBFunctions.py index cb5d4fa..c87b0c9 100644 --- a/lib/DBFunctions.py +++ b/lib/DBFunctions.py @@ -111,7 +111,7 @@ def GetRequestedGames(filter=''): game_type = str(record[2]) status = str(record[3]) system = str(record[4]) - cover = str(record[5]) + cover = str(record[5]) rowdata = "Delete
" + game_name + "" + game_type + "" + system + "" + status + " +
- +
- +
- +
- + @@ -1079,11 +1080,13 @@ def comingsoon(self): return html; @cherrypy.expose - def updatestatus(self,game_id='',status=''): + def updatestatus(self,game_id='',status='',filePath=''): if(os.name <> 'nt'): os.chdir(WebRoot.appPath) if(status <> ''): UpdateStatus(game_id,status) + if(status == 'Downloaded'): + ProcessDownloaded(game_id,status,filePath) raise cherrypy.InternalRedirect('/') @cherrypy.expose @@ -1138,74 +1141,74 @@ def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=36 newznabApi = '"' + newznabApi + '"' newznabWiiCat = '"' + newznabWiiCat + '"' newznabXbox360Cat = '"' + newznabXbox360Cat + '"' - prowlApi = '"' + prowlApi + '"' - gamezUsername = '"' + gamezUsername + '"' - gamezPassword = '"' + gamezPassword + '"' - growlHost = '"' + growlHost + '"' - growlPassword = '"' + growlPassword + '"' - notifoUsername = '"' + notifoUsername + '"' - notifoApi = '"' + notifoApi + '"' - nzbBlackholePath = '"' + nzbBlackholePath + '"' - torrentBlackholePath = '"' + torrentBlackholePath + '"' - wiiDestination = '"' + wiiDestination + '"' - xbox360Destination = '"' + xbox360Destination + '"' - nzbBlackholeDownloadDirectory = '"' + nzbBlackholeDownloadDirectory + '"' - torrentBlackholeDownloadDirectory = '"' + torrentBlackholeDownloadDirectory + '"' - sabDownloadDirectory = '"' + sabDownloadDirectory + '"' - defaultSearch = '"' + defaultSearch + '"' - if(sabnzbdEnabled == 'sabnzbdEnabled'): + prowlApi = '"' + prowlApi + '"' + gamezUsername = '"' + gamezUsername + '"' + gamezPassword = '"' + gamezPassword + '"' + growlHost = '"' + growlHost + '"' + growlPassword = '"' + growlPassword + '"' + notifoUsername = '"' + notifoUsername + '"' + notifoApi = '"' + notifoApi + '"' + nzbBlackholePath = '"' + nzbBlackholePath + '"' + torrentBlackholePath = '"' + torrentBlackholePath + '"' + wiiDestination = '"' + wiiDestination.replace("\\","\\\\") + '"' + xbox360Destination = '"' + xbox360Destination.replace("\\","\\\\") + '"' + nzbBlackholeDownloadDirectory = '"' + nzbBlackholeDownloadDirectory.replace("\\","\\\\") + '"' + torrentBlackholeDownloadDirectory = '"' + torrentBlackholeDownloadDirectory.replace("\\","\\\\") + '"' + sabDownloadDirectory = '"' + sabDownloadDirectory.replace("\\","\\\\") + '"' + defaultSearch = '"' + defaultSearch + '"' + if(sabnzbdEnabled == 'sabnzbdEnabled'): sabnzbdEnabled = "1" else: sabnzbdEnabled = "0" - if(nzbmatrixEnabled == 'nzbmatrixEnabled'): + if(nzbmatrixEnabled == 'nzbmatrixEnabled'): nzbmatrixEnabled = "1" else: nzbmatrixEnabled = "0" - if(newznabEnabled == 'newznabEnabled'): + if(newznabEnabled == 'newznabEnabled'): newznabEnabled = "1" else: newznabEnabled = "0" - if(growlEnabled == 'growlEnabled'): + if(growlEnabled == 'growlEnabled'): growlEnabled = "1" else: growlEnabled = "0" - if(prowlEnabled == 'prowlEnabled'): + if(prowlEnabled == 'prowlEnabled'): prowlEnabled = "1" else: prowlEnabled = "0" - if(notifoEnabled == 'notifoEnabled'): + if(notifoEnabled == 'notifoEnabled'): notifoEnabled = "1" else: notifoEnabled = "0" - if(nzbBlackholeEnabled == 'nzbBlackholeEnabled'): + if(nzbBlackholeEnabled == 'nzbBlackholeEnabled'): nzbBlackholeEnabled = "1" else: nzbBlackholeEnabled = "0" - if(torrentBlackholeEnabled == 'torrentBlackholeEnabled'): + if(torrentBlackholeEnabled == 'torrentBlackholeEnabled'): torrentBlackholeEnabled = "1" else: torrentBlackholeEnabled = "0" - if(katEnabled == 'katEnabled'): + if(katEnabled == 'katEnabled'): katEnabled = "1" else: katEnabled = "0" - if(processTorrentsDirectoryEnabled == 'processTorrentsDirectoryEnabled'): + if(processTorrentsDirectoryEnabled == 'processTorrentsDirectoryEnabled'): processTorrentsDirectoryEnabled = "1" else: processTorrentsDirectoryEnabled = "0" - if(processNzbsDirectoryEnabled == 'processNzbsDirectoryEnabled'): + if(processNzbsDirectoryEnabled == 'processNzbsDirectoryEnabled'): processNzbsDirectoryEnabled = "1" else: processNzbsDirectoryEnabled = "0" - if(processSabDirectoryEnabled == 'processSabDirectoryEnabled'): + if(processSabDirectoryEnabled == 'processSabDirectoryEnabled'): processSabDirectoryEnabled = "1" else: processSabDirectoryEnabled = "0" - if(processXbox360Enabled == 'processXbox360Enabled'): + if(processXbox360Enabled == 'processXbox360Enabled'): processXbox360Enabled = "1" else: processXbox360Enabled = "0" - if(processWiiEnabled == 'processWiiEnabled'): + if(processWiiEnabled == 'processWiiEnabled'): processWiiEnabled = "1" else: processWiiEnabled = "0" @@ -1245,20 +1248,19 @@ def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=36 config.set('Newznab','wii_category_id',newznabWiiCat) config.set('Newznab','xbox360_category_id',newznabXbox360Cat) config.set('Newznab','api_key',newznabApi) - config.set('Notifications','prowl_api',prowlApi) - config.set('Notifications','growl_host',growlHost) - config.set('Notifications','growl_port',growlPort) - config.set('Notifications','growl_password',growlPassword) - config.set('Notifications','notifo_username',notifoUsername) - config.set('Notifications','notifo_apikey',notifoApi) - config.set('Blackhole','nzb_blackhole_path',nzbBlackholePath) - config.set('Blackhole','torrent_blackhole_path',torrentBlackholePath) - config.set('Folders','torrent_completed',torrentBlackholeDownloadDirectory) - config.set('Folders','nzb_completed',nzbBlackholeDownloadDirectory) - config.set('Folders','sabnzbd_completed',sabDownloadDirectory) - config.set('Folders','xbox360_destination',xbox360Destination) - config.set('Folders','wii_destination',wiiDestination) - + config.set('Notifications','prowl_api',prowlApi) + config.set('Notifications','growl_host',growlHost) + config.set('Notifications','growl_port',growlPort) + config.set('Notifications','growl_password',growlPassword) + config.set('Notifications','notifo_username',notifoUsername) + config.set('Notifications','notifo_apikey',notifoApi) + config.set('Blackhole','nzb_blackhole_path',nzbBlackholePath) + config.set('Blackhole','torrent_blackhole_path',torrentBlackholePath) + config.set('Folders','torrent_completed',torrentBlackholeDownloadDirectory) + config.set('Folders','nzb_completed',nzbBlackholeDownloadDirectory) + config.set('Folders','sabnzbd_completed',sabDownloadDirectory) + config.set('Folders','xbox360_destination',xbox360Destination) + config.set('Folders','wii_destination',wiiDestination) with open(configFilePath,'wb') as configFile: config.write(configFile) status = "Application Settings Updated Successfully. Gamez is restarting. If after 5 seconds, Gamez isn't working, update the Gamez.ini file and re-launch Gamez" @@ -1285,22 +1287,25 @@ def api(self,api_key='',mode='',term='',system=''): elif(mode == 'UPDATEGAMELIST'): try: AddWiiGamesIfMissing() - AddXbox360GamesIfMissing() - AddComingSoonGames() - return json.dumps({"Response":"Game list has been updated successfully"}) + AddXbox360GamesIfMissing() + AddComingSoonGames() + return json.dumps({"Response":"Game list has been updated successfully"}) except: return json.dumps({"Error" : "Error Updating Game List"}) + elif(mode == 'GETREQUESTED'): + return ApiGetRequestedGames() + elif(mode == 'ADDREQUESTED'): + response = {"Error" : mode + " Mode Not Implemented"} + elif(mode == 'DELETEREQUESTED'): + response = {"Error" : mode + " Mode Not Implemented"} + elif(mode == 'UPDATEREQUESTEDSTATUS'): + response = {"Error" : mode + " Mode Not Implemented"} + elif(mode == 'SEARCHUPCOMING'): + response = {"Error" : mode + " Mode Not Implemented"} + elif(mode == 'ADDUPCOMINGTOREQUESTED'): + response = {"Error" : mode + " Mode Not Implemented"} else: response = {"Error" : mode + " Mode Not Implemented"} - - #TODO: Get List of requested games - - #TODO: Add Game to requested list - - #TODO: Remove game from requested list - - #TODO: Update game list from gamezapp.org web service - return json.dumps(response) return json.dumps({"Error" : "Unkown Error"}) diff --git a/lib/WebRoot.pyc b/lib/WebRoot.pyc index 535e592..2b4569c 100644 Binary files a/lib/WebRoot.pyc and b/lib/WebRoot.pyc differ