Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 6363e46

Browse files
committed
Unescape HTML special characters
1 parent 0b26280 commit 6363e46

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

extension/background.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ current_browser.downloads.onCreated.addListener(function(downloadItem) {
198198
});
199199

200200
message.url = url;
201-
message.filename = downloadItem['filename'].replace(/^.*[\\\/]/, '');
201+
message.filename = unescape(downloadItem['filename']);
202202
message.filesize = fileSize;
203203
message.referrer = downloadItem['referrer'];
204204
current_browser.cookies.getAll({ 'url': extractRootURL(url) }, parseCookies);
@@ -290,7 +290,7 @@ current_browser.webRequest.onHeadersReceived.addListener(function(details) {
290290
disposition = details.responseHeaders[i].value;
291291
if (disposition.lastIndexOf('filename') != -1) {
292292
message.filename = disposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/)[1];
293-
message.filename = message.filename.replace(/["']/g, "");
293+
message.filename = unescape(message.filename);
294294
interruptDownload = true;
295295
}
296296
} else if (details.responseHeaders[i].name.toLowerCase() == 'content-type') {

extension/extract.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,20 @@
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
extract();
21+
extract();
22+
2223
function extract() {
2324
var txt = '';
24-
25+
urls = []
2526
for (var i = 0; i < document.links.length; i++) {
2627
url = document.links[i].href;
2728
var valid = /^(ftp|http|https):\/\/[^ "]+$/.test(url);
28-
if(valid && txt.indexOf(url) == -1) {
29-
txt += url + '\n';
29+
if(valid) {
30+
var decodedURL = unescape(url);
31+
if(urls.indexOf(decodedURL) < 0) {
32+
urls.push(decodedURL);
33+
txt += url + '\n';
34+
}
3035
}
3136
}
3237

uget-chrome-wrapper/bin/uget-chrome-wrapper

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
# sudo apt install python3-urllib3
2222
import struct, sys, threading, logging, json, urllib, subprocess, tempfile
2323
from urllib.parse import urlparse
24+
from urllib.parse import unquote
2425
from urllib.request import urlopen
2526
from os.path import splitext, basename, join, expanduser
2627
from mimetypes import guess_extension
@@ -174,7 +175,7 @@ def read_message():
174175

175176
# Add the file name
176177
if filename:
177-
command.append("--filename=" + filename)
178+
command.append("--filename=" + unquote(filename))
178179

179180
# Add the cookie file
180181
if use_cookie_file:

0 commit comments

Comments
 (0)