From 4d8081533c94005c0078bd4a33203c2f9b659428 Mon Sep 17 00:00:00 2001 From: Michael Dlesk Date: Sat, 24 Dec 2011 22:31:56 -0500 Subject: [PATCH 1/2] Added log and settings page --- Gamez.ini | 10 +- Gamez.py | 16 ++- css/navigation.css | 35 ++++- css/settings.css | 54 ++++++++ lib/ConfigFunctions.py | 4 - lib/ConfigFunctions.pyc | Bin 1787 -> 1716 bytes lib/Constants.pyc | Bin 267 -> 267 bytes lib/DBFunctions.py | 80 +++++++++++- lib/DBFunctions.pyc | Bin 5906 -> 9111 bytes lib/GameTasks.py | 6 + lib/GameTasks.pyc | Bin 3370 -> 3690 bytes lib/Logger.py | 9 ++ lib/Logger.pyc | Bin 0 -> 480 bytes lib/UpgradeFunctions.py | 11 +- lib/UpgradeFunctions.pyc | Bin 4008 -> 4395 bytes lib/WebRoot.py | 273 ++++++++++++++++++++++++++++++++++++++- lib/WebRoot.pyc | Bin 10372 -> 21995 bytes lib/__init__.pyc | Bin 120 -> 120 bytes 18 files changed, 477 insertions(+), 21 deletions(-) create mode 100644 css/settings.css create mode 100644 lib/Logger.py create mode 100644 lib/Logger.pyc diff --git a/Gamez.ini b/Gamez.ini index a92a8ed..fc18e19 100644 --- a/Gamez.ini +++ b/Gamez.ini @@ -3,19 +3,17 @@ server.socket_host = "127.0.0.1" server.socket_port = 8085 [NZBMatrix] -username = -api_key = +username = "" +api_key = "" [Sabnzbd] -api_key = +api_key = "" host = "127.0.0.1" -port = 8080 -password = "" [Scheduler] download_interval = 60 [SystemGenerated] is_to_ignore_update = 0 -ignored_version = +ignored_version = "" diff --git a/Gamez.py b/Gamez.py index 665ac2e..5e48955 100644 --- a/Gamez.py +++ b/Gamez.py @@ -14,12 +14,15 @@ import cherrypy.process.plugins from cherrypy.process.plugins import Daemonizer from lib.ConfigFunctions import CheckConfigForAllKeys +from lib.DBFunctions import ValidateDB +from lib.Logger import LogEvent app_path = os.path.dirname(os.path.abspath("__FILE__")) config_path = os.path.join(app_path,'Gamez.ini') class RunApp(): def RunWebServer(self,isToDaemonize): + LogEvent("Generating CherryPy configuration") cherrypy.config.update(config_path) css_path = os.path.join(app_path,'css') images_path = os.path.join(app_path,'images') @@ -38,11 +41,15 @@ def RunWebServer(self,isToDaemonize): } daemon = Daemonizer(cherrypy.engine) - if(isToDaemonize == 1): + if(isToDaemonize == 1): + LogEvent("Preparing to run in daemon mode") daemon.subscribe() + LogEvent("Generating Post Process Script") GenerateSabPostProcessScript() RunGameTask() + + LogEvent("Getting download interval from config file and invoking scheduler") config = ConfigParser.RawConfigParser() config.read('Gamez.ini') interval = config.get('Scheduler','download_interval').replace('"','') @@ -50,8 +57,11 @@ def RunWebServer(self,isToDaemonize): workerTask = cherrypy.process.plugins.BackgroundTask(fInterval,RunGameTask) try: workerTask.start() + + LogEvent("Starting the Gamez web server") cherrypy.quickstart(WebRoot(app_path),'/',config=conf) except KeyboardInterrupt: + LogEvent("Shutting down Gamez") workerTask.cancel() if(isToDaemonize == 1): daemon.unsubscribe() @@ -103,12 +113,16 @@ def RunGameTask(): sabnzbdHost = config.get('Sabnzbd','host').replace('"','') sabnzbdPort = config.get('Sabnzbd','port').replace('"','') sabnzbdApi = config.get('Sabnzbd','api_key').replace('"','') + LogEvent("Searching for games") lib.GameTasks.GameTasks().FindGames(nzbMatrixUser,nzbMatrixApi,sabnzbdApi,sabnzbdHost,sabnzbdPort) except: print(sys.exc_info()[0]) if __name__ == '__main__': + LogEvent("Checking config file for completeness") CheckConfigForAllKeys(app_path) + LogEvent("Checking to make sure all tables exist in the database") + ValidateDB() isToDaemonize = 0 params = sys.argv for param in params: diff --git a/css/navigation.css b/css/navigation.css index dd32981..184aae3 100644 --- a/css/navigation.css +++ b/css/navigation.css @@ -171,4 +171,37 @@ div#menu li.back .left { background-color: khaki; color: Maroon; border: solid 1px silver; -} \ No newline at end of file +} + + +.clear-log-button { + border-top: 1px solid #96d1f8; + background: #65a9d7; + background: -webkit-gradient(linear, left top, left bottom, from(#3e779d), to(#65a9d7)); + background: -webkit-linear-gradient(top, #3e779d, #65a9d7); + background: -moz-linear-gradient(top, #3e779d, #65a9d7); + background: -ms-linear-gradient(top, #3e779d, #65a9d7); + background: -o-linear-gradient(top, #3e779d, #65a9d7); + padding: 5px 10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + -webkit-box-shadow: rgba(0,0,0,1) 0 1px 0; + -moz-box-shadow: rgba(0,0,0,1) 0 1px 0; + box-shadow: rgba(0,0,0,1) 0 1px 0; + text-shadow: rgba(0,0,0,.4) 0 1px 0; + color: white; + font-size: 14px; + font-family: Georgia, serif; + text-decoration: none; + vertical-align: middle; + } +.clear-log-button:hover { + border-top-color: #28597a; + background: #28597a; + color: #ccc; + } +.clear-log-button:active { + border-top-color: #1b435e; + background: #1b435e; + } \ No newline at end of file diff --git a/css/settings.css b/css/settings.css new file mode 100644 index 0000000..ea48f7c --- /dev/null +++ b/css/settings.css @@ -0,0 +1,54 @@ +body{ +font-family:"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif; +font-size:12px; +} +p, h1, form, button{border:0; margin:0; padding:0;} +.spacer{clear:both; height:1px;} +/* ----------- My Form ----------- */ +.myform{ +margin:0 auto; +width:600px; +padding:14px; +} + +/* ----------- stylized ----------- */ +#stylized{ +border:solid 2px #b7ddf2; +background:#ebf4fb; +} +#stylized h1 { +font-size:14px; +font-weight:bold; +margin-bottom:10px; +} +#stylized label{ +display:block; +font-weight:bold; +text-align:right; +width:240px; +float:left; +margin-top:5px; +} +#stylized input{ +float:left; +font-size:12px; +padding:4px 2px; +border:solid 1px #aacfe4; +width:300px; +margin:2px 0 20px 10px; +} +#stylized button{ +clear:both; +margin-left:250px; +width:125px; +height:31px; +background:#666666 url(img/button.png) no-repeat; +text-align:center; +line-height:31px; +color:#FFFFFF; +font-size:11px; +font-weight:bold; +} + + + diff --git a/lib/ConfigFunctions.py b/lib/ConfigFunctions.py index 96a2744..56c8e9b 100644 --- a/lib/ConfigFunctions.py +++ b/lib/ConfigFunctions.py @@ -51,10 +51,6 @@ def CheckConfigForAllKeys(app_path): config.set('Sabnzbd','host','"127.0.0.1"') changesMade = True - if(config.has_option('Sabnzbd','password') == False): - config.set('Sabnzbd','password','""') - changesMade = True - if(config.has_option('Scheduler','download_interval') == False): config.set('Scheduler','download_interval','60') changesMade = True diff --git a/lib/ConfigFunctions.pyc b/lib/ConfigFunctions.pyc index 1363c23d7ce760dbf8b6de27cfefac2da3799298..c573a68b0f47beb3b21cc0cecf274173b9289412 100644 GIT binary patch delta 181 zcmey(yM>pH`7ZjUh#lAw>wJz(N>F!F?nJ!VD=q49(08j3t~5wTujT3=B1l3`M-m zB|Ho@%nT_alUtcp8AT_rWQGOIF*O)h6X#lykCz)+A_TwI=Cl(N}@ eWeFo=#^k50iIW}J1h@r(azVl%LV0pDTOSkhN{>;nuBX}ZPD5KHDnDqcS`UW%r delta 19 acmeBX>SkhN{>;l2XfTm2l+kcv%z6MZH3ew^ diff --git a/lib/DBFunctions.py b/lib/DBFunctions.py index e003ca2..7b74c64 100644 --- a/lib/DBFunctions.py +++ b/lib/DBFunctions.py @@ -1,6 +1,8 @@ import os import sqlite3 import sys +import datetime +from Logger import LogEvent def GetAllWiiGames(): db_path = os.path.join(os.path.abspath(""),"Gamez.db") @@ -94,6 +96,7 @@ def GetWiiGameDataFromTerm(term): return data def AddWiiGameToDb(db_id,status): + LogEvent("Adding game in 'Wanted' status") db_path = os.path.join(os.path.abspath(""),"Gamez.db") sql = "insert into requested_games(WiiGameID,status) select '" + db_id + "','" + status + "' where not exists(select 1 from requested_games where WiiGameID='" + db_id + "')" connection = sqlite3.connect(db_path) @@ -117,7 +120,14 @@ def GetRequestedGames(): game_name = str(record[1]) game_id = str(record[2]) status = str(record[3]) - rowdata = "Delete" + game_name + "" + game_id + "" + status + "" + rowdata = "Delete" + game_name + "" + game_id + "" + status + "" data = data + rowdata except: continue @@ -125,6 +135,7 @@ def GetRequestedGames(): return data def RemoveWiiGameFromDb(db_id): + LogEvent("Removing game") db_path = os.path.join(os.path.abspath(""),"Gamez.db") sql = "delete from requested_games where WiiGameID='" + db_id + "'" connection = sqlite3.connect(db_path) @@ -145,6 +156,7 @@ def GetRequestedGamesAsArray(): return result def UpdateStatus(game_id,status): + LogEvent("Update status of game to " + status) db_path = os.path.join(os.path.abspath(""),"Gamez.db") sql = "update requested_games set status='" + status + "' where WiiGameID='" + game_id + "'" connection = sqlite3.connect(db_path) @@ -152,4 +164,70 @@ def UpdateStatus(game_id,status): cursor.execute(sql) connection.commit() cursor.close() + return + +def ValidateDB(): + LogEvent("Checking to make sure database has the correct tables") + db_path = os.path.join(os.path.abspath(""),"Gamez.db") + sql = "select name from sqlite_master where type='table'" + logTableExists = False + connection = sqlite3.connect(db_path) + cursor = connection.cursor() + cursor.execute(sql) + result = cursor.fetchall() + tables = list() + for record in result: + tableName = str(record[0]) + if(tableName == 'gamez_log'): + logTableExists = True + cursor.close() + if(logTableExists == False): + LogEvent("Creating table 'gamez_log'") + sql = "create table gamez_log(ID INTEGER NOT NULL PRIMARY KEY UNIQUE,message TEXT(255) NOT NULL,created_date DATE)" + connection = sqlite3.connect(db_path) + cursor = connection.cursor() + cursor.execute(sql) + connection.commit() + cursor.close() + return + +def AddEventToDB(message): + db_path = os.path.join(os.path.abspath(""),"Gamez.db") + createdDate = datetime.datetime.now() + sql = "INSERT INTO gamez_log (message,created_date) values('" + message + "',datetime())" + connection = sqlite3.connect(db_path) + cursor = connection.cursor() + cursor.execute(sql) + connection.commit() + cursor.close() + return + +def GetLog(): + db_path = os.path.join(os.path.abspath(""),"Gamez.db") + sql = "SELECT message,created_date FROM gamez_log order by created_date desc" + data = '' + connection = sqlite3.connect(db_path) + cursor = connection.cursor() + cursor.execute(sql) + result = cursor.fetchall() + for record in result: + try: + message = str(record[0]) + created_date = str(record[1]) + rowdata = "" + message + "" + created_date + "" + data = data + rowdata + except: + continue + cursor.close() + return data + +def ClearDBLog(): + db_path = os.path.join(os.path.abspath(""),"Gamez.db") + createdDate = datetime.datetime.now() + sql = "delete from gamez_log" + connection = sqlite3.connect(db_path) + cursor = connection.cursor() + cursor.execute(sql) + connection.commit() + cursor.close() return \ No newline at end of file diff --git a/lib/DBFunctions.pyc b/lib/DBFunctions.pyc index 8eac889fe5c7d975ea9e673d55e99dbd91fc54b0..cd55db8e593d5081422637210cecdffe46eb9ce7 100644 GIT binary patch literal 9111 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 diff --git a/lib/GameTasks.py b/lib/GameTasks.py index cc91d8f..e48c73f 100644 --- a/lib/GameTasks.py +++ b/lib/GameTasks.py @@ -6,6 +6,7 @@ import shutil import stat from subprocess import call +from Logger import LogEvent class GameTasks(): @@ -18,6 +19,7 @@ def FindGames(self, nzbmatrixusername, nzbmatrixapi,sabnzbdApi,sabnzbdHost,sabnz try: game_name = str(game[0]) game_id = str(game[1]) + LogEvent("Searching for game: " + game_name) nzbmatrixResult = GameTasks().FindGameOnNZBMatrix(game_name,game_id,nzbmatrixusername,nzbmatrixapi,sabnzbdApi,sabnzbdHost,sabnzbdPort) except: error = sys.exc_info()[0] @@ -37,6 +39,7 @@ def FindGameOnNZBMatrix(self,game_name,game_id,username,api,sabnzbdApi,sabnzbdHo nzbID = nzbID.replace(";","") if(nzbID <> "nothing_found"): + LogEvent("Game found on NZB Matrix") GameTasks().AddNZBToSab(nzbID,game_name,sabnzbdApi,sabnzbdHost,sabnzbdPort,game_id) UpdateStatus(game_id,"Snatched") return @@ -47,6 +50,7 @@ def AddNZBToSab(self,nzbID,game_name,sabnzbdApi,sabnzbdHost,sabnzbdPort,game_id) responseObject = urllib.FancyURLopener({}).open(url) responseObject.read() responseObject.close() + LogEvent("NZB added to Sabnzbd") return def CheckIfPostProcessExistsInSab(self,sabnzbdApi,sabnzbdHost,sabnzbdPort): @@ -61,10 +65,12 @@ def CheckIfPostProcessExistsInSab(self,sabnzbdApi,sabnzbdHost,sabnzbdPort): destPath = os.path.join(scriptDir,"gamezPostProcess.py") try: + LogEvent("Copying post process script to Sabnzbd scripts folder") shutil.copyfile(srcPath,destPath) except: print 'Error Copying File' try: + LogEvent("Setting permissions on post process script") cmd = "chmod +x '" + destPath + "'" os.system(cmd) except: diff --git a/lib/GameTasks.pyc b/lib/GameTasks.pyc index 2f45429b87784f99e8f26cc3c4a092d5a2fb5e79..b87f9897a75f77cbef3806881037c1fd0cfacd7f 100644 GIT binary patch delta 1207 zcmZux&u<$=6n?X|*WMp?9Jh({t7cUqu?eM-s#Yo-DjYaa}hqi}aEA`5S1BeT%#P=qts1O;=m#4S$-hA(SZ~W83 zZ%d1XKdSb3xBuGe((zvb|KG-z-%b`&pC~NS(4jq-wp|ioiNZ34Cfy|(6Mec}rO=?Z zUzz;)LBkga%PN46lHPl_qBxuU-V=}1HL+RyhH{fOZrrBBG96r1Ka0~dNL8Y|Ld~%t zk?DK`Q#}#O#WD>l>bdZQsanRoCr=_}JL;s}-G1EjzDQE9*V&8S@_Y*)f}*-)Tq*_3 z`+jaLilr(n*#eN56%8y)R7FA5v1;mkK#MsOMzXu3XM8fdm}u%#)#M2vm90uvT8e3A}>*VwtD9=Ye& zf@Roi*s=y7uskQ`fV{dzcsMiHyN)g2SL4dFJ1xo_3TsDwa%oW2?Lptri)%54QiyPh zHZRA5t{<%E!}X&wrzv-+iK3f_E@8q3XfApP1zyB8j^nfEedNMlT5#@OAIDsd-X@8WxBl&U>@ z?(8a}+fkP3=qTOmOW99i$%FJi$<$r@te8^w?G^RRo_AhFaBwtH>TmnZ1>K(iG==G5 z-l1yRz0%2ckGg{Qjn*)%s?VJ3HXpdihgQ|E&b(ublXy55wymBzuh-}Kq@DooV^CHP z+&51J+&5NDG6mDHrm-x}OnyxzZfl7@20W>nz(PHqZg$w U9>oLq!`TMBvzX|A7v8Y(4@>Un$p8QV delta 885 zcmZ8fyKmEA5WjOAJ9ca*ElHE6NgE2KDSaT7B2)&1RG<~0fLsBkQiakuv`JH^vRy<_ zDu(iyt8Zf94*&@X39&G;ARc0cl?jOzF)+cMTOPtE|9szl=eyrMzUH6g`Xb*<{pp48 z-!XydGP3pxs%UfO^y z720#+0}iU8eQzfI3U5cm1L@@Rw^ASG3{ICP0PMkT5)Dm^ zU=ou8ja#1-mL`H)tXb%#mnfNLL`}osq`OV3U-PiO%OV7`Zdq3tk(kWNM)mLC-^$a z&?Od?ok5LMX6@$)0CSiiF;FMmN7yYHBB5rmDTdWGBP7Ti%Kn7-Deo6=)B^U3FY20F zV#anstj97ZN;>Nyn=#fxO8+EgTgXr$&Aq*R*=yQ|*jN&lH8pM@Af12oIRp@kNz4-J zSe5C_UEykG==CSXsP_3v3W7K^4Cq9mv)j$9t^tVXSTH;1A}q8Az)A3B#)&~@%YcA} zU_!@$Z3O)7o!s*d>+BLY^=Yc^nZ86bx8nJpZpwJZ^IBeUrnS+gsT9xFn>Fz`K7p3_ z6dyq@zksS3GRBUD<^Nao6a}CKAl_c}QYBd3t$LUYc8Os`+&2~ub642Y=biv)l~@OfN{q$NpWoCIjY9-005a7G0> khlDo0X0yILX&)tneO!DrixMrBW}Q#*uJq7G{FS8i3$}cZs{jB1 diff --git a/lib/Logger.py b/lib/Logger.py new file mode 100644 index 0000000..e53db6b --- /dev/null +++ b/lib/Logger.py @@ -0,0 +1,9 @@ +import DBFunctions + +def LogEvent(message): + DBFunctions.AddEventToDB(message) + return + +def ClearLog(): + ClearDBLog() + return \ No newline at end of file diff --git a/lib/Logger.pyc b/lib/Logger.pyc new file mode 100644 index 0000000000000000000000000000000000000000..483bcc2d61082961f115917e09a043d6cd467141 GIT binary patch literal 480 zcmbV{!AiqG5Qb-xO0~8JpFr@mCm%pWG>v+ZAgw3KC1#h9l4K>j6%=pv3HqL%1h4wf zQmj{9GLwHZfByY8{+Nv3*PmHQn-$@Gj&et68V^%LbPo~H8w8V%gNS4_R|DAUFRZL& zNGXY!qTB(RCt5JQ60MjRd2=O}Oo_?wqov8!vMYUUJLkvPUub>#WIBIm(`J!*`M0NrFk!C=b|_ErPnHliQ!2+MaK5`82*0 z_-^9s{*K10FJ2ol-pI&^ugGhWQAK=Jg{t@o=}f9TAw$Sh;-{rklTKZRSd97j#d?n6 zo>fUEsOroL?ugq#9!=`XFgpETqp&z9L+pp`A*i{N2`S#l5Eg23QlaeUdA^r#q$jGc ztNx4YYq6aXu7y6#|3c@}lQX#Pj{A_eKenxtwAXIKgHB zoM!Q1W*uMPVcfO9Tu*zcUqEm7mGidy(DrN*dz<)W=u&s!^MkbA%L{uj=qDI}M@8<# z!*DZ~g~8;Y+(m~UX!}v~2F4?z)K8+>jx%Q?eeXqdA6owi_M9)DSV6Fv_m0x`B5mvOo}Agw;+Bmd^2tS>6a(Ajh$o8T ze*Zuh^R94Jd6FNFz2td;)}SbWwDBo#Le<5_k!@YkPI021-Scj#dy;S2BU?P}w~IKj zYN+&7X{d>5qK*3|q|HzE9~XJYw!GWdciGRfJAiPf zDnp}P2vzAICJa7=ZSsM4-1}%F>xMU3^v6j#fWIrNNHuD!hmR( z_f(bTapEH4Q~~aM5kVGZ(&*M$jZN?Z2#jEv1`F%@K#u+KA;G1vAFJR{kq&k!#~3-M zaTd{MI))4WpJWPbC6q|6{)vPO3^BHw0s&e$dg=;Z=>5BAh-hMZKs)iOb+G_m#Qz#aJ*62sr1rE zP`G!{5I`ihRe)vHEShEWo>>Zz;qV1y{)Mo+gbYXxZ`ua6DXEnd2GroWl*Nb|&F?@> zsYG&Dthk@42FTJbQG(1u)J?Dy0Mo63=eU<MBh(*TY z=;jqYg7rd=%Plf?PvGx0EubbUFW=}>1^3^Q;S$eLe7(XeW4?CBGj7WeZiA{K2J4=^ z{H=NB-<8gLV_*6^(s^GWefioELY+8Tk>N65YPh0~W#_IWcsaoBo}T9q6)GF0QmF=g z000#-YGb{g;gq1dDG5$fQp`#T3sMXmib=Tms_qmhhIm-keu9$#kh@Jr?v8sG?Nb(Q zWmWiA;v>aelz@)uGW3!|%^{)O)8b^D60fAgw-RA-7-!kWsau1Ut^BOVbj4kdioDx+ znEKBLhnf{PwCa!6F-`gKvvXg>peIfRi#SKR302R94iyM0DyD@i{K(@fKROcL{kItE zzFUI!(hd@MKeH${zXJ8{pw+@oM}sVT)hH{hgjI9NHjO4{Y37c|Ja3V!I>(-;&O6Pf z-T1^NY2lQTwdxG1{^POCWUPx&l`=t-TU|d(1L;N|a|@Db^i?#v$j1e}p?qqChu~hd zQP^&NYIRnIBVc2-mpV$!9A|NMqO6{wqFA9tvSRAgAQK9TS(GbI)$VxU)6#I)7uH@$ zDI1upIU{-isY!kf8G-byk2TH*TJm1g?4tf=G6)#b+`v@hH7%tU++X6VW)c7tfe4owdG((6z%G+&Qgs{285tbU!ci8NsxpbCF|KmSB hHCXswH%|tc{ge-`+(rj2;uHS8(O#u~v%XTF{|~*{oyPzG literal 4008 zcmbtXOK%)m6+XAyZg<=6#PMUCFd;EPBbvq786KMmjR0GYkRnf}oQy{v2dmt5V^_Pn zt6lfDAE;YG3JX^72lxk!Sg~i#{DxWZ9}rvM`_8TI*g-;KaJjBeo%=rLJKs63{=GT- z)zAO2)0Xn5g1;8Zy!LN}_WPc(X**B`MNLG<!|)UQPCE z<27bve`YM#Wxqa_8?xUR%d@gSE6J4n1{=;vGOfbABsCS9lFX=Zi-+26)p5Y|U-;Q+ z8Hj!!&9gjr_A^_!H17p%6WUU-Gw2@KqRqiGc&G4g;&p#R<3&bBypcB$D&i|DRK-`N zGo|vB45y?sExsn58R^tzsK$ANkwy&raE}V@098ltfg3;`P3z3iTlxVivZC zpv#?3N%5r&r+MSk3T505=R5mSdZPNe>c74@7mFL=TPrSta{-I9hHGB4=Jju__<1~wp zGV5acF((|?nS<3U)$nk|G0>guuy5Fa+4N@i8k*0 zkT#zjJTLN&ZF_g1E;-23ql0q#_Mq4Hz_45IU-?CjKC$i7?Y!8ToOupfcOQ+InrYyf zH}}m0Ja-}S;a?4FI(-86ukeBJ8KDI2|Ch6H5vg^;Mz9mBdVP?xI@#5c-M z3VImg_|H`0r~v)m*=J&mL5ttd@$O;Ru6lOI(Z7$^^>OQvPrUEDCmS1aKV3gg{mI~H zy`6VA0FK;kbd$`w(+#!xhL4W}qoq>b`JYC+?NXYUyaS|+?5$5}*7XdmwOe?l+f7VqPAkI)ckHFF!!yqQJYMEd}86;NxUoilC5 zI?YFuZQ^x*L<5KsK}xRx7iBQ4q6vHoHv*63Nx%&-0fdwc4L^VxB}81DJb0iZlt}?S z16XhnxK?==P0npGb1u*M7juIVed)o4jo*JV2>E6 zI4Wo=Nyf^67we<%u#>jEC{k}*l%i$oxad14iSDw4TLy~SPBZ(QoJoJaRefVdBGkj3 zOMtCI;dmNRB3c0+R?LD~!m}7q@gDjnsQ4>P3a7(u$72#IDF?tXWFW8(fdM2aFiNG8 z5IpZb(P02jfC_+sz#*`}Hkznc!AnR8Ow(W-&=k__wS~b_NY|J^@aO;_k+ZrP&D|V>La82(J};Ml(Y|FF&U4zRYpx2 z-ICF588*eQlzmAJfAHJ4R(`>Qxyo>hb?+sDTOeb3Ed%41=m7oVRzDm_2__I^P;w(7!L8`|8%~cA4-6 zuDL|7441iy;m5Znfz7})5A;0e6)GQ=O63cDV*z*_c7u_~7ZVjKOgOCMi{%mm)L zgJ6>t-KpdY7<5WjcUuhTcR0h5DMF!@9EAj;Wt3+Aadx_vncm4s#ZjDP8|N^Z$cEOq z(T5O`rO{A%jgy%B{tG8L^2Y9<-L}rX9%R|oT3KQwYd&8q!*{K<##J7(A#1!PDm}Zs zOr3X{e7f@sJYZSJdpIaT3;Rx7R*GnBGmNXY}cB%}SApx_d(`l*G1!)-+a!Bk>)$U~A z({kaiFRZ;r&m=JA-)I9;i)HJI05ukAoQ@bsgf(Q(|>m;X(@%pfn z7B+-qDLYhH;Yz_WJdK*G3c(faa6FhylSuSKXrmvY`Nqj&1(RPY`d{QX>i;L)a0iW` zh?qyhSVYQbXlc +
  • + + Settings + +
    • +
  • + + Log + +
    • @@ -76,6 +89,7 @@ def index(self,status_message='',version=''): html = html + """No games added. Try searching for some.""" else: html = html + """ + @@ -83,6 +97,7 @@ def index(self,status_message='',version=''): + """ @@ -114,12 +129,11 @@ def search(self,term=''): - - + - + @@ -130,12 +144,22 @@ def search(self,term=''): Home +
  • + + Settings + +
    • +
  • + + Log + +
    • -
    +
      - + + + + + + + + +
    +
    +

    General

    + + + + + + + + + + +

    SABnzbd+

    + + + + + + + + + + +

    NZB Matrix

    + + + + + + + + +
    + + + +
    + + + + + + + + """ + return html; + + @cherrypy.expose + def log(self,status_message='',version=''): + if(os.name <> 'nt'): + os.chdir(WebRoot.appPath) + html = """ + + + + + + + + + + + + + + """ + html = html + """ + + +
    """ + db_result = GetLog() + if(db_result == ''): + html = html + """No log entries.""" + else: + html = html + """ + +
    Game Name Game ID StatusUpdate Status
    + + + + + + """ + html = html + db_result + html = html + """ + +
    MessageDate / Time
    +
    + + """ + html = html + """ +
    + + + + """ return html; @@ -225,4 +456,32 @@ def ignorecurrentversion(self,verification): def upgradetolatestversion(self,verification): if(verification == "SYSTEM_DIRECTED"): status = UpdateToLatestVersion(WebRoot.appPath) - raise cherrypy.InternalRedirect("/?status_message=" + status) \ No newline at end of file + raise cherrypy.InternalRedirect("/?status_message=" + status) + + @cherrypy.expose + def savesettings(self,cherrypyHost='', nzbMatrixUsername='', downloadInterval=3600, sabPort='', nzbMatrixApi='', sabApi='', cherrypyPort='', sabHost=''): + cherrypyHost = '"' + cherrypyHost + '"' + nzbMatrixUsername = '"' + nzbMatrixUsername + '"' + nzbMatrixApi = '"' + nzbMatrixApi + '"' + sabApi = '"' + sabApi + '"' + sabHost = '"' + sabHost + '"' + config = ConfigParser.RawConfigParser() + configFilePath = os.path.join(WebRoot.appPath,'Gamez.ini') + config.read(configFilePath) + config.set('global','server.socket_host',cherrypyHost) + config.set('global','server.socket_port',cherrypyPort) + config.set('NZBMatrix','username',nzbMatrixUsername) + config.set('NZBMatrix','api_key',nzbMatrixApi) + config.set('Sabnzbd','host',sabHost) + config.set('Sabnzbd','port',sabPort) + config.set('Sabnzbd','api_key',sabApi) + config.set('Scheduler','download_interval',downloadInterval) + 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" + raise cherrypy.InternalRedirect("/?status_message=" + status) + + @cherrypy.expose + def clearlog(self): + ClearDBLog() + raise cherrypy.InternalRedirect('/') \ No newline at end of file diff --git a/lib/WebRoot.pyc b/lib/WebRoot.pyc index 9fd54e7b5379f9602933799bed840286daecad38..ecd1093f151429519ae0dc32250c088f635dd389 100644 GIT binary patch literal 21995 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 delta 1192 zcma)5%S%*Y6hG(QJ9nJ%&Wsw<=s4n-J+76OL<$w6_VQg_6>|_`a&G42JaTRj(Jp%| zB(MYi0k!J^!O)^j?OL^KR|GEFMG#cWsB^xl43X$Qe&6|ieCPGM=YD*IOJ^GOFQH&h z&$qEz_;u;L_VQc0xzae%hZ%s34huoZRYR&8au%d4$b}#k0?ZhYF(KoFC4d_M)2T3I z5XNmkyU+jNYs@xRKHQ;OIFR&&oN~`Qg@X4dm%&`W#a1H)*Q0d@T5z@iRj!+8)Chw}X__yD>m#^$Qp*ztnREFYQ&2(TJM>v_Jlp zt|y|@+iR9r6V*OCRoiY{Mu2ih-C-<$+O~|8j5fyuT%A)bz+T{pIJUAZnvO2Fg?L}u z%K%ygw?s^|v?xZmR1wZey>nGbg+1po+KVpzNrhl$~Ar8b#CxM z%R8;RhSNB;0(AoGEpU5ai{_5S;ECnAi#aDMRE#=D4>U+`B{#h|doe3kf)&nNQRc5A z%r3E-l{&{y#cS7iTM}77vv>gQFm0Vk_Nc)PGwDbOC7XM-SSYzpy^wK%q(FX$~;ESP9&0o}y9851Mpy!v_d)%p20#R+VsrOGC1WlM#;Q$vx-&Yhlo o^2y@dVmjlVxRRgs<_q~!<*!mYReI)}gJGF2i+>yoJ20XB1VC2D82|tP diff --git a/lib/__init__.pyc b/lib/__init__.pyc index da42fe5fb3ec08bc27a7876d541cb0d76d2d55f8..7c98187df73dbe85df2ce402f8946eda05cc3b71 100644 GIT binary patch delta 13 Ucmb=ZU}yf!%k?Ap>qPcK03zN6P5=M^ delta 13 Ucmb=ZU}yf!%XMGw%S84<03kaB{{R30 From da8bf46f8c86e866946ec8b06ebcf3b179f4c3c1 Mon Sep 17 00:00:00 2001 From: Michael Dlesk Date: Sat, 24 Dec 2011 22:47:06 -0500 Subject: [PATCH 2/2] Added version number --- lib/Constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Constants.py b/lib/Constants.py index 5216c00..7144977 100644 --- a/lib/Constants.py +++ b/lib/Constants.py @@ -1,2 +1,2 @@ def VersionNumber(): - return "0.0.0.1" + return "0.0.0.3"