Made lists filterable and added force search option

Gamez.py

@@ -155,8 +155,9 @@ def RunGameTask():
         isTorrentBlackholeEnabled = config.get('SystemGenerated','blackhole_torrent_enabled').replace('"','')
         isTorrentKATEnabled = config.get('SystemGenerated','torrent_kat_enabled').replace('"','')
         torrentBlackholePath  = config.get('Blackhole','torrent_blackhole_path').replace('"','')
+        manualSearchGame = ''
         LogEvent("Searching for games")
-        lib.GameTasks.GameTasks().FindGames(nzbMatrixUser,nzbMatrixApi,sabnzbdApi,sabnzbdHost,sabnzbdPort,newznabWiiCat,newznabApi,newznabHost,newznabPort,newznabXbox360Cat,sabnzbdCategory,isSabEnabled,isNzbMatrixEnabled,isNewznabEnabled,isNzbBlackholeEnabled,nzbBlackholePath,isTorrentBlackholeEnabled,isTorrentKATEnabled,torrentBlackholePath)
+        lib.GameTasks.GameTasks().FindGames(manualSearchGame,nzbMatrixUser,nzbMatrixApi,sabnzbdApi,sabnzbdHost,sabnzbdPort,newznabWiiCat,newznabApi,newznabHost,newznabPort,newznabXbox360Cat,sabnzbdCategory,isSabEnabled,isNzbMatrixEnabled,isNewznabEnabled,isNzbBlackholeEnabled,nzbBlackholePath,isTorrentBlackholeEnabled,isTorrentKATEnabled,torrentBlackholePath)
     except:
         errorMessage = "Major error occured when running scheduled tasks"
         for message in sys.exc_info():

Gamez.pyproj

@@ -3,10 +3,9 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{8cc016a0-bf76-4414-8742-661a8ad2e8ca}</ProjectGuid>
     <ProjectHome>.</ProjectHome>
-    <StartupFile>
-    </StartupFile>
+    <StartupFile>Gamez.py</StartupFile>
     <SearchPath>
     </SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
