import each anki1 deck as its basename

anki/importing/anki1.py

@@ -2,7 +2,7 @@
 # Copyright: Damien Elmes <anki@ichi2.net>
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-import traceback
+import traceback, os
 from anki.lang import _
 from anki.upgrade import Upgrader
 from anki.importing.anki2 import Anki2Importer
@@ -27,5 +27,6 @@ class Anki1Importer(Anki2Importer):
         deck.close()
         mdir = self.file.replace(".anki", ".media")
         self.file = deck.path
+        self.groupPrefix = os.path.basename(self.file).replace(".anki", "")
         Anki2Importer.run(self, mdir)
 

anki/importing/anki2.py

@@ -125,9 +125,12 @@ class Anki2Importer(Importer):
         # get the name in src
         g = self.src.groups.get(gid)
         name = g['name']
-        # add prefix if necessary
+        # if there's a prefix, replace the top level group
         if self.groupPrefix:
-            name = self.groupPrefix + "::" + name
+            tmpname = "::".join(name.split("::")[1:])
+            name = self.groupPrefix
+            if tmpname:
+                name += "::" + name
         # create in local
         newid = self.dst.groups.id(name)
         # add to group map and return