Merge pull request #4687 from NAStool/dev

Dev
jeechoul · May 9, 2023 · 1481363 · 1481363
2 parents 6cebee9 + 6331704
commit 1481363
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,4 +54,4 @@ jobs:
           push: true
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/nas-tools:latest
-            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}
+            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}
diff --git a/app/conf/moduleconf.py b/app/conf/moduleconf.py
@@ -523,11 +523,9 @@ class ModuleConf(object):
         }
     }
 
-    # 网络测试对象
+    # 网络测试对象，TMDB API除外
     NETTEST_TARGETS = [
         "www.themoviedb.org",
-        "api.themoviedb.org",
-        "api.tmdb.org",
         "image.tmdb.org",
         "webservice.fanart.tv",
         "api.telegram.org",

diff --git a/app/sites/site_subtitle.py b/app/sites/site_subtitle.py
@@ -112,6 +112,8 @@ def download(self, media_info, site_id, cookie, ua, download_dir):
                     continue
             if sublink_list:
                 log.info(f"【Sites】{media_info.page_url} 页面字幕下载完成")
+            else:
+                log.warn(f"【Sites】{media_info.page_url} 页面未找到字幕下载链接")
         elif res is not None:
             log.warn(f"【Sites】连接 {media_info.page_url} 失败，状态码：{res.status_code}")
         else:

diff --git a/initializer.py b/initializer.py
@@ -327,7 +327,7 @@ def update_config():
     try:
         tmdb_proxy = Config().get_config('laboratory').get("tmdb_proxy")
         if tmdb_proxy:
-            _config['app']['tmdb_domain'] = 'tmdb.nastool.workers.dev'
+            _config['app']['tmdb_domain'] = 'tmdb.nastool.cn'
             _config['laboratory'].pop("tmdb_proxy")
             overwrite_cofig = True
     except Exception as e:

diff --git a/web/backend/user.cp310-win_amd64.pyd b/web/backend/user.cp310-win_amd64.pyd
diff --git a/web/backend/user.cpython-310-aarch64-linux-gnu.so b/web/backend/user.cpython-310-aarch64-linux-gnu.so
diff --git a/web/backend/user.cpython-310-darwin.so b/web/backend/user.cpython-310-darwin.so
diff --git a/web/backend/user.cpython-310-x86_64-linux-gnu.so b/web/backend/user.cpython-310-x86_64-linux-gnu.so
diff --git a/web/static/components/layout/navbar/index.js b/web/static/components/layout/navbar/index.js
@@ -69,6 +69,7 @@ export class LayoutNavbar extends CustomElement {
       document.querySelector("#logo_animation").remove();
       this.removeAttribute("hidden");
       document.querySelector("#page_content").removeAttribute("hidden");
+      document.querySelector("#main_bottom_menubar").classList.remove('d-none');
       document.querySelector("layout-searchbar").removeAttribute("hidden");
     }, 200);
 

diff --git a/web/static/css/style.css b/web/static/css/style.css
@@ -70,6 +70,7 @@ body, .page {
     left:calc(50% - 40px);
     width:80px;
     height:80px;
+    z-index: 1033;
 }
 
 .offcanvas {

diff --git a/web/templates/navigation.html b/web/templates/navigation.html
@@ -103,7 +103,7 @@
     {{ OOPS.loading() }}
     </div>
   </div>
-  <div class="position-fixed w-100 d-flex justify-content-between d-sm-none main-bottom-menubar">
+  <div id="main_bottom_menubar" class="position-fixed w-100 d-flex justify-content-between d-sm-none main-bottom-menubar d-none">
     <a class="card-btn border-0" href="javascript:navmenu('index')">
       {{ SVG.home() }}
     </a>

diff --git a/web/templates/setting/plugin.html b/web/templates/setting/plugin.html
@@ -137,7 +137,7 @@ <h5 class="modal-title" id="plugin_page_title"></h5>
                     style="background-image: url('../static/img/plugins/${plugin.icon}')"
                 >
                 </span>
-                ${count ? `<span class="badge position-absolute" style="top: 10px; right: 10px;">${count}</span>` : ''}
+                ${count ? `<span class="badge position-absolute" style="top: 10px; right: 10px;">${count.toLocaleString()}</span>` : ''}
               </div>
               <div class="card-body text-start">
                 <div class="card-title mb-1">${plugin.name}</div>