HOTFIX (#20):

- temporarely disabled cache (sorry beatsaver!)
* some ugly hacks as hotfix for the time being

TODO: proper fix & refactoring

Author: Luux

cache.py

@@ -17,7 +17,7 @@
 headers = {"User-Agent": "ARBSMapDo V1"}
 
 # Used to avoid spamming beatsaver API
-beatsaver_scraped_data_url = "https://raw.githubusercontent.com/andruzzzhka/BeatSaberScrappedData/master/beatSaverScrappedData.zip"
+BEATSAVER_SCRAPED_DATA_URL = "https://github.com/andruzzzhka/BeatSaberScrappedData/raw/master/combinedScrappedData.zip"
 
 
 class Cache:
@@ -27,36 +27,38 @@ def __init__(self, arbsmapdo_config):
         self.tmp_dir = Path(arbsmapdo_config["tmp_dir"])
         self.tmp_dir.mkdir(exist_ok=True)
         self.download_dir = Path(arbsmapdo_config["download_dir"])
-        self.beatsaver_cachefile = Path(arbsmapdo_config["beatsaver_cachefile"])
-        self.levelhash_cachefile = Path(arbsmapdo_config["levelhash_cachefile"])
+        self.beatsaver_cachefile = Path(
+            arbsmapdo_config["beatsaver_cachefile"])
+        self.levelhash_cachefile = Path(
+            arbsmapdo_config["levelhash_cachefile"])
         self.rescan = arbsmapdo_config["rescan"]
 
-        self._beatsaver_cache, self.local_cache_last_downloaded = self.load_beatsaver_cache_from_andruzzzhka_scrapes()
+        # self.load_beatsaver_cache_from_andruzzzhka_scrapes()
+        self._beatsaver_cache, self.local_cache_last_downloaded = {}, {}
         self.levelhash_cache = self.load_levelhash_cache()
         self.update_levelhash_cache()
 
     def _update_andruzzzhka_scrapes(self):
         print("Updating Local BeatSaver Cache. This helps avoiding spamming the API hundreds of times.")
-        print("Downloading beatSaverScrappedData (helps to avoid spamming beatsaver API)...")
+        print(
+            "Downloading beatSaverScrappedData (helps to avoid spamming beatsaver API)...")
 
         self.beatsaver_cachefile.unlink(missing_ok=True)
 
         dl_filename = str(self.tmp_dir.joinpath("andruzzzhka_scrape.zip"))
-        wget.download(beatsaver_scraped_data_url, dl_filename)
+        wget.download(BEATSAVER_SCRAPED_DATA_URL, dl_filename)
 
         # Unzip
         try:
             with zipfile.ZipFile(str(dl_filename), "r") as zip_file:
                 zip_file.extractall(str(self.tmp_dir))
                 # Replace old local cache by updated version
-                os.replace(self.tmp_dir.joinpath("beatSaverScrappedData.json"), self.beatsaver_cachefile)
+                os.replace(self.tmp_dir.joinpath(
+                    "combinedScrappedData.json"), self.beatsaver_cachefile)
         except zipfile.BadZipFile as e:
             # Workaround for https://github.com/andruzzzhka/BeatSaberScrappedData/issues/6
-            print(f"Error when extracting zipfile:\n{e}\nDownloading uncompressed json instead (will be slower!)...")
-            wget.download("https://raw.githubusercontent.com/andruzzzhka/BeatSaberScrappedData/master/beatSaverScrappedData.json",
-                          out=str(self.beatsaver_cachefile))
+            print(f"Error when extracting zipfile:\n{e}")
 
-        last_updated = time.time()
         print("\nCache ready.")
 
     def load_beatsaver_cache_from_andruzzzhka_scrapes(self):
@@ -70,8 +72,8 @@ def load_beatsaver_cache_from_andruzzzhka_scrapes(self):
 
             # Elapsed is given in seconds. The scrapes of andruzzzhka get updated once per day.
             if elapsed > 86400:
-                update = True 
-        
+                update = True
+
         # Update cache if neccessary
         if update:
             self._update_andruzzzhka_scrapes()
@@ -83,7 +85,7 @@ def load_beatsaver_cache_from_andruzzzhka_scrapes(self):
 
         cache_dict = dict()
         for levelinfo in scraped_cache_raw:
-            cache_dict[levelinfo["hash"].lower()] = levelinfo
+            cache_dict[levelinfo["Hash"].lower()] = levelinfo
 
         return cache_dict, last_modified
 
@@ -96,16 +98,18 @@ def _get_beatsaver_info_by_api(self, level_id):
         try:
             if len(level_id) == 40:
                 # Is sha1-hash
-                response = requests.get("https://beatsaver.com/api/maps/by-hash/{id}".format(id=level_id), headers=headers)
+                response = requests.get(
+                    "https://beatsaver.com/api/maps/hash/{id}".format(id=level_id), headers=headers)
             else:
                 # Treat as level key
-                response = requests.get("https://beatsaver.com/api/maps/detail/{id}".format(id=level_id), headers=headers)
+                response = requests.get(
+                    "https://beatsaver.com/api/maps/detail/{id}".format(id=level_id), headers=headers)
             json = response.json()
         except JSONDecodeError:
             print("Failed to get level {} from Beat Saver.".format(level_id))
             return None
         return json
-    
+
     def get_beatsaver_info(self, level_id):
         """
         Uses information from the cache (hashes only) or calls the beatsaver API (hashes & keys)
@@ -135,7 +139,7 @@ def load_levelhash_cache(self):
                 return hashcache
         else:
             return dict()
-    
+
     def save_levelhash_cache(self):
         # Save updates to the cachefile
         with open(self.levelhash_cachefile, "w+", encoding="UTF-8") as fp:
@@ -149,12 +153,10 @@ def update_levelhash_cache(self):
             # If this is not the case -> calculate the hash and store to hashcache
             if entry.name not in self.levelhash_cache.keys():
                 if entry.is_dir():
-                    levelhash = utils.calculate_Level_hash_from_dir(self.download_dir.joinpath(entry.name))
+                    levelhash = utils.calculate_Level_hash_from_dir(
+                        self.download_dir.joinpath(entry.name))
                     self.levelhash_cache[entry.name] = levelhash
                 if entry.is_file() and entry.suffix == ".zip":
-                    levelhash = utils.calculate_Level_hash_from_zip(self.download_dir.joinpath(entry.name))
+                    levelhash = utils.calculate_Level_hash_from_zip(
+                        self.download_dir.joinpath(entry.name))
                     self.levelhash_cache[entry.name] = levelhash
-
-
-
-