Changeset 1170:f59845f5741b

Timestamp:

05/19/08 22:24:40 (7 months ago)

Author:

Ronny Pfannschmidt <Ronny.Pfannschmidt@…>

Message:

took the Environment class away, its module level now

Files:

• pida-plugins/gtags/gtags.py (modified) (1 diff)
• pida-plugins/koders/koders.py (modified) (1 diff)
• pida-plugins/rfc/rfc.py (modified) (2 diffs)
• pida/core/application.py (modified) (4 diffs)
• pida/core/boss.py (modified) (5 diffs)
• pida/core/environment.py (modified) (2 diffs)
• pida/services/plugins/plugins.py (modified) (8 diffs)
• pida/services/shortcuts/shortcuts.py (modified) (1 diff)
• pida/ui/paneds.py (modified) (1 diff)
• pida/utils/debugger/debugger.py (modified) (2 diffs)

pida-plugins/gtags/gtags.py

@@ -28 +28 @@
 
 # PIDA Imports
-from pida.core.environment import Environment, get_uidef_path
+from pida.core.environment import get_uidef_path
 from pida.core.service import Service
 from pida.core.events import EventsConfig

pida-plugins/koders/koders.py

@@ -30 +30 @@
 
 # PIDA Imports
-from pida.core.environment import Environment, get_uidef_path
 from pida.core.service import Service
 from pida.core.actions import ActionsConfig

pida-plugins/rfc/rfc.py

@@ -29 +29 @@
 
 # PIDA Imports
-from pida.core.environment import Environment, get_uidef_path
+from pida.core.environment import pida_home, get_uidef_path
 from pida.core.service import Service
 from pida.core.actions import ActionsConfig
@@ -189 +189 @@
 
     def start(self):
-        self._filename = os.path.join(Environment.pida_home, 'rfc-index.txt')
+        self._filename = os.path.join(pida_home, 'rfc-index.txt')
         self._view = RfcView(self)
         self._has_loaded = False

pida/core/application.py

@@ -76 +76 @@
 # This can test if PIDA is installed
 try:
-    from pida.core.environment import Environment
+    from pida.core import environment as env
     from pida.core.boss import Boss
     from pida import PIDA_VERSION
@@ -88 +88 @@
 
 
-def run_pida(env):
-    b = Boss(env)
+def run_pida():
+    b = Boss()
     PosixSignalHandler(b)
     try:
@@ -126 +126 @@
 
 def main():
-    env = Environment(sys.argv)
-    sys.argv = sys.argv[:1]
     if env.is_debug():
         os.environ['PIDA_DEBUG'] = '1'
@@ -136 +134 @@
         set_trace()
     if env.is_version():
-        run_func = run_version
+        run_version()
     else:
-        run_func = run_pida
-    exit_val = run_func(env)
-    signal.signal(signal.SIGALRM, force_quit)
-    signal.alarm(3)
-    sys.exit(exit_val)
+        exit_val = run_pida()
+        signal.signal(signal.SIGALRM, force_quit)
+        signal.alarm(3)
+        sys.exit(exit_val)
 
 

pida/core/boss.py

@@ -6 +6 @@
 from pida.core.servicemanager import ServiceManager
 from pida.core.log import get_logger
-
+from pida.core import environment as env
 from pida.ui.icons import IconRegister
 from pida.ui.window import PidaWindow
@@ -23 +23 @@
 
 
-    def __init__(self, env=None):
-        self._env = env
-
+    def __init__(self):
         if env.is_debug():
             get_logger().setLevel(logging.DEBUG)
@@ -42 +40 @@
 
     def _run_first_time(self):
-        if not self._env.has_firstrun() or self._env.is_firstrun():
+        if not env.has_firstrun() or env.is_firstrun():
             ft = FirstTimeWindow(self._sm.get_available_editors())
-            success, editor = ft.run(self._env.get_firstrun_filename())
+            success, editor = ft.run(env.firstrun_filename)
             self.override_editor = editor
             self.quit_before_started = not success
