fix: 合并冲突

.github/workflows/build-dev.yml

@@ -1,4 +1,4 @@
-name: NAStool Dev
+name: NAStool Docker Dev
 on:
   workflow_dispatch:
   push:

.github/workflows/build-package.yml

@@ -0,0 +1,181 @@
+name: NAStool Package
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - version.py
+      - .github/workflows/build-package.yml
+      - requirements.txt
+
+jobs:
+  Windows-build:
+    runs-on: windows-latest
+    steps:
+    - name: init Python 3.10.10
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10.10'
+    - name: install dependent packages
+      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/linyuan0213/nas-tools --recurse-submodule
+        cd nas-tools
+        pip install -r requirements.txt
+        echo ("NASTOOL_CONFIG=D:/a/nas-tools/nas-tools/nas-tools/config/config.yaml") >> $env:GITHUB_ENV
+        echo $env:NASTOOL_CONFIG
+      shell: pwsh
+    - name: package through pyinstaller
+      run: |
+        cd nas-tools
+        dir
+        copy .\package\rely\upx.exe c:\hostedtoolcache\windows\python\3.10.10\x64\Scripts
+        copy .\package\rely\hook-cn2an.py c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\pyinstaller\hooks
+        copy .\package\rely\hook-zhconv.py c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\pyinstaller\hooks
+        copy .\package\rely\hook-iso639.py c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\pyinstaller\hooks
+        copy .\third_party.txt .\package
+        copy .\package\rely\template.jinja2 c:\hostedtoolcache\windows\Python\3.10.10\x64\lib\site-packages\setuptools\_vendor\pyparsing\diagram
+        xcopy .\web c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\web\ /e
+        xcopy .\config c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\config\ /e
+        xcopy .\db_scripts c:\hostedtoolcache\windows\python\3.10.10\x64\lib\site-packages\db_scripts\ /e
+        cd package
+        pyinstaller nas-tools.spec
+        dir  D:/a/nas-tools/nas-tools/nas-tools/package/dist
+      shell: pwsh
+    - name: upload windows file
+      uses: actions/upload-artifact@v3
+      with:
+        name: windows
+        path: D:/a/nas-tools/nas-tools/nas-tools/package/dist/nas-tools.exe
+
+  Linux-build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: init Python 3.10.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.10'
+      - name: install dependent packages
+        run: |
+          python -m pip install --upgrade pip
+          pip install wheel pyinstaller==5.7.0
+          git clone --depth=1 -b master https://github.com/linyuan0213/nas-tools --recurse-submodule
+          cd nas-tools
+          pip install -r requirements.txt
+          echo ("NASTOOL_CONFIG=/home/runner/work/nas-tools/nas-tools/nas-tools/config/config.yaml") >> $env:GITHUB_ENV
+          echo $env:NASTOOL_CONFIG
+        shell: pwsh
+      - name: package through pyinstaller
+        run: |
+          cd nas-tools
+          pwd
+          ls -all
+          cp ./package/rely/hook-cn2an.py /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./package/rely/hook-zhconv.py /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./package/rely/hook-iso639.py /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./third_party.txt ./package/
+          cp ./package/rely/template.jinja2 /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/diagram/
+          cp -r ./web/. /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/web/
+          cp -r ./config/. /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/config/
+          cp -r ./db_scripts/. /opt/hostedtoolcache/Python/3.10.10/x64/lib/python3.10/site-packages/db_scripts/
+          cd package
+          pwd
+          ls -all
+          pyinstaller nas-tools.spec
+          mv /home/runner/work/nas-tools/nas-tools/nas-tools/package/dist/nas-tools /home/runner/work/nas-tools/nas-tools/nas-tools/package/dist/nas-tools.linux
+          ls -all /home/runner/work/nas-tools/nas-tools/nas-tools/package/dist
+        shell: pwsh
+      - name: upload linux file
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux
+          path: /home/runner/work/nas-tools/nas-tools/nas-tools/package/dist/nas-tools.linux
+
+  Mac-build:
+    runs-on: macos-latest
+    steps:
+      - name: init Python 3.10.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.10'
+      - name: install dependent packages
+        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/linyuan0213/nas-tools --recurse-submodule
+          cd nas-tools
+          pip install -r requirements.txt
+          CURRENT_DIR=$(pwd)
+          echo "NASTOOL_CONFIG=$CURRENT_DIR/config/config.yaml" >> $GITHUB_ENV
+          echo $env:NASTOOL_CONFIG
+        shell: bash
+      - name: package through pyinstaller
+        run: |
+          cd nas-tools
+          pwd
+          ls -all
+          cp ./package/rely/hook-cn2an.py $Python_ROOT_DIR/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./package/rely/hook-zhconv.py $Python_ROOT_DIR/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./package/rely/hook-iso639.py $Python_ROOT_DIR/lib/python3.10/site-packages/PyInstaller/hooks/
+          cp ./third_party.txt ./package/
+          cp ./package/rely/template.jinja2 $Python_ROOT_DIR/lib/python3.10/site-packages/setuptools/_vendor/pyparsing/diagram/
+          cp -r ./web/. $Python_ROOT_DIR/lib/python3.10/site-packages/web/
+          cp -r ./config/. $Python_ROOT_DIR/lib/python3.10/site-packages/config/
+          cp -r ./db_scripts/. $Python_ROOT_DIR/lib/python3.10/site-packages/db_scripts/
+          cd package
+          pyinstaller nas-tools.spec
+          mv ./dist/nas-tools ./dist/nas-tools.mac
+          pwd
+          ls -all ./dist/
+        shell: bash
+      - name: upload mac file
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: /Users/runner/work/nas-tools/nas-tools/nas-tools/package/dist/nas-tools.mac
+
+  Create-release_Send-message:
+    permissions: write-all
+    runs-on: ubuntu-latest
+    needs: [Windows-build, Linux-build, Mac-build]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Release version
+      id: release_version
+      run: |
+        app_version=$(cat version.py |sed -ne "s/APP_VERSION\s=\s'v\(.*\)'/\1/gp")
+        echo "app_version=$app_version" >> $GITHUB_ENV
+    - name: download exe and rename
+      uses: actions/download-artifact@v3
+    - name: get release_informations
+      shell: bash
+      run: |
+        pwd
+        ls -all
+        mkdir releases
+        mv ./windows/nas-tools.exe /home/runner/work/nas-tools/nas-tools/releases/nastool_win_v${{ env.app_version }}.exe
+        mv ./linux/nas-tools.linux /home/runner/work/nas-tools/nas-tools/releases/nastool_linux_v${{ env.app_version }}
+        mv ./macos/nas-tools.mac /home/runner/work/nas-tools/nas-tools/releases/nastool_macos_v${{ env.app_version }}
+        pwd
+        ls -all
+    - name: Create release
+      id: create_release
+      uses: actions/create-release@latest
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: v${{ env.app_version }}
+        release_name: v${{ env.app_version }}
+        body: ${{ github.event.commits[0].message }}
+        draft: false
+        prerelease: false
+    - name: Upload release asset
+      uses: dwenegar/upload-release-assets@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        release_id: ${{ steps.create_release.outputs.id }}
+        assets_path: |
+            /home/runner/work/nas-tools/nas-tools/releases/

