Fix bunkr entries

cyberdrop_dl/__init__.py

@@ -1 +1 @@
-__version__ = "5.0.38"
+__version__ = "5.0.39"

cyberdrop_dl/scraper/crawlers/bunkrr_crawler.py

@@ -101,7 +101,7 @@ async def other(self, scrape_item: ScrapeItem) -> None:
 
     async def get_stream_link(self, url: URL) -> URL:
         """Gets the stream link for a given url"""
-        cdn_possibilities = r"^(?:(?:(?:media-files|cdn|c|pizza|cdn-burger)[0-9]{0,2})|(?:(?:big-taco-|cdn-pizza|cdn-meatballs|cdn-milkshake)[0-9]{0,2}(?:redir)?))\.bunkr?\.[a-z]{2,3}$"
+        cdn_possibilities = r"^(?:(?:(?:media-files|cdn|c|pizza|cdn-burger)[0-9]{0,2})|(?:(?:big-taco-|cdn-pizza|cdn-meatballs|cdn-milkshake|meatballs)[0-9]{0,2}(?:redir)?))\.bunkr?\.[a-z]{2,3}$"
 
         if not re.match(cdn_possibilities, url.host):
             return url

cyberdrop_dl/scraper/scraper.py

@@ -37,7 +37,7 @@ def __init__(self, manager: Manager):
                         "redd.it": self.reddit, "redgifs": self.redgifs, "rule34.xxx": self.rule34xxx,
                         "rule34.xyz": self.rule34xyz, "saint": self.saint, "scrolller": self.scrolller,
                         "simpcity": self.simpcity, "socialmediagirls": self.socialmediagirls,
-                        "toonily": self.toonily, "xbunker": self.xbunker, "xbunkr": self.xbunkr}
+                        "toonily": self.toonily, "xbunker": self.xbunker, "xbunkr": self.xbunkr, "bunkr": self.bunkrr}
         self.download_mapping = {"bunkrr": "bunkrr", "celebforum": "celebforum", "coomer": "coomer",
                                  "cyberdrop": "cyberdrop", "cyberfile": "cyberfile", "e-hentai": "e-hentai",
                                  "erome": "erome", "fapello": "fapello", "f95zone": "f95zone", "gofile": "gofile",
@@ -52,7 +52,7 @@ def __init__(self, manager: Manager):
                                  "rule34.xxx": "rule34.xxx", "rule34.xyz": "rule34.xyz", "saint": "saint",
                                  "scrolller": "scrolller", "simpcity": "simpcity",
                                  "socialmediagirls": "socialmediagirls",  "toonily": "toonily", "xbunker": "xbunker",
-                                 "xbunkr": "xbunkr"}
+                                 "xbunkr": "xbunkr", "bunkr": "bunkrr"}
         self.existing_crawlers = {}
         self.manager = manager
         self.jdownloader = JDownloader(self.manager)
@@ -63,6 +63,7 @@ async def bunkrr(self) -> None:
         """Creates a Bunkr Crawler instance"""
         from cyberdrop_dl.scraper.crawlers.bunkrr_crawler import BunkrrCrawler
         self.existing_crawlers['bunkrr'] = BunkrrCrawler(self.manager)
+        self.existing_crawlers['bunkr'] = self.existing_crawlers['bunkrr']
 
     async def celebforum(self) -> None:
         """Creates a CelebForum Crawler instance"""

cyberdrop_dl/utils/database/tables/history_table.py

@@ -34,6 +34,7 @@ async def startup(self) -> None:
         """Startup process for the HistoryTable"""
         await self.db_conn.execute(create_history)
         await self.db_conn.commit()
+        await self.fix_bunkr_v4_entries()
 
     async def check_complete(self, domain: str, url: URL) -> bool:
         """Checks whether an individual file has completed given its domain and url path"""
@@ -79,3 +80,9 @@ async def get_failed_items(self) -> Iterable[Row]:
         result = await cursor.execute("""SELECT * FROM media WHERE completed = 0""")
         failed_files = await result.fetchall()
         return failed_files
+
+    """~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"""
+
+    async def fix_bunkr_v4_entries(self) -> None:
+        """Fixes bunkr v4 entries in the database"""
+        await self.db_conn.execute("""UPDATE media SET domain = 'bunkrr' WHERE domain = 'bunkr'""")

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cyberdrop-dl"
-version = "5.0.38"
+version = "5.0.39"
 description = "Bulk downloader for multiple file hosts"
 authors = ["Jules Winnfield <[email protected]>"]
 readme = "README.md"