Merge branch 'main' of https://github.com/tonquer/picacg-windows into…

… main
tonquer · Feb 27, 2021 · 9e272dc · 9e272dc
2 parents a7cf501 + 4b45c6f
commit 9e272dc
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 65 deletions.
diff --git a/src/qt/qtmain.py b/src/qt/qtmain.py
@@ -83,8 +83,6 @@ def __init__(self):
 
         self.resize(self.settingForm.mainSize)
         self.bookInfoForm.resize(self.settingForm.bookSize)
-        self.qtReadImg.resize(self.settingForm.readSize)
-
         self.loginForm.userIdEdit.setText(self.settingForm.userId)
         self.loginForm.passwdEdit.setText(self.settingForm.passwd)
 
@@ -119,11 +117,9 @@ def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
         userId = self.loginForm.userIdEdit.text()
         passwd = self.loginForm.passwdEdit.text()
         self.bookInfoForm.close()
-        self.settingForm.ExitSaveSetting(self.size(), self.bookInfoForm.size(), self.qtReadImg.size(), userId, passwd)
+        self.settingForm.ExitSaveSetting(self.size(), self.bookInfoForm.size(), userId, passwd)
 
     def Init(self):
-        # config.UpdateIos()
-        # self.ClearExpiredCache()
         waifu2x.Set(config.Waifu2xThread, config.Encode, getattr(config, "Model"+str(config.Model)))
         stat = waifu2x.Init()
         if stat < 0:
@@ -154,6 +150,6 @@ def InitUpdateBack(self, data):
                                                                                         data),
                                          QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes)
             if r == QMessageBox.Yes:
-                QDesktopServices.openUrl(QUrl("https://github.com/tonquer/picacg-windows/releases"))
+                QDesktopServices.openUrl(QUrl("https://github.com/tonquer/picacomic-windows/releases"))
         except Exception as es:
             Log.Error(es)
diff --git a/src/server/req.py b/src/server/req.py
@@ -208,45 +208,10 @@ def __init__(self, bookId="", content=""):
                                              {"content": content}, method)
 
 
-# 发送评论
-class SendCommentChildrenReq(ServerReq):
-    def __init__(self, comentId="", content=""):
-        url = config.Url + "comments/{}".format(comentId)
-        method = "POST"
-        super(self.__class__, self).__init__(url, ToolUtil.GetHeader(url, method),
-                                             {"content": content}, method)
-
-
-# 查看子评论
-class GetCommentsChildrenReq(ServerReq):
-    def __init__(self, comentId="", page=1):
-        url = config.Url + "comments/{}/childrens?page={}".format(comentId, page)
-        method = "Get"
-        super(self.__class__, self).__init__(url, ToolUtil.GetHeader(url, method),
-                                             {}, method)
-
-
 # 下载图片
 class SpeedTestReq(ServerReq):
-    Index = 0
-    URLS = [
-        "https://storage1.picacomic.com/static/fc75975a-af8e-40c5-8679-725d6f64d6f5.jpg",
-        # "https://storage1.picacomic.com/static/5aa5c52b-8fb5-4c16-866c-d6d92fb4a761.jpg",
-        # "https://storage1.picacomic.com/static/7e7d1320-9717-4702-883d-2899975283b2.jpg",
-        # "https://storage1.picacomic.com/static/91c3f41a-e6de-4de1-a80f-10af17aee5a8.jpg",
-        # "https://storage1.picacomic.com/static/60c852b9-e47d-400c-af9d-bee86ce20b6d.jpg",
-        # "https://storage1.picacomic.com/static/66541fe6-caaa-4965-ac1a-1b1b793e5677.jpg",
-    ]
-
     def __init__(self):
-        url = SpeedTestReq.URLS[SpeedTestReq.Index]
-        SpeedTestReq.Index += 1
-        if SpeedTestReq.Index >= len(SpeedTestReq.URLS):
-            SpeedTestReq.Index = 0
+        url = "https://storage1.picacomic.com/static/7e7d1320-9717-4702-883d-2899975283b2.jpg"
         method = "Download"