@@ -22,5 +21,183 @@
     <DebugSymbols>true</DebugSymbols>
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
+  <ItemGroup>
+    <Content Include="API.md" />
+    <Content Include="Gamez.db" />
+    <Content Include="Gamez.ini" />
+    <Content Include="README.md" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="cherrypy\lib\auth.py" />
+    <Compile Include="cherrypy\lib\auth_basic.py" />
+    <Compile Include="cherrypy\lib\auth_digest.py" />
+    <Compile Include="cherrypy\lib\caching.py" />
+    <Compile Include="cherrypy\lib\covercp.py" />
+    <Compile Include="cherrypy\lib\cpstats.py" />
+    <Compile Include="cherrypy\lib\cptools.py" />
+    <Compile Include="cherrypy\lib\encoding.py" />
+    <Compile Include="cherrypy\lib\gctools.py" />
+    <Compile Include="cherrypy\lib\http.py" />
+    <Compile Include="cherrypy\lib\httpauth.py" />
+    <Compile Include="cherrypy\lib\httputil.py" />
+    <Compile Include="cherrypy\lib\jsontools.py" />
+    <Compile Include="cherrypy\lib\profiler.py" />
+    <Compile Include="cherrypy\lib\reprconf.py" />
+    <Compile Include="cherrypy\lib\sessions.py" />
+    <Compile Include="cherrypy\lib\static.py" />
+    <Compile Include="cherrypy\lib\xmlrpcutil.py" />
+    <Compile Include="cherrypy\lib\__init__.py" />
+    <Compile Include="cherrypy\process\plugins.py" />
+    <Compile Include="cherrypy\process\servers.py" />
+    <Compile Include="cherrypy\process\win32.py" />
+    <Compile Include="cherrypy\process\wspbus.py" />
+    <Compile Include="cherrypy\process\__init__.py" />
+    <Compile Include="cherrypy\scaffold\__init__.py" />
+    <Compile Include="cherrypy\test\benchmark.py" />
+    <Compile Include="cherrypy\test\checkerdemo.py" />
+    <Compile Include="cherrypy\test\helper.py" />
+    <Compile Include="cherrypy\test\logtest.py" />
+    <Compile Include="cherrypy\test\modfastcgi.py" />
+    <Compile Include="cherrypy\test\modfcgid.py" />
+    <Compile Include="cherrypy\test\modpy.py" />
+    <Compile Include="cherrypy\test\modwsgi.py" />
+    <Compile Include="cherrypy\test\sessiondemo.py" />
+    <Compile Include="cherrypy\test\test_auth_basic.py" />
+    <Compile Include="cherrypy\test\test_auth_digest.py" />
+    <Compile Include="cherrypy\test\test_bus.py" />
+    <Compile Include="cherrypy\test\test_caching.py" />
+    <Compile Include="cherrypy\test\test_config.py" />
+    <Compile Include="cherrypy\test\test_config_server.py" />
+    <Compile Include="cherrypy\test\test_conn.py" />
+    <Compile Include="cherrypy\test\test_core.py" />
+    <Compile Include="cherrypy\test\test_dynamicobjectmapping.py" />
+    <Compile Include="cherrypy\test\test_encoding.py" />
+    <Compile Include="cherrypy\test\test_etags.py" />
+    <Compile Include="cherrypy\test\test_http.py" />
+    <Compile Include="cherrypy\test\test_httpauth.py" />
+    <Compile Include="cherrypy\test\test_httplib.py" />
+    <Compile Include="cherrypy\test\test_json.py" />
+    <Compile Include="cherrypy\test\test_logging.py" />
+    <Compile Include="cherrypy\test\test_mime.py" />
+    <Compile Include="cherrypy\test\test_misc_tools.py" />
+    <Compile Include="cherrypy\test\test_objectmapping.py" />
+    <Compile Include="cherrypy\test\test_proxy.py" />
+    <Compile Include="cherrypy\test\test_refleaks.py" />
+    <Compile Include="cherrypy\test\test_request_obj.py" />
+    <Compile Include="cherrypy\test\test_routes.py" />
+    <Compile Include="cherrypy\test\test_session.py" />
+    <Compile Include="cherrypy\test\test_sessionauthenticate.py" />
+    <Compile Include="cherrypy\test\test_states.py" />
+    <Compile Include="cherrypy\test\test_static.py" />
+    <Compile Include="cherrypy\test\test_tools.py" />
+    <Compile Include="cherrypy\test\test_tutorials.py" />
+    <Compile Include="cherrypy\test\test_virtualhost.py" />
+    <Compile Include="cherrypy\test\test_wsgiapps.py" />
+    <Compile Include="cherrypy\test\test_wsgi_ns.py" />
+    <Compile Include="cherrypy\test\test_wsgi_vhost.py" />
+    <Compile Include="cherrypy\test\test_xmlrpc.py" />
+    <Compile Include="cherrypy\test\webtest.py" />
+    <Compile Include="cherrypy\test\_test_decorators.py" />
+    <Compile Include="cherrypy\test\_test_states_demo.py" />
+    <Compile Include="cherrypy\test\__init__.py" />
+    <Compile Include="cherrypy\tutorial\bonus-sqlobject.py" />
+    <Compile Include="cherrypy\tutorial\tut01_helloworld.py" />
+    <Compile Include="cherrypy\tutorial\tut02_expose_methods.py" />
+    <Compile Include="cherrypy\tutorial\tut03_get_and_post.py" />
+    <Compile Include="cherrypy\tutorial\tut04_complex_site.py" />
+    <Compile Include="cherrypy\tutorial\tut05_derived_objects.py" />
+    <Compile Include="cherrypy\tutorial\tut06_default_method.py" />
+    <Compile Include="cherrypy\tutorial\tut07_sessions.py" />
+    <Compile Include="cherrypy\tutorial\tut08_generators_and_yield.py" />
+    <Compile Include="cherrypy\tutorial\tut09_files.py" />
+    <Compile Include="cherrypy\tutorial\tut10_http_errors.py" />
+    <Compile Include="cherrypy\tutorial\__init__.py" />
+    <Compile Include="cherrypy\wsgiserver\ssl_builtin.py" />
+    <Compile Include="cherrypy\wsgiserver\ssl_pyopenssl.py" />
+    <Compile Include="cherrypy\wsgiserver\wsgiserver2.py" />
+    <Compile Include="cherrypy\wsgiserver\wsgiserver3.py" />
+    <Compile Include="cherrypy\wsgiserver\__init__.py" />
+    <Compile Include="cherrypy\_cpchecker.py" />
+    <Compile Include="cherrypy\_cpcompat.py" />
+    <Compile Include="cherrypy\_cpconfig.py" />
+    <Compile Include="cherrypy\_cpdispatch.py" />
+    <Compile Include="cherrypy\_cperror.py" />
+    <Compile Include="cherrypy\_cplogging.py" />
+    <Compile Include="cherrypy\_cpmodpy.py" />
+    <Compile Include="cherrypy\_cpnative_server.py" />
+    <Compile Include="cherrypy\_cpreqbody.py" />
+    <Compile Include="cherrypy\_cprequest.py" />
+    <Compile Include="cherrypy\_cpserver.py" />
+    <Compile Include="cherrypy\_cpthreadinglocal.py" />
+    <Compile Include="cherrypy\_cptools.py" />
+    <Compile Include="cherrypy\_cptree.py" />
+    <Compile Include="cherrypy\_cpwsgi.py" />
+    <Compile Include="cherrypy\_cpwsgi_server.py" />
+    <Compile Include="cherrypy\__init__.py" />
+    <Compile Include="cron\base.py" />
+    <Compile Include="cron\eta.py" />
+    <Compile Include="cron\kinepolisrss.py" />
+    <Compile Include="cron\movierss.py" />
+    <Compile Include="cron\renamer.py" />
+    <Compile Include="cron\subtitle.py" />
+    <Compile Include="cron\trailer.py" />
+    <Compile Include="cron\trakt.py" />
+    <Compile Include="cron\yarr.py" />
+    <Compile Include="cron\__init__.py" />
+    <Compile Include="Gamez.py" />
+    <Compile Include="gntp\notifier.py" />
+    <Compile Include="gntp\__init__.py" />
+    <Compile Include="lib\ConfigFunctions.py" />
+    <Compile Include="lib\Constants.py" />
+    <Compile Include="lib\DBFunctions.py" />
+    <Compile Include="lib\feedparser.py" />
+    <Compile Include="lib\FolderFunctions.py" />
+    <Compile Include="lib\GameTasks.py" />
+    <Compile Include="lib\Logger.py" />
+    <Compile Include="lib\Notifications.py" />
+    <Compile Include="lib\Notifo.py" />
+    <Compile Include="lib\UpgradeFunctions.py" />
+    <Compile Include="lib\WebRoot.py" />
+    <Compile Include="lib\__init__.py" />
+    <Compile Include="postprocess\gamezPostProcess.py" />
+    <Compile Include="prowlpy\prowlpy.py" />
+    <Compile Include="prowlpy\__init__.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include=".git\" />
+    <Folder Include=".git\hooks\" />
+    <Folder Include=".git\info\" />
+    <Folder Include=".git\logs\" />
+    <Folder Include=".git\logs\refs\" />
+    <Folder Include=".git\logs\refs\heads\" />
+    <Folder Include=".git\objects\" />
+    <Folder Include=".git\objects\info\" />
+    <Folder Include=".git\objects\pack\" />
+    <Folder Include=".git\refs\" />
+    <Folder Include=".git\refs\heads\" />
+    <Folder Include=".git\refs\remotes\" />
+    <Folder Include=".git\refs\remotes\origin\" />
+    <Folder Include=".git\refs\tags\" />
+    <Folder Include="cherrypy\" />
+    <Folder Include="cherrypy\lib\" />
+    <Folder Include="cherrypy\process\" />
+    <Folder Include="cherrypy\scaffold\" />
+    <Folder Include="cherrypy\scaffold\static\" />
+    <Folder Include="cherrypy\test\" />
+    <Folder Include="cherrypy\test\static\" />
+    <Folder Include="cherrypy\tutorial\" />
+    <Folder Include="cherrypy\wsgiserver\" />
+    <Folder Include="cron\" />
+    <Folder Include="css\" />
+    <Folder Include="css\datatables_images\" />
+    <Folder Include="css\navigation_images\" />
+    <Folder Include="css\redmond\" />
+    <Folder Include="css\redmond\images\" />
+    <Folder Include="gntp\" />
+    <Folder Include="js\" />
+    <Folder Include="lib\" />
+    <Folder Include="postprocess\" />
+    <Folder Include="prowlpy\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
 </Project>

