Skip to content

Commit

Permalink
Improve add torrent dialog and add sequential download (#541)
Browse files Browse the repository at this point in the history 
Closes #509
  • Loading branch information
@vktr
vktr committed Mar 7, 2018
1 parent 8d4f9d2 commit 8b6e954
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 49 deletions.
4 changes: 3 additions & 1 deletion lang/1033.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@
"enable_lsd": "Enable LSD",
"enable_pex": "Enable PeX",
"changing_pex_settings_requires_restart": "Changing the PeX setting requires a restart",
"restart_required": "Restart required"
"restart_required": "Restart required",
"file": "File",
"comment": "Comment"
}
}
171 changes: 124 additions & 47 deletions src/picotorrent/addtorrentdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@
#include <libtorrent/torrent_info.hpp>
#include <wx/dataview.h>
#include <wx/filepicker.h>
#include <wx/persist.h>
#include <wx/persist/toplevel.h>

#include <shellapi.h>

namespace lt = libtorrent;
using pt::AddTorrentDialog;

wxBEGIN_EVENT_TABLE(AddTorrentDialog, wxDialog)
EVT_CHECKBOX(ptID_SEQUENTIAL_DOWNLOAD, OnSequentialDownloadChanged)
EVT_CHOICE(ptID_TORRENT_LIST, OnTorrentChanged)
EVT_DATAVIEW_ITEM_CONTEXT_MENU(ptID_FILE_LIST, OnFileContextMenu)
EVT_DIRPICKER_CHANGED(ptID_SAVE_PATH, OnSavePathChanged)
Expand All @@ -28,56 +31,49 @@ wxEND_EVENT_TABLE()
AddTorrentDialog::AddTorrentDialog(wxWindow* parent,
std::shared_ptr<pt::Translator> translator,
std::vector<lt::add_torrent_params>& params)
: wxDialog(parent, wxID_ANY, i18n(translator, "add_torrent_s"), wxDefaultPosition, wxSize(400, 400)),
: wxDialog(parent, wxID_ANY, i18n(translator, "add_torrent_s"), wxDefaultPosition, wxSize(400, 540), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_params(params),
m_trans(translator),
m_filesViewModel(new FileStorageViewModel(translator))
{
wxPanel* panel = new wxPanel(this, wxID_ANY);
m_torrents = new wxChoice(panel, ptID_TORRENT_LIST);
m_size = new wxStaticText(panel, wxID_ANY, wxEmptyString);
m_savePath = new wxDirPickerCtrl(panel, ptID_SAVE_PATH, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE | wxDIRP_SMALL);
m_filesView = new wxDataViewCtrl(panel, ptID_FILE_LIST);
this->SetName("AddTorrentDialog");
this->SetMinSize(this->GetSize());

wxFlexGridSizer* flexGrid = new wxFlexGridSizer(3, 2, 9, 25);
flexGrid->AddGrowableCol(1, 1);
wxPanel* pnl = new wxPanel(this, wxID_ANY);

// Torrent
flexGrid->Add(new wxStaticText(panel, wxID_ANY, m_trans->Translate("torrent")), 0, wxALIGN_CENTER_VERTICAL);

for (lt::add_torrent_params& p : m_params)
{
wxString name = "<unknown name>";

if (p.ti)
{
name = p.ti->name();
}
else if (!p.name.empty())
{
name = p.name;
}
else
{
std::stringstream ss;
ss << p.info_hash;
name = ss.str();
}

m_torrents->Insert(name, 0);
}

flexGrid->Add(m_torrents, 1, wxEXPAND);
// File
wxStaticBoxSizer* fileSizer = new wxStaticBoxSizer(wxVERTICAL, pnl, i18n(translator, "file"));
m_torrents = new wxChoice(fileSizer->GetStaticBox(), ptID_TORRENT_LIST);
fileSizer->Add(m_torrents, 0, wxEXPAND | wxALL, 5);

// Size
flexGrid->Add(new wxStaticText(panel, wxID_ANY, m_trans->Translate("size")), 0, wxALIGN_CENTER_VERTICAL);
flexGrid->Add(m_size);

// Save path
flexGrid->Add(new wxStaticText(panel, wxID_ANY, m_trans->Translate("save_path")), 0, wxALIGN_CENTER_VERTICAL);
flexGrid->Add(m_savePath, 1, wxEXPAND);
// Torrent
wxStaticBoxSizer* torrentSizer = new wxStaticBoxSizer(wxVERTICAL, pnl, i18n(translator, "torrent"));
wxFlexGridSizer* torrentGrid = new wxFlexGridSizer(2, 10, 25);

m_name = new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
m_size = new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
m_comment = new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
m_infoHash = new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);

torrentGrid->AddGrowableCol(1, 1);
torrentGrid->Add(new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, m_trans->Translate("name")));
torrentGrid->Add(m_name, 0, wxEXPAND);
torrentGrid->Add(new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, m_trans->Translate("size")));
torrentGrid->Add(m_size, 0, wxEXPAND);
torrentGrid->Add(new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, m_trans->Translate("info_hash")));
torrentGrid->Add(m_infoHash, 0, wxEXPAND);
torrentGrid->Add(new wxStaticText(torrentSizer->GetStaticBox(), wxID_ANY, m_trans->Translate("comment")));
torrentGrid->Add(m_comment, 0, wxEXPAND);
torrentSizer->Add(torrentGrid, 1, wxEXPAND | wxALL, 5);

