Skip to content

Commit 77b1f88

Browse files
tonquertonquer
committed
update
1 parent af97ea5 commit 77b1f88

38 files changed

+443646
-299437
lines changed

‎.github/workflows/CI.yml

-96
Original file line numberDiff line numberDiff line change
@@ -79,100 +79,4 @@ jobs:
7979
with:
8080
name: ${{ env.PACKAGENAME }}
8181
path: ${{ env.PACKAGENAME }}
82-
retention-days: 7
83-
84-
ubuntu:
85-
runs-on: ubuntu-20.04
86-
env:
87-
PACKAGENAME: jmcomic_py37_linux
88-
steps:
89-
- uses: actions/checkout@v4
90-
- name: Set up Python 3.7
91-
uses: actions/setup-python@v5
92-
with:
93-
python-version: 3.7
94-
- name: Install dependencies
95-
run: |
96-
sudo apt-get install -y fuse libfuse2
97-
python -m pip install --upgrade pip
98-
pip install pyinstaller==4.8
99-
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-cp37m-linux_x86_64.whl
100-
pip install -r src/requirements.txt
101-
- name: Build
102-
run: |
103-
cd src
104-
pyinstaller --hidden-import=_cffi_backend --collect-data curl_cffi --add-data "../lib/linux/*:." -w start.py
105-
cd dist
106-
mkdir -p jmcomic.AppRun/usr/bin
107-
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
108-
chmod +x appimagetool-x86_64.AppImage
109-
cp -r ../../res/appimage/* jmcomic.AppRun/
110-
cp -r ../../res/icon/logo_round.png jmcomic.AppRun/JMComic.png
111-
cp -r start/* jmcomic.AppRun/usr/bin/
112-
113-
mv jmcomic.AppRun/usr/bin/start jmcomic.AppRun/usr/bin/JMComic
114-
chmod +x jmcomic.AppRun/AppRun
115-
chmod +x jmcomic.AppRun/usr/bin/JMComic
116-
./appimagetool-x86_64.AppImage jmcomic.AppRun
117-
mv JMComic-x86_64.AppImage ../../${{ env.PACKAGENAME }}-x86_64.AppImage
118-
cd ../..
119-
- name: Upload
120-
uses: actions/upload-artifact@v4
121-
with:
122-
name: ${{ env.PACKAGENAME }}
123-
path: ${{ env.PACKAGENAME }}-x86_64.AppImage
124-
retention-days: 7
125-
126-
macos:
127-
runs-on: macos-13
128-
env:
129-
PACKAGENAME: jmcomic_py37_macos
130-
steps:
131-
- uses: actions/checkout@v4
132-
- name: Set up Python 3.7
133-
uses: actions/setup-python@v5
134-
with:
135-
python-version: 3.7
136-
137-
- name: Install dependencies
138-
run: |
139-
python3.7 -m pip install --upgrade pip
140-
pip3.7 install pyinstaller==4.8
141-
pip3.7 install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-cp37m-macosx_11_0_x86_64.whl
142-
pip3.7 install -r src/requirements_macos.txt
143-
brew install create-dmg
144-
- name: Build
145-
run: |
146-
cd src
147-
cp ../res/icon/Icon.icns ./
148-
pyinstaller --clean --onedir --name JMComic \
149-
--hidden-import sr_ncnn_vulkan --hidden-import PySide6 --hidden-import requests \
150-
--hidden-import urllib3 --hidden-import websocket-client --hidden-import pillow \
151-
--hidden-import config \
152-
--hidden-import component \
153-
--hidden-import server \
154-
--hidden-import task \
155-
--hidden-import tools \
156-
--hidden-import view \
157-
--hidden-import=_cffi_backend --collect-data curl_cffi \
158-
--add-data "../lib/macos/*:." \
159-
--strip --windowed -i Icon.icns \
160-
start.py
161-
xattr -cr dist/JMComic.app
162-
create-dmg --volname "JMComic" --volicon "Icon.icns" --icon "JMComic.app" 200 190 \
163-
--window-pos 200 120 \
164-
--window-size 800 400 \
165-
--icon-size 100 \
166-
--hide-extension "JMComic.app" --app-drop-link 600 185 \
167-
${{ env.PACKAGENAME }}.dmg dist/JMComic.app
168-
169-
zip -9 jmcomic.zip ${{ env.PACKAGENAME }}.dmg
170-
mv ${{ env.PACKAGENAME }}.dmg ..
171-
mv jmcomic.zip ..
172-
cd ..
173-
- name: Upload
174-
uses: actions/upload-artifact@v4
175-
with:
176-
name: ${{ env.PACKAGENAME }}
177-
path: ${{ env.PACKAGENAME }}.dmg
17882
retention-days: 7

‎.github/workflows/release.yml

-114
Original file line numberDiff line numberDiff line change
@@ -41,69 +41,6 @@ jobs:
4141
draft: true
4242
prerelease: true
4343

44-
macos:
45-
needs: [setup, release]
46-
runs-on: macos-13
47-
env:
48-
PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_macos_x64
49-
steps:
50-
- uses: actions/checkout@v4
51-
- name: Set up Python 3.7
52-
uses: actions/setup-python@v5
53-
with:
54-
python-version: 3.7
55-
56-
- name: Install dependencies
57-
run: |
58-
python3.7 -m pip install --upgrade pip
59-
pip3.7 install pyinstaller==4.8
60-
pip3.7 install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-cp37m-macosx_11_0_x86_64.whl
61-
pip3.7 install -r src/requirements_macos.txt
62-
brew install create-dmg
63-
- name: Build
64-
run: |
65-
cd src
66-
cp ../res/icon/Icon.icns ./
67-
pyinstaller --clean --onedir --name JMComic \
68-
--hidden-import sr_ncnn_vulkan --hidden-import PySide6 --hidden-import requests \
69-
--hidden-import urllib3 --hidden-import websocket-client --hidden-import pillow \
70-
--hidden-import config \
71-
--hidden-import component \
72-
--hidden-import server \
73-
--hidden-import task \
74-
--hidden-import tools \
75-
--hidden-import view \
76-
--hidden-import=_cffi_backend --collect-data curl_cffi \
77-
--add-data "../lib/macos/*:." \
78-
--strip --windowed -i Icon.icns \
79-
start.py
80-
xattr -cr dist/JMComic.app
81-
create-dmg --volname "JMComic" --volicon "Icon.icns" --icon "JMComic.app" 200 190 \
82-
--window-pos 200 120 \
83-
--window-size 800 400 \
84-
--icon-size 100 \
85-
--hide-extension "JMComic.app" --app-drop-link 600 185 \
86-
${{ env.PACKAGENAME }}.dmg dist/JMComic.app
87-
88-
zip -9 jmcomic.zip ${{ env.PACKAGENAME }}.dmg
89-
mv ${{ env.PACKAGENAME }}.dmg ..
90-
mv jmcomic.zip ..
91-
cd ..
92-
- name: Upload
93-
uses: actions/upload-artifact@v4
94-
with:
95-
name: ${{ env.PACKAGENAME }}
96-
path: jmcomic.zip
97-
- name: upload-macos
98-
uses: actions/upload-release-asset@v1
99-
env:
100-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
101-
with:
102-
upload_url: ${{ needs.release.outputs.Up_Url }}
103-
asset_path: ${{ env.PACKAGENAME }}.dmg
104-
asset_name: ${{ env.PACKAGENAME }}.dmg
105-
asset_content_type: application/gzip
106-
10744
windows:
10845
needs: [setup, release]
10946
runs-on: windows-latest
@@ -183,54 +120,3 @@ jobs:
183120
asset_path: ${{ env.PACKAGENAME }}.zip
184121
asset_name: ${{ env.PACKAGENAME }}.zip
185122
asset_content_type: application/zip
186-
187-
ubuntu:
188-
needs: [setup, release]
189-
runs-on: ubuntu-20.04
190-
env:
191-
PACKAGENAME: ${{ needs.setup.outputs.PACKAGE_PREFIX }}_linux_x64
192-
steps:
193-
- uses: actions/checkout@v4
194-
- name: Set up Python 3.7
195-
uses: actions/setup-python@v5
196-
with:
197-
python-version: 3.7
198-
- name: Install dependencies
199-
run: |
200-
sudo apt-get install -y fuse libfuse2
201-
python -m pip install --upgrade pip
202-
pip install pyinstaller==4.8
203-
pip install https://github.com/tonquer/waifu2x-vulkan/releases/download/v1.1.6/sr_ncnn_vulkan-1.2.0-cp37-cp37m-linux_x86_64.whl
204-
pip install -r src/requirements.txt
205-
- name: Build
206-
run: |
207-
cd src
208-
pyinstaller --hidden-import=_cffi_backend --collect-data curl_cffi --add-data "../lib/linux/*:." -w start.py
209-
cd dist
210-
mkdir -p jmcomic.AppRun/usr/bin
211-
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
212-
chmod +x appimagetool-x86_64.AppImage
213-
cp -r ../../res/appimage/* jmcomic.AppRun/
214-
cp -r ../../res/icon/logo_round.png jmcomic.AppRun/JMComic.png
215-
cp -r start/* jmcomic.AppRun/usr/bin/
216-
217-
mv jmcomic.AppRun/usr/bin/start jmcomic.AppRun/usr/bin/JMComic
218-
chmod +x jmcomic.AppRun/AppRun
219-
chmod +x jmcomic.AppRun/usr/bin/JMComic
220-
./appimagetool-x86_64.AppImage jmcomic.AppRun
221-
mv JMComic-x86_64.AppImage ../../${{ env.PACKAGENAME }}-x86_64.AppImage
222-
cd ../..
223-
- name: Upload
224-
uses: actions/upload-artifact@v4
225-
with:
226-
name: ${{ env.PACKAGENAME }}
227-
path: ${{ env.PACKAGENAME }}-x86_64.AppImage
228-
- name: upload-win
229-
uses: actions/upload-release-asset@v1
230-
env:
231-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
232-
with:
233-
upload_url: ${{ needs.release.outputs.Up_Url }}
234-
asset_path: ${{ env.PACKAGENAME }}-x86_64.AppImage
235-
asset_name: ${{ env.PACKAGENAME }}-x86_64.AppImage
236-
asset_content_type: application/zip

‎res/icon/loading.gif

-254 KB
Loading

‎res/icon/loading/loading_1.png

210 KB
Loading

‎res/icon/loading/loading_10.png

262 KB
Loading

‎res/icon/loading/loading_2.png

228 KB
Loading

‎res/icon/loading/loading_3.png

239 KB
Loading

‎res/icon/loading/loading_4.png

255 KB
Loading

‎res/icon/loading/loading_5.png

316 KB
Loading

‎res/icon/loading/loading_6.png

257 KB
Loading

‎res/icon/loading/loading_7.png

279 KB
Loading

‎res/icon/loading/loading_8.png

237 KB
Loading

‎res/icon/loading/loading_9.png

230 KB
Loading

‎src/component/widget/navigation_widget.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def Logout(self):
107107

108108
def LoginSucBack(self):
109109
self.UpdateProxyName()
110-
QtOwner().owner.LoginSucBack()
110+
# QtOwner().owner.LoginSucBack()
111111
if not QtOwner().user.isLogin:
112112
return
113113
# self.pushButton.hide()

‎src/config/config.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
UpdateUrl2Back = "https://hub.ggo.icu/tonquer/JMComic-qt/"
2323
UpdateUrl3Back = "https://hub.fastgit.xyz/tonquer/JMComic-qt"
2424

25-
UpdateVersion = "v1.2.3"
26-
RealVersion = "v1.2.3"
27-
VersionTime = "2024-6-30"
25+
UpdateVersion = "v1.2.5"
26+
RealVersion = "v1.2.5"
27+
VersionTime = "2024-10-15"
2828

29-
Waifu2xVersion = "1.1.6"
29+
Waifu2xVersion = "1.2.0"
3030
LoginUserName = ""
3131

3232

‎src/config/global_config.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ def set_value(self, value):
2222

2323
class GlobalConfig:
2424
Ver = GlobalItem(22)
25+
VerTime = GlobalItem("2024-10-15")
2526

2627
# web url
2728
WebDnsList = GlobalItem([])
2829
Url = GlobalItem("https://18-comicblade.art")
29-
UrlList = GlobalItem(["https://18-comicblade.art","https://18comic.vip","https://jmcomic.me","https://18-comicstellar.club","https://18comic.tw","https://18-comicstellar.me"])
30+
UrlList = GlobalItem(["https://18comic-hok.vip","https://18comic.vip","https://jmcomic.me","https://18comic-16promax.club","https://18comic.tw","https://18comic-doa.xyz"])
3031

3132
# mobile url
3233

@@ -78,11 +79,18 @@ def GetImgUrl2(index):
7879
@staticmethod
7980
def LoadSetting():
8081
try:
82+
newKv = {}
8183
for k, v in dict(Setting.GlobalConfig.value).items():
8284
Log.Debug("load global setting, k={}, v={}".format(k, v))
83-
value = getattr(GlobalConfig, k, "")
84-
if isinstance(value, GlobalItem) :
85-
value.set_value(v)
85+
newKv[k] = v
86+
oldV = newKv.get("Ver", 0)
87+
if GlobalConfig.Ver.value > oldV:
88+
Log.Debug("can not load old config, ver:{}->{}".format(oldV, GlobalConfig.Ver.value))
89+
else:
90+
for k, v in newKv.items():
91+
value = getattr(GlobalConfig, k, "")
92+
if isinstance(value, GlobalItem):
93+
value.set_value(v)
8694
except Exception as es:
8795
Log.Error(es)
8896
pass

0 commit comments

Comments
 (0)