diff --git a/docs/building.html b/docs/building.html index e9aef2885..f17bcb223 100644 --- a/docs/building.html +++ b/docs/building.html @@ -3,7 +3,7 @@
- +Each time a peer is blocked because of the IP filter, a peer_blocked_alert is generated.
+++
+- ::
+- ip_filter const& get_ip_filter() const;
+
Returns the ip_filter currently in the session. See ip_filter.
+@@ -876,28 +889,28 @@ struct session_status { bool has_incoming_connections; - float upload_rate; - float download_rate; + int upload_rate; + int download_rate; size_type total_download; size_type total_upload; - float payload_upload_rate; - float payload_download_rate; + int payload_upload_rate; + int payload_download_rate; size_type total_payload_download; size_type total_payload_upload; - float ip_overhead_upload_rate; - float ip_overhead_download_rate; + int ip_overhead_upload_rate; + int ip_overhead_download_rate; size_type total_ip_overhead_download; size_type total_ip_overhead_upload; - float dht_upload_rate; - float dht_download_rate; + int dht_upload_rate; + int dht_download_rate; size_type total_dht_download; size_type total_dht_upload; - float tracker_upload_rate; - float tracker_download_rate; + int tracker_upload_rate; + int tracker_download_rate; size_type total_tracker_download; size_type total_tracker_upload; @@ -1921,7 +1934,7 @@ struct torrent_handle torrent_handle(); torrent_status status(); - void file_progress(std::vector<size_type>& fp); + void file_progress(std::vector<size_type>& fp, int flags = 0); void get_download_queue(std::vector<partial_piece_info>& queue) const; void get_peer_info(std::vector<peer_info>& v) const; torrent_info const& get_torrent_info() const; @@ -2123,7 +2136,7 @@ particular pieces, piece_priorityfile_progress()
-void file_progress(std::vector<size_type>& fp); +void file_progress(std::vector<size_type>& fp, int flags = 0);This function fills in the supplied vector with the the number of bytes downloaded @@ -2131,6 +2144,13 @@ of each file in this torrent. The progress values are ordered the same as the fi in the torrent_info. This operation is not very cheap. Its complexity is O(n + mj). Where n is the number of files, m is the number of downloading pieces and j is the number of blocks in a piece.
+The flags parameter can be used to specify the granularity of the file progress. If +left at the default value of 0, the progress will be as accurate as possible, but also +more expensive to calculate. If torrent_handle::piece_granularity is specified, +the progress will be specified in piece granularity. i.e. only pieces that have been +fully downloaded and passed the hash check count. When specifying piece granularity, +the operation is a lot cheaper, since libtorrent already keeps track of this internally +and no calculation is required.
progress is a value in the range [0, 1], that represents the progress of the -torrent's current task. It may be checking files or downloading. The torrent's -current task is in the state member, it will be one of the following:
+torrent's current task. It may be checking files or downloading. +progress_ppm reflects the same value as progress, but instead in a range +[0, 1000000] (ppm = parts per million). When floating point operations are disabled, +this is the only alternative to the floating point value in progress.
+The torrent's current task is in the state member, it will be one of the following:
invalid_lt_tracker_message | The peer sent an invalid tracker exchange message | + +
NAT-PMP errors:
+code | +symbol | +description | +
---|---|---|
108 | unsupported_protocol_version | The NAT-PMP router responded with an unsupported protocol version | @@ -5713,6 +5792,81 @@ potentially better peer
fastresume data errors:
+code | +symbol | +description | +
---|---|---|
113 | +missing_file_sizes | +The resume data file is missing the 'file sizes' entry | +
114 | +no_files_in_resume_data | +The resume data file 'file sizes' entry is empty | +
115 | +missing_pieces | +The resume data file is missing the 'pieces' and 'slots' entry | +
116 | +mismatching_number_of_files | +The number of files in the resume data does not match the number +of files in the torrent | +
117 | +mismatching_files_size | +One of the files on disk has a different size than in the fast +resume file | +
118 | +mismatching_file_timestamp | +One of the files on disk has a different timestamp than in the +fast resume file | +
119 | +not_a_dictionary | +The resume data file is not a dictionary | +
120 | +invalid_blocks_per_piece | +The 'blocks per piece' entry is invalid in the resume data file | +
121 | +missing_slots | +The resume file is missing the 'slots' entry, which is required +for torrents with compact allocation | +
122 | +too_many_slots | +The resume file contains more slots than the torrent | +
123 | +invalid_slot_list | +The 'slot' entry is invalid in the resume data | +
124 | +invalid_piece_index | +One index in the 'slot' list is invalid | +
125 | +pieces_need_reorder | +The pieces on disk needs to be re-ordered for the specified +allocation mode. This happens if you specify sparse allocation +and the files on disk are using compact storage. The pieces needs +to be moved to their right position | +
The names of these error codes are declared in then libtorrent::errors namespace.
There is also another error category, libtorrent::upnp_category, defining errors retrned by UPnP routers. Here's a (possibly incomplete) list of UPnP error codes:
@@ -5808,13 +5962,13 @@ std::string error_code_to_string(boost::system::error_code const& ec) static const char const* swedish[] = { "inget fel", - "en fil i torrenten kolliderar med en fil från en annan torrent", + "en fil i torrenten kolliderar med en fil frÂn en annan torrent", "hash check misslyckades", - "torrent filen är inte en dictionary", - "'info'-nyckeln saknas eller är korrupt i torrentfilen", - "'info'-fältet är inte en dictionary", - "'piece length' fältet saknas eller är korrupt i torrentfilen", - "torrentfilen saknar namnfältet", + "torrent filen ‰r inte en dictionary", + "'info'-nyckeln saknas eller ‰r korrupt i torrentfilen", + "'info'-f‰ltet ‰r inte en dictionary", + "'piece length' f‰ltet saknas eller ‰r korrupt i torrentfilen", + "torrentfilen saknar namnf‰ltet", "ogiltigt namn i torrentfilen (kan vara en attack)", // ... more strings here }; @@ -5857,7 +6011,7 @@ struct storage_interface virtual int writev(file::iovec_t const* bufs, int slot, int offset, int num_bufs) = 0; virtual int sparse_end(int start) const; virtual bool move_storage(fs::path save_path) = 0; - virtual bool verify_resume_data(lazy_entry const& rd, std::string& error) = 0; + virtual bool verify_resume_data(lazy_entry const& rd, error_code& error) = 0; virtual bool write_resume_data(entry& rd) const = 0; virtual bool move_slot(int src_slot, int dst_slot) = 0; virtual bool swap_slots(int slot1, int slot2) = 0; @@ -5957,14 +6111,14 @@ The default storage moves the single file or the directory of the torrent.-bool verify_resume_data(lazy_entry const& rd, std::string& error) = 0; +bool verify_resume_data(lazy_entry const& rd, error_code& error) = 0;
This function should verify the resume data rd with the files on disk. If the resume data seems to be up-to-date, return true. If not, set error to a description of what mismatched and return false.
The default storage may compare file sizes and time stamps of the files.
-Returning true indicates an error occurred.
+Returning false indicates an error occurred.
tvblob
The BLOBbox represents the ability to harness all of the content available -on the web, without any filtering or pre-selection by a third party ¿ just +on the web, without any filtering or pre-selection by a third party ø just like surfing the web.
This means that anyone will have the ability to reach viewers via the Internet directly on TV, without them having to connect a PC.
diff --git a/docs/python_binding.html b/docs/python_binding.html index e9e854257..09b5a7d72 100644 --- a/docs/python_binding.html +++ b/docs/python_binding.html @@ -3,7 +3,7 @@ - +