Skip to content

Commit

Permalink
支持库调整
Browse files Browse the repository at this point in the history
  • Loading branch information
kitUIN committed Nov 28, 2020
1 parent df259aa commit 4193b85
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
6 changes: 2 additions & 4 deletions PicImageSearch/saucenao.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import io

import requests
import urllib3
from PIL import Image
from loguru import logger
from requests_toolbelt import MultipartEncoder

Expand Down Expand Up @@ -161,7 +158,8 @@ def search(self, url: str):
)
headers = {'Content-Type': m.content_type}
urllib3.disable_warnings()
resp = requests.post(self.SauceNAOURL, headers=headers,data=m,params=params,verify=False,**self.requests_kwargs)
resp = requests.post(self.SauceNAOURL, headers=headers, data=m, params=params, verify=False,
**self.requests_kwargs)
status_code = resp.status_code
logger.info(status_code)
data = resp.json()
Expand Down
14 changes: 7 additions & 7 deletions PicImageSearch/tracemoe.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ def __repr__(self):


class TraceMoeResponse:
def __init__(self, resp,mute):
def __init__(self, resp, mute):
self.raw: list = []
resp_docs = resp['docs']
for i in resp_docs:
self.raw.append(TraceMoeNorm(i,mute=mute))
self.raw.append(TraceMoeNorm(i, mute=mute))
self.origin: dict = resp
self.RawDocsCount: int = resp['RawDocsCount'] # 搜索的帧总数
self.RawDocsSearchTime: int = resp['RawDocsSearchTime'] # 从数据库检索帧所用的时间
Expand All @@ -79,7 +79,7 @@ def __repr__(self):
class TraceMoe:
TraceMoeURL = 'https://trace.moe/api/search'

def __init__(self, mute=False,**requests_kwargs):
def __init__(self, mute=False, **requests_kwargs):
"""
:param mute: 预览视频是否静音(默认不静音)
:param **requests_kwargs:代理设置
Expand Down Expand Up @@ -125,18 +125,18 @@ def search(self, url, Filter=0):
params = dict()
if url[:4] == 'http': # 网络url
params['url'] = url
res = requests.get(self.TraceMoeURL, params=params,verify=False,**self.requests_kwargs)
res = requests.get(self.TraceMoeURL, params=params, verify=False, **self.requests_kwargs)
if res.status_code == 200:
data = res.json()
return TraceMoeResponse(data,self.mute)
return TraceMoeResponse(data, self.mute)
else:
logger.error(self._errors(res.status_code))
else: # 是否是本地文件
img = self._base_64(url)
res = requests.post(self.TraceMoeURL, json={"image": img, "filter": Filter},**self.requests_kwargs)
res = requests.post(self.TraceMoeURL, json={"image": img, "filter": Filter}, **self.requests_kwargs)
if res.status_code == 200:
data = res.json()
return TraceMoeResponse(data,self.mute)
return TraceMoeResponse(data, self.mute)
else:
logger.error(self._errors(res.status_code))
except Exception as e:
Expand Down
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
requests==2.23.0
setuptools~=50.3.0
loguru~=0.5.3
Pillow~=7.2.0
BeautifulSoup4~=4.9.3
PicImageSearch~=0.6.6
urllib3~=1.25.11

0 comments on commit 4193b85

Please sign in to comment.