Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
XianxinMao
Yt Dlp
提交
2e023649
Y
Yt Dlp
项目概览
XianxinMao
/
Yt Dlp
11 个月 前同步成功
通知
27
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
Yt Dlp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
2e023649
编写于
6月 19, 2023
作者:
P
pukkandan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cookies] Revert compatibility breakage in
b38d4c94
上级
51a07b0d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
README.md
README.md
+1
-1
yt_dlp/cookies.py
yt_dlp/cookies.py
+10
-10
未找到文件。
README.md
浏览文件 @
2e023649
...
...
@@ -728,7 +728,7 @@ ## Filesystem Options:
By default, all containers of the most
recently accessed profile are used.
Currently supported keyrings are: basictext,
gnomekeyring, kwallet
gnomekeyring, kwallet
, kwallet5, kwallet6
--no-cookies-from-browser Do not load cookies from browser (default)
--cache-dir DIR Location in the filesystem where yt-dlp can
store some downloaded information (such as
...
...
yt_dlp/cookies.py
浏览文件 @
2e023649
...
...
@@ -705,11 +705,11 @@ class _LinuxKeyring(Enum):
https://chromium.googlesource.com/chromium/src/+/refs/heads/main/components/os_crypt/sync/key_storage_util_linux.h
SelectedLinuxBackend
"""
KWALLET
4
=
auto
()
# this value is just called KWALLET in the chromium source but it is for KDE4 only
KWALLET
=
auto
()
# KDE4
KWALLET5
=
auto
()
KWALLET6
=
auto
()
GNOME
_
KEYRING
=
auto
()
BASIC
_
TEXT
=
auto
()
GNOMEKEYRING
=
auto
()
BASICTEXT
=
auto
()
SUPPORTED_KEYRINGS
=
_LinuxKeyring
.
__members__
.
keys
()
...
...
@@ -803,7 +803,7 @@ def _choose_linux_keyring(logger):
desktop_environment
=
_get_linux_desktop_environment
(
os
.
environ
,
logger
)
logger
.
debug
(
f
'detected desktop environment:
{
desktop_environment
.
name
}
'
)
if
desktop_environment
==
_LinuxDesktopEnvironment
.
KDE4
:
linux_keyring
=
_LinuxKeyring
.
KWALLET
4
linux_keyring
=
_LinuxKeyring
.
KWALLET
elif
desktop_environment
==
_LinuxDesktopEnvironment
.
KDE5
:
linux_keyring
=
_LinuxKeyring
.
KWALLET5
elif
desktop_environment
==
_LinuxDesktopEnvironment
.
KDE6
:
...
...
@@ -811,9 +811,9 @@ def _choose_linux_keyring(logger):
elif
desktop_environment
in
(
_LinuxDesktopEnvironment
.
KDE3
,
_LinuxDesktopEnvironment
.
LXQT
,
_LinuxDesktopEnvironment
.
OTHER
):
linux_keyring
=
_LinuxKeyring
.
BASIC
_
TEXT
linux_keyring
=
_LinuxKeyring
.
BASICTEXT
else
:
linux_keyring
=
_LinuxKeyring
.
GNOME
_
KEYRING
linux_keyring
=
_LinuxKeyring
.
GNOMEKEYRING
return
linux_keyring
...
...
@@ -828,7 +828,7 @@ def _get_kwallet_network_wallet(keyring, logger):
"""
default_wallet
=
'kdewallet'
try
:
if
keyring
==
_LinuxKeyring
.
KWALLET
4
:
if
keyring
==
_LinuxKeyring
.
KWALLET
:
service_name
=
'org.kde.kwalletd'
wallet_path
=
'/modules/kwalletd'
elif
keyring
==
_LinuxKeyring
.
KWALLET5
:
...
...
@@ -929,11 +929,11 @@ def _get_linux_keyring_password(browser_keyring_name, keyring, logger):
keyring
=
_LinuxKeyring
[
keyring
]
if
keyring
else
_choose_linux_keyring
(
logger
)
logger
.
debug
(
f
'Chosen keyring:
{
keyring
.
name
}
'
)
if
keyring
in
(
_LinuxKeyring
.
KWALLET
4
,
_LinuxKeyring
.
KWALLET5
,
_LinuxKeyring
.
KWALLET6
):
if
keyring
in
(
_LinuxKeyring
.
KWALLET
,
_LinuxKeyring
.
KWALLET5
,
_LinuxKeyring
.
KWALLET6
):
return
_get_kwallet_password
(
browser_keyring_name
,
keyring
,
logger
)
elif
keyring
==
_LinuxKeyring
.
GNOME
_
KEYRING
:
elif
keyring
==
_LinuxKeyring
.
GNOMEKEYRING
:
return
_get_gnome_keyring_password
(
browser_keyring_name
,
logger
)
elif
keyring
==
_LinuxKeyring
.
BASIC
_
TEXT
:
elif
keyring
==
_LinuxKeyring
.
BASICTEXT
:
# when basic text is chosen, all cookies are stored as v10 (so no keyring password is required)
return
None
assert
False
,
f
'Unknown keyring
{
keyring
}
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录