@@ -87 +85 @@
 
     def get_service_dirs(self):
-        if self._env is None:
-            return []
-        else:
-            return [
-                self._env.get_base_service_directory(),
-                self._env.get_local_service_directory(),
-            ]
+        import pida.services
+        return pida.services.__path__
 
     def get_editor_dirs(self):
-        if self._env is None:
-            return []
-        else:
-            return [
-                self._env.get_base_editor_directory(),
-            ]
+        import pida.editors
+        return pida.editors.__path__
 
-    def get_editor(self):
+    @property
+    def editor(self):
         return self._sm.editor
-
-    editor = property(get_editor)
 
     def get_plugins(self):
@@ -130 +118 @@
 
     def get_pida_home(self):
-        return self._env.pida_home
+        return env.pida_home
 
     def show_splash(self):

pida/core/environment.py

@@ -1 +1 @@
 import os
+import sys
 from optparse import OptionParser
 
@@ -31 +32 @@
     return get_resource_path('data', name)
 
+pida_home = os.path.expanduser('~/.pida2')
+firstrun_filename = os.path.join(pida_home, 'first_run_wizard')
+plugins_dir = os.path.join(pida_home, 'plugins')
 
-class Environment(object):
+if not os.path.exists(pida_home):
+    os.mkdir(pida_home)
 
-    pida_home = os.path.expanduser('~/.pida2')
+op = OptionParser()
+op.add_option('-v', '--version', action='store_true',
+    help=_('Print version information and exit.'))
+op.add_option('-D', '--debug', action='store_true',
+    help=_('Run PIDA with added debug information.'))
+op.add_option('-T', '--trace', action='store_true',
+    help=_('Run PIDA with tracing.'))
+op.add_option('-F', '--firstrun', action='store_true',
+    help=_('Run the PIDA first run wizard.'))
 
-    def __init__(self, argv):
-        if not os.path.exists(self.pida_home):
-            os.mkdir(self.pida_home)
-        self.get_options(argv)
-        self.env = dict(os.environ)
+opts, args = op.parse_args(sys.argv)
+env = dict(os.environ)
 
-    def get_options(self, argv):
-        op = OptionParser()
-        op.add_option('-v', '--version', action='store_true',
-            help=_('Print version information and exit.'))
-        op.add_option('-D', '--debug', action='store_true',
-            help=_('Run PIDA with added debug information.'))
-        op.add_option('-T', '--trace', action='store_true',
-            help=_('Run PIDA with tracing.'))
-        op.add_option('-F', '--firstrun', action='store_true',
-            help=_('Run the PIDA first run wizard.'))
-        self.opts, self.args = op.parse_args(argv)
+def is_version():
+    return opts.version
 
-    def is_version(self):
-        return self.opts.version
+def is_debug():
+    return opts.debug
 
-    def is_debug(self):
-        return self.opts.debug
+def is_trace():
+    return opts.trace
 
-    def is_trace(self):
-        return self.opts.trace
+def is_firstrun():
+    return opts.firstrun
 
-    def is_firstrun(self):
-        return self.opts.firstrun
-
-    def get_base_service_directory(self):
-        return os.path.join(
-            os.path.dirname(os.path.dirname(__file__)), 'services')
-
-    def get_local_service_directory(self):
-        path = os.path.join(self.pida_home, 'services')
-        if not os.path.exists(path):
-            os.mkdir(path)
-        return path
-
-    def get_base_editor_directory(self):
-        return os.path.join(
-            os.path.dirname(os.path.dirname(__file__)), 'editors')
-
-    def get_plugins_directory(self):
-        path = os.path.join(self.pida_home, 'plugins')
-        if not os.path.exists(path):
-            os.mkdir(path)
-        return path
-
-    def get_firstrun_filename(self):
-        return os.path.join(self.pida_home, 'first_run_wizard')
-
-    def has_firstrun(self):
-        return os.path.exists(self.get_firstrun_filename())
+def has_firstrun():
+    return os.path.exists(firstrun_filename)
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

