codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up torrents.py and small change to decode_string 

Replaced some try/except-decoding with decode_string.
Removed redundant methods ti_name and apply_options.
In decode_string - changed last encoding (with ignore) from
chardet-detected to the encoding specified in key-argument.
This commit is contained in:
bendikro 2013-02-12 01:14:57 +01:00
parent c11262082e
commit 5bcb104a01
2 changed files with 51 additions and 104 deletions
Show Stats 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'),
lambda: ("iso-8859-1", 'strict'),
lambda: (chardet.detect(s)["encoding"], 'strict'),
lambda: (chardet.detect(s)["encoding"], 'ignore')]
lambda: (encoding, 'ignore')]
if not encoding is "utf8":
encodings.insert(0, lambda: (encoding, 'strict'))

153
deluge/core/torrent.py
View File

@ -49,6 +49,7 @@ import deluge.common
import deluge.component as component
from deluge.configmanager import ConfigManager, get_config_dir
from deluge.event import *
from deluge.common import decode_string
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
# {session_id: status_dict, ...}
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)
# Set the libtorrent handle
@ -274,30 +275,6 @@ class Torrent(object):
def get_options(self):
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):
self.owner = account
@ -315,7 +292,6 @@ class Torrent(object):
v = -1
else:
v = int(m_up_speed * 1024)
self.handle.set_upload_limit(v)
def set_max_download_speed(self, m_down_speed):
@ -395,7 +371,7 @@ class Torrent(object):
def set_file_priorities(self, file_priorities):
if not self.has_metadata():
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")
self.options["file_priorities"] = self.handle.file_priorities()
return
@ -592,11 +568,8 @@ class Torrent(object):
# We do not want to report peers that are half-connected
if peer.flags & peer.connecting or peer.flags & peer.handshake:
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
country = str()
for c in peer.country:
@ -736,9 +709,6 @@ class Torrent(object):
:type status: libtorrent.torrent_status
"""
#import datetime
#print datetime.datetime.now().strftime("%H:%M:%S.%f"),
#print " update_status"
self.status = status
def _create_status_funcs(self):
@ -802,34 +772,52 @@ class Torrent(object):
"ratio": self.get_ratio,
"tracker_host": self.get_tracker_host,
"last_seen_complete": self.get_last_seen_complete,
"comment": self.ti_comment,
"name": self.ti_name,
"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,
"name": self.get_name,
"pieces": self._get_pieces_info,
"comment": ti_comment,
"num_files": ti_num_files,
"num_pieces": ti_num_pieces,
"piece_length": ti_piece_length,
"private": ti_priv,
"total_size": ti_total_size,
}
def ti_comment(self):
if self.has_metadata():
try:
return self.torrent_info.comment().decode("utf8", "ignore")
except UnicodeDecodeError:
return self.torrent_info.comment()
return ""
def ti_comment():
if self.has_metadata():
return decode_string(self.torrent_info.comment())
return u""
def ti_name(self):
def ti_priv():
if self.has_metadata():
return self.torrent_info.priv()
return False
def ti_total_size():
if self.has_metadata():
return self.torrent_info.total_size()
return 0
def ti_num_files():
if self.has_metadata():
return self.torrent_info.num_files()
return 0
def ti_num_pieces():
if self.has_metadata():
return self.torrent_info.num_pieces()
return 0
def ti_piece_length():
if self.has_metadata():
return self.torrent_info.piece_length()
return 0
def get_name(self):
if self.has_metadata():
name = self.torrent_info.file_at(0).path.split("/", 1)[0]
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
return decode_string(name)
elif self.magnet:
try:
keys = dict([k.split('=') for k in self.magnet.split('?')[-1].split('&')])
@ -837,55 +825,11 @@ class Torrent(object):
if not name:
return self.torrent_id
name = unquote(name).replace('+', ' ')
try:
return name.decode("utf8", "ignore")
except UnicodeDecodeError:
return name
return decode_string(name)
except:
pass
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):
"""Pause this torrent"""
# Turn off auto-management so the torrent will not be unpaused by lt queueing
@ -1124,7 +1068,7 @@ class Torrent(object):
except OSError as (errno, strerror):
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
dict. If the key is no longer valid, the dict will be deleted.
@ -1147,7 +1091,10 @@ class Torrent(object):
self.torrent_id)
self._last_seen_complete = time.time()
def get_pieces_info(self):
def _get_pieces_info(self):
if not self.has_metadata():
return None
pieces = {}
# First get the pieces availability.
availability = self.handle.piece_availability()