This commit is contained in:
@@ -357,6 +357,8 @@ translations! {
|
||||
player_saved_torrents: "Saved torrents" , "Сохранённые торренты";
|
||||
player_refresh: "Refresh" , "Обновить";
|
||||
player_no_saved_torrents: "No saved torrents" , "Сохранённых торрентов нет";
|
||||
player_add_torrent: "Add torrent" , "Добавить торрент";
|
||||
player_choose_saved_or_add_torrent: "Choose a saved torrent or add a new one." , "Выберите сохранённый торрент или добавьте новый.";
|
||||
player_torrent_file: "Torrent file" , "Torrent-файл";
|
||||
player_magnet_link: "Magnet link" , "Magnet-ссылка";
|
||||
player_preview_content: "Preview content" , "Предпросмотр";
|
||||
@@ -372,6 +374,8 @@ translations! {
|
||||
player_failed: "Failed" , "Ошибка";
|
||||
player_paused: "Paused" , "Пауза";
|
||||
player_no_torrent_selected: "No torrent selected" , "Торрент не выбран";
|
||||
player_downloaded: "Downloaded" , "Загружено";
|
||||
player_speed: "Speed" , "Скорость";
|
||||
player_down: "down" , "вниз";
|
||||
player_up: "up" , "вверх";
|
||||
player_peers: "peers" , "пиры";
|
||||
|
||||
+12
-4
@@ -194,10 +194,14 @@ impl TorrentSessionRow {
|
||||
self.status.as_str()
|
||||
};
|
||||
let stats = handle.map(|h| h.stats());
|
||||
let downloaded_bytes = stats
|
||||
let mut downloaded_bytes = stats
|
||||
.as_ref()
|
||||
.map(|s| s.progress_bytes)
|
||||
.unwrap_or_else(|| i64_to_u64(self.downloaded_bytes));
|
||||
let selected_size = i64_to_u64(self.selected_size);
|
||||
if status == "complete" {
|
||||
downloaded_bytes = selected_size;
|
||||
}
|
||||
let uploaded_bytes = stats
|
||||
.as_ref()
|
||||
.map(|s| s.uploaded_bytes)
|
||||
@@ -225,7 +229,7 @@ impl TorrentSessionRow {
|
||||
status: status.to_string(),
|
||||
client_state: stats.as_ref().map(|s| s.state.to_string()),
|
||||
total_size: i64_to_u64(self.total_size),
|
||||
selected_size: i64_to_u64(self.selected_size),
|
||||
selected_size,
|
||||
downloaded_bytes,
|
||||
uploaded_bytes,
|
||||
progress_percent,
|
||||
@@ -313,10 +317,14 @@ impl TorrentJob {
|
||||
|
||||
fn dto(&self) -> TorrentJobDto {
|
||||
let stats = self.handle.as_ref().map(|h| h.stats());
|
||||
let downloaded_bytes = stats
|
||||
let mut downloaded_bytes = stats
|
||||
.as_ref()
|
||||
.map(|s| s.progress_bytes)
|
||||
.unwrap_or(self.downloaded_bytes);
|
||||
let selected_size = self.selected_size();
|
||||
if self.status == TorrentJobStatus::Complete {
|
||||
downloaded_bytes = selected_size;
|
||||
}
|
||||
let uploaded_bytes = stats
|
||||
.as_ref()
|
||||
.map(|s| s.uploaded_bytes)
|
||||
@@ -336,7 +344,7 @@ impl TorrentJob {
|
||||
status: self.status.as_str().to_string(),
|
||||
client_state: stats.as_ref().map(|s| s.state.to_string()),
|
||||
total_size: self.total_size(),
|
||||
selected_size: self.selected_size(),
|
||||
selected_size,
|
||||
downloaded_bytes,
|
||||
uploaded_bytes,
|
||||
progress_percent: if self.status == TorrentJobStatus::Complete {
|
||||
|
||||
Reference in New Issue
Block a user