app/conf/moduleconf.py

@@ -644,6 +644,14 @@ class ModuleConf(object):
                     "tooltip": "在Emby设置->高级->API密钥处生成，注意不要复制到了应用名称",
                     "type": "text",
                     "placeholder": ""
+                },
+                "play_host": {
+                    "id": "emby.play_host",
+                    "required": False,
+                    "title": "媒体播放地址",
+                    "tooltip": "配置播放设备的访问地址，用于媒体详情页跳转播放页面；如为https则需要增加https://前缀，留空则默认与服务器地址一致",
+                    "type": "text",
+                    "placeholder": "http://127.0.0.1:8096"
                 }
             }
         },
@@ -668,6 +676,14 @@ class ModuleConf(object):
                     "tooltip": "在Jellyfin设置->高级->API密钥处生成",
                     "type": "text",
                     "placeholder": ""
+                },
+                "play_host": {
+                    "id": "jellyfin.play_host",
+                    "required": False,
+                    "title": "媒体播放地址",
+                    "tooltip": "配置播放设备的访问地址，用于媒体详情页跳转播放页面；如为https则需要增加https://前缀，留空则默认与服务器地址一致",
+                    "type": "text",
+                    "placeholder": "http://127.0.0.1:8096"
                 }
             }
         },

app/db/__init__.py

@@ -31,14 +31,14 @@ def update_db():
     """
     更新数据库
     """
-    db_location = os.path.join(Config().get_config_path(), 'user.db')
-    script_location = os.path.join(Config().get_root_path(), 'db_scripts')
+    db_location = os.path.normpath(os.path.join(Config().get_config_path(), 'user.db'))
+    script_location = os.path.normpath(os.path.join(Config().get_root_path(), 'db_scripts'))
     log.console('开始更新数据库...')
     try:
         alembic_cfg = AlembicConfig()
         alembic_cfg.set_main_option('script_location', script_location)
         alembic_cfg.set_main_option('sqlalchemy.url', f"sqlite:///{db_location}")
         alembic_upgrade(alembic_cfg, 'head')
+        log.console('数据库更新完成')
     except Exception as e:
-        pass
-    log.console('数据库更新完成')
+        log.console(f'数据库更新失败：{e}')

app/filetransfer.py

@@ -789,10 +789,17 @@ def __finish_transfer(status, message):
                         message_medias[message_key].total_episodes += media.total_episodes
                         message_medias[message_key].size += media.size
                 # 生成nfo及poster
-                self.scraper.gen_scraper_files(media=media,
-                                               dir_path=ret_dir_path,
-                                               file_name=os.path.basename(ret_file_path),
-                                               file_ext=file_ext)
+                if bluray_disk_dir and media.type == MediaType.MOVIE:
+                    # 原盘文件的情况下 使用目录名称.nfo 生成
+                    self.scraper.gen_scraper_files(media=media,
+                                                   dir_path=ret_dir_path,
+                                                   file_name=os.path.basename(ret_dir_path),
+                                                   file_ext=file_ext)
+                else:
+                    self.scraper.gen_scraper_files(media=media,
+                                                   dir_path=ret_dir_path,
+                                                   file_name=os.path.basename(ret_file_path),
+                                                   file_ext=file_ext)
                 # 更新进度
                 self.progress.update(ptype=ProgressKey.FileTransfer,
                                      value=round(total_count / len(Medias) * 100),
@@ -1126,9 +1133,10 @@ def get_format_dict(self, media):
         """
         if not media:
             return {}
+        # 当前语种标题
         episode_title = self.media.get_episode_title(media)
-        # 此处使用独立对象，避免影响语言
-        en_title = Media().get_tmdb_en_title(media)
+        # 英文标题
+        en_title = self.media.get_tmdb_en_title(media)
         media_format_dict = {
             "title": StringUtils.clear_file_name(media.title),
             "en_title": StringUtils.clear_file_name(en_title),

app/helper/openai_helper.py

@@ -157,7 +157,7 @@ def translate_to_zh(self, text):
         :param text: 输入文本
         """
         if not self.get_state():
-            return None
+            return False, None
         system_prompt = "You are a translation engine that can only translate text and cannot interpret it."
         user_prompt = f"translate to zh-CN:\n\n{text}"
         result = ""