[zip-] handle loading/extracting files locally + remotely #2127

saulpw · Nov 20, 2023 · 0e1afd8 · 0e1afd8
1 parent 037b0d1
commit 0e1afd8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/visidata/loaders/archive.py b/visidata/loaders/archive.py
@@ -63,12 +63,16 @@ class ZipSheet(Sheet):
 
     def openZipFile(self, fp, *args, **kwargs):
         '''Use VisiData input to handle password-protected zip files.'''
+        if isinstance(fp, zipfile.ZipFile):
+            zip_open =  fp.open
+        elif isinstance(fp, unzip_http.RemoteZipFile):
+            zip_open = fp._open
         try:
-            return fp._open(*args, **kwargs)
+            return zip_open(*args, **kwargs)
         except RuntimeError as err:
             if 'password required' in err.args[0]:
                 pwd = vd.input(f'{args[0].filename} is encrypted, enter password: ', display=False)
-                return fp._open(*args, **kwargs, pwd=pwd.encode('utf-8'))
+                return zip_open(*args, **kwargs, pwd=pwd.encode('utf-8'))
             vd.exceptionCaught(err)
 
     def openRow(self, row):