PublicMirrors/you-get
1
0
Fork 0
mirror of https://github.com/soimort/you-get.git synced 2025-01-24 05:55:02 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

[common] --cookies loads Mozilla cookies.sqlite instead of Netscape cookies.txt

Browse Source
This commit is contained in:
Mort Yao 2015-10-05 04:17:54 +02:00
parent eb141c1908
commit acf990fed6
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/you_get/common.py
View File

@ -8,6 +8,7 @@ import platform
import re import re
import sys import sys
from urllib import request, parse from urllib import request, parse
from http import cookiejar
from .version import __version__ from .version import __version__
from .util import log from .util import log
@ -19,6 +20,7 @@ json_output = False
force = False force = False
player = None player = None
extractor_proxy = None extractor_proxy = None
cookies = None
cookies_txt = None cookies_txt = None
fake_headers = { fake_headers = {
@ -861,7 +863,7 @@ def script_main(script_name, download, download_playlist = None):
-f | --force Force overwriting existed files. -f | --force Force overwriting existed files.
-i | --info Display the information of videos without downloading. -i | --info Display the information of videos without downloading.
-u | --url Display the real URLs of videos without downloading. -u | --url Display the real URLs of videos without downloading.
-c | --cookies Load NetScape's cookies.txt file. -c | --cookies Load Mozilla cookies.sqlite file.
-n | --no-merge Don't merge video parts. -n | --no-merge Don't merge video parts.
-F | --format <STREAM_ID> Video format code. -F | --format <STREAM_ID> Video format code.
-o | --output-dir <PATH> Set the output directory for downloaded videos. -o | --output-dir <PATH> Set the output directory for downloaded videos.
@ -891,8 +893,8 @@ def script_main(script_name, download, download_playlist = None):
global json_output global json_output
global player global player
global extractor_proxy global extractor_proxy
global cookies
global cookies_txt global cookies_txt
cookies_txt = None
info_only = False info_only = False
playlist = False playlist = False
@ -923,9 +925,25 @@ def script_main(script_name, download, download_playlist = None):
dry_run = True dry_run = True
info_only = False info_only = False
elif o in ('-c', '--cookies'): elif o in ('-c', '--cookies'):
from http import cookiejar #cookies_txt = cookiejar.MozillaCookieJar(a)
cookies_txt = cookiejar.MozillaCookieJar(a) #cookies_txt.load()
cookies_txt.load() import sqlite3
cookies = cookiejar.MozillaCookieJar(a)
con = sqlite3.connect(a)
cur = con.cursor()
cur.execute("SELECT host, path, isSecure, expiry, name, value FROM moz_cookies")
for item in cur.fetchall():
c = cookiejar.Cookie(0, item[4], item[5],
None, False,
item[0],
item[0].startswith('.'),
item[0].startswith('.'),
item[1], False,
item[2],
item[3], item[3]=="",
None, None, {})
cookies.set_cookie(c)
elif o in ('-l', '--playlist'): elif o in ('-l', '--playlist'):
playlist = True playlist = True
elif o in ('-n', '--no-merge'): elif o in ('-n', '--no-merge'):