@@ -27,27 +27,15 @@ def __call__(self, task):
2727 if task .res .raw .status_code != 200 :
2828 return
2929
30- updateInfo = re .findall (r"<meta property=\"og:description\" content=\"([^\"]*)\"" , task .res .raw .text )
31- if updateInfo :
32- rawData = updateInfo [0 ]
33- else :
34- rawData = ""
35-
36- versionInfo = re .findall ("<meta property=\" og:url\" content=\" .*tag/([^\" ]*)\" " , task .res .raw .text )
37- if versionInfo :
38- verData = versionInfo [0 ]
39- else :
40- verData = ""
41-
30+ verData = task .res .GetText ()
4231 info = verData .replace ("v" , "" ).split ("." )
4332 version = int (info [0 ]) * 100 + int (info [1 ]) * 10 + int (info [2 ]) * 1
33+
4434 info2 = re .findall (r"\d+\d*" , os .path .basename (config .UpdateVersion ))
4535 curversion = int (info2 [0 ]) * 100 + int (info2 [1 ]) * 10 + int (info2 [2 ]) * 1
4636
47- rawData = "\n \n v" + "." .join (info ) + "\n " + rawData
48-
4937 if version > curversion :
50- data ["data" ] = rawData
38+ data ["data" ] = verData . replace ( " \r \n " , "" ). replace ( " \n " , "" )
5139 else :
5240 data ["data" ] = "no"
5341 except Exception as es :
@@ -57,38 +45,22 @@ def __call__(self, task):
5745 TaskBase .taskObj .taskBack .emit (task .bakParam , pickle .dumps (data ))
5846
5947
60- @handler (req .CheckPreUpdateReq )
61- class CheckPreUpdateReqHandler (object ):
48+ @handler (req .CheckUpdateInfoReq )
49+ class CheckUpdateInfoHandler (object ):
6250 def __call__ (self , task ):
6351 data = {"st" : task .status , "data" : "" }
6452 try :
6553 if not task .res .GetText () or task .status == Status .NetError :
6654 return
6755 if task .res .raw .status_code != 200 :
6856 return
69- rawData = json .loads (task .res .raw .text )
70- if not rawData :
71- return
72- v = rawData [0 ]
73- verData = v .get ("tag_name" )
74- info = verData .replace ("v" , "" ).split ("." )
75- version = int (info [0 ]) * 100 + int (info [1 ]) * 10 + int (info [2 ]) * 1
76- info2 = re .findall (r"\d+\d*" , os .path .basename (config .UpdateVersion ))
77- curversion = int (info2 [0 ]) * 100 + int (info2 [1 ]) * 10 + int (info2 [2 ]) * 1
78-
79- rawData = v .get ("body" )
80-
81- if version > curversion :
82- data ["data" ] = rawData
83- else :
84- data ["data" ] = "no"
8557
58+ data ["data" ] = task .res .GetText ()
8659 except Exception as es :
8760 pass
8861 finally :
8962 if task .bakParam :
9063 TaskBase .taskObj .taskBack .emit (task .bakParam , pickle .dumps (data ))
91-
9264# @handler(req.GetUserInfoReq)
9365# class GetUserInfoReqHandler(object):
9466# def __call__(self, task: Task):
@@ -761,27 +733,40 @@ def __call__(self, backData):
761733 if backData .bakParam :
762734 TaskBase .taskObj .downloadBack .emit (backData .bakParam , 0 , - Status .Error , b"" )
763735 return
736+
764737 fileSize = int (r .headers .get ('Content-Length' , 0 ))
765- if fileSize <= 0 :
766- fileSize = 100000
767738 getSize = 0
768739 data = b""
769- now = time .time ()
770740
771741 addSize = 0
742+ now = time .time ()
743+ isAlreadySend = False
772744 # 网速快，太卡了，优化成最多100ms一次
773- for chunk in r .iter_content (chunk_size = 4096 ):
774- cur = time .time ()
775- tick = cur - now
776- addSize += len (chunk )
777- if tick >= 0.1 :
778- if backData .bakParam and addSize > 0 :
779- TaskBase .taskObj .downloadBack .emit (backData .bakParam , addSize , max (1 , fileSize - getSize ), b"" )
780- addSize = 0
781- now = cur
782-
783- getSize += len (chunk )
784- data += chunk
745+ try :
746+ for chunk in r .iter_content (chunk_size = 4096 ):
747+ cur = time .time ()
748+ tick = cur - now
749+ addSize += len (chunk )
750+ if tick >= 0.1 :
751+ isAlreadySend = True
752+ if backData .bakParam and addSize > 0 :
753+ TaskBase .taskObj .downloadBack .emit (backData .bakParam , addSize ,
754+ max (1 , fileSize - getSize ), b"" )
755+ addSize = 0
756+ now = cur
757+
758+ getSize += len (chunk )
759+ data += chunk
760+ if not isAlreadySend :
761+ if backData .bakParam :
762+ TaskBase .taskObj .downloadBack .emit (backData .bakParam , 0 , getSize , b"" )
763+
764+ except Exception as es :
765+ Log .Error (es )
766+ if backData .req .resetCnt > 0 :
767+ backData .req .isReset = True
768+ Server ().ReDownload (backData )
769+ return
785770
786771 # Log.Info("size:{}, url:{}".format(ToolUtil.GetDownloadSize(fileSize), backData.req.url))
787772 _ , _ , mat , isAni = ToolUtil .GetPictureSize (data )
@@ -829,15 +814,17 @@ def __call__(self, backData):
829814 except Exception as es :
830815 Log .Error (es )
831816 # 保存失败了
832- if backData .backParam :
833- TaskBase .taskObj .downloadBack .emit (backData .backParam , 0 , - 2 , b"" )
817+ if backData .bakParam :
818+ TaskBase .taskObj .downloadBack .emit (backData .bakParam , 0 , - 2 , b"" )
834819
835820 if backData .bakParam :
836821 TaskBase .taskObj .downloadBack .emit (backData .bakParam , 0 , 0 , data )
822+
837823 except Exception as es :
824+ backData .status = Status .DownloadFail
838825 Log .Error (es )
839- if backData .backParam :
840- TaskBase .taskObj .downloadBack .emit (backData .backParam , 0 , - 1 , b"" )
826+ if backData .bakParam :
827+ TaskBase .taskObj .downloadBack .emit (backData .bakParam , 0 , - backData . status , b"" )
841828
842829
843830@handler (req .DnsOverHttpsReq )
@@ -884,7 +871,9 @@ def __call__(self, backData):
884871 r = backData .res
885872 try :
886873 if r .status_code != 200 :
874+ data ["st" ] = Status .Error
887875 if backData .bakParam :
876+ data ["st" ] = Status .Error
888877 TaskBase .taskObj .taskBack .emit (backData .bakParam , pickle .dumps (data ))
889878 return
890879
@@ -897,13 +886,14 @@ def __call__(self, backData):
897886 if consume >= 3.0 :
898887 break
899888 consume = time .time () - now
900- downloadSize = getSize / max ( 0.0001 , consume )
889+ downloadSize = getSize / consume
901890 speed = ToolUtil .GetDownloadSize (downloadSize )
902891 if backData .bakParam :
903892 data ["data" ] = speed
904893 TaskBase .taskObj .taskBack .emit (backData .bakParam , pickle .dumps (data ))
905894
906895 except Exception as es :
907896 Log .Error (es )
897+ data ["st" ] = Status .DownloadFail
908898 if backData .bakParam :
909899 TaskBase .taskObj .taskBack .emit (backData .bakParam , pickle .dumps (data ))
0 commit comments