Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

tell progress, stop trying to read first piece

Browse source
This commit is contained in:
Victor Shyba 2020-02-28 15:22:57 -03:00
parent 53382b7e15
commit f145d08c10
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbry/extras/daemon/json_response_encoder.py
View file

@ -291,9 +291,9 @@ class JSONResponseEncoder(JSONEncoder):
'sd_hash': managed_stream.descriptor.sd_hash if is_stream else None, 'sd_hash': managed_stream.descriptor.sd_hash if is_stream else None,
'mime_type': managed_stream.mime_type if is_stream else None, 'mime_type': managed_stream.mime_type if is_stream else None,
'key': managed_stream.descriptor.key if is_stream else None, 'key': managed_stream.descriptor.key if is_stream else None,
'total_bytes_lower_bound': managed_stream.descriptor.lower_bound_decrypted_length() if is_stream else None, 'total_bytes_lower_bound': managed_stream.descriptor.lower_bound_decrypted_length() if is_stream else managed_stream.torrent_length,
'total_bytes': managed_stream.descriptor.upper_bound_decrypted_length() if is_stream else None, 'total_bytes': managed_stream.descriptor.upper_bound_decrypted_length() if is_stream else managed_stream.torrent_length,
'written_bytes': managed_stream.written_bytes if is_stream else None, 'written_bytes': managed_stream.written_bytes if is_stream else managed_stream.written_bytes,
'blobs_completed': managed_stream.blobs_completed if is_stream else None, 'blobs_completed': managed_stream.blobs_completed if is_stream else None,
'blobs_in_stream': managed_stream.blobs_in_stream if is_stream else None, 'blobs_in_stream': managed_stream.blobs_in_stream if is_stream else None,
'blobs_remaining': managed_stream.blobs_remaining if is_stream else None, 'blobs_remaining': managed_stream.blobs_remaining if is_stream else None,

5
lbry/torrent/session.py
View file

@ -40,8 +40,6 @@ log = logging.getLogger(__name__)
DEFAULT_FLAGS = ( # fixme: somehow the logic here is inverted? DEFAULT_FLAGS = ( # fixme: somehow the logic here is inverted?
libtorrent.add_torrent_params_flags_t.flag_auto_managed libtorrent.add_torrent_params_flags_t.flag_auto_managed
| libtorrent.add_torrent_params_flags_t.flag_paused
| libtorrent.add_torrent_params_flags_t.flag_duplicate_is_error
| libtorrent.add_torrent_params_flags_t.flag_update_subscribe | libtorrent.add_torrent_params_flags_t.flag_update_subscribe
) )
@ -104,7 +102,6 @@ class TorrentHandle:
self.torrent_file = self._handle.get_torrent_info().files() self.torrent_file = self._handle.get_torrent_info().files()
self._base_path = status.save_path self._base_path = status.save_path
first_piece = self.torrent_file.at(self.largest_file_index).offset first_piece = self.torrent_file.at(self.largest_file_index).offset
self._handle.read_piece(first_piece)
if not self.started.is_set(): if not self.started.is_set():
if self._handle.have_piece(first_piece): if self._handle.have_piece(first_piece):
self.started.set() self.started.set()
@ -205,7 +202,7 @@ class TorrentSession:
) )
def _add_torrent(self, btih: str, download_directory: Optional[str]): def _add_torrent(self, btih: str, download_directory: Optional[str]):
params = {'info_hash': binascii.unhexlify(btih.encode())} params = {'info_hash': binascii.unhexlify(btih.encode()), 'flags': DEFAULT_FLAGS}
if download_directory: if download_directory:
params['save_path'] = download_directory params['save_path'] = download_directory
handle = self._session.add_torrent(params) handle = self._session.add_torrent(params)

4
lbry/torrent/torrent_manager.py
View file

@ -62,6 +62,10 @@ class TorrentSource(ManagedDownloadSource):
def torrent_length(self): def torrent_length(self):
return self.torrent_session.get_size(self.identifier) return self.torrent_session.get_size(self.identifier)
@property
def written_bytes(self):
return self.torrent_session.get_downloaded(self.identifier)
@property @property
def torrent_name(self): def torrent_name(self):
return self.torrent_session.get_name(self.identifier) return self.torrent_session.get_name(self.identifier)