-        header = ToolUtil.GetHeader(url, method)
-        header['cache-control'] = 'no-cache'
-        header['expires'] = '0'
-        header['pragma'] = 'no-cache'
-        super(self.__class__, self).__init__(url, header,
+        super(self.__class__, self).__init__(url, ToolUtil.GetHeader(url, method),
                                              {}, method)
diff --git a/src/server/user_handler.py b/src/server/user_handler.py
@@ -181,7 +181,7 @@ def __call__(self, backData):
                     data += chunk
                 if backData.bakParam:
                     QtTask().downloadBack.emit(backData.bakParam, 0, b"")
-                # Log.Info("size:{}, url:{}".format(ToolUtil.GetDownloadSize(fileSize), backData.req.url))
+
                 if backData.cacheAndLoadPath and config.IsUseCache and len(data) > 0:
                     filePath = backData.cacheAndLoadPath
                     fileDir = os.path.dirname(filePath)
@@ -230,20 +230,6 @@ def __call__(self, backData):
             QtTask().taskBack.emit(backData.bakParam, backData.res.raw.text)
 
 
-@handler(req.SendCommentChildrenReq)
-class GetKeywordsHandler(object):
-    def __call__(self, backData):
-        if backData.bakParam:
-            QtTask().taskBack.emit(backData.bakParam, backData.res.raw.text)
-
-
-@handler(req.GetCommentsChildrenReq)
-class GetKeywordsHandler(object):
-    def __call__(self, backData):
-        if backData.bakParam:
-            QtTask().taskBack.emit(backData.bakParam, backData.res.raw.text)
-
-
 @handler(req.SpeedTestReq)
 class SpeedTestReq(object):
     def __call__(self, backData):
@@ -262,7 +248,7 @@ def __call__(self, backData):
                 getSize = 0
                 now = time.time()
                 consume = 1
-                for chunk in r.iter_content(chunk_size=10240):
+                for chunk in r.iter_content(chunk_size=1024):
                     getSize += len(chunk)
                     consume = time.time() - now
                     if consume >= 2:

diff --git a/ui/test.py b/ui/test.py
@@ -17,15 +17,23 @@ class Ui_Test(object):
     def setupUi(self, Test):
         if not Test.objectName():
             Test.setObjectName(u"Test")
-        Test.resize(400, 286)
+        Test.resize(411, 301)
         Test.setAcceptDrops(False)
         self.gridLayout = QGridLayout(Test)
         self.gridLayout.setObjectName(u"gridLayout")
         self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.graphicsView = QGraphicsView(Test)
+        self.frame = QFrame(Test)
+        self.frame.setObjectName(u"frame")
+        self.frame.setFrameShape(QFrame.StyledPanel)
+        self.frame.setFrameShadow(QFrame.Raised)
+        self.graphicsView = QGraphicsView(self.frame)
         self.graphicsView.setObjectName(u"graphicsView")
+        self.graphicsView.setGeometry(QRect(10, 50, 256, 192))
+        self.label = QLabel(self.frame)
+        self.label.setObjectName(u"label")
+        self.label.setGeometry(QRect(250, 140, 54, 12))
 
-        self.gridLayout.addWidget(self.graphicsView, 0, 0, 1, 1)
+        self.gridLayout.addWidget(self.frame, 0, 0, 1, 1)
 
 
         self.retranslateUi(Test)
@@ -35,5 +43,6 @@ def setupUi(self, Test):
 
     def retranslateUi(self, Test):
         Test.setWindowTitle(QCoreApplication.translate("Test", u"Form", None))
+        self.label.setText(QCoreApplication.translate("Test", u"TextLabel", None))
     # retranslateUi
 
diff --git a/ui/test.ui b/ui/test.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>286</height>
+    <width>411</width>
+    <height>301</height>
    </rect>
   </property>
   <property name="acceptDrops">
@@ -30,7 +30,37 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <widget class="QGraphicsView" name="graphicsView"/>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <widget class="QGraphicsView" name="graphicsView">
+      <property name="geometry">
+       <rect>
+        <x>10</x>
+        <y>50</y>
+        <width>256</width>
+        <height>192</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label">
+      <property name="geometry">
+       <rect>
+        <x>250</x>
+        <y>140</y>
+        <width>54</width>
+        <height>12</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>TextLabel</string>
+      </property>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>