Skip to content
This repository was archived by the owner on Aug 3, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY . .
ENV DEBIAN_FRONTEND noninteractive
ENV TZ Asia/Shanghai

RUN pip install -r requirements.txt
RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple

EXPOSE 35050
EXPOSE 36050
Expand Down
4 changes: 4 additions & 0 deletions Src/Manager/ProxyManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ def getQualityUsefulProxy(self, **kwargs):
return result

def deleteRawProxy(self, proxy):
log.info(proxy)
self.raw_proxy.deleteRawProxy(proxy)

def saveRawProxy(self, proxy):
Expand Down Expand Up @@ -159,6 +160,9 @@ def updateUsefulProxy(self, item, info):
if item.get("https") == PROXY_HTTPS["UNKNOWN"]:
data["$set"]["https"] = info["https"]

if item.get("quality"):
data["$set"]["quality"] = -1

if len(data["$set"]) > 0:
self.useful_proxy.updateUsefulProxy(item["proxy"], data)

Expand Down
26 changes: 25 additions & 1 deletion Src/Web/api/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,33 @@ def get(self):
item = proxy_manager.getSampleUsefulProxy(**options)
if item:
del item["_id"]

result["data"] = item

return result
class deleteProxy(Resource):
def __init__(self, **kwargs):
super(deleteProxy, self).__init__(**kwargs)

parser = reqparse.RequestParser()
parser.add_argument('proxy', type=str, location='args')
self.args = parser.parse_args()

def get(self):
result = {
"data": {}
}

options = {
"proxy": self.args.get('proxy'),
"quality":-1
}
log.info("receive params: {}".format(options))
info={}
item = proxy_manager.updateUsefulProxy(options, info)
log.info("delete {}".format(item))
result["data"] = item

return result

class Proxies(Resource):
def __init__(self, **kwargs):
Expand Down Expand Up @@ -140,4 +162,6 @@ def init_app(app):
api = Api(app)
api.add_resource(Proxies, '/api/v1/proxies/')
api.add_resource(Proxy, '/api/v1/proxy/')
api.add_resource(deleteProxy, '/api/v1/proxy/delete')

api.add_resource(ApiList, '/api/v1/')
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ pymongo==3.7.2
flask-mongoengine==0.8.2
Flask-Admin==1.5.3
Flask-Security==3.0.0
email-validator==1.1.1