add rss.m-team.cc in site conf

.github/workflows/build-package.yml

@@ -20,7 +20,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install wheel numpy==1.23.5 pyparsing==3.0.9 wxpython==4.2.0 pyinstaller==5.7.0
-        git clone --depth=1 -b master https://github.com/hsuyelin/nas-tools --recurse-submodule
+        git clone --depth=1 -b master https://github.com/naughtyGitCat/nas-tools --recurse-submodule
         cd nas-tools
         pip install -r package/requirements.txt
         echo ("NASTOOL_CONFIG=D:/a/nas-tools/nas-tools/nas-tools/config/config.yaml") >> $env:GITHUB_ENV
@@ -63,7 +63,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install wheel pyinstaller==5.7.0
-          git clone --depth=1 -b master https://github.com/hsuyelin/nas-tools --recurse-submodule
+          git clone --depth=1 -b master https://github.com/naughtyGitCat/nas-tools --recurse-submodule
           cd nas-tools
           pip install -r package/requirements.txt
           echo ("NASTOOL_CONFIG=/home/runner/work/nas-tools/nas-tools/nas-tools/config/config.yaml") >> $env:GITHUB_ENV
@@ -187,7 +187,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install wheel numpy==1.23.5 pyparsing==3.0.9 pyinstaller==5.7.0
-          git clone --depth=1 -b master https://github.com/hsuyelin/nas-tools --recurse-submodule
+          git clone --depth=1 -b master https://github.com/naughtyGitCat/nas-tools --recurse-submodule
           cd nas-tools
           pip install -r package/requirements.txt
           CURRENT_DIR=$(pwd)

.gitignore

@@ -11,6 +11,12 @@
 .vscode/
 Dockerfile-dev
 config/sites.json
