diff --git a/Contents/Code/default_prefs.py b/Contents/Code/default_prefs.py index 6e7ba6f5..1a0bc426 100644 --- a/Contents/Code/default_prefs.py +++ b/Contents/Code/default_prefs.py @@ -16,8 +16,6 @@ int_plexapi_plexapi_timeout='180', int_plexapi_upload_retries_max='3', int_plexapi_upload_threads='3', - str_youtube_user='', - str_youtube_passwd='', str_youtube_cookies='', enum_webapp_locale='en', str_webapp_http_host='0.0.0.0', diff --git a/Contents/Code/youtube_dl_helper.py b/Contents/Code/youtube_dl_helper.py index f493b626..1aaedd62 100644 --- a/Contents/Code/youtube_dl_helper.py +++ b/Contents/Code/youtube_dl_helper.py @@ -69,10 +69,7 @@ def process_youtube(url): youtube_dl_params = dict( cookiefile=cookie_jar_file.name, logger=plugin_logger, - outtmpl=u'%(id)s.%(ext)s', - password=Prefs['str_youtube_passwd'] if Prefs['str_youtube_passwd'] else None, socket_timeout=10, - username=Prefs['str_youtube_user'] if Prefs['str_youtube_user'] else None, youtube_include_dash_manifest=False, ) diff --git a/Contents/DefaultPrefs.json b/Contents/DefaultPrefs.json index 48bc2498..8dbe8aaa 100644 --- a/Contents/DefaultPrefs.json +++ b/Contents/DefaultPrefs.json @@ -104,21 +104,6 @@ "default": "3", "secure": "false" }, - { - "id": "str_youtube_user", - "type": "text", - "label": "YouTube Username", - "default": "", - "secure": "true" - }, - { - "id": "str_youtube_passwd", - "type": "text", - "label": "YouTube Password", - "default": "", - "option": "hidden", - "secure": "true" - }, { "id": "str_youtube_cookies", "type": "text", diff --git a/docs/source/about/usage.rst b/docs/source/about/usage.rst index 7840fd7e..38cae230 100644 --- a/docs/source/about/usage.rst +++ b/docs/source/about/usage.rst @@ -224,24 +224,6 @@ Default Minimum ``1`` -YouTube Username -^^^^^^^^^^^^^^^^ - -Description - The YouTube Username to use. Supplying YouTube credentials will allow access to age restricted content. - -Default - None - -YouTube Password -^^^^^^^^^^^^^^^^ - -Description - The YouTube Password to use. Supplying YouTube credentials will allow access to age restricted content. - -Default - None - YouTube Cookies ^^^^^^^^^^^^^^^^