pymoul-svn

[Pymoul-svn] SF.net SVN: pymoul: [273] pymoul/trunk/src/moul/osdependent/darwin/__init__ .py

[<ti...@us...>]

Revision: 273
          http://pymoul.svn.sourceforge.net/pymoul/?rev=273&view=rev
Author:   tiran
Date:     2007-03-21 05:28:30 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
grrr ... I thought that .../UruLive Preferences/... was wrong
Also fixed the getMoulInstallDir search function. Now it should detect MOUL in /Applications and ~/Applications

Modified Paths:
--------------
    pymoul/trunk/src/moul/osdependent/darwin/__init__.py

Modified: pymoul/trunk/src/moul/osdependent/darwin/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-20 18:59:01 UTC (rev 272)
+++ pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-21 12:28:30 UTC (rev 273)
@@ -31,7 +31,7 @@
 LOG.warning('Mac/Darwin support is experimental')
 
 HOME = os.path.expanduser('~')
-MOUL_DIR = "%s/Library/Preferences/UruLive/Preferences/p_drive/My Documents/Uru Live" % HOME
+MOUL_DIR = "%s/Library/Preferences/UruLive Preferences/p_drive/My Documents/Uru Live" % HOME
 APP_PATH = "Uru Live.app/Contents/Resources/Game.app/Contents/Resources/transgaming/c_drive/Program Files/Uru Live/"
 APP_NAME = "Uru Live.app"
 EXEC_NAME = "???" # XXX
@@ -59,7 +59,7 @@
     """Get path to MOUL install dir
     """
     for path in LOCATIONS:
-        if os.path.isfile(os.path.join(path, EXEC_NAME)):
+        if os.path.isfile(os.path.join(path, UPDATER)):
             LOG.info("Uru directory found: %s" % path)
             return path
     LOG.warning("Uru directory NOT found! Search path was: \n %s" % 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pymoul-svn] SF.net SVN: pymoul: [276] pymoul/trunk/src/moul/osdependent/darwin/__init__ .py

[<ti...@us...>]

Revision: 276
          http://pymoul.svn.sourceforge.net/pymoul/?rev=276&view=rev
Author:   tiran
Date:     2007-03-22 11:58:49 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
Fixed Mac path definitions. The Mac version should pick up the correct pathes and be able to load the journals now. Please test and debug ;)

Modified Paths:
--------------
    pymoul/trunk/src/moul/osdependent/darwin/__init__.py

Modified: pymoul/trunk/src/moul/osdependent/darwin/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-21 12:39:25 UTC (rev 275)
+++ pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-22 18:58:49 UTC (rev 276)
@@ -32,10 +32,11 @@
 
 HOME = os.path.expanduser('~')
 MOUL_DIR = "%s/Library/Preferences/UruLive Preferences/p_drive/My Documents/Uru Live" % HOME
-APP_PATH = "Uru Live.app/Contents/Resources/Game.app/Contents/Resources/transgaming/c_drive/Program Files/Uru Live/"
-APP_NAME = "Uru Live.app"
+#APP_NAME = "Uru Live.app"
+APP_NAME = "Myst Online.app"
+DATA_DIR = "Contents/Resources/Myst Online.app/Contents/Resources/transgaming/c_drive/Program Files/Uru Live"
+UPDATER = "Contents/Resources/Myst Online.app/Contents/Resources/transgaming/c_drive/Program Files/Uru Live/Cider/URU Live Updater.app/Contents/MacOS/URU Live Updater"
 EXEC_NAME = "???" # XXX
-UPDATER = "Uru Live.app/Contents/Resources/Game.app/Contents/Resources/URU Live Updater.app/Contents/MacOS/URU Live Updater"
 LOCATIONS = [
     "/Applications",
     "%s/Applications" % HOME,
@@ -56,12 +57,15 @@
     return PYMOUL_DIR
 
 def getMoulInstallDir():
-    """Get path to MOUL install dir
+    """Get path to MOUL data root dir
     """
     for path in LOCATIONS:
-        if os.path.isfile(os.path.join(path, UPDATER)):
+        updater = os.path.join(path, APP_NAME, UPDATER)
+        data_dir = os.path.join(path, APP_NAME, DATA_DIR)
+        if os.path.isfile(updater) and os.path.isdir(data_dir):
             LOG.info("Uru directory found: %s" % path)
-            return path
+            LOG.debug("Uru data dir is %s" % data_dir)
+            return data_dir
     LOG.warning("Uru directory NOT found! Search path was: \n %s" % 
                 repr(LOCATIONS))
     return 'INVALID'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.