WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit bfa310e

Browse files
tonquertonquer
committed
update
1 parent 241d915 commit bfa310e

File tree

89 files changed

+1233
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1233
-668
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
cd src
4040
cd db
4141
rm -rf book.db
42-
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db
42+
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db
4343
cd ..
4444
cp ../res/icon/Icon.icns ./
4545
pyinstaller --target-architecture=universal2 --clean --onedir --name PicACG \
@@ -99,7 +99,7 @@ jobs:
9999
cd src
100100
cd db
101101
rm -rf book.db
102-
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db
102+
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db
103103
cd ..
104104
cp ../res/icon/Icon.icns ./
105105
pyinstaller --target-architecture=universal2 --clean --onedir --name PicACG \
@@ -154,7 +154,7 @@ jobs:
154154
cd src
155155
cd db
156156
Remove-Item book.db
157-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
157+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
158158
cd ..
159159
160160
cp ..\res\icon\icon.ico .\
@@ -195,7 +195,7 @@ jobs:
195195
cd src
196196
cd db
197197
Remove-Item book.db
198-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
198+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
199199
cd ..
200200
201201
cp ..\res\icon\icon.ico .\
@@ -237,7 +237,7 @@ jobs:
237237
cd src
238238
cd db
239239
Remove-Item book.db
240-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
240+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
241241
cd ..
242242
cp ..\res\icon\icon.ico .\
243243
pyinstaller -F -w -i icon.ico start.py
@@ -276,7 +276,7 @@ jobs:
276276
cd src
277277
cd db
278278
Remove-Item book.db
279-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
279+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
280280
cd ..
281281
cp ..\res\icon\icon.ico .\
282282
pyinstaller -F -w -i icon.ico start.py
@@ -318,7 +318,7 @@ jobs:
318318
pyinstaller -w start.py
319319
cd db
320320
rm -rf book.db
321-
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db
321+
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db
322322
cd ..
323323
cd dist
324324
mkdir -p picacg.AppRun/usr/bin

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
cd src
7272
cd db
7373
rm -rf book.db
74-
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db
74+
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db
7575
cd ..
7676
cp ../res/icon/Icon.icns ./
7777
pyinstaller --target-architecture=universal2 --clean --onedir --name PicACG \
@@ -139,7 +139,7 @@ jobs:
139139
cd src
140140
cd db
141141
rm -rf book.db
142-
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db
142+
wget https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db
143143
cd ..
144144
cp ../res/icon/Icon.icns ./
145145
pyinstaller --target-architecture=universal2 --clean --onedir --name PicACG \
@@ -204,7 +204,7 @@ jobs:
204204
cd src
205205
cd db
206206
Remove-Item book.db
207-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
207+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
208208
cd ..
209209
cp ..\res\icon\icon.ico .\
210210
pyinstaller -F -w -i icon.ico start.py --upx-dir "D:\upx-4.2.4-win64"
@@ -256,7 +256,7 @@ jobs:
256256
cd src
257257
cd db
258258
Remove-Item book.db
259-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
259+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
260260
cd ..
261261
cp ..\res\icon\icon.ico .\
262262
pyinstaller -F -w -i icon.ico start.py --upx-dir "D:\upx-4.2.4-win64"
@@ -309,7 +309,7 @@ jobs:
309309
cd src
310310
cd db
311311
Remove-Item book.db
312-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
312+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
313313
cd ..
314314
cp ..\res\icon\icon.ico .\
315315
pyinstaller -F -w -i icon.ico start.py --upx-dir "D:\upx-4.2.4-win64"
@@ -361,7 +361,7 @@ jobs:
361361
cd src
362362
cd db
363363
Remove-Item book.db
364-
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.2/book.db" -OutFile "book.db"
364+
Invoke-WebRequest -Uri "https://github.com/bika-robot/picacg-database/releases/download/v1.5.3/book.db" -OutFile "book.db"
365365
cd ..
366366
cp ..\res\icon\icon.ico .\
367367
pyinstaller -F -w -i icon.ico start.py --upx-dir "D:\upx-4.2.4-win64"

‎src/component/dialog/base_mask_dialog.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class BaseMaskDialog(QDialog):
1010
closed = Signal()
1111

1212
def __init__(self, parent):
13-
QDialog.__init__(self, parent=parent)
13+
QDialog.__init__(self, parent)
1414
self.vBoxLayout = QVBoxLayout(self)
1515
self.windowMask = QWidget(self)
1616
# 蒙版中间的对话框，所有小部件以他为父级窗口

‎src/component/list/comic_list_widget.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def AddBookItemByBook(self, v, isShowHistory=False, isShowToolButton=False):
180180
else:
181181
tags = ""
182182
isShiled = QtOwner().IsInFilter(categories, tags, title)
183-
self.AddBookItem(_id, title, categories, url, path, likesCount, updated_at, pagesCount, finished, isShowToolButton=isShowToolButton, isShiled=isShiled)
183+
self.AddBookItem(_id, title, categories, url, path, likesCount, updated_at, pagesCount, finished, isShowToolButton=isShowToolButton, isShiled=isShiled, tags=tags)
184184

185185
def AddBookItemByHistory(self, v):
186186
_id = v.bookId
@@ -190,14 +190,15 @@ def AddBookItemByHistory(self, v):
190190
categories = "{} {}".format(ToolUtil.GetUpdateStrByTick(v.tick), Str.GetStr(Str.Looked))
191191
self.AddBookItem(_id, title, categories, url, path)
192192

