Merge pull request NAStool#3110 from jxxghp/dev

fix #3107
link2fun · Jan 23, 2023 · 0e7a704 · 0e7a704
2 parents 8d5b641 + f88a06a
commit 0e7a704
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/app/conf/siteconf.py b/app/conf/siteconf.py
@@ -41,6 +41,7 @@ class SiteConf:
             '//button[@type="submit"]',
             '//button[@lay-filter="login"]',
             '//button[@lay-filter="formLogin"]',
+            '//input[@type="button"][@value="登录"]'
         ],
         "error": [
             "//table[@class='main']//td[@class='text']/text()"

diff --git a/app/sites/sitecookie.py b/app/sites/sitecookie.py
@@ -223,6 +223,8 @@ def __get_captcha_url(siteurl, imageurl):
         """
         if not siteurl or not imageurl:
             return ""
+        if imageurl.startswith("/"):
+            imageurl = imageurl[1:]
         return "%s/%s" % (StringUtils.get_base_url(siteurl), imageurl)
 
     def update_sites_cookie_ua(self,

diff --git a/config.py b/config.py
@@ -14,7 +14,7 @@
 RMT_MEDIAEXT = ['.mp4', '.mkv', '.ts', '.iso',
                 '.rmvb', '.avi', '.mov', '.mpeg',
                 '.mpg', '.wmv', '.3gp', '.asf',
-                '.m4v', '.flv', '.m2ts']
+                '.m4v', '.flv', '.m2ts', '.strm']
 # 支持的字幕文件后缀格式
 RMT_SUBEXT = ['.srt', '.ass', '.ssa']
 # 电视剧动漫的分类genre_ids