Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use standard Netscape cookies.txt format for loading/saving cookies #287

Closed
wants to merge 1 commit into from
Closed

Use standard Netscape cookies.txt format for loading/saving cookies #287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions gdown/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import tempfile
import textwrap
import time
from http.cookiejar import MozillaCookieJar

import requests
import six
Expand Down Expand Up @@ -66,12 +67,21 @@ def _get_session(proxy, use_cookies, return_cookies_file=False):
print("Using proxy:", proxy, file=sys.stderr)

# Load cookies if exists
cookies_file = osp.join(home, ".cache/gdown/cookies.json")
if osp.exists(cookies_file) and use_cookies:
with open(cookies_file) as f:
cookies = json.load(f)
for k, v in cookies:
sess.cookies[k] = v
cookies_file = osp.join(home, ".cache/gdown/cookies.txt")
if use_cookies:
if osp.exists(cookies_file):
# standard netscape cookies.txt format
cj = MozillaCookieJar(cookies_file)
cj.load()
sess.cookies.update(cj)
else:
# old cookies format
old_cookies_file = osp.join(home, ".cache/gdown/cookies.json")
if osp.exists(old_cookies_file):
with open(old_cookies_file) as f:
cookies = json.load(f)
for k, v in cookies:
sess.cookies[k] = v

if return_cookies_file:
return sess, cookies_file
Expand Down Expand Up @@ -205,14 +215,11 @@ def download(
if use_cookies:
if not osp.exists(osp.dirname(cookies_file)):
os.makedirs(osp.dirname(cookies_file))
# Save cookies
with open(cookies_file, "w") as f:
cookies = [
(k, v)
for k, v in sess.cookies.items()
if not k.startswith("download_warning_")
]
json.dump(cookies, f, indent=2)
# Save cookies with netscape format
cj = MozillaCookieJar(cookies_file)
for cookie in sess.cookies:
cj.set_cookie(cookie)
cj.save()

if "Content-Disposition" in res.headers:
# This is the file
Expand Down