Merge pull request #77 from grrttedwards/fix/76/url-pattern-relaxation

Fix/76/url pattern relaxation

Author: grrttedwards

changelog.txt

@@ -1,5 +1,8 @@
 Changelog
 
+* 9/29/2019 - v1.2.1
+Relaxed the pattern match for most URLs which may not be prefixed with "www.".
+
 * 9/28/2019 - v1.2.0
 Integrated cfscrape as an anti-measure for Cloudflare bot-detection, for Curse and WoWAce. Node.js is now a requirement for Curse-based sites.
 

updater/site/abstract_site.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
 
+import requests
+
 from updater.site.enum import GameVersion
 
 
@@ -8,8 +10,10 @@ class SiteError(Exception):
 
 
 class AbstractSite(ABC):
+    # each implementation should declare a static _URLS list of
+    _URLS: [str] = None
     # each implementation should create a static session for itself
-    session = None
+    session: requests.Session = None
 
     def __init__(self, url: str, game_version: GameVersion):
         self.url = url
@@ -20,12 +24,11 @@ def handles(cls, url: str) -> bool:
         return any(supported_url in url for supported_url in cls.get_supported_urls())
 
     @classmethod
-    @abstractmethod
     def get_supported_urls(cls) -> [str]:
-        # ABC for some reason won't enforce implementing this, perhaps
-        # because it only checks when the class is instantiated?
-        raise TypeError(f"Can't instantiate abstract class {cls.__name__}"
-                        " with abstract methods get_supported_urls")
+        if not cls._URLS:
+            raise NotImplementedError(f"Can't instantiate class {cls.__name__}"
+                                      " without list of supported URLs cls._URLS")
+        return cls._URLS
 
     @abstractmethod
     def find_zip_url(self) -> str:

updater/site/curse.py

@@ -7,20 +7,22 @@
 
 
 class Curse(AbstractSite):
-    _URL = 'https://www.curseforge.com/wow/addons/'
     _OLD_URL = 'https://mods.curse.com/addons/wow/'
     _OLD_PROJECT_URL = 'https://wow.curseforge.com/projects/'
 
+    _URLS = [
+        'https://www.curseforge.com/wow/addons/',
+        'https://curseforge.com/wow/addons/',
+        _OLD_URL,
+        _OLD_PROJECT_URL
+    ]
+
     session = cfscrape.create_scraper("https://www.curseforge.com/")
 
     def __init__(self, url: str, game_version: GameVersion):
         url = Curse._convert_old_curse_urls(url)
         super().__init__(url, game_version)
 
-    @classmethod
-    def get_supported_urls(cls):
-        return [cls._OLD_URL, cls._OLD_PROJECT_URL, cls._URL]
-
     def find_zip_url(self):
         try:
             page = Curse.session.get(self.url)

updater/site/github.py

@@ -7,7 +7,10 @@
 
 
 class GitHub(AbstractSite):
-    _URL = 'https://github.com/'
+    _URLS = [
+        'https://www.github.com/',
+        'https://github.com/'
+    ]
 
     session = requests.session()
 
@@ -16,10 +19,6 @@ def __init__(self, url: str):
             url = (url + '/tree/master')
         super().__init__(url, GameVersion.agnostic)
 
-    @classmethod
-    def get_supported_urls(cls):
-        return [cls._URL]
-
     def find_zip_url(self):
         return self.url.replace('/tree/', '/archive/', 1) + '.zip'
 

updater/site/tukui.py

@@ -6,18 +6,17 @@
 
 
 class Tukui(AbstractSite):
-    _URL = 'https://git.tukui.org/elvui/'
-    latest_version = None
+    _URLS = [
+        'https://git.tukui.org/elvui/'
+    ]
 
     session = requests.session()
 
+    latest_version = None
+
     def __init__(self, url: str):
         super().__init__(url, GameVersion.agnostic)
 
-    @classmethod
-    def get_supported_urls(cls) -> [str]:
-        return [cls._URL]
-
     def find_zip_url(self):
         version = self.get_latest_version()
         # like https://git.tukui.org/elvui/elvui/-/archive/v11.21/elvui-v11.21.zip

updater/site/wowace.py

@@ -7,7 +7,10 @@
 
 
 class WoWAce(AbstractSite):
-    _URL = 'https://www.wowace.com/projects/'
+    _URLS = [
+        'https://www.wowace.com/projects/',
+        'https://wowace.com/projects/'
+    ]
 
     session = cfscrape.create_scraper()
 
@@ -16,10 +19,6 @@ def __init__(self, url: str, game_version: GameVersion):
             raise NotImplementedError("Updating classic addons are not yet supported for WoWAce.")
         super().__init__(url, game_version)
 
-    @classmethod
-    def get_supported_urls(cls):
-        return [cls._URL]
-
     def find_zip_url(self):
         return self.url + '/files/latest'
 

updater/site/wowinterface.py

@@ -7,17 +7,15 @@
 
 
 class WoWInterface(AbstractSite):
-    _URL = 'https://www.wowinterface.com/downloads/'
-
+    _URLS = [
+        'https://www.wowinterface.com/downloads',
+        'https://wowinterface.com/downloads'
+    ]
     session = requests.session()
 
     def __init__(self, url: str, game_version: GameVersion):
         super().__init__(url, game_version)
 
-    @classmethod
-    def get_supported_urls(cls) -> [str]:
-        return [cls._URL]
-
     def find_zip_url(self):
         downloadpage = self.url.replace('info', 'download')
         try: