From 16cbb7f535003af83a88e0f3d5c23fbb57a6929b Mon Sep 17 00:00:00 2001
From: Michael Dlesk <michaeldlesk@gmail.com>
Date: Sat, 24 Dec 2011 23:48:35 -0500
Subject: [PATCH] Fixed issues when launching from different folder using abs
 path

---
 Gamez.Python.VS2010.suo | Bin 0 -> 12288 bytes
 Gamez.py                |   7 ++++---
 lib/ConfigFunctions.py  |   4 ++++
 lib/DBFunctions.py      |   2 --
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 Gamez.Python.VS2010.suo

diff --git a/Gamez.Python.VS2010.suo b/Gamez.Python.VS2010.suo
new file mode 100644
index 0000000000000000000000000000000000000000..3dfbad1aa09b00164a0475c06217a1c108400c74
GIT binary patch
literal 12288
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
UccxlSWtU`&-f?f$KOP$RAJdB$$p8QV

literal 0
HcmV?d00001

diff --git a/Gamez.py b/Gamez.py
index 5e48955..93abd24 100644
--- a/Gamez.py
+++ b/Gamez.py
@@ -68,7 +68,8 @@ def RunWebServer(self,isToDaemonize):
         
 def GenerateSabPostProcessScript():
     config = ConfigParser.RawConfigParser()
-    config.read('Gamez.ini')
+    print(os.path.join(app_path,'Gamez.ini'))
+    config.read(os.path.join(app_path,'Gamez.ini'))
     gamezWebHost = config.get('global','server.socket_host').replace('"','')
     gamezWebport = config.get('global','server.socket_port').replace('"','')
     gamezBaseUrl = "http://" + gamezWebHost + ":" + gamezWebport + "/"
@@ -119,10 +120,10 @@ def RunGameTask():
         print(sys.exc_info()[0])
 
 if __name__ == '__main__':
+    app_path = sys.path[0]
+    ValidateDB()
     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/lib/ConfigFunctions.py b/lib/ConfigFunctions.py
index 56c8e9b..145ba7a 100644
--- a/lib/ConfigFunctions.py
+++ b/lib/ConfigFunctions.py
@@ -51,6 +51,10 @@ def CheckConfigForAllKeys(app_path):
         config.set('Sabnzbd','host','"127.0.0.1"')
         changesMade = True
 
+    if(config.has_option('Sabnzbd','port') == False):
+        config.set('Sabnzbd','port','')
+        changesMade = True
+
     if(config.has_option('Scheduler','download_interval') == False):
         config.set('Scheduler','download_interval','60')
         changesMade = True
diff --git a/lib/DBFunctions.py b/lib/DBFunctions.py
index 7b74c64..a8bef90 100644
--- a/lib/DBFunctions.py
+++ b/lib/DBFunctions.py
@@ -167,7 +167,6 @@ def UpdateStatus(game_id,status):
     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
@@ -182,7 +181,6 @@ def ValidateDB():
             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()