+config/temp
+config/plugins
+config/*.db
+config/*.dat
+config/backup_file
+config/archive_file
 nastools_test.py
 /node_modules/**
 package-lock.json

app/media/meta/metavideov2.py

@@ -37,21 +37,21 @@ class MetaVideoV2(MetaBase):
     _seasons_re = r"(?:第)?\s*(?:\d+|[一二三四五六七八九十]+)\s*(季)?\s*\.\s*(?:第)?\s*(?:\d+|[一二三四五六七八九十]+)\s*(季)"
     _seasons_re_2 = r"(?:[Ss]0*|Season|season)([0-9]+)\s*\.\s*(?:[Ss]0*|Season|season)([0-9]+)"
     _season_re = r"(?:第)?\s*(?:\d+|[一二三四五六七八九十]+)\s*(季)"
-    _season_re_2 = r"(?<![a-zA-Z0-9_])(?i)[sS](eason)?\s*0*\d+"
+    _season_re_2 = r"(?<![a-zA-Z0-9_])[sS](eason)?\s*0*\d+"
     _season_all_re = r"(?<![^\s.\\-])\s*(?<!第)(?:\d+|[一二三四五六七八九十]+)\s*(季)\s*(全)(?![^\s.\\-]*[\d一二三四五六七八九十])"
     _season_all_re_2 = r"(全|共)\s*(?:\d+|[一二三四五六七八九十]+)\s*(季)"
     _episodes_re = r"(?:第)?\s*(?<![sS])(?:\d+|[一二三四五六七八九十]+)\s*(?:集|话|話)?\s*\.\s*(?:第)?\s*(?:\d+|[一二三四五六七八九十]+)\s*(?:集|话|話)"
     _episodes_re_2 = r"(?:[Ee]0*|episode|ep)([0-9]+)\s*\.\s*(?:[Ee]0*|episode|ep)([0-9]+)"
     _episode_re = r"(?:第)?\s*(?:\d+|[一二三四五六七八九十]+)\s*(?:集|话|話)"
-    _episode_re_2 = r"(?<![a-zA-Z0-9_])(?i)(?:e|ep|episode)\s*0*\d+"
+    _episode_re_2 = r"(?<![a-zA-Z0-9_])(?:e|ep|episode)\s*0*\d+"
     _episode_all_re = r"(?<![^\s.\\-])\s*(?<!第)(?:\d+|[一二三四五六七八九十]+)\s*(寄|集|话|話)\s*(全)(?![^\s.\\-]*[\d一二三四五六七八九十])"
     _episode_all_re_2 = r"(全|共)\s*(?:\d+|[一二三四五六七八九十]+)\s*(寄|集|话|話)"
     _numbers_re = r"\d+|[一二三四五六七八九十]+"
     _years_re = r"(\d{4}(?!p|P))\s*\.\s*(\d{4})(?![pP])"
     _release_date_re = r"\d{2,4}年\d+(?:月)?(?:新番|合集|)"
     _other_re = r"\[(?:★|❤|GB|JP|KR|CN|TW|US|SG|招募翻译(?:校对)?|招募翻譯(?:校對)?|)\]"
-    _special_resource_team = r"(?i)(HDCTV)"
-    _special_streaming_service = r"(?i)(Jade|ViuTv)"
+    _special_resource_team = r"(HDCTV)"
+    _special_streaming_service = r"(Jade|ViuTv)"
 
     def __init__(self,
                  title,
@@ -311,10 +311,10 @@ def __init_resource_type(self):
         self.resource_type = re.sub(r'(?i)disney', 'DSNP', self.resource_type)
         self.resource_type = re.sub(r'(?i)hbo max', 'HMAX', self.resource_type)
 
-        if re.findall(r'%s' % self._special_resource_team, self._original_title):
+        if re.findall(r'%s' % self._special_resource_team, self._original_title, flags=re.IGNORECASE):
             self.resource_type = re.sub(r'(?i)ctv', '', self.resource_type)
 
-        special_streaming_services_matches = re.findall(r'%s' % self._special_streaming_service, self._original_title)
+        special_streaming_services_matches = re.findall(r'%s' % self._special_streaming_service, self._original_title, flags=re.IGNORECASE)
         if len(special_streaming_services_matches) > 1:
             special_streaming_services_text = ' '.join(special_streaming_services_matches)
         else:
@@ -468,7 +468,7 @@ def __fix_resource_team(self):
             else:
                 self.resource_team = None
 
-        special_resource_team_matches = re.findall(r'%s' % self._special_resource_team, self._original_title)
+        special_resource_team_matches = re.findall(r'%s' % self._special_resource_team, self._original_title, flags=re.IGNORECASE)
         if len(special_resource_team_matches) > 1:
             special_resource_team_text = ' '.join(special_resource_team_matches)
         else:

app/sites/siteuserinfo/mteam_torrent.py

@@ -84,9 +84,9 @@ def _mt_get_sys_roles(self):
                 sysrole._classUp = int(result.get("classUp"))
                 sysrole._registerWeek = int(result.get("registerWeek"))
                 sysrole._downloaded = int(result.get("downloaded"))
-                sysrole._shareRate = int(result.get("shareRate"))
-                sysrole._shareRateLimit = int(result.get("shareRateLimit"))
-                sysrole._sortPoint = int(result.get("sortPoint"))
+                sysrole._shareRate = float(result.get("shareRate"))
+                sysrole._shareRateLimit = float(result.get("shareRateLimit"))
+                sysrole._sortPoint = float(result.get("sortPoint"))
                 g_sys_role_list.append(sysrole)
             log.info(f"【MTeamUserInfo】 获取馒头系统角色成功，共有{len(g_sys_role_list)}个角色")
         elif res is not None:

app/utils/string_utils.py

@@ -265,11 +265,22 @@ def get_url_domain(url):
         """
         获取URL的域名部分，不含WWW和HTTP
         """
+        common_prefixes: list = ["www."]
+        site_prefixes: dict = {"m-team": ["api.", "rss.", "kp."]}
         if not url:
             return ""
         _, netloc = StringUtils.get_url_netloc(url)
         if netloc:
-            return netloc.lower().replace("www.", "")
+            netloc_lower: str = netloc.lower()
+            # trim common prefix
+            for common_prefix in common_prefixes:
+                netloc_lower = netloc_lower.replace(common_prefix, "")
+            # remove site custom prefix
+            for site_key in site_prefixes.keys():
+                if site_key in netloc_lower:
+                    for prefix in site_prefixes[site_key]:
+                        netloc_lower = netloc_lower.replace(prefix, "")
+            return netloc_lower
         return ""
 
     @staticmethod

requirements.txt

@@ -27,7 +27,7 @@ decorator==5.1.1
 executing==1.2.0
 Flask==2.3.3
 Flask-Login==0.6.2
-fast-bencode==1.1.3
+fast-bencode==1.1.6
 flask-compress==1.14
 flask-restx==1.1.0
 flask-sock==0.6.0

start.ps1

@@ -0,0 +1,3 @@
+$CONFIG_DIR=Join-Path -Path (Get-Location).Path -ChildPath 'config'
+$Env:NASTOOL_CONFIG=Join-Path -Path $CONFIG_DIR -ChildPath 'config.yaml'
+Start-Process python -Args run.py

version.py

@@ -1 +1 @@
-APP_VERSION = 'v3.4.1'
+APP_VERSION = 'v3.4.2'