github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 21:03:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update utorrent client. Fixes #1138

Browse source
This commit is contained in:
clinton-hall 2017-01-10 08:25:55 +10:30
commit 454db6fe6a
2 changed files with 77 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

105
core/utorrent/client.py
View file

@ -1,50 +1,47 @@
# coding=utf8 # coding=utf8
import urllib
import json import urllib2
import urlparse
import cookielib
import re import re
import StringIO
try:
import json
except ImportError:
import simplejson as json
from six import StringIO from upload import MultiPartForm
from six.moves.http_cookiejar import CookieJar
from six.moves.urllib_error import HTTPError
from six.moves.urllib_parse import urljoin, urlencode
from six.moves.urllib_request import (
build_opener, install_opener,
HTTPBasicAuthHandler, HTTPCookieProcessor,
Request,
)
from core.utorrent.upload import MultiPartForm
class UTorrentClient(object): class UTorrentClient(object):
def __init__(self, base_url, username, password): def __init__(self, base_url, username, password):
self.base_url = base_url self.base_url = base_url
self.username = username self.username = username
self.password = password self.password = password
self.opener = self._make_opener('uTorrent', base_url, username, password) self.opener = self._make_opener('uTorrent', base_url, username, password)
self.token = self._get_token() self.token = self._get_token()
# TODO refresh token, when necessary #TODO refresh token, when necessary
def _make_opener(self, realm, base_url, username, password): def _make_opener(self, realm, base_url, username, password):
"""uTorrent API need HTTP Basic Auth and cookie support for token verify.""" '''uTorrent API need HTTP Basic Auth and cookie support for token verify.'''
auth_handler = HTTPBasicAuthHandler() auth_handler = urllib2.HTTPBasicAuthHandler()
auth_handler.add_password(realm=realm, auth_handler.add_password(realm=realm,
uri=base_url, uri=base_url,
user=username, user=username,
passwd=password) passwd=password)
opener = build_opener(auth_handler) opener = urllib2.build_opener(auth_handler)
install_opener(opener) urllib2.install_opener(opener)
cookie_jar = CookieJar() cookie_jar = cookielib.CookieJar()
cookie_handler = HTTPCookieProcessor(cookie_jar) cookie_handler = urllib2.HTTPCookieProcessor(cookie_jar)
handlers = [auth_handler, cookie_handler] handlers = [auth_handler, cookie_handler]
opener = build_opener(*handlers) opener = urllib2.build_opener(*handlers)
return opener return opener
def _get_token(self): def _get_token(self):
url = urljoin(self.base_url, 'token.html') url = urlparse.urljoin(self.base_url, 'token.html')
response = self.opener.open(url) response = self.opener.open(url)
token_re = "<div id='token' style='display:none;'>([^<>]+)</div>" token_re = "<div id='token' style='display:none;'>([^<>]+)</div>"
match = re.search(token_re, response.read()) match = re.search(token_re, response.read())
@ -56,43 +53,25 @@ class UTorrentClient(object):
return self._action(params) return self._action(params)
def start(self, *hashes): def start(self, *hashes):
params = [('action', 'start'), ] params = [('action', 'start'),]
for hash in hashes: for hash in hashes:
params.append(('hash', hash)) params.append(('hash', hash))
return self._action(params) return self._action(params)
def stop(self, *hashes): def stop(self, *hashes):
params = [('action', 'stop'), ] params = [('action', 'stop'),]
for hash in hashes: for hash in hashes:
params.append(('hash', hash)) params.append(('hash', hash))
return self._action(params) return self._action(params)
def pause(self, *hashes): def pause(self, *hashes):
params = [('action', 'pause'), ] params = [('action', 'pause'),]
for hash in hashes: for hash in hashes:
params.append(('hash', hash)) params.append(('hash', hash))
return self._action(params) return self._action(params)
def forcestart(self, *hashes): def forcestart(self, *hashes):
params = [('action', 'forcestart'), ] params = [('action', 'forcestart'),]
for hash in hashes:
params.append(('hash', hash))
return self._action(params)
def remove(self, *hashes):
params = [('action', 'remove'), ]
for hash in hashes:
params.append(('hash', hash))
return self._action(params)
def removedata(self, *hashes):
params = [('action', 'removedata'), ]
for hash in hashes:
params.append(('hash', hash))
return self._action(params)
def recheck(self, *hashes):
params = [('action', 'recheck'), ]
for hash in hashes: for hash in hashes:
params.append(('hash', hash)) params.append(('hash', hash))
return self._action(params) return self._action(params)
@ -105,6 +84,14 @@ class UTorrentClient(object):
params = [('action', 'getprops'), ('hash', hash)] params = [('action', 'getprops'), ('hash', hash)]
return self._action(params) return self._action(params)
def setprops(self, hash, **kvpairs):
params = [('action', 'setprops'), ('hash', hash)]
for k, v in kvpairs.iteritems():
params.append( ("s", k) )
params.append( ("v", v) )
return self._action(params)
def setprio(self, hash, priority, *files): def setprio(self, hash, priority, *files):
params = [('action', 'setprio'), ('hash', hash), ('p', str(priority))] params = [('action', 'setprio'), ('hash', hash), ('p', str(priority))]
for file_index in files: for file_index in files:
@ -117,7 +104,7 @@ class UTorrentClient(object):
form = MultiPartForm() form = MultiPartForm()
if filepath is not None: if filepath is not None:
file_handler = open(filepath) file_handler = open(filepath,'rb')
else: else:
file_handler = StringIO.StringIO(bytes) file_handler = StringIO.StringIO(bytes)
@ -125,10 +112,26 @@ class UTorrentClient(object):
return self._action(params, str(form), form.get_content_type()) return self._action(params, str(form), form.get_content_type())
def addurl(self, url):
params = [('action', 'add-url'), ('s', url)]
self._action(params)
def remove(self, *hashes):
params = [('action', 'remove'),]
for hash in hashes:
params.append(('hash', hash))
return self._action(params)
def removedata(self, *hashes):
params = [('action', 'removedata'),]
for hash in hashes:
params.append(('hash', hash))
return self._action(params)
def _action(self, params, body=None, content_type=None): def _action(self, params, body=None, content_type=None):
# about token, see https://github.com/bittorrent/webui/wiki/TokenSystem #about token, see https://github.com/bittorrent/webui/wiki/TokenSystem
url = '{url}?token={token}&{params}'.format(url=self.url, token=self.token, params=urlencode(params)) url = self.base_url + '?token=' + self.token + '&' + urllib.urlencode(params)
request = Request(url) request = urllib2.Request(url)
if body: if body:
request.add_data(body) request.add_data(body)
@ -139,5 +142,5 @@ class UTorrentClient(object):
try: try:
response = self.opener.open(request) response = self.opener.open(request)
return response.code, json.loads(response.read()) return response.code, json.loads(response.read())
except HTTPError: except urllib2.HTTPError,e:
raise raise