193-
def AddBookItem(self, _id, title, categoryStr="", url="", path="", likesCount="", updated_at="", pagesCount="", finished="", isShowToolButton=False, isShiled=False):
193+
def AddBookItem(self, _id, title, categoryStr="", url="", path="", likesCount="", updated_at="", pagesCount="", finished="", isShowToolButton=False, isShiled=False, tags=""):
194194
index = self.count()
195195
widget = ComicItemWidget(isShiled=isShiled)
196196
widget.setFocusPolicy(Qt.NoFocus)
197197
widget.id = _id
198198
widget.title = title
199199
widget.picNum = pagesCount
200200
widget.category = categoryStr
201+
widget.tags = tags
201202

202203
widget.url = ToolUtil.GetRealUrl(url, path)
203204
if self.isGame:

‎src/component/widget/comic_item_widget.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def __init__(self, isCategory=False, isShiled=False):
2121
self.title = ""
2222
self.picNum = 0
2323
self.category = ""
24+
self.tags = ""
2425

2526
self.index = 0
2627
self.url = ""

‎src/config/config.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
ProjectName = "PicACG"
16-
ThreadNum = 10 # 线程
16+
ThreadNum = 5 # 线程
1717
DownloadThreadNum = 5 # 下载线程
1818
ResetDownloadCnt = 5 # 下载图片重试次数
1919
ResetDownloadCntDefault = 2 # 下载封面重试次数
@@ -52,7 +52,7 @@
5252

5353
UpdateVersion = "v1.5.2"
5454
RealVersion = "v1.5.2"
55-
TimeVersion = "2025-3-16"
55+
TimeVersion = "2025-4-13"
5656
DbVersion = ""
5757

5858
Waifu2xVersion = "1.2.0"
@@ -112,4 +112,6 @@
112112
# "pica-pica.wikawika.xyz",
113113
"www.picacomic.com",
114114
"storage-b.picacomic.com",
115-
]
115+
]
116+
117+

‎src/config/global_config.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def set_value(self, value):
2121

2222

2323
class GlobalConfig:
24-
Ver = GlobalItem(6)
25-
VerTime = GlobalItem("2024-10-15")
24+
Ver = GlobalItem(7)
25+
VerTime = GlobalItem("2025-3-17")
2626
# web url
2727
WebDnsList = GlobalItem([])
2828

@@ -31,15 +31,22 @@ class GlobalConfig:
3131
Address = GlobalItem(["104.21.91.145", "188.114.98.153"])
3232
AddressIpv6 = GlobalItem(["2606:4700:d:28:dbf4:26f3:c265:73bc", "2a06:98c1:3120:ca71:be2c:c721:d2b5:5dbf"])
3333
ImageUrl = GlobalItem("s3.picacomic.com")
34-
ImageServerList = GlobalItem(["s3.picacomic.com", "storage.diwodiwo.xyz", "s2.picacomic.com", "storage1.picacomic.com", "storage-b.picacomic.com"])
35-
ImageJumList = GlobalItem(["img.picacomic.com", "img.diwodiwo.xyz"])
34+
ImageServerList = GlobalItem(["s3.picacomic.com", "storage.diwodiwo.xyz", "s2.picacomic.com",
35+
"storage1.picacomic.com", "storage-b.picacomic.com",
36+
"storage1.go2778.com",
37+
"storage-b.go2778.com"
38+
])
39+
ImageJumList = GlobalItem(["img.picacomic.com", "img.diwodiwo.xyz", "img.safedataplj.com"])
3640

3741
ProxyApiDomain = GlobalItem("bika-api.ggo.icu")
3842
ProxyImgDomain = GlobalItem("bika-img.ggo.icu")
3943

4044
ProxyApiDomain2 = GlobalItem("bika2-api.ggo.icu")
4145
ProxyImgDomain2 = GlobalItem("bika21-img.ggo.icu")
4246

47+
# 使用sni欺骗，避免
48+
SniDomain = GlobalItem(["picacomic.com", "diwodiwo.xyz", "tipatipa.xyz", "wikawika.xyz"])
49+
4350
def __init__(self):
4451
pass
4552

‎src/config/setting.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class Setting:
111111
IsUseHttps = SettingValue("ProxySetting", 1, False)
112112
PreIpv6 = SettingValue("ProxySetting", 0, False)
113113
LastProxyResult = SettingValue("ProxySetting", {}, False)
114+
IsUseSniPretend = SettingValue("ProxySetting", 1, False)
114115

115116
ProxySelectIndex = SettingValue("ProxySetting", 1, False)
116117
ProxyImgSelectIndex = SettingValue("ProxySetting", 1, False)
@@ -178,6 +179,7 @@ class Setting:
178179
IsForbidTag = SettingValue("Other", False, False)
179180
IsForbidTitle = SettingValue("Other", False, False)
180181
IsSkipSpace = SettingValue("Other", 0, False)
182+
IsSkipPic = SettingValue("Other", 0, False)
181183

182184
@staticmethod
183185
def InitLoadSetting():

‎src/interface/ui_book_eps.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
################################################################################
44
## Form generated from reading UI file 'ui_book_eps.ui'
55
##
6-
## Created by: Qt User Interface Compiler version 6.2.4
6+
## Created by: Qt User Interface Compiler version 6.5.3
77
##
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################

‎src/interface/ui_book_info.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
################################################################################
44
## Form generated from reading UI file 'ui_book_info.ui'
55
##
6-
## Created by: Qt User Interface Compiler version 6.2.4
6+
## Created by: Qt User Interface Compiler version 6.5.3
77
##
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################

0 commit comments

Comments
 (0)