Gamez.sln

@@ -0,0 +1,18 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Gamez", "Gamez.pyproj", "{8CC016A0-BF76-4414-8742-661A8AD2E8CA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8CC016A0-BF76-4414-8742-661A8AD2E8CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CC016A0-BF76-4414-8742-661A8AD2E8CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

lib/Constants.py

@@ -1,2 +1,2 @@
 def VersionNumber():
-    return "1.1.15.0"
+    return "1.1.16.0"

lib/DBFunctions.py

@@ -112,7 +112,7 @@ def GetRequestedGames(filter=''):
             status = str(record[3])
             system = str(record[4])
             cover = str(record[5])
-            rowdata = "<tr align='center'><td><a href='removegame?dbid=" + db_id + "'>Delete</a></td><td><center><img width='85' height='120'  src='" + cover + "' /></center></td><td>" + game_name + "</td><td>" + game_type + "</td><td>" + system + "</td><td>" + status + "</td><td><select id=updateSatusSelectObject class=ui-widget onchange=UpdateGameStatus(this.options[this.selectedIndex].value,'" + db_id + "')>"
+            rowdata = "<tr align='center'><td><a href='removegame?dbid=" + db_id + "'>Delete</a>&nbsp;|&nbsp;<a href='forcesearch?dbid=" + db_id + "'>Force Search</a></td><td><center><img width='85' height='120'  src='" + cover + "' /></center></td><td>" + game_name + "</td><td>" + game_type + "</td><td>" + system + "</td><td>" + status + "</td><td><select id=updateSatusSelectObject class=ui-widget onchange=UpdateGameStatus(this.options[this.selectedIndex].value,'" + db_id + "')>"
             if(status == "Snatched"):
                 rowdata = rowdata + "<option>Downloaded</option><option selected=true>Snatched</option><option>Wanted</option>"
             elif(status == "Downloaded"):
@@ -137,9 +137,12 @@ def RemoveGameFromDb(db_id):
     cursor.close()
     return
 
-def GetRequestedGamesAsArray():
+def GetRequestedGamesAsArray(manualSearchGame):
     db_path = os.path.join(os.path.abspath(""),"Gamez.db")
-    sql = "SELECT game_name,ID,system FROM requested_games WHERE status='Wanted' order by game_name asc"
+    if(manualSearchGame <> ''):
+        sql = "SELECT game_name,ID,system FROM requested_games WHERE id='" + manualSearchGame + "' order by game_name asc"
+    else:
+        sql = "SELECT game_name,ID,system FROM requested_games WHERE status='Wanted' order by game_name asc"
     connection = sqlite3.connect(db_path)
     cursor = connection.cursor()
     cursor.execute(sql)

lib/GameTasks.py

@@ -11,14 +11,14 @@
 
 class GameTasks():
 
-    def FindGames(self, nzbmatrixusername, nzbmatrixapi,sabnzbdApi,sabnzbdHost,sabnzbdPort,newznabWiiCat,newznabApi,newznabHost,newznabPort,newznabXbox360Cat,sabnzbdCategory,isSabEnabled,isNzbMatrixEnabled,isNewznabEnabled,isNzbBlackholeEnabled,nzbBlackholePath,isTorrentBlackholeEnabled,isTorrentKATEnabled,torrentBlackholePath):
+    def FindGames(self, manualSearchGame,nzbmatrixusername, nzbmatrixapi,sabnzbdApi,sabnzbdHost,sabnzbdPort,newznabWiiCat,newznabApi,newznabHost,newznabPort,newznabXbox360Cat,sabnzbdCategory,isSabEnabled,isNzbMatrixEnabled,isNewznabEnabled,isNzbBlackholeEnabled,nzbBlackholePath,isTorrentBlackholeEnabled,isTorrentKATEnabled,torrentBlackholePath):
         if(isSabEnabled == "1"):       
             GameTasks().CheckIfPostProcessExistsInSab(sabnzbdApi,sabnzbdHost,sabnzbdPort)
         nzbmatrixusername = nzbmatrixusername.replace('"','')
         nzbmatrixapi = nzbmatrixapi.replace('"','')
         newznabApi = newznabApi.replace('"','')     
         newznabWiiCat = newznabWiiCat.replace('"','')  
-        games = GetRequestedGamesAsArray()
+        games = GetRequestedGamesAsArray(manualSearchGame)
         for game in games:
             try:
                 game_name = str(game[0])

lib/WebRoot.py

@@ -11,6 +11,8 @@
 import hashlib
 import random
 from lib.FolderFunctions import *
+from Constants import *
+from GameTasks import *
 
 class WebRoot:
     appPath = ''
@@ -127,7 +129,7 @@ def index(self,status_message='',version='',filter=''):
                 <thead>
                   <tr>
                     <th>Actions</th>
-		    <th>Cover</th>
+		            <th>Cover</th>
                     <th>Game Name</th>
                     <th>Game Type</th>
                     <th>System</th>
@@ -141,7 +143,7 @@ def index(self,status_message='',version='',filter=''):
                 </tbody>
               </table>
               <script>$(document).ready(function() {
-	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":false,"bLengthChange":false});});
+	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":true,"bLengthChange":false});});
               </script>
              """
         html = html + """
@@ -263,7 +265,7 @@ def search(self,term='',system=''):
                 </tbody>
               </table>
               <script>$(document).ready(function() {
-	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":false,"bLengthChange":false});});
+	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":true,"bLengthChange":false});});
               </script>
              """
         html = html + """
@@ -820,6 +822,7 @@ def settings(self):
 		</script>
                 
 		<br /><br />
+        <div style="margin-left:5px">Gamez Version: """ + VersionNumber() + """</div>
 		<div align="right" style="margin-right:20px">
 			<button style="border:0; margin:0; padding:0;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;" type="submit">Save Settings</button>
 		</div>	
@@ -1067,7 +1070,7 @@ def comingsoon(self):
                 </tbody>
               </table>
               <script>$(document).ready(function() {
-	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":false,"bLengthChange":false,"iDisplayLength":25});});
+	            oTable = $('#searchresults').dataTable({"bJQueryUI": true,"bSort":true,"bLengthChange":false,"iDisplayLength":25});});
               </script>
              """
         html = html + """
@@ -1316,3 +1319,33 @@ def updategamelist(self):
         AddComingSoonGames()
         status = "Game list has been updated successfully"
         raise cherrypy.InternalRedirect("/?status_message=" + status)
+
+    @cherrypy.expose
+    def forcesearch(self,dbid):
+        if(os.name <> 'nt'):
+            os.chdir(WebRoot.appPath)
+        config = ConfigParser.RawConfigParser()
+        config.read(os.path.join(WebRoot.appPath,'Gamez.ini'))
+        nzbMatrixUser = config.get('NZBMatrix','username').replace('"','')
+        nzbMatrixApi = config.get('NZBMatrix','api_key').replace('"','')
+        sabnzbdHost = config.get('Sabnzbd','host').replace('"','')
+        sabnzbdPort = config.get('Sabnzbd','port').replace('"','')
+        sabnzbdApi = config.get('Sabnzbd','api_key').replace('"','')
+        sabnzbdCategory = config.get('Sabnzbd','category').replace('"','')
+        newznabWiiCat = config.get('Newznab','wii_category_id').replace('"','')
+        newznabXbox360Cat = config.get('Newznab','xbox360_category_id').replace('"','')
+        newznabApi = config.get('Newznab','api_key').replace('"','')
+        newznabHost = config.get('Newznab','host').replace('"','')
+        newznabPort = config.get('Newznab','port').replace('"','')
+        isSabEnabled = config.get('SystemGenerated','sabnzbd_enabled').replace('"','')
+        isNzbMatrixEnabled = config.get('SystemGenerated','nzbmatrix_enabled').replace('"','')
+        isNewznabEnabled = config.get('SystemGenerated','newznab_enabled').replace('"','')
+        isNzbBlackholeEnabled = config.get('SystemGenerated','blackhole_nzb_enabled').replace('"','')
+        nzbBlackholePath = config.get('Blackhole','nzb_blackhole_path').replace('"','')
+        isTorrentBlackholeEnabled = config.get('SystemGenerated','blackhole_torrent_enabled').replace('"','')
+        isTorrentKATEnabled = config.get('SystemGenerated','torrent_kat_enabled').replace('"','')
+        torrentBlackholePath  = config.get('Blackhole','torrent_blackhole_path').replace('"','')
+        manualSearchGame = dbid
+        LogEvent("Searching for games")
+        GameTasks().FindGames(manualSearchGame,nzbMatrixUser,nzbMatrixApi,sabnzbdApi,sabnzbdHost,sabnzbdPort,newznabWiiCat,newznabApi,newznabHost,newznabPort,newznabXbox360Cat,sabnzbdCategory,isSabEnabled,isNzbMatrixEnabled,isNewznabEnabled,isNzbBlackholeEnabled,nzbBlackholePath,isTorrentBlackholeEnabled,isTorrentKATEnabled,torrentBlackholePath)
+        raise cherrypy.InternalRedirect('/')