43
core/utorrent/upload.py
View file

@ -1,10 +1,12 @@
# coding=utf-8 # coding=utf-8
# code copied from http://www.doughellmann.com/PyMOTW/urllib2/ # code copied from http://www.doughellmann.com/PyMOTW/urllib2/
from email.generator import _make_boundary as make_boundary
import itertools import itertools
import mimetools
import mimetypes import mimetypes
from cStringIO import StringIO
import urllib
import urllib2
class MultiPartForm(object): class MultiPartForm(object):
"""Accumulate the data to be used when posting a form.""" """Accumulate the data to be used when posting a form."""
@ -12,11 +14,11 @@ class MultiPartForm(object):
def __init__(self): def __init__(self):
self.form_fields = [] self.form_fields = []
self.files = [] self.files = []
self.boundary = make_boundary() self.boundary = mimetools.choose_boundary()
return return
def get_content_type(self): def get_content_type(self):
return 'multipart/form-data; boundary={0}'.format(self.boundary) return 'multipart/form-data; boundary=%s' % self.boundary
def add_field(self, name, value): def add_field(self, name, value):
"""Add a simple field to the form data.""" """Add a simple field to the form data."""
@ -38,32 +40,33 @@ class MultiPartForm(object):
# Once the list is built, return a string where each # Once the list is built, return a string where each
# line is separated by '\r\n'. # line is separated by '\r\n'.
parts = [] parts = []
part_boundary = '--{boundary}'.format(boundary=self.boundary) part_boundary = '--' + self.boundary
# Add the form fields # Add the form fields
parts.extend( parts.extend(
[part_boundary, [ part_boundary,
'Content-Disposition: form-data; name="{0}"'.format(name), 'Content-Disposition: form-data; name="%s"' % name,
'', '',
value, value,
] ]
for name, value in self.form_fields for name, value in self.form_fields
) )
# Add the files to upload # Add the files to upload
parts.extend( parts.extend(
[part_boundary, [ part_boundary,
'Content-Disposition: file; name="{0}"; filename="{1}"'.format(field_name, filename), 'Content-Disposition: file; name="%s"; filename="%s"' % \
'Content-Type: {0}'.format(content_type), (field_name, filename),
'', 'Content-Type: %s' % content_type,
body, '',
] body,
]
for field_name, filename, content_type, body in self.files for field_name, filename, content_type, body in self.files
) )
# Flatten the list and add closing boundary marker, # Flatten the list and add closing boundary marker,
# then return CR+LF separated data # then return CR+LF separated data
flattened = list(itertools.chain(*parts)) flattened = list(itertools.chain(*parts))
flattened.append('--{boundary}--'.format(boundary=self.boundary)) flattened.append('--' + self.boundary + '--')
flattened.append('') flattened.append('')
return '\r\n'.join(flattened) return '\r\n'.join(flattened)