修复名称开头结尾有空格时，无法下载章节

tonquer#111
LQ-wbd · Dec 27, 2021 · ecee400 · ecee400
1 parent e21c66c
commit ecee400
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,7 +13,7 @@ jobs:
   ubuntu:
     runs-on: ubuntu-18.04
     env:
-      PACKAGENAME: jmcomic_py37_ubuntu_x86_64
+      PACKAGENAME: bika_py37_ubuntu_x86_64
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.7
@@ -22,6 +22,9 @@ jobs:
         python-version: 3.7
     - name: Install dependencies
       run: |
+        ldd --version
+        apt-get install -y libxcb*
+        apt-get install -y libvulkan1
         python -m pip install --upgrade pip
         pip install pyinstaller==4.5.1
         pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.0.9/waifu2x_vulkan-1.0.9-cp37-cp37m-linux_x86_64.whl
@@ -38,10 +41,13 @@ jobs:
         cp ../data picacg.AppDir/ -r
         cp start/* picacg.AppDir/usr/bin -r
         mv picacg.AppDir/usr/bin/start picacg.AppDir/usr/bin/PicACG
+        chmod +x picacg.AppDir/AppRun
+        chmod +x picacg.AppDir/usr/bin/PicACG
 
         wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
         ./appimagetool-x86_64.AppImage picacg.AppDir
+        chmod +x PicACG-x86_64.AppImage
         mv PicACG-x86_64.AppImage ../../
         cd ../../
     - name: Upload

diff --git a/src/server/sql_server.py b/src/server/sql_server.py
@@ -327,6 +327,7 @@ def Search(wordList, isTitle, isAutor, isDes, isTag, isCategory, isCreator, page
                 if not word:
                     continue
                 if isTitle:
+                    data3 += " title like '%{}%' or ".format(Converter('zh-hans').convert(word).replace("'", "''"))
                     data3 += " title2 like '%{}%' or ".format(Converter('zh-hans').convert(word).replace("'", "''"))
                 if isAutor:
                     data3 += " author like '%{}%' or ".format(Converter('zh-hans').convert(word).replace("'", "''"))

diff --git a/src/tools/tool.py b/src/tools/tool.py
@@ -282,7 +282,7 @@ def GetModelByIndex(noise, scale, index):
 
     @staticmethod
     def GetCanSaveName(name):
-        return re.sub('[\\\/:*?"<>|\0\r\n]', '', name).rstrip(".")
+        return re.sub('[\\\/:*?"<>|\0\r\n]', '', name).rstrip(".").strip(" ")
 
     @staticmethod
     def LoadCachePicture(filePath):