play demo from args

AO2XP.py

@@ -21,15 +21,20 @@ if osname == "Linux": QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitT
 app = QtGui.QApplication(sys.argv)
 
 path = sys.argv[0]
+demofile = None
+
+if len(sys.argv) > 1:
+    demofile = sys.argv[-1]
+    if not exists(demofile):
+        QtGui.QMessageBox.critical(None, "Unable to load demo", "The demo file '%s' doesn't exist." % (demofile))
+        os._exit(-2)
+
 if osname == "Darwin":
     path = Cocoa.NSBundle.mainBundle()
     os.chdir(path.resourcePath())
 
-debugmode = len(sys.argv) > 1 and sys.argv[1] == "debug"
+missing = audio.checkAvailable()
-if not debugmode:
+if missing:
-    fakebass = len(sys.argv) > 1 and sys.argv[1] == "ignorebass"
-    missing = audio.checkAvailable()
-    if missing or fakebass:
     QtGui.QMessageBox.critical(None, "Unable to launch game", "Couldn't find the file %s on the client folder.\nAO2XP needs this file in order to play sounds and music.\nThe file is included in the client's zip file, make sure it's in the same folder as the AO2XP exe.\n\nAdditional info:\n%s\n%s" % (missing, sys.argv, os.getcwd()))
     os._exit(-2)
 
@@ -37,7 +42,8 @@ class gamewindow(QtGui.QMainWindow):
     def __init__(self):
         super(gamewindow, self).__init__()
         self.stackwidget = QtGui.QStackedWidget(self)
-        self.widget = mainmenu.lobby(self)
+        
+        self.widget = mainmenu.lobby(self, demofile)
         self.gamewidget = gameview.GUI(self)
         self.stackwidget.addWidget(self.widget)
         self.stackwidget.addWidget(self.gamewidget)
@@ -53,6 +59,10 @@ class gamewindow(QtGui.QMainWindow):
         self.demopickergui = demo.DemoPicker(self)
         self.aboutgui = self.aboutBox()
         
+        if demofile:
+            self.gamewidget.start_demo(demofile)
+            self.stackwidget.setCurrentWidget(self.gamewidget)
+    
     def center(self):
         frameGm = self.frameGeometry()
         centerPoint = QtGui.QDesktopWidget().availableGeometry().center()
@@ -88,10 +98,9 @@ class gamewindow(QtGui.QMainWindow):
         box.button(QtGui.QMessageBox.Close).setText('Take that!')
         return box
 
-if not debugmode:
+# Vanilla downloader
-    # Vanilla downloader
+force_downloader = len(sys.argv) > 1 and sys.argv[1] == "download"
-    force_downloader = len(sys.argv) > 1 and sys.argv[1] == "download"
+if force_downloader or (not exists("base/background") and not exists("base/characters") and not exists("base/sounds") and not exists("base/evidence")):
-    if force_downloader or (not exists("base/background") and not exists("base/characters") and not exists("base/sounds") and not exists("base/evidence")):
     jm = QtGui.QMessageBox.information(None, "Warning", "You seem to be missing the included Attorney Online content.\nWould you like to download them automatically?", QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
     if jm == QtGui.QMessageBox.Yes:
         import basedownloader
@@ -100,10 +109,10 @@ if not debugmode:
     else:
         os._exit(-3)
 
-    # AO2XP update checker
+# AO2XP update checker
-    can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", False) # Automatic updates are opt-in!
+can_update = ini.read_ini_bool("AO2XP.ini", "General", "install updates", False) # Automatic updates are opt-in!
-    force_update = "forceupdate" in sys.argv[1:]
+force_update = "forceupdate" in sys.argv[1:]
-    if can_update or force_update:
+if can_update or force_update:
     import updater
     code = updater.checkForUpdates(force_update)
     if code == 0:
@@ -112,8 +121,6 @@ if not debugmode:
     elif osname == "Darwin": # bundle
         os.chdir(path.resourcePath()) # return to Resources folder
 
-
-
 # This hides stupid useless QT warnings
 def handler(msg_type, msg_string):
     pass

demo.py

@@ -114,7 +114,7 @@ class DemoPlayer(QtCore.QObject):
     def load_demo(self, file):
         last_line = ""
         time = 0
-        with open("logs/" + file) as f:
+        with open(file) as f:
             for line in f:
                 last_line = last_line + line
                 if last_line.strip()[-1] == "%":
@@ -233,6 +233,7 @@ def get_demo_fname(treeview, item):
     while item.isValid():
         fname = model.fileName(item)
         if fname == "logs":
+            path.insert(0, "logs")
             break
         path.insert(0, fname)
         item = item.parent()

mainmenu.py

@@ -33,7 +33,7 @@ class lobby(QtGui.QWidget):
     gamewindow = None
     tab = 0
 
-    def __init__(self, parent=None):
+    def __init__(self, parent=None, demo=None):
         super(lobby, self).__init__(parent)
         self.can_connect = False
         self.svclicked = None
@@ -195,7 +195,7 @@ class lobby(QtGui.QWidget):
         self.masterserver.msgbox_signal.connect(self.showMessageBox)
         self.masterserver.start()
         
-        if self.autoconnect:
+        if not demo and self.autoconnect:
             self.aoserverinfo.setIP(self.autoconnect[-1], self.autoconnect[0], self.autoconnect[1], self.autoconnect[2])
             print '[debug]', 'Connecting automatically to ip: ' + self.autoconnect[0] + ', port: ' + str(self.autoconnect[1]) + ", websocket port: " + str(self.autoconnect[2])
             self.aoserverinfo.stop()