From 094f176c5d4525859dba102fcf7f0a40e2ceab58 Mon Sep 17 00:00:00 2001 From: Ray Date: Sat, 13 Dec 2008 17:37:23 -0500 Subject: [PATCH] Moved execution_path() to Configuration.py. --- pyfpdb/Configuration.py | 7 +++++++ pyfpdb/GuiAutoImport.py | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 3bcaaa91..091b2d47 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -25,6 +25,7 @@ Handles HUD configuration files. # Standard Library modules import os import sys +import inspect import string import traceback import shutil @@ -582,6 +583,10 @@ class Config: sg.append(c.supported_games[game].game_name) return sg + def execution_path(self, filename): + """Join the fpdb path to filename.""" + return os.path.join(os.path.dirname(inspect.getfile(sys._getframe(1))), filename) + if __name__== "__main__": c = Config() @@ -638,3 +643,5 @@ if __name__== "__main__": for game in c.get_supported_games(): print c.get_game_parameters(game) + + print "start up path = ", c.execution_path("") \ No newline at end of file diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index 31390b74..ffe46bb1 100644 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -24,7 +24,6 @@ import gtk import gobject import os import sys -import inspect import time import fpdb_import @@ -107,10 +106,6 @@ class GuiAutoImport (threading.Thread): print "GuiAutoImport.import_dir done" return True - def execution_path(self, filename): - """Join the fpdb path to filename.""" - return os.path.join(os.path.dirname(inspect.getfile(sys._getframe(1))), filename) - def startClicked(self, widget, data): """runs when user clicks start on auto import tab""" @@ -132,7 +127,7 @@ class GuiAutoImport (threading.Thread): self.pipe_to_hud = subprocess.Popen(command, bufsize = bs, stdin = subprocess.PIPE, universal_newlines=True) else: - command = self.execution_path('HUD_main.py') + command = self.config.execution_path('HUD_main.py') bs = 1 self.pipe_to_hud = subprocess.Popen((command, self.database), bufsize = bs, stdin = subprocess.PIPE, universal_newlines=True)