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.

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

minor fixes to cookies #275

Merged
merged 35 commits into from
Nov 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2af6484
add more browsers
datawhores Nov 12, 2024
c5b562f
add more browser to import
datawhores Nov 12, 2024
27a759d
add action for new browser
datawhores Nov 12, 2024
6708e42
add browser cookies
datawhores Nov 12, 2024
74752a7
make sure everything is lower case
datawhores Nov 12, 2024
3d59be7
add handle fix for sqlite schema for browser3
datawhores Nov 12, 2024
791951d
spelling
datawhores Nov 12, 2024
f35e711
remove get get_forum cookie and use get_cookie from browser
datawhores Nov 12, 2024
abbc2b6
remove forum_cookie function
datawhores Nov 12, 2024
e1bcdc2
fix spelling
datawhores Nov 12, 2024
ceb6470
update poetry
datawhores Nov 13, 2024
e4dd454
lower case browser
datawhores Nov 13, 2024
1d2518b
Update pyproject.toml
jbsparrow Nov 13, 2024
0667a2d
use hash instead of pull request
datawhores Nov 13, 2024
774afc6
add cookies wrapper
datawhores Nov 13, 2024
462f9ea
catch errors and log to user
datawhores Nov 13, 2024
192c82a
ran pre-commit
datawhores Nov 13, 2024
66995d7
Merge branch 'auto-cookie-update' of https://github.com/datawhores/Cy…
datawhores Nov 13, 2024
0050d01
handle broswer being none
datawhores Nov 13, 2024
bb79469
handle errors
datawhores Nov 13, 2024
1c194c0
remove s
datawhores Nov 13, 2024
c459add
add sites arg from other branch
datawhores Nov 13, 2024
13c46ae
support multiple browseres
datawhores Nov 13, 2024
a4ec787
support sites selection
datawhores Nov 13, 2024
d16a2a8
move valid site check
datawhores Nov 13, 2024
cc948b4
move cookie file path down
datawhores Nov 13, 2024
cfd3576
support converted comma or space seperated str into python list
datawhores Nov 13, 2024
a4153fa
make domain lower
datawhores Nov 13, 2024
cd72553
use supported hosts
datawhores Nov 13, 2024
ab90c10
Merge branch 'master' into auto-cookie-update
NTFSvolume Nov 13, 2024
da6a56a
use all_host and move cooke_jar out of inner loop
datawhores Nov 13, 2024
ea70d17
Merge branch 'auto-cookie-update' of https://github.com/datawhores/Cy…
datawhores Nov 13, 2024
240e085
spacing
datawhores Nov 13, 2024
1d7ed2c
merge
datawhores Nov 13, 2024
40f4b98
ran ruff
datawhores Nov 14, 2024
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
Prev Previous commit
Next Next commit
support multiple browseres
datawhores committed Nov 13, 2024
commit 13c46ae60e1406f761748371b6bad435df706dc6
22 changes: 13 additions & 9 deletions cyberdrop_dl/utils/args/browser_cookie_extraction.py
Original file line number Diff line number Diff line change
@@ -77,18 +77,22 @@ def wrapper(*args, **kwargs) -> CookieJar:


@cookie_wrapper
def get_cookies_from_browser(manager: Manager, browser: str = None) -> None:
def get_cookies_from_browser(manager: Manager, browsers: str = None) -> None:
"""Get the cookies for the supported sites"""
manager.path_manager.cookies_dir.mkdir(exist_ok=True)
browser = browser or manager.config_manager.settings_data["Browser_Cookies"]["browser"]
browser = browser.lower() if browser else None
for domain in SupportedDomains.supported_forums:
cookies = get_cookie(browser, domain)
cookie_jar = MozillaCookieJar()
cookie_file_path = manager.path_manager.cookies_dir / f"{domain}.txt"
browsers = browsers or manager.config_manager.settings_data["Browser_Cookies"]["browser"]
if not isinstance(browsers,list):
browsers = [browsers]

for cookie in cookies:
cookie_jar.set_cookie(cookie)
for domain in SupportedDomains.supported_forums:
for browser in browsers:
browser = browser.lower() if browser else None
cookies = get_cookie(browser, domain)
cookie_jar = MozillaCookieJar()
cookie_file_path = manager.path_manager.cookies_dir / f"{domain}.txt"

for cookie in cookies:
cookie_jar.set_cookie(cookie)

cookie_jar.save(cookie_file_path, ignore_discard=True, ignore_expires=True)