[databrowser] somewhat improved error handling for file opening

bendalab · Jan 23, 2025 · db35b33 · db35b33
1 parent fdb757a
commit db35b33
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/audian/audian.py b/src/audian/audian.py
@@ -1213,7 +1213,7 @@ def load_files(self, file_paths):
         # prepare open all files in a single buffer:
         browser = DataBrowser(file_paths, self.load_kwargs, self.plugins,
                               self.channels, self.audio, self.acts)
-        self.tabs.addTab(browser, os.path.basename(file_paths[0]))
+        self.tabs.addTab(browser, browser.name())
         self.browsers.append(browser)
         self.tabs.setCurrentWidget(browser)
         QTimer.singleShot(100, self.load_data)
@@ -1243,8 +1243,7 @@ def load_data(self):
                                                   self.channels,
                                                   self.audio,
                                                   self.acts)
-                            self.tabs.addTab(browser,
-                                             os.path.basename(file_path))
+                            self.tabs.addTab(browser, browser.name())
                             self.browsers.append(browser)
                             if first:
                                 self.tabs.setCurrentWidget(browser)
@@ -1258,7 +1257,7 @@ def load_data(self):
 Can not open file <b>{browser.file_path}</b>!''')
                     break
                 self.tabs.setTabText(self.tabs.indexOf(browser),
-                                     os.path.basename(browser.data.file_path))
+                                     browser.name())
                 for b in self.browsers:
                     if not b.data.data is None and \
                        b.data.channels != browser.data.channels:

diff --git a/src/audian/data.py b/src/audian/data.py
@@ -164,8 +164,10 @@ def open(self, unwrap, unwrap_clip):
         # raw data:        
         tbuffer = self.buffer_time + self.tbefore + self.tafter
         tback = self.back_time + self.tbefore
+        verbose = isinstance(self.file_path, (list, tuple, np.ndarray))
         try:
             self.data = DataLoader(self.file_path, tbuffer, tback,
+                                   verbose=verbose,
                                    **self.load_kwargs)
         except IOError:
             self.data = None

diff --git a/src/audian/databrowser.py b/src/audian/databrowser.py
@@ -188,6 +188,13 @@ def __del__(self):
         self.close()
 
 
+    def name(self):
+        if isinstance(self.data.file_path, (list, tuple, np.ndarray)):
+            return os.path.basename(self.data.file_path[0])
+        else:
+            return os.path.basename(self.data.file_path)
+
+
     def get_trace(self, name):
         return self.data[name]