Changeset 847:5cbdf59de0c0 for pida/services/sessions/sessions.py

Timestamp:

05/11/07 20:29:04 (20 months ago)

Author:

aconbere

Message:

enabled last session loading

Files:

• pida/services/sessions/sessions.py (modified) (6 diffs)

pida/services/sessions/sessions.py

@@ -86 +86 @@
         self._path = session_path
         self._config = ConfigObj(self._path)
-        self.name = self._config['name']
-        self._files = self._config['files']
-#        self._project = self._config['project']
+
+        if self._config.has_key('name') and self._config.has_key('files'):
+            self.name = self._config.get('name')
+            self._files = self._config.get('files')
+#            self._project = self._config['project']
+        else:
+            # something has gone horribly wrong
+            # return false and log it in the service
+            raise IOError('Failed to read config file')
 
     def _parse_session_path(self, path):
@@ -104 +110 @@
         self._files = files
 
+    def get_path(self):
+        return self._path
+
 
 class SessionsActionsConfig(ActionsConfig):
@@ -179 +188 @@
         )
 
-
     gladefile = 'sessions-properties'
     label_text = _('Sessions Properties')
@@ -188 +196 @@
 
 
+class SessionsEventsConfig(EventsConfig):
+
+    def subscribe_foreign_events(self):    
+        self.subscribe_foreign_event('buffer', 'document-changed', self.svc.save_last_session)
+        self.subscribe_foreign_event('editor', 'started', self.svc.load_last_session)
 
 class Sessions(Service):
@@ -207 +220 @@
     files = [buffer.filename for buffer in current_buffers]
     """
-    # TODO - Make Sessions align with Pida style guide
-    # TODO - Create the Pida Prefrences Gui
     # TODO - Save the last session on close
     # TODO - Allow restoring of last session on startup
@@ -215 +226 @@
     actions_config = SessionsActionsConfig
     options_config = SessionsOptionsConfig
+    events_config = SessionsEventsConfig
+    last_session_file = 'last.session'
 
     def pre_start(self):
         self.sessions_dir = os.path.join(self.boss.get_pida_home(),
             'sessions')
+        self.last_session_path = os.path.join(self.sessions_dir,
+                self.last_session_file)
         if not os.path.exists(self.sessions_dir):
             os.mkdir(self.sessions_dir)
+
+        self.last_session = SessionObject()
+
+        if not os.path.exists(self.last_session_path):
+            self.last_session.new(self.last_session_path, [])
+            self.last_session.save()
+        else:
+            self.last_session.load(self.last_session_path)
+
         self._set_current_session(None)
-#        self.current_session = None
-
-    def load_session(self, file_path):
+
+    def load_last_session(self):
+        if self.opt('load_last_session'):
+            self.load_session(self.last_session_path)
+
+    def load_session(self, file_path, set_current=None):
         """
         load the saved session file from disk
         """
         session = SessionObject()
-        session.load(file_path)
-        self._set_current_session(session)
-        self.load_buffers(session.get_files())
+        try:
+            session.load(file_path)
+            if set_current:
+                self._set_current_session(session)
+            self.load_buffers(session.get_files())
+        except IOError:
+            # when we catch this exception we should really make an attempt
+            # at repairing whatever session file it was failing on.
+            self.log_warn(_('Session file:%s failed to load') % file_path)
+            return
+
+    def save_last_session(self, document):
+        self.last_session.set_files(self._get_current_buffers())
+        self.last_session.save()
 
     def save_current_session(self, file_path=None):
-        if not self.current_session:
+        """
+        If no file_path is given save_current_session assumes you will be
+        saving to the default last_session path which is /sessions/last.session
+        """
+
+        if self.current_session:
+            self.current_session.set_files(self._get_current_buffers())
+            self.current_session.save(file_path)
+        else:
             self.current_session = SessionObject()
             self.current_session.new(file_path,
-                files = self._get_current_buffers())
+                    files = self._get_current_buffers())
             self.current_session.save()
-        else:
-            self.current_session.set_files(self._get_current_buffers())
-            self.current_session.save(file_path)
 
     def _set_current_session(self, session):