Fix opening of log files

Did a refactoring renaming fullPath to full_path too.

3 files changed, 29 insertions, 32 deletions

diff --git a/develop-activity/develop_app.py b/develop-activity/develop_app.py
index 376ee23..297eecd 100644
--- a/develop-activity/develop_app.py
+++ b/develop-activity/develop_app.py
@@ -444,19 +444,19 @@ class DevelopActivity(activity.Activity):
             nodefilter=activity_model.inmanifestfn(self.bundle))
         self.treeview.set_model(self.model)
 
-    def load_file(self, fullPath):
+    def load_file(self, full_path):
         """Load one activity subfile into the editor view.
         """
-        logging.error('load_file fullPath %s', fullPath)
+        logging.error('load_file full_path %s', full_path)
         logging.error('load_file self.activity_dir %s', self.activity_dir)
 
-        if fullPath.startswith(self.activity_dir):
-            filename = fullPath[len(self.activity_dir):]
+        if full_path.startswith(self.activity_dir):
+            filename = full_path[len(self.activity_dir):]
         else:
-            filename = fullPath
-            fullPath = os.path.join(self.activity_dir, fullPath)
+            filename = full_path
+            full_path = os.path.join(self.activity_dir, full_path)
         logging.error('load_file filename %s', filename)
-        self.editor.load_object(fullPath, filename)
+        self.editor.load_object(full_path, filename)
 
     def selection_cb(self, column):
         """User selected an item in the treeview. Load it.
@@ -595,7 +595,7 @@ class DevelopActivity(activity.Activity):
             #avoid infinite recursion
             return
         if isinstance(page, sourceview_editor.GtkSourceview2Page):
-            source = page.fullPath
+            source = page.full_path
             tree_iter = self.model.get_iter_from_filepath(source)
             if tree_iter:
                 tree_selection = self.treeview.get_selection()
diff --git a/develop-activity/logviewer.py b/develop-activity/logviewer.py
index 0a8bd30..dde5c7c 100644
--- a/develop-activity/logviewer.py
+++ b/develop-activity/logviewer.py
@@ -108,7 +108,7 @@ class LogMinder(gtk.VBox):
 
         if event == gio.FILE_MONITOR_EVENT_CHANGED:
             for log in self._openlogs:
-                if logfile in log.logpath:
+                if logfile in log.full_path:
                     log.update()
         elif (event == gio.FILE_MONITOR_EVENT_DELETED
                 or event == gio.FILE_MONITOR_EVENT_CREATED):
@@ -146,9 +146,9 @@ class LogMinder(gtk.VBox):
             lambda widget, child: self.activity.editor.remove_page(
                 self.activity.editor.page_num(child)))
         self.activity.editor.append_page(scrollwnd, tablabel)
-        self.activity.editor.set_current_page(-1)
         self._active_log = newlogview
         self.activity.editor.show_all()
+        self.activity.editor.set_current_page(-1)
 
     def _filter_by_name(self, node):
         return (self._namefilter in node.filename) or node.isDirectory
@@ -195,11 +195,11 @@ class LogBuffer(gtk.TextBuffer):
 
 class LogView(gtk.TextView):
 
-    def __init__(self, logpath, logminder):
+    def __init__(self, full_path, logminder):
         gtk.TextView.__init__(self)
 
         self.logminder = logminder
-        self.logpath = logpath
+        self.full_path = full_path
         self.logminder._openlogs.append(self)
 
         self.set_wrap_mode(gtk.WRAP_WORD)
@@ -213,7 +213,7 @@ class LogView(gtk.TextView):
         select_tag.props.background = '#B0B0FF'
         tagtable.add(select_tag)
 
-        newbuffer = self._create_log_buffer(logpath, tagtable)
+        newbuffer = self._create_log_buffer(full_path, tagtable)
         if newbuffer:
             self.set_buffer(newbuffer)
             self.text_buffer = newbuffer
@@ -250,9 +250,6 @@ class LogView(gtk.TextView):
 
         return logbuffer
 
-    def __eq__(self, other):
-        return other == self.logpath or other == self.filename
-
     def replace(self, *args, **kw):
         return (False, False)
 
diff --git a/develop-activity/sourceview_editor.py b/develop-activity/sourceview_editor.py
index e8b1fe7..e29caed 100644
--- a/develop-activity/sourceview_editor.py
+++ b/develop-activity/sourceview_editor.py
@@ -53,19 +53,19 @@ class GtkSourceview2Editor(gtk.Notebook):
     def set_to_page_like(self, full_path):
         for n in range(self.get_n_pages()):
             page = self._get_page(n)
-            if page.fullPath == full_path:
+            if page.full_path == full_path:
                 self.set_current_page(n)
                 return True
         return False
 
-    def load_object(self, fullPath, filename):
-        if self.set_to_page_like(fullPath):
+    def load_object(self, full_path, filename):
+        if self.set_to_page_like(full_path):
             return
         scrollwnd = gtk.ScrolledWindow()
         scrollwnd.set_policy(gtk.POLICY_AUTOMATIC,
                              gtk.POLICY_AUTOMATIC)
 
-        page = GtkSourceview2Page(fullPath)
+        page = GtkSourceview2Page(full_path)
         scrollwnd.add(page)
         scrollwnd.page = page
         label = filename
@@ -175,7 +175,7 @@ class GtkSourceview2Editor(gtk.Notebook):
         for i in range(self.get_n_pages()):
             page = self._get_page(i)
             if isinstance(page, GtkSourceview2Page):
-                filenames.append(page.fullPath)
+                filenames.append(page.full_path)
         return filenames
 
     def save_all(self):
@@ -183,7 +183,7 @@ class GtkSourceview2Editor(gtk.Notebook):
         for i in range(self.get_n_pages()):
             page = self._get_page(i)
             if isinstance(page, GtkSourceview2Page):
-                logging.info('%s', page.fullPath)
+                logging.info('%s', page.full_path)
                 page.save()
 
     def reroot(self, olddir, newdir):
@@ -192,9 +192,9 @@ class GtkSourceview2Editor(gtk.Notebook):
             page = self._get_page(i)
             if isinstance(page, GtkSourceview2Page):
                 if page.reroot(olddir, newdir):
-                    logging.info('rerooting page %s failed', page.fullPath)
+                    logging.info('rerooting page %s failed', page.full_path)
                 else:
-                    logging.info('rerooting page %s succeeded', page.fullPath)
+                    logging.info('rerooting page %s succeeded', page.full_path)
 
     def get_selected(self):
         return self._get_page().get_selected()
@@ -204,7 +204,7 @@ class GtkSourceview2Editor(gtk.Notebook):
         return buff.get_text(buff.get_start_iter(), buff.get_end_iter())
 
     def get_file_path(self):
-        return self._get_page().fullPath
+        return self._get_page().full_path
 
     def close_page(self):
         return self.remove_page(self.get_current_page())
@@ -218,13 +218,13 @@ class GtkSourceview2Editor(gtk.Notebook):
 
 class GtkSourceview2Page(gtksourceview2.View):
 
-    def __init__(self, fullPath):
+    def __init__(self, full_path):
         '''
         Do any initialization here.
         '''
         gtksourceview2.View.__init__(self)
 
-        self.fullPath = fullPath
+        self.full_path = full_path
 
         self.set_size_request(900, 350)
         self.set_editable(True)
@@ -257,14 +257,14 @@ class GtkSourceview2Page(gtksourceview2.View):
         Load the text, and optionally scroll to the given offset in the file.
         '''
         self.text_buffer.begin_not_undoable_action()
-        _file = file(self.fullPath)
+        _file = file(self.full_path)
         self.text_buffer.set_text(_file.read())
         _file.close()
         if offset is not None:
             self._scroll_to_offset(offset)
 
         self.text_buffer.set_highlight_syntax(False)
-        mime_type = mimetypes.guess_type(self.fullPath)[0]
+        mime_type = mimetypes.guess_type(self.full_path)[0]
         if mime_type:
             lang_manager = gtksourceview2.language_manager_get_default()
             lang_ids = lang_manager.get_language_ids()
@@ -285,7 +285,7 @@ class GtkSourceview2Page(gtksourceview2.View):
         if self.text_buffer.can_undo():  # only save if there's something to
             buff = self.text_buffer
             text = buff.get_text(buff.get_start_iter(), buff.get_end_iter())
-            _file = file(self.fullPath, 'w')
+            _file = file(self.full_path, 'w')
             try:
                 _file.write(text)
             except (IOError, OSError):
@@ -366,9 +366,9 @@ class GtkSourceview2Page(gtksourceview2.View):
 
     def reroot(self, olddir, newdir):
         '''Returns False if it works'''
-        oldpath = self.fullPath
+        oldpath = self.full_path
         if oldpath.startswith(olddir):
-            self.fullPath = os.path.join(newdir, oldpath[len(olddir):])
+            self.full_path = os.path.join(newdir, oldpath[len(olddir):])
             return False
         else:
             return True