github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve handling of text:... URLs

Browse Source 
- don't require // after the colon
- open output files in text mode
This commit is contained in:
Mike Fährmann
2017-05-12 14:10:25 +02:00
parent 677c8ced11
commit 107d29ad8a
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gallery_dl/extractor/deviantart.py
View File

@@ -165,8 +165,8 @@ class DeviantartFavoriteExtractor(DeviantartExtractor):
r"(?:/((\d+)/([^/?]+)|\?catpath=/))?"]
test = [
("http://rosuuri.deviantart.com/favourites/58951174/Useful", {
"url": "2545427f52012a8b9b07c95ca5c91002d5bf4f18",
"keyword": "7ba0e75aeeb0f51541c4a2411410f8e3b3717641",
"url": "85d1dd231be0b880c69dc947b564595fe3dd8248",
"keyword": "9ae736fd906d7b3a41d81dd5f2488fd8537a5858",
}),
("http://h3813067.deviantart.com/favourites/", {
"url": "71345ce3bef5b19bd2a56d7b96e6b5ddba747c2e",
@@ -216,7 +216,7 @@ class DeviantartJournalExtractor(DeviantartExtractor):
subcategory = "journal"
pattern = [r"(?:https?://)?([^.]+)\.deviantart\.com/journal/?$"]
test = [("http://shimoda7.deviantart.com/journal/", {
"url": "05204bddf5ebba330d73cec76bcd55b1249c6159",
"url": "d046614f41849e4a2a8d8a20c5d00cbe814ca6f2",
"keyword": "8434f8bdd4b38634e206c8689a0906ac10c3fa77",
})]
@@ -343,7 +343,7 @@ class DeviantartAPI():
return
JOURNAL_TEMPLATE = """text://<!DOCTYPE html>
JOURNAL_TEMPLATE = """text:<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">

1
gallery_dl/extractor/imgchili.py
View File

@@ -52,7 +52,6 @@ class ImgchiliImageExtractor(ImgchiliExtractor):
"89427136_test___quot;___gt;.png"), {
"url": "b93d92a6b58eb30a7ff6f9729cb748d25fea0c86",
"keyword": "376c4584dfae7d7d2e88687d4ee9618bbfd0a35c",
"content": "3b2a74be551b0b5549c831c9994760ef35138b22",
})]
def get_job_metadata(self, page):

2
gallery_dl/extractor/pixiv.py
View File

@@ -62,7 +62,7 @@ class PixivUserExtractor(Extractor):
work["extension"] = "zip"
yield Message.Url, url, work
work["extension"] = "txt"
yield Message.Url, "text://"+framelist, work
yield Message.Url, "text:"+framelist, work
elif work["page_count"] == 1:
yield Message.Url, work["url"], work