mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-09 01:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'bro/master-torrent-encoding-cleanup'

Browse source
This commit is contained in:
Chase Sterling 2013-02-11 20:24:18 -05:00
commit b08573831e
2 changed files with 22 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deluge/common.py
View file

@ -646,7 +646,7 @@ def decode_string(s, encoding="utf8"):
encodings = [lambda: ("utf8", 'strict'), encodings = [lambda: ("utf8", 'strict'),
lambda: ("iso-8859-1", 'strict'), lambda: ("iso-8859-1", 'strict'),
lambda: (chardet.detect(s)["encoding"], 'strict'), lambda: (chardet.detect(s)["encoding"], 'strict'),
lambda: (chardet.detect(s)["encoding"], 'ignore')] lambda: (encoding, 'ignore')]
if not encoding is "utf8": if not encoding is "utf8":
encodings.insert(0, lambda: (encoding, 'strict')) encodings.insert(0, lambda: (encoding, 'strict'))

125
deluge/core/torrent.py
View file

@ -49,6 +49,7 @@ import deluge.common
import deluge.component as component import deluge.component as component
from deluge.configmanager import ConfigManager, get_config_dir from deluge.configmanager import ConfigManager, get_config_dir
from deluge.event import * from deluge.event import *
from deluge.common import decode_string
TORRENT_STATE = deluge.common.TORRENT_STATE TORRENT_STATE = deluge.common.TORRENT_STATE
@ -123,7 +124,7 @@ class Torrent(object):
# We use this to return dicts that only contain changes from the previous # We use this to return dicts that only contain changes from the previous
# {session_id: status_dict, ...} # {session_id: status_dict, ...}
self.prev_status = {} self.prev_status = {}
self.prev_status_cleanup_loop = LoopingCall(self.cleanup_prev_status) self.prev_status_cleanup_loop = LoopingCall(self._cleanup_prev_status)
self.prev_status_cleanup_loop.start(10) self.prev_status_cleanup_loop.start(10)
# Set the libtorrent handle # Set the libtorrent handle
@ -265,30 +266,6 @@ class Torrent(object):
def get_options(self): def get_options(self):
return self.options return self.options
def get_name(self):
if self.has_metadata:
name = self.torrent_info.file_at(0).path.replace("\\", "/", 1).split("/", 1)[0]
if not name:
name = self.torrent_info.name()
try:
return name.decode("utf8", "ignore")
except UnicodeDecodeError:
return name
elif self.magnet:
try:
keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')])
name = keys.get('dn')
if not name:
return self.torrent_id
name = unquote(name).replace('+', ' ')
try:
return name.decode("utf8", "ignore")
except UnicodeDecodeError:
return name
except:
pass
return self.torrent_id
def set_owner(self, account): def set_owner(self, account):
self.owner = account self.owner = account
@ -306,7 +283,6 @@ class Torrent(object):
v = -1 v = -1
else: else:
v = int(m_up_speed * 1024) v = int(m_up_speed * 1024)
self.handle.set_upload_limit(v) self.handle.set_upload_limit(v)
def set_max_download_speed(self, m_down_speed): def set_max_download_speed(self, m_down_speed):
@ -386,7 +362,7 @@ class Torrent(object):
def set_file_priorities(self, file_priorities): def set_file_priorities(self, file_priorities):
if not self.has_metadata: if not self.has_metadata:
return return
if len(file_priorities) != self.ti_num_files(): if len(file_priorities) != self.torrent_info.num_files():
log.debug("file_priorities len != num_files") log.debug("file_priorities len != num_files")
self.options["file_priorities"] = self.handle.file_priorities() self.options["file_priorities"] = self.handle.file_priorities()
return return
@ -583,11 +559,8 @@ class Torrent(object):
# We do not want to report peers that are half-connected # We do not want to report peers that are half-connected
if peer.flags & peer.connecting or peer.flags & peer.handshake: if peer.flags & peer.connecting or peer.flags & peer.handshake:
continue continue
try:
client = str(peer.client).decode("utf-8")
except UnicodeDecodeError:
client = str(peer.client).decode("latin-1")
client = decode_string(str(peer.client))
# Make country a proper string # Make country a proper string
country = str() country = str()
for c in peer.country: for c in peer.country:
@ -727,9 +700,6 @@ class Torrent(object):
:type status: libtorrent.torrent_status :type status: libtorrent.torrent_status
""" """
#import datetime
#print datetime.datetime.now().strftime("%H:%M:%S.%f"),
#print " update_status"
self.status = status self.status = status
def _create_status_funcs(self): def _create_status_funcs(self):
@ -784,6 +754,12 @@ class Torrent(object):
"trackers": lambda: self.trackers, "trackers": lambda: self.trackers,
"tracker_status": lambda: self.tracker_status, "tracker_status": lambda: self.tracker_status,
"upload_payload_rate": lambda: self.status.upload_payload_rate, "upload_payload_rate": lambda: self.status.upload_payload_rate,
"comment": lambda: decode_string(self.torrent_info.comment()) if self.has_metadata else u"",
"num_files": lambda: self.torrent_info.num_files() if self.has_metadata else 0,
"num_pieces": lambda: self.torrent_info.num_pieces() if self.has_metadata else 0,
"piece_length": lambda: self.torrent_info.piece_length() if self.has_metadata else 0,
"private": lambda: self.torrent_info.priv() if self.has_metadata else False,
"total_size": lambda: self.torrent_info.total_size() if self.has_metadata else 0,
"eta": self.get_eta, "eta": self.get_eta,
"file_progress": self.get_file_progress, # Adjust progress to be 0-100 value "file_progress": self.get_file_progress, # Adjust progress to be 0-100 value
"files": self.get_files, "files": self.get_files,
@ -793,34 +769,16 @@ class Torrent(object):
"ratio": self.get_ratio, "ratio": self.get_ratio,
"tracker_host": self.get_tracker_host, "tracker_host": self.get_tracker_host,
"last_seen_complete": self.get_last_seen_complete, "last_seen_complete": self.get_last_seen_complete,
"comment": self.ti_comment, "name": self.get_name,
"name": self.ti_name, "pieces": self._get_pieces_info,
"num_files": self.ti_num_files,
"num_pieces": self.ti_num_pieces,
"pieces": self.ti_pieces_info,
"piece_length": self.ti_piece_length,
"private": self.ti_priv,
"total_size": self.ti_total_size,
} }
def ti_comment(self): def get_name(self):
if self.has_metadata: if self.has_metadata:
try: name = self.torrent_info.file_at(0).path.replace("\\", "/", 1).split("/", 1)[0]
return self.torrent_info.comment().decode("utf8", "ignore")
except UnicodeDecodeError:
return self.torrent_info.comment()
return ""
def ti_name(self):
if self.has_metadata:
name = self.torrent_info.file_at(0).path.split("/", 1)[0]
if not name: if not name:
name = self.torrent_info.name() name = self.torrent_info.name()
try: return decode_string(name)
return name.decode("utf8", "ignore")
except UnicodeDecodeError:
return name
elif self.magnet: elif self.magnet:
try: try:
keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')]) keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')])
@ -828,55 +786,11 @@ class Torrent(object):
if not name: if not name:
return self.torrent_id return self.torrent_id
name = unquote(name).replace('+', ' ') name = unquote(name).replace('+', ' ')
try: return decode_string(name)
return name.decode("utf8", "ignore")
except UnicodeDecodeError:
return name
except: except:
pass pass
return self.torrent_id return self.torrent_id
def ti_priv(self):
if self.has_metadata:
return self.torrent_info.priv()
return False
def ti_total_size(self):
if self.has_metadata:
return self.torrent_info.total_size()
return 0
def ti_num_files(self):
if self.has_metadata:
return self.torrent_info.num_files()
return 0
def ti_num_pieces(self):
if self.has_metadata:
return self.torrent_info.num_pieces()
return 0
def ti_piece_length(self):
if self.has_metadata:
return self.torrent_info.piece_length()
return 0
def ti_pieces_info(self):
if self.has_metadata:
return self.get_pieces_info()
return None
def apply_options(self):
"""Applies the per-torrent options that are set."""
self.handle.set_max_connections(self.max_connections)
self.handle.set_max_uploads(self.max_upload_slots)
self.handle.set_upload_limit(int(self.max_upload_speed * 1024))
self.handle.set_download_limit(int(self.max_download_speed * 1024))
self.handle.prioritize_files(self.file_priorities)
self.handle.set_sequential_download(self.options["sequential_download"])
self.handle.resolve_countries(True)
def pause(self): def pause(self):
"""Pause this torrent""" """Pause this torrent"""
# Turn off auto-management so the torrent will not be unpaused by lt queueing # Turn off auto-management so the torrent will not be unpaused by lt queueing
@ -1115,7 +1029,7 @@ class Torrent(object):
except OSError as (errno, strerror): except OSError as (errno, strerror):
log.debug("Cannot Remove Folder: %s (ErrNo %s)", strerror, errno) log.debug("Cannot Remove Folder: %s (ErrNo %s)", strerror, errno)
def cleanup_prev_status(self): def _cleanup_prev_status(self):
""" """
This method gets called to check the validity of the keys in the prev_status This method gets called to check the validity of the keys in the prev_status
dict. If the key is no longer valid, the dict will be deleted. dict. If the key is no longer valid, the dict will be deleted.
@ -1138,7 +1052,10 @@ class Torrent(object):
self.torrent_id) self.torrent_id)
self._last_seen_complete = time.time() self._last_seen_complete = time.time()
def get_pieces_info(self): def _get_pieces_info(self):
if not self.has_metadata:
return None
pieces = {} pieces = {}
# First get the pieces availability. # First get the pieces availability.
availability = self.handle.piece_availability() availability = self.handle.piece_availability()