fixes handling of multimedia level (#47)

wilddom · Sep 2, 2017 · 8d6476d · 8d6476d
1 parent 91b5e1e
commit 8d6476d
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/Memrise_Course_Importer/memrise.py b/Memrise_Course_Importer/memrise.py
@@ -637,9 +637,6 @@ def loadMem(data, memData, pool, fixUrl=lambda url: url):
     def loadLevel(self, course, levelIndex):
         levelData = self.service.loadLevelData(course.id, levelIndex)
 
-        if levelData["success"] == False:
-            return None
-
         level = Level(levelData["session"]["level"]["id"])
         level.index = levelData["session"]["level"]["index"]
         level.title = sanitizeName(levelData["session"]["level"]["title"])
@@ -669,7 +666,7 @@ def loadLevel(self, course, levelIndex):
 
         for userData in levelData["thingusers"]:
             level.pool.schedule.add(self.loadScheduleInfo(userData, level.pool))
-            memData = levelData["mems"].get(unicode(userData["thing_id"]),{}).get(unicode(userData["mem_id"]))
+            memData = levelData.get("mems", {}).get(unicode(userData["thing_id"]),{}).get(unicode(userData["mem_id"]))
             if memData:
                 level.pool.mems.add(self.loadMem(userData, memData, level.pool, self.service.toAbsoluteMediaUrl))
 
@@ -784,7 +781,7 @@ def loadLevelData(self, courseId, levelIndex):
             response = self.openWithRetry(levelUrl)
             return json.load(response)
         except urllib2.HTTPError as e:
-            if e.code == 404:
+            if e.code == 404 or e.code == 400:
                 raise LevelNotFoundError("Level not found: {}".format(levelIndex))
             else:
                 raise