move .reopen() to mw; fix exporting

ankitects · Mar 20, 2020 · fa12213 · fa12213
1 parent fe59d11
commit fa12213
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/pylib/anki/collection.py b/pylib/anki/collection.py
@@ -262,14 +262,6 @@ def close(self, save: bool = True) -> None:
             self.media.close()
             self._closeLog()
 
-    def reopen(self) -> None:
-        "Reconnect to DB (after changing threads, etc)."
-        raise Exception("fixme")
-        # if not self.db:
-        #     # self.db = DBProxy(self.path)
-        #     self.media.connect()
-        #     self._openLog()
-
     def rollback(self) -> None:
         self.db.rollback()
         self.db.begin()

diff --git a/pylib/anki/exporting.py b/pylib/anki/exporting.py
@@ -397,20 +397,20 @@ def __init__(self, col):
         AnkiPackageExporter.__init__(self, col)
 
     def doExport(self, z, path):
-        # close our deck & write it into the zip file, and reopen
+        "Export collection. Caller must re-open afterwards."
+        # close our deck & write it into the zip file
         self.count = self.col.cardCount()
         v2 = self.col.schedVer() != 1
+        mdir = self.col.media.dir()
         self.col.close()
         if not v2:
             z.write(self.col.path, "collection.anki2")
         else:
             self._addDummyCollection(z)
             z.write(self.col.path, "collection.anki21")
-        self.col.reopen()
         # copy all media
         if not self.includeMedia:
             return {}
-        mdir = self.col.media.dir()
         return self._exportMedia(z, os.listdir(mdir), mdir)
 
 

diff --git a/qt/aqt/exporting.py b/qt/aqt/exporting.py
@@ -25,7 +25,7 @@ def __init__(
     ):
         QDialog.__init__(self, mw, Qt.Window)
         self.mw = mw
-        self.col = mw.col
+        self.col = mw.col.weakref()
         self.frm = aqt.forms.exporting.Ui_ExportDialog()
         self.frm.setupUi(self)
         self.exporter = None
@@ -151,6 +151,7 @@ def accept(self):
                 period = 3000
                 if self.isVerbatim:
                     msg = _("Collection exported.")
+                    self.mw.reopen()
                 else:
                     if self.isTextNote:
                         msg = (

diff --git a/qt/aqt/main.py b/qt/aqt/main.py
@@ -459,14 +459,17 @@ def loadCollection(self) -> bool:
 
     def _loadCollection(self) -> bool:
         cpath = self.pm.collectionPath()
-
         self.col = Collection(cpath)
 
         self.setEnabled(True)
         self.maybeEnableUndo()
         self.moveToState("deckBrowser")
         return True
 
+    def reopen(self):
+        cpath = self.pm.collectionPath()
+        self.col = Collection(cpath)
+
     def unloadCollection(self, onsuccess: Callable) -> None:
         def callback():
             self.setEnabled(False)