mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-20 11:35:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle torrent add failures in web UI

Browse source 
Show an error dialog and remove the torrent from the list
when a torrent file fails to upload or a URL fails to download.
This commit is contained in:
John Garland 2012-12-02 16:24:59 +11:00
parent 2e0b0d9474
commit ce4b4ef48e
6 changed files with 129 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
deluge/ui/web/js/deluge-all-debug.js
View file

@ -1429,7 +1429,8 @@ Deluge.add.Window = Ext.extend(Ext.Window, {
Deluge.add.Window.superclass.initComponent.call(this);
this.addEvents(
'beforeadd',
'add'
'add',
'addfailed'
);
},
@ -1628,12 +1629,14 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
this.url = new Deluge.add.UrlWindow();
this.url.on('beforeadd', this.onTorrentBeforeAdd, this);
this.url.on('add', this.onTorrentAdd, this);
this.url.on('addfailed', this.onTorrentAddFailed, this);
}
if (!this.file) {
this.file = new Deluge.add.FileWindow();
this.file.on('beforeadd', this.onTorrentBeforeAdd, this);
this.file.on('add', this.onTorrentAdd, this);
this.file.on('addfailed', this.onTorrentAddFailed, this);
}
this.optionsPanel.form.getDefaults();
@ -1665,6 +1668,14 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
}
},
onTorrentAddFailed: function(torrentId) {
var store = this.list.getStore();
var torrentRecord = store.getById(torrentId);
if (torrentRecord) {
store.remove(torrentRecord);
}
},
onUrl: function(button, event) {
this.url.show();
}
@ -1770,6 +1781,15 @@ Deluge.add.FileWindow = Ext.extend(Deluge.add.Window, {
// private
onUploadFailure: function(form, action) {
this.hide();
Ext.MessageBox.show({
title: _('Error'),
msg: _('Failed to upload torrent'),
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
this.fireEvent('addfailed', this.torrentId);
},
// private
@ -2369,7 +2389,7 @@ Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
var cookies = this.cookieField.getValue();
var torrentId = this.createTorrentId();
if (url.substring(0,20) == 'magnet:?xt=urn:btih:') {
if (url.indexOf('magnet:?') == 0 && url.indexOf('xt=urn:btih') > -1) {
deluge.client.web.get_magnet_info(url, {
success: this.onGotInfo,
scope: this,
@ -2379,6 +2399,7 @@ Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
} else {
deluge.client.web.download_torrent_from_url(url, cookies, {
success: this.onDownload,
failure: this.onDownloadFailed,
scope: this,
torrentId: torrentId
});
@ -2398,6 +2419,18 @@ Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
});
},
onDownloadFailed: function(obj, resp, req) {
Ext.MessageBox.show({
title: _('Error'),
msg: _('Failed to download torrent'),
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
this.fireEvent('addfailed', req.options.torrentId);
},
onGotInfo: function(info, obj, response, request) {
info['filename'] = request.options.filename;
this.fireEvent('add', request.options.torrentId, info);

120
deluge/ui/web/js/deluge-all.js
View file

File diff suppressed because one or more lines are too long

10
deluge/ui/web/js/deluge-all/add/AddWindow.js
View file

@ -186,12 +186,14 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
this.url = new Deluge.add.UrlWindow();
this.url.on('beforeadd', this.onTorrentBeforeAdd, this);
this.url.on('add', this.onTorrentAdd, this);
this.url.on('addfailed', this.onTorrentAddFailed, this);
}
if (!this.file) {
this.file = new Deluge.add.FileWindow();
this.file.on('beforeadd', this.onTorrentBeforeAdd, this);
this.file.on('add', this.onTorrentAdd, this);
this.file.on('addfailed', this.onTorrentAddFailed, this);
}
this.optionsPanel.form.getDefaults();
@ -223,6 +225,14 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
}
},
onTorrentAddFailed: function(torrentId) {
var store = this.list.getStore();
var torrentRecord = store.getById(torrentId);
if (torrentRecord) {
store.remove(torrentRecord);
}
},
onUrl: function(button, event) {
this.url.show();
}

9
deluge/ui/web/js/deluge-all/add/FileWindow.js
View file

@ -99,6 +99,15 @@ Deluge.add.FileWindow = Ext.extend(Deluge.add.Window, {
// private
onUploadFailure: function(form, action) {
this.hide();
Ext.MessageBox.show({
title: _('Error'),
msg: _('Failed to upload torrent'),
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
this.fireEvent('addfailed', this.torrentId);
},
// private

13
deluge/ui/web/js/deluge-all/add/UrlWindow.js
View file

@ -91,6 +91,7 @@ Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
} else {
deluge.client.web.download_torrent_from_url(url, cookies, {
success: this.onDownload,
failure: this.onDownloadFailed,
scope: this,
torrentId: torrentId
});
@ -110,6 +111,18 @@ Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
});
},
onDownloadFailed: function(obj, resp, req) {
Ext.MessageBox.show({
title: _('Error'),
msg: _('Failed to download torrent'),
buttons: Ext.MessageBox.OK,
modal: false,
icon: Ext.MessageBox.ERROR,
iconCls: 'x-deluge-icon-error'
});
this.fireEvent('addfailed', req.options.torrentId);
},
onGotInfo: function(info, obj, response, request) {
info['filename'] = request.options.filename;
this.fireEvent('add', request.options.torrentId, info);

3
deluge/ui/web/js/deluge-all/add/Window.js
View file

@ -41,7 +41,8 @@ Deluge.add.Window = Ext.extend(Ext.Window, {
Deluge.add.Window.superclass.initComponent.call(this);
this.addEvents(
'beforeadd',
'add'
'add',
'addfailed'
);
},