pida/services/plugins/plugins.py

@@ -41 +41 @@
 from pida.core.servicemanager import ServiceLoader, ServiceLoadingError
 from pida.core.options import OptionItem, manager, OTypeStringList, OTypeString
+
+from pida.core.environment import plugins_dir
 
 from pida.utils.web import fetch_url
@@ -148 +150 @@
         self.item = None
         self.installed_item = None
-        self.plugins_dir = ''
         self.first_start = True
         self.installed_list.set_columns([
@@ -385 +386 @@
         self._viewedit = PluginsEditView(self)
         self.task = None
-        self.plugin_path = self.boss._env.get_plugins_directory()
         self._start_list = OptionItem('plugins', 'start_list', _('Start plugin list'),
                 OTypeStringList, [], _('List of plugin to start'), None)
@@ -429 +429 @@
     def update_installed_plugins(self, start=False):
         self._view.clear_installed()
-        l_installed = list(self._loader.get_all_service_files([self.plugin_path]))
+        l_installed = list(self._loader.get_all_service_files([plugins_dir]))
         if start:
             start_list = manager.get_value(self._start_list)
@@ -481 +481 @@
     def _fetch_available_plugins(self):
         # get installed items
-        l_installed = list(self._loader.get_all_service_files([self.plugin_path]))
+        l_installed = list(self._loader.get_all_service_files([plugins_dir]))
         installed_list = []
         for service_name, service_file in l_installed:
@@ -517 +517 @@
     def install(self, item, content):
         # write plugin
-        plugin_path = os.path.join(self.plugin_path, item.plugin)
-        filename = os.path.join(self.plugin_path, os.path.basename(item.url))
+        plugin_path = os.path.join(plugins_dir, item.plugin)
+        filename = os.path.join(plugins_dir, os.path.basename(item.url))
         file = open(filename, 'wb')
         file.write(content)
@@ -525 +525 @@
         # check if we need to stop and remove him
         l_installed = [p[0] for p in
-            self._loader.get_all_service_files([self.plugin_path])]
+            self._loader.get_all_service_files([plugins_dir])]
         item.directory = plugin_path
         if item.plugin in l_installed:
@@ -533 +533 @@
         tar = tarfile.open(filename, 'r:gz')
         for tarinfo in tar:
-            tar.extract(tarinfo, path=self.plugin_path)
+            tar.extract(tarinfo, path=plugins_dir)
         tar.close()
         os.unlink(filename)
 
         # start service
-        self.start_plugin(plugin_path)
+        self.start_plugin(plugin_dir)
         self.boss.cmd('notify', 'notify', title=_('Plugins'),
                 data=_('Installation of %s completed') % item.plugin)

pida/services/shortcuts/shortcuts.py

@@ -73 +73 @@
         self.add_main_widget(vbox)
         for service in self.svc.boss.get_services() + [
-                                self.svc.boss.get_editor()]:
+                                self.svc.boss.editor]:
             if len(service.get_keyboard_options()):
                 sli = ServiceListItem(service)

pida/ui/paneds.py

@@ -121 +121 @@
     def _center_on_parent(self, view, size):
         gdkwindow = view.get_parent_window()
-        px, py, pw, ph, pbd = view.svc.boss.get_window().window.get_geometry()
+        px, py, pw, ph, pbd = view.svc.window.window.get_geometry()
         w, h = size
         cx = (pw - w) / 2

pida/utils/debugger/debugger.py

@@ -363 +363 @@
 
         if not self.svc._executable:
-            self.boss.get_window().error_dlg(
+            self.boss.window.error_dlg(
                 'Debug controller is not fully configured.')
         else:
             if self.svc._is_running:
-                self.boss.get_window().error_dlg(
+                self.boss.window.error_dlg(
                     'Debugger already running.')
             else:
@@ -373 +373 @@
                     self.svc.emit('debugger_started')
                 else:
-                    self.boss.get_window().error_dlg(
+                    self.boss.window.error_dlg(
                         'Debug session failed to launch.')