Ticket #1412: sugar-1412.patch

src/jarabe/journal/model.py

@@ -258 +258 @@
 
     def setup(self):
         self._file_list = []
+        self._pending_directories = 1
         self._recurse_dir(self._mount_point)
 
     def stop(self):
@@ -293 +294 @@
         return entries, total_count
 
     def _recurse_dir(self, dir_path):
-        if self._stopped:
-            return
+        try:
+            if self._stopped:
+                return
 
-        for entry in os.listdir(dir_path):
-            if entry.startswith('.'):
-                continue
-            full_path = dir_path + '/' + entry
             try:
-                stat = os.stat(full_path)
-                if S_IFMT(stat.st_mode) == S_IFDIR:
-                    self._pending_directories += 1
-                    gobject.idle_add(lambda s=full_path: self._recurse_dir(s))
+                dirs = os.listdir(dir_path)
+            except Exception:
+                logging.exception('Error reading directory %r', dir_path)
+                dirs = []
+
+            for entry in dirs:
+                if entry.startswith('.'):
+                    continue
+                full_path = os.path.join(dir_path, entry)
+                try:
+                    self._append_file(full_path)
+                except Exception:
+                    logging.exception('Error reading file %r', full_path)
+
+        finally:
+            self._pending_directories -= 1
+            if self._pending_directories == 0:
+                self.setup_ready()
 
-                elif S_IFMT(stat.st_mode) == S_IFREG:
-                    add_to_list = True
+    def _append_file(self, full_path):
+        stat = os.stat(full_path)
 
-                    if self._regex is not None and \
-                            not self._regex.match(full_path):
-                        add_to_list = False
+        if S_IFMT(stat.st_mode) == S_IFDIR:
+            self._pending_directories += 1
+            gobject.idle_add(
+                    lambda s=full_path: self._recurse_dir(s))
 
-                    if None not in [self._date_start, self._date_end] and \
-                            (stat.st_mtime < self._date_start or
-                             stat.st_mtime > self._date_end):
-                        add_to_list = False
+        elif S_IFMT(stat.st_mode) == S_IFREG:
+            add_to_list = True
 
-                    if self._mime_types:
-                        mime_type = gio.content_type_guess(filename=full_path)
-                        if mime_type not in self._mime_types:
-                            add_to_list = False
+            if self._regex is not None and \
+                    not self._regex.match(full_path):
+                add_to_list = False
 
-                    if add_to_list:
-                        file_info = (full_path, stat, int(stat.st_mtime))
-                        self._file_list.append(file_info)
+            if None not in [self._date_start, self._date_end] and \
+                    (stat.st_mtime < self._date_start or
+                     stat.st_mtime > self._date_end):
+                add_to_list = False
 
-                    self.progress.send(self)
+            if self._mime_types:
+                mime_type = gio.content_type_guess(
+                        filename=full_path)
+                if mime_type not in self._mime_types:
+                    add_to_list = False
 
-            except Exception:
-                logging.exception('Error reading file %r', full_path)
+            if add_to_list:
+                file_info = (full_path, stat, int(stat.st_mtime))
+                self._file_list.append(file_info)
 
-        if self._pending_directories == 0:
-            self.setup_ready()
-        else:
-            self._pending_directories -= 1
+            self.progress.send(self)
 
 def _get_file_metadata(path, stat):
     client = gconf.client_get_default()