diff -ruN youtube-dl-orig/README.md youtube-dl/README.md --- youtube-dl-orig/README.md 2021-02-10 09:34:46.000000000 -0600 +++ youtube-dl/README.md 2021-02-14 11:08:29.000000000 -0600 @@ -82,7 +82,7 @@ is not possible instead of searching. --ignore-config Do not read configuration files. When given in the global configuration file - /etc/youtube-dl.conf: Do not read the + @FINK_PREFIX@/etc/youtube-dl.conf: Do not read the user configuration in ~/.config/youtube-dl/config (%APPDATA%/youtube-dl/config.txt on @@ -480,7 +480,7 @@ # CONFIGURATION -You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and macOS, the system wide configuration file is located at `/etc/youtube-dl.conf` and the user wide configuration file at `~/.config/youtube-dl/config`. On Windows, the user wide configuration file locations are `%APPDATA%\youtube-dl\config.txt` or `C:\Users\\youtube-dl.conf`. Note that by default configuration file may not exist so you may need to create it yourself. +You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and macOS, the system wide configuration file is located at `@FINK_PREFIX@/etc/youtube-dl.conf` and the user wide configuration file at `~/.config/youtube-dl/config`. On Windows, the user wide configuration file locations are `%APPDATA%\youtube-dl\config.txt` or `C:\Users\\youtube-dl.conf`. Note that by default configuration file may not exist so you may need to create it yourself. For example, with the following configuration file youtube-dl will always extract the audio, not copy the mtime, use a proxy and save all videos under `Movies` directory in your home directory: ``` diff -ruN youtube-dl-orig/README.txt youtube-dl/README.txt --- youtube-dl-orig/README.txt 2021-02-10 09:35:09.000000000 -0600 +++ youtube-dl/README.txt 2021-02-14 11:08:45.000000000 -0600 @@ -102,7 +102,7 @@ is not possible instead of searching. --ignore-config Do not read configuration files. When given in the global configuration file - /etc/youtube-dl.conf: Do not read the + @FINK_PREFIX@/etc/youtube-dl.conf: Do not read the user configuration in ~/.config/youtube-dl/config (%APPDATA%/youtube-dl/config.txt on @@ -531,7 +531,7 @@ You can configure youtube-dl by placing any supported command line option to a configuration file. On Linux and macOS, the system wide -configuration file is located at /etc/youtube-dl.conf and the user wide +configuration file is located at @FINK_PREFIX@/etc/youtube-dl.conf and the user wide configuration file at ~/.config/youtube-dl/config. On Windows, the user wide configuration file locations are %APPDATA%\youtube-dl\config.txt or C:\Users\\youtube-dl.conf. Note that by default configuration diff -ruN youtube-dl-orig/youtube-dl.fish youtube-dl/youtube-dl.fish --- youtube-dl-orig/youtube-dl.fish 2021-02-10 09:35:12.000000000 -0600 +++ youtube-dl/youtube-dl.fish 2021-02-14 11:09:36.000000000 -0600 @@ -9,7 +9,7 @@ complete --command youtube-dl --long-option extractor-descriptions --description 'Output descriptions of all supported extractors' complete --command youtube-dl --long-option force-generic-extractor --description 'Force extraction to use the generic extractor' complete --command youtube-dl --long-option default-search --description 'Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dl "large apple". Use the value "auto" to let youtube-dl guess ("auto_warning" to emit a warning when guessing). "error" just throws an error. The default value "fixup_error" repairs broken URLs, but emits an error if this is not possible instead of searching.' -complete --command youtube-dl --long-option ignore-config --description 'Do not read configuration files. When given in the global configuration file /etc/youtube-dl.conf: Do not read the user configuration in ~/.config/youtube-dl/config (%APPDATA%/youtube-dl/config.txt on Windows)' +complete --command youtube-dl --long-option ignore-config --description 'Do not read configuration files. When given in the global configuration file @FINK_PREFIX@/etc/youtube-dl.conf: Do not read the user configuration in ~/.config/youtube-dl/config (%APPDATA%/youtube-dl/config.txt on Windows)' complete --command youtube-dl --long-option config-location --description 'Location of the configuration file; either the path to the config or its containing directory.' complete --command youtube-dl --long-option flat-playlist --description 'Do not extract the videos of a playlist, only list them.' complete --command youtube-dl --long-option mark-watched --description 'Mark videos watched (YouTube only)' diff -ruN youtube-dl-orig/youtube_dl/options.py youtube-dl/youtube_dl/options.py --- youtube-dl-orig/youtube_dl/options.py 2021-02-04 00:14:03.000000000 -0600 +++ youtube-dl/youtube_dl/options.py 2021-02-14 11:10:29.000000000 -0600 @@ -173,7 +173,7 @@ '--ignore-config', action='store_true', help='Do not read configuration files. ' - 'When given in the global configuration file /etc/youtube-dl.conf: ' + 'When given in the global configuration file @FINK_PREFIX@/etc/youtube-dl.conf: ' 'Do not read the user configuration in ~/.config/youtube-dl/config ' '(%APPDATA%/youtube-dl/config.txt on Windows)') general.add_option( @@ -903,7 +903,7 @@ elif '--ignore-config' in command_line_conf: pass else: - system_conf = _readOptions('/etc/youtube-dl.conf') + system_conf = _readOptions('@FINK_PREFIX@/etc/youtube-dl.conf') if '--ignore-config' not in system_conf: user_conf = _readUserConf() diff -ruN youtube-dl-orig/youtube_dl/update.py youtube-dl/youtube_dl/update.py --- youtube-dl-orig/youtube_dl/update.py 2021-02-04 00:14:03.000000000 -0600 +++ youtube-dl/youtube_dl/update.py 2021-02-14 11:11:19.000000000 -0600 @@ -37,8 +37,8 @@ JSON_URL = UPDATE_URL + 'versions.json' UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) - if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'): - to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.') + if True: + to_screen('It looks like you installed youtube-dl with Fink. Please use "fink selfupdate && fink -m install youtube-dl" to update.') return # Check if there is a new version --- youtube-dl-orig/youtube_dl/extractor/youtube.py 2021-12-16 12:47:24.000000000 -0600 +++ youtube-dl/youtube_dl/extractor/youtube.py 2023-02-25 17:41:42.000000000 -0600 @@ -1791,7 +1791,7 @@ microformat.get('uploadDate') or search_meta('uploadDate')), 'uploader': video_details['author'], - 'uploader_id': self._search_regex(r'/(?:channel|user)/([^/?&#]+)', owner_profile_url, 'uploader id') if owner_profile_url else None, + 'uploader_id': self._search_regex(r'/(?:channel/|user/|@)([^/?&#]+)', owner_profile_url, 'uploader id', default=None), 'uploader_url': owner_profile_url, 'channel_id': channel_id, 'channel_url': 'https://www.youtube.com/channel/' + channel_id if channel_id else None,