build master

Author: jxxghp

.github/workflows/build-windows.yml

@@ -86,14 +86,14 @@ jobs:
         release_id: ${{ steps.create_release.outputs.id }}
         assets_path: |
             /home/runner/work/nas-tools/nas-tools/releases/
-    #
-    #- name: Send telegram message (release informations)
-    #  uses: appleboy/telegram-action@master
-    #  with:
-    #    to: ${{ secrets.TELEGRAM_TO }}
-    #    token: ${{ secrets.TELEGRAM_TOKEN }}
-    #    format: markdown
-    #    message: |
-    #        *v${{ env.app_version }}*
 
-    #        ${{ github.event.commits[0].message }}
+    - name: Send telegram message (release informations)
+      uses: appleboy/telegram-action@master
+      with:
+        to: ${{ secrets.TELEGRAM_TO }}
+        token: ${{ secrets.TELEGRAM_TOKEN }}
+        format: markdown
+        message: |
+            *v${{ env.app_version }}*
+
+            ${{ github.event.commits[0].message }}

.github/workflows/build.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - dev
+      - master
     paths:
       - version.py
       - .github/workflows/build.yml
@@ -51,4 +51,5 @@ jobs:
             linux/amd64
           push: true
           tags: |
-            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}-beta
+            ${{ secrets.DOCKER_USERNAME }}/nas-tools:latest
+            ${{ secrets.DOCKER_USERNAME }}/nas-tools:${{ env.app_version }}

docker/Dockerfile

@@ -10,7 +10,7 @@ RUN apk update  \
     && chmod +x /usr/bin/mc \
     && pip install --upgrade pip setuptools wheel \
     && pip install cython \
-    && pip install -r https://raw.githubusercontent.com/NAStool/nas-tools/dev/requirements.txt \
+    && pip install -r https://raw.githubusercontent.com/NAStool/nas-tools/master/requirements.txt \
     && apk del libffi-dev \
     && npm install pm2 -g \
     && rm -rf /tmp/* /root/.cache /var/cache/apk/*
@@ -19,7 +19,7 @@ ENV LANG="C.UTF-8" \
     NASTOOL_CONFIG="/config/config.yaml" \
     NASTOOL_AUTO_UPDATE=true \
     NASTOOL_CN_UPDATE=true \
-    NASTOOL_VERSION=dev \
+    NASTOOL_VERSION=master \
     PS1="\u@\h:\w \$ " \
     REPO_URL="https://github.com/NAStool/nas-tools.git" \
     PYPI_MIRROR="https://pypi.tuna.tsinghua.edu.cn/simple" \
@@ -34,7 +34,7 @@ RUN python_ver=$(python3 -V | awk '{print $2}') \
     && echo 'fs.inotify.max_user_watches=524288' >> /etc/sysctl.conf \
     && echo 'fs.inotify.max_user_instances=524288' >> /etc/sysctl.conf \
     && git config --global pull.ff only \
-    && git clone -b dev ${REPO_URL} ${WORKDIR} --depth=1 --recurse-submodule \
+    && git clone -b master ${REPO_URL} ${WORKDIR} --depth=1 --recurse-submodule \
     && git config --global --add safe.directory ${WORKDIR} \
     && chmod +x ${WORKDIR}/docker/entrypoint.sh
 EXPOSE 3000

docker/entrypoint.sh

@@ -28,7 +28,6 @@ if [ "${NASTOOL_AUTO_UPDATE}" = "true" ]; then
     git clean -dffx
     git fetch --depth 1 origin ${branch}
     git reset --hard origin/${branch}
-    chmod +x docker/entrypoint.sh
 
     if [ $? -eq 0 ]; then
         echo "更新成功..."

web/action.py

@@ -3502,8 +3502,9 @@ def get_search_result(self, data=None):
                             season=int(filter_season.replace("S", "")) if filter_season else None
                         )
                     # One Piece S01-S21 E01-E1028 1999 1080p WEB-DL H.264 -@OPFansMaplesnow
-                    except:
-                        pass
+                    except Exception as e:
+                        print(str(e))
+
                 SearchResults[title_string] = {
                     "key": item.ID,
                     "title": item.TITLE,