Mercurial > parpg-source

diff common/utils.py @ 2:06145a6ee387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed resource path dependencies issue that caused PARPG to crash on start. * PARPG should now run without issue (system installation not tested). * Utilized FIFE's VFS module to remove path dependencies from most PARPG modules. * The new parpg.vfs module is a singleton with a single global variable, VFS, which is a reference to the global VFS instance. Although a singleton is not ideal it should be replaced once PARPG's core code is refactored. * The parpg.vfs singleton is initialized in the parpg.applicaiton.PARPGApplication class with the absolute path to the data directory via the parpg.settings module and corresponding configuration file. * A new DataPath entry was added to the default system configuration file template under the [parpg] section to support the new parpg.vfs module. * Updated the parpg-assets subrepo to revision 3 to fix some dialog file format issues (for details see commit message for parpg-assets). * Fixed a few bugs in the parpg.dialogueparsers.YAMLDialogueParser class related to exception handling.
author M. George Hansen <technopolitica@gmail.com>
date Mon, 06 Jun 2011 15:56:14 -1000
parents 7a89ea5404b1
children
line wrap: on
line diff
--- a/common/utils.py	Tue May 31 02:46:20 2011 -0700
+++ b/common/utils.py	Mon Jun 06 15:56:14 2011 -1000
@@ -13,8 +13,13 @@
 
 # Miscellaneous game functions
 
-import os, sys, fnmatch
+import sys
+import os
+import fnmatch
+
 from textwrap import dedent
+from contextlib import contextmanager
+from parpg import vfs
 
 def addPaths (*paths):
     """Adds a list of paths to sys.path. Paths are expected to use forward
@@ -38,9 +43,16 @@
 def locateFiles(pattern, root=os.curdir):
     """Locate all files matching supplied filename pattern in and below
     supplied root directory."""
-    for path, _, files in os.walk(os.path.abspath(root)):
-        for filename in fnmatch.filter(files, pattern):
-            yield os.path.join(path, filename)
+    filepaths = []
+    filenames = vfs.VFS.listFiles(root)
+    for filename in fnmatch.filter(filenames, pattern):
+        vfs_file_path = '/'.join([root, filename])
+        filepaths.append(vfs_file_path)
+    dirnames = vfs.VFS.listDirectories(root)
+    for dirname in dirnames:
+        subdir_filepaths = locateFiles(pattern, '/'.join([root, dirname]))
+        filepaths.extend(subdir_filepaths)
+    return filepaths
 
 def dedent_chomp(string):
     """Remove common leading whitespace and chomp each non-blank line."""
@@ -59,3 +71,13 @@
         formatted_lines.append(line)
     result = ''.join(formatted_lines)
     return result
+
+@contextmanager
+def cwd(dirname):
+    cwd = os.getcwd()
+
+    try:
+        os.chdir(dirname)
+        yield
+    finally:
+        os.chdir(cwd)