Fix up edit trackers

This commit is contained in:
Andrew Resch 2007-06-25 03:56:51 +00:00
commit b22a0111ca
2 changed files with 28 additions and 35 deletions

View file

@ -1354,7 +1354,7 @@ static PyObject *torrent_get_trackers(PyObject *self, PyObject *args)
for (std::vector<announce_entry>::const_iterator i = h.trackers().begin();
i != h.trackers().end(); ++i)
{
trackerslist = trackerslist + i->url +"\r\n";
trackerslist = trackerslist + i->url +"\n";
}
}
return Py_BuildValue("s",trackerslist.c_str());
@ -1373,10 +1373,13 @@ static PyObject *torrent_replace_trackers(PyObject *self, PyObject *args)
torrent_handle& h = M_torrents->at(index).handle;
std::vector<libtorrent::announce_entry> trackerlist;
std::istringstream file(tracker);
std::istringstream trackers(tracker);
std::string line;
while(std::getline(file, line)){
trackerlist.push_back(line);
while (std::getline(trackers, line)) {
libtorrent::announce_entry a_entry(line);
trackerlist.push_back(a_entry);
}
h.replace_trackers(trackerlist);
h.force_reannounce();

View file

@ -322,17 +322,7 @@ class DelugeGTK:
def accept_edit_window(self,arg=None):
torrent = self.get_selected_torrent()
self.newlist = self.edit_list.get_buffer()
self.start = self.textbuffer.get_start_iter()
self.end = self.textbuffer.get_end_iter()
self.contents = self.textbuffer.get_text(self.start,self.end,include_hidden_chars=False)
self.new_contents = []
for line in self.contents:
if not line.strip():
continue
else:
self.new_contents.append(line)
self.textlist = "".join(self.new_contents)
self.textlist = self.textbuffer.get_text(self.textbuffer.get_start_iter(), self.textbuffer.get_end_iter(), include_hidden_chars=False).strip()
self.manager.replace_trackers(torrent, self.textlist)
self.edit_window.destroy()