2017-11-02 01:29:39 +08:00
|
|
|
diff --git a/anki/collection.py b/anki/collection.py
|
2017-11-04 09:28:14 +08:00
|
|
|
index 6cec228..189c706 100644
|
2017-11-02 01:29:39 +08:00
|
|
|
--- a/anki/collection.py
|
|
|
|
|
+++ b/anki/collection.py
|
2017-11-04 09:28:14 +08:00
|
|
|
@@ -60,7 +60,7 @@ class _Collection:
|
2016-11-03 22:44:40 +08:00
|
|
|
self.server = server
|
|
|
|
|
self._lastSave = time.time()
|
|
|
|
|
self.clearUndo()
|
|
|
|
|
- self.media = MediaManager(self, server)
|
|
|
|
|
+ self.media = MediaManager(self)
|
|
|
|
|
self.models = ModelManager(self)
|
|
|
|
|
self.decks = DeckManager(self)
|
|
|
|
|
self.tags = TagManager(self)
|
2017-11-02 01:29:39 +08:00
|
|
|
diff --git a/anki/media.py b/anki/media.py
|
2017-11-04 09:28:14 +08:00
|
|
|
index 4e3ccf3..3bfdc81 100644
|
2017-11-02 01:29:39 +08:00
|
|
|
--- a/anki/media.py
|
|
|
|
|
+++ b/anki/media.py
|
2017-11-04 09:28:14 +08:00
|
|
|
@@ -26,11 +26,8 @@ class MediaManager:
|
2016-11-03 22:44:40 +08:00
|
|
|
]
|
|
|
|
|
regexps = soundRegexps + imgRegexps
|
|
|
|
|
|
|
|
|
|
- def __init__(self, col, server):
|
|
|
|
|
+ def __init__(self, col):
|
|
|
|
|
self.col = col
|
|
|
|
|
- if server:
|
|
|
|
|
- self._dir = None
|
|
|
|
|
- return
|
|
|
|
|
# media directory
|
|
|
|
|
self._dir = re.sub("(?i)\.(anki2)$", ".media", self.col.path)
|
2017-11-04 09:28:14 +08:00
|
|
|
if not os.path.exists(self._dir):
|
|
|
|
|
@@ -48,8 +45,6 @@ class MediaManager:
|
2016-11-03 22:44:40 +08:00
|
|
|
self.connect()
|
|
|
|
|
|
|
|
|
|
def connect(self):
|
|
|
|
|
- if self.col.server:
|
|
|
|
|
- return
|
|
|
|
|
path = self.dir()+".db2"
|
|
|
|
|
create = not os.path.exists(path)
|
|
|
|
|
os.chdir(self._dir)
|
2017-11-04 09:28:14 +08:00
|
|
|
@@ -100,8 +95,6 @@ create table meta (dirMod int, lastUsn int); insert into meta values (0, 0);
|
2016-11-03 22:44:40 +08:00
|
|
|
os.rename("../collection.media.db", npath)
|
|
|
|
|
|
|
|
|
|
def close(self):
|
|
|
|
|
- if self.col.server:
|
|
|
|
|
- return
|
|
|
|
|
self.db.close()
|
|
|
|
|
self.db = None
|
|
|
|
|
# change cwd back to old location
|