// Storage
wxStaticBoxSizer* storageSizer = new wxStaticBoxSizer(wxVERTICAL, pnl, i18n(translator, "storage"));
wxFlexGridSizer* storageGrid = new wxFlexGridSizer(2, 10, 25);

m_savePath = new wxDirPickerCtrl(storageSizer->GetStaticBox(), ptID_SAVE_PATH, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE | wxDIRP_SMALL);
m_filesView = new wxDataViewCtrl(storageSizer->GetStaticBox(), ptID_FILE_LIST);
m_sequentialMode = new wxCheckBox(storageSizer->GetStaticBox(), ptID_SEQUENTIAL_DOWNLOAD, i18n(m_trans, "sequential_download"));

// File tree
auto nameCol = m_filesView->AppendIconTextColumn(
i18n(m_trans, "name"),
FileStorageViewModel::Columns::Name,
Expand Down Expand Up @@ -105,16 +101,55 @@ AddTorrentDialog::AddTorrentDialog(wxWindow* parent,
m_filesView->AssociateModel(m_filesViewModel);
m_filesViewModel->DecRef();

storageGrid->AddGrowableCol(1, 1);
storageGrid->Add(new wxStaticText(storageSizer->GetStaticBox(), wxID_ANY, m_trans->Translate("save_path")), 0, wxALIGN_CENTER_VERTICAL);
storageGrid->Add(m_savePath, 1, wxEXPAND);
storageGrid->AddSpacer(0);
storageGrid->Add(m_sequentialMode, 1, wxEXPAND);

storageSizer->Add(storageGrid, 0, wxEXPAND | wxALL, 5);
storageSizer->Add(m_filesView, 1, wxEXPAND | wxALL, 5);

// Buttons
wxBoxSizer* buttonsSizer = new wxBoxSizer(wxHORIZONTAL);
buttonsSizer->Add(new wxButton(panel, wxID_OK));
buttonsSizer->Add(new wxButton(panel, wxID_CANCEL));
buttonsSizer->Add(new wxButton(pnl, wxID_OK));
buttonsSizer->Add(new wxButton(pnl, wxID_CANCEL));

// Main sizer
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(flexGrid, 0, wxALL | wxEXPAND, 5);
mainSizer->Add(m_filesView, 1, wxALL | wxEXPAND, 5);
mainSizer->Add(fileSizer, 0, wxEXPAND | wxALL, 5);
mainSizer->AddSpacer(2);
mainSizer->Add(torrentSizer, 0, wxEXPAND | wxALL, 5);
mainSizer->AddSpacer(2);
mainSizer->Add(storageSizer, 1, wxEXPAND | wxALL, 5);
mainSizer->AddSpacer(2);
mainSizer->Add(buttonsSizer, 0, wxALL | wxALIGN_RIGHT, 5);

panel->SetSizerAndFit(mainSizer);
for (lt::add_torrent_params& p : m_params)
{
wxString name = "<unknown name>";

if (p.ti)
{
name = p.ti->name();
}
else if (!p.name.empty())
{
name = p.name;
}
else
{
std::stringstream ss;
ss << p.info_hash;
name = ss.str();
}

m_torrents->Insert(name, 0);
}

pnl->SetSizer(mainSizer);

wxPersistenceManager::Get().RegisterAndRestore(this);

m_torrents->Select(0);
LoadTorrentInfo(0);
Expand All @@ -124,21 +159,48 @@ void AddTorrentDialog::LoadTorrentInfo(int index)
{
lt::add_torrent_params& params = m_params.at(index);

m_name->SetLabel("-");
m_size->SetLabel("-");
m_comment->SetLabel("-");
m_infoHash->SetLabel("-");

// Save path
m_savePath->SetPath(params.save_path);
m_sequentialMode->SetValue(
(params.flags & lt::torrent_flags::sequential_download) == lt::torrent_flags::sequential_download);

if (params.ti)
{
m_name->SetLabel(params.ti->name());

std::stringstream ss;
ss << params.ti->info_hash();

m_infoHash->SetLabel(ss.str());

// Size
m_size->SetLabel(wxString(Utils::ToHumanFileSize(params.ti->total_size())));

if (!params.ti->comment().empty())
{
m_comment->SetLabel(params.ti->comment());
}

// Files
m_filesViewModel->RebuildTree(params.ti);
m_filesViewModel->UpdatePriorities(params.file_priorities);
m_filesView->Expand(m_filesViewModel->GetRootItem());
}
else
{
if (!params.info_hash.is_all_zeros())
{
std::stringstream ss;
ss << params.info_hash;

m_infoHash->SetLabel(ss.str());
}

m_size->SetLabel("-");
m_filesViewModel->Cleared();
}
Expand Down Expand Up @@ -181,6 +243,21 @@ void AddTorrentDialog::OnSetPriority(wxCommandEvent& event)
m_filesViewModel->UpdatePriorities(params.file_priorities);
}

void AddTorrentDialog::OnSequentialDownloadChanged(wxCommandEvent&)
{
int idx = m_torrents->GetSelection();
lt::add_torrent_params& params = m_params.at(idx);

if (m_sequentialMode->IsChecked())
{
params.flags |= lt::torrent_flags::sequential_download;
}
else
{
params.flags &= ~lt::torrent_flags::sequential_download;
}
}

void AddTorrentDialog::OnTorrentChanged(wxCommandEvent& event)
{
LoadTorrentInfo(event.GetInt());
Expand Down
6 changes: 6 additions & 0 deletions src/picotorrent/addtorrentdlg.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ namespace pt
{
ptID_TORRENT_LIST = wxID_HIGHEST,
ptID_SAVE_PATH,
ptID_SEQUENTIAL_DOWNLOAD,
ptID_TORRENT_FILE_LIST,
ptID_FILE_LIST
};
Expand All @@ -44,13 +45,18 @@ namespace pt
void OnFileContextMenu(wxDataViewEvent&);
void OnSavePathChanged(wxFileDirPickerEvent&);
void OnSetPriority(wxCommandEvent&);
void OnSequentialDownloadChanged(wxCommandEvent&);
void OnTorrentChanged(wxCommandEvent&);

wxDECLARE_EVENT_TABLE();

wxChoice* m_torrents;
wxStaticText* m_name;
wxStaticText* m_size;
wxStaticText* m_comment;
wxStaticText* m_infoHash;
wxDirPickerCtrl* m_savePath;
wxCheckBox* m_sequentialMode;
wxDataViewCtrl* m_filesView;
FileStorageViewModel* m_filesViewModel;

Expand Down
30 changes: 30 additions & 0 deletions src/picotorrent/torrentcontextmenu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ BEGIN_EVENT_TABLE(TorrentContextMenu, wxMenu)
EVT_MENU(ptID_OPEN_IN_EXPLORER, TorrentContextMenu::OpenInExplorer)
EVT_MENU(ptID_FORCE_RECHECK, TorrentContextMenu::ForceRecheck)
EVT_MENU(ptID_FORCE_REANNOUNCE, TorrentContextMenu::ForceReannounce)
EVT_MENU(ptID_SEQUENTIAL_DOWNLOAD, TorrentContextMenu::SequentialDownload)
END_EVENT_TABLE()

TorrentContextMenu::TorrentContextMenu(
Expand Down Expand Up @@ -83,6 +84,18 @@ TorrentContextMenu::TorrentContextMenu(
AppendSeparator();
Append(ptID_FORCE_REANNOUNCE, i18n(tr, "force_reannounce"));
Append(ptID_FORCE_RECHECK, i18n(tr, "force_recheck"));

if (m_state->selected_torrents.size() == 1)
{
const lt::torrent_handle& th = m_state->selected_torrents.at(0);
bool isSequential = (th.flags() & lt::torrent_flags::sequential_download) == lt::torrent_flags::sequential_download;

wxMenuItem* item = Append(ptID_SEQUENTIAL_DOWNLOAD, i18n(tr, "sequential_download"));
item->SetCheckable(true);
item->Check(isSequential);
}

AppendSeparator();
Append(ptID_MOVE, i18n(tr, "move"));
Append(ptID_REMOVE, i18n(tr, "remove"));
AppendSeparator();
Expand Down Expand Up @@ -223,3 +236,20 @@ void TorrentContextMenu::QueueBottom(wxCommandEvent& WXUNUSED(event))
th.queue_position_bottom();
}
}

void TorrentContextMenu::SequentialDownload(wxCommandEvent& WXUNUSED(event))
{
for (lt::torrent_handle& th : m_state->selected_torrents)
{
bool isSequential = (th.flags() & lt::torrent_flags::sequential_download) == lt::torrent_flags::sequential_download;

if (isSequential)
{
th.unset_flags(lt::torrent_flags::sequential_download);
}
else
{
th.set_flags(lt::torrent_flags::sequential_download);
}
}
}
4 changes: 3 additions & 1 deletion src/picotorrent/torrentcontextmenu.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ namespace pt
ptID_COPY_INFO_HASH,
ptID_OPEN_IN_EXPLORER,
ptID_FORCE_RECHECK,
ptID_FORCE_REANNOUNCE
ptID_FORCE_REANNOUNCE,
ptID_SEQUENTIAL_DOWNLOAD
};

wxDECLARE_EVENT_TABLE();
Expand All @@ -50,6 +51,7 @@ namespace pt
void QueueDown(wxCommandEvent&);
void QueueTop(wxCommandEvent&);
void QueueBottom(wxCommandEvent&);
void SequentialDownload(wxCommandEvent&);

wxWindow* m_parent;
std::shared_ptr<SessionState> m_state;
Expand Down

0 comments on commit 8b6e954

Please sign in to comment.