[skip travis] renaming

to avoid using same folder when using pip install for example

diff --git a/MANIFEST.in b/MANIFEST.in
index 4e43e99f394dfc8506447ea4e8328467f5f6a8f5..d2cce9a1cc718446475b4a7e95919d41fbf70731 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,8 +2,8 @@ include README.md
 include LICENSE
 include AUTHORS
 include ChangeLog
 include LICENSE
 include AUTHORS
 include ChangeLog

-include youtube-dl.bash-completion
-include youtube-dl.fish
-include youtube-dl.1
+include youtube-dlc.bash-completion
+include youtube-dlc.fish
+include youtube-dlc.1

 recursive-include docs Makefile conf.py *.rst
 recursive-include test *
 recursive-include docs Makefile conf.py *.rst
 recursive-include test *

diff --git a/Makefile b/Makefile
index 3e17365b83d62cf320f70bc45189e78937ec89d3..9588657c15b0360f258a807f767ce22981218230 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
+all: youtube-dlc README.md CONTRIBUTING.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish supportedsites

 
 clean:
 
 clean:

-       rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish youtube_dl/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+       rm -rf youtube-dlc.1.temp.md youtube-dlc.1 youtube-dlc.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dlc.tar.gz youtube-dlc.zsh youtube-dlc.fish youtube_dlc/extractor/lazy_extractors.py *.dump *.part* *.ytdl *.info.json *.mp4 *.m4a *.flv *.mp3 *.avi *.mkv *.webm *.3gp *.wav *.ape *.swf *.jpg *.png CONTRIBUTING.md.tmp youtube-dlc youtube-dlc.exe

        find . -name "*.pyc" -delete
        find . -name "*.class" -delete
 
        find . -name "*.pyc" -delete
        find . -name "*.class" -delete
 


@@ -17,23 +17,23 @@ SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then ech
 # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
 
 # set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
 MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
 

-install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
+install: youtube-dlc youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish

        install -d $(DESTDIR)$(BINDIR)
        install -d $(DESTDIR)$(BINDIR)

-       install -m 755 youtube-dl $(DESTDIR)$(BINDIR)
+       install -m 755 youtube-dlc $(DESTDIR)$(BINDIR)

        install -d $(DESTDIR)$(MANDIR)/man1
        install -d $(DESTDIR)$(MANDIR)/man1

-       install -m 644 youtube-dl.1 $(DESTDIR)$(MANDIR)/man1
+       install -m 644 youtube-dlc.1 $(DESTDIR)$(MANDIR)/man1

        install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
        install -d $(DESTDIR)$(SYSCONFDIR)/bash_completion.d

-       install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
+       install -m 644 youtube-dlc.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dlc

        install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions
        install -d $(DESTDIR)$(SHAREDIR)/zsh/site-functions

-       install -m 644 youtube-dl.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dl
+       install -m 644 youtube-dlc.zsh $(DESTDIR)$(SHAREDIR)/zsh/site-functions/_youtube-dlc

        install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions
        install -d $(DESTDIR)$(SYSCONFDIR)/fish/completions

-       install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
+       install -m 644 youtube-dlc.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dlc.fish

 
 codetest:
        flake8 .
 
 test:
 
 codetest:
        flake8 .
 
 test:

-       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       #nosetests --with-coverage --cover-package=youtube_dlc --cover-html --verbose --processes 4 test

        nosetests --verbose test
        $(MAKE) codetest
 
        nosetests --verbose test
        $(MAKE) codetest
 


@@ -51,34 +51,34 @@ offlinetest: codetest
                --exclude test_youtube_lists.py \
                --exclude test_youtube_signature.py
 
                --exclude test_youtube_lists.py \
                --exclude test_youtube_signature.py
 

-tar: youtube-dl.tar.gz
+tar: youtube-dlc.tar.gz

 
 .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
 
 
 .PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
 

-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
+pypi-files: youtube-dlc.bash-completion README.txt youtube-dlc.1 youtube-dlc.fish

 
 

-youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
+youtube-dlc: youtube_dlc/*.py youtube_dlc/*/*.py

        mkdir -p zip
        mkdir -p zip

-       for d in youtube_dl youtube_dl/downloader youtube_dl/extractor youtube_dl/postprocessor ; do \
+       for d in youtube_dlc youtube_dlc/downloader youtube_dlc/extractor youtube_dlc/postprocessor ; do \

          mkdir -p zip/$$d ;\
          cp -pPR $$d/*.py zip/$$d/ ;\
        done
          mkdir -p zip/$$d ;\
          cp -pPR $$d/*.py zip/$$d/ ;\
        done

-       touch -t 200001010101 zip/youtube_dl/*.py zip/youtube_dl/*/*.py
-       mv zip/youtube_dl/__main__.py zip/
-       cd zip ; zip -q ../youtube-dl youtube_dl/*.py youtube_dl/*/*.py __main__.py
+       touch -t 200001010101 zip/youtube_dlc/*.py zip/youtube_dlc/*/*.py
+       mv zip/youtube_dlc/__main__.py zip/
+       cd zip ; zip -q ../youtube-dlc youtube_dlc/*.py youtube_dlc/*/*.py __main__.py

        rm -rf zip
        rm -rf zip

-       echo '#!$(PYTHON)' > youtube-dl
-       cat youtube-dl.zip >> youtube-dl
-       rm youtube-dl.zip
-       chmod a+x youtube-dl
+       echo '#!$(PYTHON)' > youtube-dlc
+       cat youtube-dlc.zip >> youtube-dlc
+       rm youtube-dlc.zip
+       chmod a+x youtube-dlc

 
 

-README.md: youtube_dl/*.py youtube_dl/*/*.py
-       COLUMNS=80 $(PYTHON) youtube_dl/__main__.py --help | $(PYTHON) devscripts/make_readme.py
+README.md: youtube_dlc/*.py youtube_dlc/*/*.py
+       COLUMNS=80 $(PYTHON) youtube_dlc/__main__.py --help | $(PYTHON) devscripts/make_readme.py

 
 CONTRIBUTING.md: README.md
        $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 
 
 CONTRIBUTING.md: README.md
        $(PYTHON) devscripts/make_contributing.py README.md CONTRIBUTING.md
 

-issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dl/version.py
+issuetemplates: devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE_tmpl/4_bug_report.md .github/ISSUE_TEMPLATE_tmpl/5_feature_request.md youtube_dlc/version.py

        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md
        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/1_broken_site.md .github/ISSUE_TEMPLATE/1_broken_site.md
        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/2_site_support_request.md .github/ISSUE_TEMPLATE/2_site_support_request.md
        $(PYTHON) devscripts/make_issue_template.py .github/ISSUE_TEMPLATE_tmpl/3_site_feature_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md


@@ -91,34 +91,34 @@ supportedsites:
 README.txt: README.md
        pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 
 README.txt: README.md
        pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
 

-youtube-dl.1: README.md
-       $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
-       pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
-       rm -f youtube-dl.1.temp.md
+youtube-dlc.1: README.md
+       $(PYTHON) devscripts/prepare_manpage.py youtube-dlc.1.temp.md
+       pandoc -s -f $(MARKDOWN) -t man youtube-dlc.1.temp.md -o youtube-dlc.1
+       rm -f youtube-dlc.1.temp.md

 
 

-youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
+youtube-dlc.bash-completion: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/bash-completion.in

        $(PYTHON) devscripts/bash-completion.py
 
        $(PYTHON) devscripts/bash-completion.py
 

-bash-completion: youtube-dl.bash-completion
+bash-completion: youtube-dlc.bash-completion

 
 

-youtube-dl.zsh: youtube_dl/*.py youtube_dl/*/*.py devscripts/zsh-completion.in
+youtube-dlc.zsh: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/zsh-completion.in

        $(PYTHON) devscripts/zsh-completion.py
 
        $(PYTHON) devscripts/zsh-completion.py
 

-zsh-completion: youtube-dl.zsh
+zsh-completion: youtube-dlc.zsh

 
 

-youtube-dl.fish: youtube_dl/*.py youtube_dl/*/*.py devscripts/fish-completion.in
+youtube-dlc.fish: youtube_dlc/*.py youtube_dlc/*/*.py devscripts/fish-completion.in

        $(PYTHON) devscripts/fish-completion.py
 
        $(PYTHON) devscripts/fish-completion.py
 

-fish-completion: youtube-dl.fish
+fish-completion: youtube-dlc.fish

 
 

-lazy-extractors: youtube_dl/extractor/lazy_extractors.py
+lazy-extractors: youtube_dlc/extractor/lazy_extractors.py

 
 

-_EXTRACTOR_FILES = $(shell find youtube_dl/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
-youtube_dl/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)
+_EXTRACTOR_FILES = $(shell find youtube_dlc/extractor -iname '*.py' -and -not -iname 'lazy_extractors.py')
+youtube_dlc/extractor/lazy_extractors.py: devscripts/make_lazy_extractors.py devscripts/lazy_load_template.py $(_EXTRACTOR_FILES)

        $(PYTHON) devscripts/make_lazy_extractors.py $@
 
        $(PYTHON) devscripts/make_lazy_extractors.py $@
 

-youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish ChangeLog AUTHORS
-       @tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
+youtube-dlc.tar.gz: youtube-dlc README.md README.txt youtube-dlc.1 youtube-dlc.bash-completion youtube-dlc.zsh youtube-dlc.fish ChangeLog AUTHORS
+       @tar -czf youtube-dlc.tar.gz --transform "s|^|youtube-dlc/|" --owner 0 --group 0 \

                --exclude '*.DS_Store' \
                --exclude '*.kate-swp' \
                --exclude '*.pyc' \
                --exclude '*.DS_Store' \
                --exclude '*.kate-swp' \
                --exclude '*.pyc' \


@@ -128,8 +128,8 @@ youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-
                --exclude '.git' \
                --exclude 'docs/_build' \
                -- \
                --exclude '.git' \
                --exclude 'docs/_build' \
                -- \

-               bin devscripts test youtube_dl docs \
+               bin devscripts test youtube_dlc docs \

                ChangeLog AUTHORS LICENSE README.md README.txt \
                ChangeLog AUTHORS LICENSE README.md README.txt \

-               Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
-               youtube-dl.zsh youtube-dl.fish setup.py setup.cfg \
-               youtube-dl
+               Makefile MANIFEST.in youtube-dlc.1 youtube-dlc.bash-completion \
+               youtube-dlc.zsh youtube-dlc.fish setup.py setup.cfg \
+               youtube-dlc

diff --git a/README.md b/README.md
index 9854aab92cb6f4fe53107f0116ecb0130c34cd46..5e4cd3a446e59c09a397b9a9176f8b5748de7608 100644 (file)
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ # INSTALLATION
 To build the Windows executable yourself
 
     python -m pip install --upgrade pyinstaller
 To build the Windows executable yourself
 
     python -m pip install --upgrade pyinstaller

-    pyinstaller.exe youtube_dl\__main__.py --onefile --name youtube-dlc
+    pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc

     
 Or simply execute the `make_win.bat` if pyinstaller is installed.
 There will be a `youtube-dlc.exe` in `/dist`  
     
 Or simply execute the `make_win.bat` if pyinstaller is installed.
 There will be a `youtube-dlc.exe` in `/dist`  


@@ -71,18 +71,18 @@ # OPTIONS
                                      extractor
     --default-search PREFIX          Use this prefix for unqualified URLs. For
                                      example "gvsearch2:" downloads two videos
                                      extractor
     --default-search PREFIX          Use this prefix for unqualified URLs. For
                                      example "gvsearch2:" downloads two videos

-                                     from google videos for youtube-dl "large
+                                     from google videos for youtube-dlc "large

                                      apple". Use the value "auto" to let
                                      apple". Use the value "auto" to let

-                                     youtube-dl guess ("auto_warning" to emit a
+                                     youtube-dlc 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.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file
                                      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.
     --ignore-config                  Do not read configuration files. When given
                                      in the global configuration file

-                                     /etc/youtube-dl.conf: Do not read the user
+                                     /etc/youtube-dlc.conf: Do not read the user

                                      configuration in ~/.config/youtube-
                                      configuration in ~/.config/youtube-

-                                     dl/config (%APPDATA%/youtube-dl/config.txt
+                                     dl/config (%APPDATA%/youtube-dlc/config.txt

                                      on Windows)
     --config-location PATH           Location of the configuration file; either
                                      the path to the config or its containing
                                      on Windows)
     --config-location PATH           Location of the configuration file; either
                                      the path to the config or its containing


@@ -240,7 +240,7 @@ ## Filesystem Options:
                                      filenames
     -w, --no-overwrites              Do not overwrite files
     -c, --continue                   Force resume of partially downloaded files.
                                      filenames
     -w, --no-overwrites              Do not overwrite files
     -c, --continue                   Force resume of partially downloaded files.

-                                     By default, youtube-dl will resume
+                                     By default, youtube-dlc will resume

                                      downloads if possible.
     --no-continue                    Do not resume partially downloaded files
                                      (restart from beginning)
                                      downloads if possible.
     --no-continue                    Do not resume partially downloaded files
                                      (restart from beginning)


@@ -258,11 +258,11 @@ ## Filesystem Options:
                                      option)
     --cookies FILE                   File to read cookies from and dump cookie
                                      jar in
                                      option)
     --cookies FILE                   File to read cookies from and dump cookie
                                      jar in

-    --cache-dir DIR                  Location in the filesystem where youtube-dl
+    --cache-dir DIR                  Location in the filesystem where youtube-dlc

                                      can store some downloaded information
                                      permanently. By default
                                      can store some downloaded information
                                      permanently. By default

-                                     $XDG_CACHE_HOME/youtube-dl or
-                                     ~/.cache/youtube-dl . At the moment, only
+                                     $XDG_CACHE_HOME/youtube-dlc or
+                                     ~/.cache/youtube-dlc . At the moment, only

                                      YouTube player files (for videos with
                                      obfuscated signatures) are cached, but that
                                      may change.
                                      YouTube player files (for videos with
                                      obfuscated signatures) are cached, but that
                                      may change.


@@ -308,8 +308,8 @@ ## Verbosity / Simulation Options:
                                      files in the current directory to debug
                                      problems
     --print-traffic                  Display sent and read HTTP traffic
                                      files in the current directory to debug
                                      problems
     --print-traffic                  Display sent and read HTTP traffic

-    -C, --call-home                  Contact the youtube-dl server for debugging
-    --no-call-home                   Do NOT contact the youtube-dl server for
+    -C, --call-home                  Contact the youtube-dlc server for debugging
+    --no-call-home                   Do NOT contact the youtube-dlc server for

                                      debugging
 
 ## Workarounds:
                                      debugging
 
 ## Workarounds:


@@ -370,7 +370,7 @@ ## Subtitle Options:
 ## Authentication Options:
     -u, --username USERNAME          Login with this account ID
     -p, --password PASSWORD          Account password. If this option is left
 ## Authentication Options:
     -u, --username USERNAME          Login with this account ID
     -p, --password PASSWORD          Account password. If this option is left

-                                     out, youtube-dl will ask interactively.
+                                     out, youtube-dlc will ask interactively.

     -2, --twofactor TWOFACTOR        Two-factor authentication code
     -n, --netrc                      Use .netrc authentication data
     --video-password PASSWORD        Video password (vimeo, smotri, youku)
     -2, --twofactor TWOFACTOR        Two-factor authentication code
     -n, --netrc                      Use .netrc authentication data
     --video-password PASSWORD        Video password (vimeo, smotri, youku)


@@ -381,7 +381,7 @@ ## Adobe Pass Options:
                                      a list of available MSOs
     --ap-username USERNAME           Multiple-system operator account login
     --ap-password PASSWORD           Multiple-system operator account password.
                                      a list of available MSOs
     --ap-username USERNAME           Multiple-system operator account login
     --ap-password PASSWORD           Multiple-system operator account password.

-                                     If this option is left out, youtube-dl will
+                                     If this option is left out, youtube-dlc will

                                      ask interactively.
     --ap-list-mso                    List all supported multiple-system
                                      operators
                                      ask interactively.
     --ap-list-mso                    List all supported multiple-system
                                      operators


@@ -444,6 +444,6 @@ ## Post-processing Options:
 
 # COPYRIGHT
 
 
 # COPYRIGHT
 

-youtube-dl is released into the public domain by the copyright holders.
+youtube-dlc is released into the public domain by the copyright holders.

 
 This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain.
 
 This README file was originally written by [Daniel Bolton](https://github.com/dbbolton) and is likewise released into the public domain.

diff --git a/devscripts/bash-completion.in b/devscripts/bash-completion.in
index 28bd237278da5c0ade9ed96a4cb722c1b6973cf3..1bf41f2ccf9f576bfdcd6d521869e00b452107c4 100644 (file)
--- a/devscripts/bash-completion.in
+++ b/devscripts/bash-completion.in
@@ -1,4 +1,4 @@
-__youtube_dl()
+__youtube_dlc()

 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()
 {
     local cur prev opts fileopts diropts keywords
     COMPREPLY=()


@@ -26,4 +26,4 @@ __youtube_dl()
     fi
 }
 
     fi
 }
 

-complete -F __youtube_dl youtube-dl
+complete -F __youtube_dlc youtube-dlc

diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py
index 3d1391334bd38a23c7024192c6c36522acaa5613..d68c9b1ccec6498a798b965c04122cafd94b3c88 100755 (executable)
--- a/devscripts/bash-completion.py
+++ b/devscripts/bash-completion.py
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))

-import youtube_dl
+import youtube_dlc

 
 

-BASH_COMPLETION_FILE = "youtube-dl.bash-completion"
+BASH_COMPLETION_FILE = "youtube-dlc.bash-completion"

 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 
 BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.in"
 
 


@@ -26,5 +26,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
         f.write(filled_template)
 
 

-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]

 build_completion(parser)
 build_completion(parser)

diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py
index 4a4295ba9cd3b8acf739c983248494c989781e63..62dbd2cb17590bbd2e05fc37a1d7ba6e24af5c46 100644 (file)
--- a/devscripts/buildserver.py
+++ b/devscripts/buildserver.py
@@ -12,7 +12,7 @@
 import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
 import os.path
 
 sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_input,
     compat_http_server,
     compat_str,
     compat_input,
     compat_http_server,
     compat_str,


@@ -325,7 +325,7 @@ class YoutubeDLBuilder(object):
     authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
 
     def __init__(self, **kwargs):
     authorizedUsers = ['fraca7', 'phihag', 'rg3', 'FiloSottile', 'ytdl-org']
 
     def __init__(self, **kwargs):

-        if self.repoName != 'youtube-dl':
+        if self.repoName != 'youtube-dlc':

             raise BuildError('Invalid repository "%s"' % self.repoName)
         if self.user not in self.authorizedUsers:
             raise HTTPError('Unauthorized user "%s"' % self.user, 401)
             raise BuildError('Invalid repository "%s"' % self.repoName)
         if self.user not in self.authorizedUsers:
             raise HTTPError('Unauthorized user "%s"' % self.user, 401)

diff --git a/devscripts/check-porn.py b/devscripts/check-porn.py
index 740f04de0f22ad3ac6352b114b0e8f99cf717a9f..68a33d823f2308496123fd2e08c21ff39249008d 100644 (file)
--- a/devscripts/check-porn.py
+++ b/devscripts/check-porn.py
@@ -15,8 +15,8 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import gettestcases

-from youtube_dl.utils import compat_urllib_parse_urlparse
-from youtube_dl.utils import compat_urllib_request
+from youtube_dlc.utils import compat_urllib_parse_urlparse
+from youtube_dlc.utils import compat_urllib_request

 
 if len(sys.argv) > 1:
     METHOD = 'LIST'
 
 if len(sys.argv) > 1:
     METHOD = 'LIST'

diff --git a/devscripts/create-github-release.py b/devscripts/create-github-release.py
index 2ddfa109698864f642b97f8bcb9846f84631e4d9..4714d81a6ee17ea117a2a4378dd8b6c5f80fb968 100644 (file)
--- a/devscripts/create-github-release.py
+++ b/devscripts/create-github-release.py
@@ -12,13 +12,13 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )
     compat_basestring,
     compat_getpass,
     compat_print,
     compat_urllib_request,
 )

-from youtube_dl.utils import (
+from youtube_dlc.utils import (

     make_HTTPS_handler,
     sanitized_Request,
 )
     make_HTTPS_handler,
     sanitized_Request,
 )


@@ -98,7 +98,7 @@ def main():
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(
     releaser = GitHubReleaser()
 
     new_release = releaser.create_release(

-        version, name='youtube-dl %s' % version, body=body)
+        version, name='youtube-dlc %s' % version, body=body)

     release_id = new_release['id']
 
     for asset in os.listdir(build_path):
     release_id = new_release['id']
 
     for asset in os.listdir(build_path):

diff --git a/devscripts/fish-completion.in b/devscripts/fish-completion.in
index eb79765da20b795fed35f5c02e41fb9ada630626..4f08b6d4a427eedec81d3cc78f34eb119df1ff6b 100644 (file)
--- a/devscripts/fish-completion.in
+++ b/devscripts/fish-completion.in
@@ -2,4 +2,4 @@
 {{commands}}
 
 
 {{commands}}
 
 

-complete --command youtube-dl --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"
+complete --command youtube-dlc --arguments ":ytfavorites :ytrecommended :ytsubscriptions :ytwatchlater :ythistory"

diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py
index 51d19dd33d3bf5c05fc86f3c63e23c00871fda90..a27ef44f8fe1474176291f69b31ff5a3ea46337c 100755 (executable)
--- a/devscripts/fish-completion.py
+++ b/devscripts/fish-completion.py
@@ -7,10 +7,10 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))

-import youtube_dl
-from youtube_dl.utils import shell_quote
+import youtube_dlc
+from youtube_dlc.utils import shell_quote

 
 

-FISH_COMPLETION_FILE = 'youtube-dl.fish'
+FISH_COMPLETION_FILE = 'youtube-dlc.fish'

 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {
 FISH_COMPLETION_TEMPLATE = 'devscripts/fish-completion.in'
 
 EXTRA_ARGS = {


@@ -30,7 +30,7 @@ def build_completion(opt_parser):
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')

-            complete_cmd = ['complete', '--command', 'youtube-dl', '--long-option', long_option]
+            complete_cmd = ['complete', '--command', 'youtube-dlc', '--long-option', long_option]

             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             if option.help != optparse.SUPPRESS_HELP:


@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(filled_template)
 
 
         f.write(filled_template)
 
 

-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]

 build_completion(parser)
 build_completion(parser)

diff --git a/devscripts/generate_aes_testdata.py b/devscripts/generate_aes_testdata.py
index e3df42cc2da6c99d9104c9bd2bac776af5a61c46..c89bb547e78dc4b2cd615d7ed26c9faa4a708da6 100644 (file)
--- a/devscripts/generate_aes_testdata.py
+++ b/devscripts/generate_aes_testdata.py
@@ -7,8 +7,8 @@
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.utils import intlist_to_bytes
-from youtube_dl.aes import aes_encrypt, key_expansion
+from youtube_dlc.utils import intlist_to_bytes
+from youtube_dlc.aes import aes_encrypt, key_expansion

 
 secret_msg = b'Secret message goes here'
 
 
 secret_msg = b'Secret message goes here'
 

diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
index 867ea0048fb88f1ca1382f11b1c60b17110d4fc8..04588a5eec75e21035fd2d81c866a15d3afc7dcc 100755 (executable)
--- a/devscripts/gh-pages/add-version.py
+++ b/devscripts/gh-pages/add-version.py
@@ -22,9 +22,9 @@
 new_version = {}
 
 filenames = {
 new_version = {}
 
 filenames = {

-    'bin': 'youtube-dl',
-    'exe': 'youtube-dl.exe',
-    'tar': 'youtube-dl-%s.tar.gz' % version}
+    'bin': 'youtube-dlc',
+    'exe': 'youtube-dlc.exe',
+    'tar': 'youtube-dlc-%s.tar.gz' % version}

 build_dir = os.path.join('..', '..', 'build', version)
 for key, filename in filenames.items():
     url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
 build_dir = os.path.join('..', '..', 'build', version)
 for key, filename in filenames.items():
     url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)

diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py
index 506a623772e0c2195f6b3692575f5942e84c046c..b07f1e830c6191710ab3ea67d5a1c2b0e49bf54f 100755 (executable)
--- a/devscripts/gh-pages/update-feed.py
+++ b/devscripts/gh-pages/update-feed.py
@@ -11,24 +11,24 @@
     <?xml version="1.0" encoding="utf-8"?>
     <feed xmlns="http://www.w3.org/2005/Atom">
         <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />
     <?xml version="1.0" encoding="utf-8"?>
     <feed xmlns="http://www.w3.org/2005/Atom">
         <link rel="self" href="http://ytdl-org.github.io/youtube-dl/update/releases.atom" />

-        <title>youtube-dl releases</title>
-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed</id>
+        <title>youtube-dlc releases</title>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed</id>

         <updated>@TIMESTAMP@</updated>
         @ENTRIES@
     </feed>""")
 
 entry_template = textwrap.dedent("""
     <entry>
         <updated>@TIMESTAMP@</updated>
         @ENTRIES@
     </feed>""")
 
 entry_template = textwrap.dedent("""
     <entry>

-        <id>https://yt-dl.org/feed/youtube-dl-updates-feed/youtube-dl-@VERSION@</id>
+        <id>https://yt-dl.org/feed/youtube-dlc-updates-feed/youtube-dlc-@VERSION@</id>

         <title>New version @VERSION@</title>
         <title>New version @VERSION@</title>

-        <link href="http://ytdl-org.github.io/youtube-dl" />
+        <link href="http://ytdl-org.github.io/youtube-dlc" />

         <content type="xhtml">
             <div xmlns="http://www.w3.org/1999/xhtml">
                 Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
             </div>
         </content>
         <author>
         <content type="xhtml">
             <div xmlns="http://www.w3.org/1999/xhtml">
                 Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
             </div>
         </content>
         <author>

-            <name>The youtube-dl maintainers</name>
+            <name>The youtube-dlc maintainers</name>

         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>
         </author>
         <updated>@TIMESTAMP@</updated>
     </entry>

diff --git a/devscripts/gh-pages/update-sites.py b/devscripts/gh-pages/update-sites.py
index 531c93c7089c1847a7e9018fcda5ca177f68547e..38acb5d9a2df82b9b5e892bb85d02b416f15c36c 100755 (executable)
--- a/devscripts/gh-pages/update-sites.py
+++ b/devscripts/gh-pages/update-sites.py
@@ -5,10 +5,10 @@
 import os
 import textwrap
 
 import os
 import textwrap
 

-# We must be able to import youtube_dl
+# We must be able to import youtube_dlc

 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 

-import youtube_dl
+import youtube_dlc

 
 
 def main():
 
 
 def main():


@@ -16,7 +16,7 @@ def main():
         template = tmplf.read()
 
     ie_htmls = []
         template = tmplf.read()
 
     ie_htmls = []

-    for ie in youtube_dl.list_extractors(age_limit=None):
+    for ie in youtube_dlc.list_extractors(age_limit=None):

         ie_html = '<b>{}</b>'.format(ie.IE_NAME)
         ie_desc = getattr(ie, 'IE_DESC', None)
         if ie_desc is False:
         ie_html = '<b>{}</b>'.format(ie.IE_NAME)
         ie_desc = getattr(ie, 'IE_DESC', None)
         if ie_desc is False:

diff --git a/devscripts/make_contributing.py b/devscripts/make_contributing.py
index 226d1a5d6644953982db6346a00a21ec45f9b089..f18de05600898789cc0436b9f63b49910dc263be 100755 (executable)
--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -20,7 +20,7 @@ def main():
     bug_text = re.search(
         r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
     dev_text = re.search(
     bug_text = re.search(
         r'(?s)#\s*BUGS\s*[^\n]*\s*(.*?)#\s*COPYRIGHT', readme).group(1)
     dev_text = re.search(

-        r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING YOUTUBE-DL',
+        r'(?s)(#\s*DEVELOPER INSTRUCTIONS.*?)#\s*EMBEDDING youtube-dlc',

         readme).group(1)
 
     out = bug_text + dev_text
         readme).group(1)
 
     out = bug_text + dev_text

diff --git a/devscripts/make_issue_template.py b/devscripts/make_issue_template.py
index b7ad23d8363005c7f62056822219d7772e1d91d5..37cb0d4ee11987ae690b5f61306b5de1517f0a02 100644 (file)
--- a/devscripts/make_issue_template.py
+++ b/devscripts/make_issue_template.py
@@ -16,9 +16,9 @@ def main():
     with io.open(infile, encoding='utf-8') as inf:
         issue_template_tmpl = inf.read()
 
     with io.open(infile, encoding='utf-8') as inf:
         issue_template_tmpl = inf.read()
 

-    # Get the version from youtube_dl/version.py without importing the package
-    exec(compile(open('youtube_dl/version.py').read(),
-                 'youtube_dl/version.py', 'exec'))
+    # Get the version from youtube_dlc/version.py without importing the package
+    exec(compile(open('youtube_dlc/version.py').read(),
+                 'youtube_dlc/version.py', 'exec'))

 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 
 
     out = issue_template_tmpl % {'version': locals()['__version__']}
 

diff --git a/devscripts/make_lazy_extractors.py b/devscripts/make_lazy_extractors.py
index 0a1762dbce85adf9049529ec15bdb61510787d0a..e6de72b33a2ad4e5bf3b8a2153b16119bf106634 100644 (file)
--- a/devscripts/make_lazy_extractors.py
+++ b/devscripts/make_lazy_extractors.py
@@ -14,8 +14,8 @@
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 
 if os.path.exists(lazy_extractors_filename):
     os.remove(lazy_extractors_filename)
 

-from youtube_dl.extractor import _ALL_CLASSES
-from youtube_dl.extractor.common import InfoExtractor, SearchInfoExtractor
+from youtube_dlc.extractor import _ALL_CLASSES
+from youtube_dlc.extractor.common import InfoExtractor, SearchInfoExtractor

 
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()
 
 with open('devscripts/lazy_load_template.py', 'rt') as f:
     module_template = f.read()

diff --git a/devscripts/make_supportedsites.py b/devscripts/make_supportedsites.py
index 764795bc5b1e560b033c2e9a0c395cecb10b1242..0ae6f8aa3092041bec374cee522cd5de4129ab77 100644 (file)
--- a/devscripts/make_supportedsites.py
+++ b/devscripts/make_supportedsites.py
@@ -7,10 +7,10 @@
 import sys
 
 
 import sys
 
 

-# Import youtube_dl
+# Import youtube_dlc

 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)
 ROOT_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.insert(0, ROOT_DIR)

-import youtube_dl
+import youtube_dlc

 
 
 def main():
 
 
 def main():


@@ -33,7 +33,7 @@ def gen_ies_md(ies):
                 ie_md += ' (Currently broken)'
             yield ie_md
 
                 ie_md += ' (Currently broken)'
             yield ie_md
 

-    ies = sorted(youtube_dl.gen_extractors(), key=lambda i: i.IE_NAME.lower())
+    ies = sorted(youtube_dlc.gen_extractors(), key=lambda i: i.IE_NAME.lower())

     out = '# Supported sites\n' + ''.join(
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))
     out = '# Supported sites\n' + ''.join(
         ' - ' + md + '\n'
         for md in gen_ies_md(ies))

diff --git a/devscripts/prepare_manpage.py b/devscripts/prepare_manpage.py
index 76bf873e1bd70b7e5c3a20caf2ea80f0941a2dea..843ade482ef443ba0fb44dd4fdaaa88f41548b41 100644 (file)
--- a/devscripts/prepare_manpage.py
+++ b/devscripts/prepare_manpage.py
@@ -8,7 +8,7 @@
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 README_FILE = os.path.join(ROOT_DIR, 'README.md')
 

-PREFIX = r'''%YOUTUBE-DL(1)
+PREFIX = r'''%youtube-dlc(1)

 
 # NAME
 
 
 # NAME
 


@@ -16,7 +16,7 @@
 
 # SYNOPSIS
 
 
 # SYNOPSIS
 

-**youtube-dl** \[OPTIONS\] URL [URL...]
+**youtube-dlc** \[OPTIONS\] URL [URL...]

 
 '''
 
 
 '''
 


@@ -33,7 +33,7 @@ def main():
         readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)
         readme = f.read()
 
     readme = re.sub(r'(?s)^.*?(?=# DESCRIPTION)', '', readme)

-    readme = re.sub(r'\s+youtube-dl \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)
+    readme = re.sub(r'\s+youtube-dlc \[OPTIONS\] URL \[URL\.\.\.\]', '', readme)

     readme = PREFIX + readme
 
     readme = filter_options(readme)
     readme = PREFIX + readme
 
     readme = filter_options(readme)

diff --git a/devscripts/release.sh b/devscripts/release.sh
index f2411c92724f3df995d981f31eccb0a08d390cd0..04cb7fec1b6d185ddd126564804cf949a6f5dd63 100755 (executable)
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -53,8 +53,8 @@ fi
 
 if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
 if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi
 
 if [ ! -z "`git tag | grep "$version"`" ]; then echo 'ERROR: version already present'; exit 1; fi
 if [ ! -z "`git status --porcelain | grep -v CHANGELOG`" ]; then echo 'ERROR: the working directory is not clean; commit or stash changes'; exit 1; fi

-useless_files=$(find youtube_dl -type f -not -name '*.py')
-if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; exit 1; fi
+useless_files=$(find youtube_dlc -type f -not -name '*.py')
+if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dlc: $useless_files"; exit 1; fi

 if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
 if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
 if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
 if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
 if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
 if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi


@@ -68,18 +68,18 @@ make clean
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else
 if $skip_tests ; then
     echo 'SKIPPING TESTS'
 else

-    nosetests --verbose --with-coverage --cover-package=youtube_dl --cover-html test --stop || exit 1
+    nosetests --verbose --with-coverage --cover-package=youtube_dlc --cover-html test --stop || exit 1

 fi
 
 /bin/echo -e "\n### Changing version in version.py..."
 fi
 
 /bin/echo -e "\n### Changing version in version.py..."

-sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dl/version.py
+sed -i "s/__version__ = '.*'/__version__ = '$version'/" youtube_dlc/version.py

 
 /bin/echo -e "\n### Changing version in ChangeLog..."
 sed -i "s/<unreleased>/$version/" ChangeLog
 
 
 /bin/echo -e "\n### Changing version in ChangeLog..."
 sed -i "s/<unreleased>/$version/" ChangeLog
 

-/bin/echo -e "\n### Committing documentation, templates and youtube_dl/version.py..."
+/bin/echo -e "\n### Committing documentation, templates and youtube_dlc/version.py..."

 make README.md CONTRIBUTING.md issuetemplates supportedsites
 make README.md CONTRIBUTING.md issuetemplates supportedsites

-git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md youtube_dl/version.py ChangeLog
+git add README.md CONTRIBUTING.md .github/ISSUE_TEMPLATE/1_broken_site.md .github/ISSUE_TEMPLATE/2_site_support_request.md .github/ISSUE_TEMPLATE/3_site_feature_request.md .github/ISSUE_TEMPLATE/4_bug_report.md .github/ISSUE_TEMPLATE/5_feature_request.md .github/ISSUE_TEMPLATE/6_question.md docs/supportedsites.md youtube_dlc/version.py ChangeLog

 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."
 git commit $gpg_sign_commits -m "release $version"
 
 /bin/echo -e "\n### Now tagging, signing and pushing..."


@@ -94,13 +94,13 @@ git push origin "$version"
 
 /bin/echo -e "\n### OK, now it is time to build the binaries..."
 REV=$(git rev-parse HEAD)
 
 /bin/echo -e "\n### OK, now it is time to build the binaries..."
 REV=$(git rev-parse HEAD)

-make youtube-dl youtube-dl.tar.gz
+make youtube-dlc youtube-dlc.tar.gz

 read -p "VM running? (y/n) " -n 1
 read -p "VM running? (y/n) " -n 1

-wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dl.exe?rev=$REV" -O youtube-dl.exe
+wget "http://$buildserver/build/ytdl-org/youtube-dl/youtube-dlc.exe?rev=$REV" -O youtube-dlc.exe

 mkdir -p "build/$version"
 mkdir -p "build/$version"

-mv youtube-dl youtube-dl.exe "build/$version"
-mv youtube-dl.tar.gz "build/$version/youtube-dl-$version.tar.gz"
-RELEASE_FILES="youtube-dl youtube-dl.exe youtube-dl-$version.tar.gz"
+mv youtube-dlc youtube-dlc.exe "build/$version"
+mv youtube-dlc.tar.gz "build/$version/youtube-dlc-$version.tar.gz"
+RELEASE_FILES="youtube-dlc youtube-dlc.exe youtube-dlc-$version.tar.gz"

 (cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
 (cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
 (cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)
 (cd build/$version/ && md5sum $RELEASE_FILES > MD5SUMS)
 (cd build/$version/ && sha1sum $RELEASE_FILES > SHA1SUMS)
 (cd build/$version/ && sha256sum $RELEASE_FILES > SHA2-256SUMS)

diff --git a/devscripts/show-downloads-statistics.py b/devscripts/show-downloads-statistics.py
index 6c8d1cc2d29219997de1e216bae08de2ef8a02fc..ef90a56ab2e01a9dfc71267fd242fdcc3f70bfa0 100644 (file)
--- a/devscripts/show-downloads-statistics.py
+++ b/devscripts/show-downloads-statistics.py
@@ -9,11 +9,11 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_print,
     compat_urllib_request,
 )
     compat_print,
     compat_urllib_request,
 )

-from youtube_dl.utils import format_bytes
+from youtube_dlc.utils import format_bytes

 
 
 def format_size(bytes):
 
 
 def format_size(bytes):


@@ -36,9 +36,9 @@ def format_size(bytes):
             asset_name = asset['name']
             total_bytes += asset['download_count'] * asset['size']
             if all(not re.match(p, asset_name) for p in (
             asset_name = asset['name']
             total_bytes += asset['download_count'] * asset['size']
             if all(not re.match(p, asset_name) for p in (

-                    r'^youtube-dl$',
-                    r'^youtube-dl-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
-                    r'^youtube-dl\.exe$')):
+                    r'^youtube-dlc$',
+                    r'^youtube-dlc-\d{4}\.\d{2}\.\d{2}(?:\.\d+)?\.tar\.gz$',
+                    r'^youtube-dlc\.exe$')):

                 continue
             compat_print(
                 ' %s size: %s downloads: %d'
                 continue
             compat_print(
                 ' %s size: %s downloads: %d'

diff --git a/devscripts/zsh-completion.in b/devscripts/zsh-completion.in
index b394a1ae7447797273cda4178de08b27ced26735..bb021862fbec13415e8db41b755e5796ea74e741 100644 (file)
--- a/devscripts/zsh-completion.in
+++ b/devscripts/zsh-completion.in
@@ -1,6 +1,6 @@
-#compdef youtube-dl
+#compdef youtube-dlc

 
 

-__youtube_dl() {
+__youtube_dlc() {

     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"
     local curcontext="$curcontext" fileopts diropts cur prev
     typeset -A opt_args
     fileopts="{{fileopts}}"


@@ -25,4 +25,4 @@ __youtube_dl() {
     esac
 }
 
     esac
 }
 

-__youtube_dl
\ No newline at end of file
+__youtube_dlc
\ No newline at end of file

diff --git a/devscripts/zsh-completion.py b/devscripts/zsh-completion.py
index 60aaf76cc3297adc6e80984890e33e4267b95c2b..8b957144f9c1dbb53328865e12e74c1780b57000 100755 (executable)
--- a/devscripts/zsh-completion.py
+++ b/devscripts/zsh-completion.py
@@ -6,9 +6,9 @@
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))
 import sys
 
 sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))

-import youtube_dl
+import youtube_dlc

 
 

-ZSH_COMPLETION_FILE = "youtube-dl.zsh"
+ZSH_COMPLETION_FILE = "youtube-dlc.zsh"

 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 
 ZSH_COMPLETION_TEMPLATE = "devscripts/zsh-completion.in"
 
 


@@ -45,5 +45,5 @@ def build_completion(opt_parser):
         f.write(template)
 
 
         f.write(template)
 
 

-parser = youtube_dl.parseOpts()[0]
+parser = youtube_dlc.parseOpts()[0]

 build_completion(parser)
 build_completion(parser)

diff --git a/docs/Makefile b/docs/Makefile
index 712218045524bd65fe4e36870fee67ee8557ae9d..a7159ff4595eed29dab5f524b9f6064dc918b9c7 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -85,17 +85,17 @@ qthelp:
        @echo
        @echo "Build finished; now you can run "qcollectiongenerator" with the" \
              ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
        @echo
        @echo "Build finished; now you can run "qcollectiongenerator" with the" \
              ".qhcp project file in $(BUILDDIR)/qthelp, like this:"

-       @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dl.qhcp"
+       @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/youtube-dlc.qhcp"

        @echo "To view the help file:"
        @echo "To view the help file:"

-       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dl.qhc"
+       @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/youtube-dlc.qhc"

 
 devhelp:
        $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
        @echo
        @echo "Build finished."
        @echo "To view the help file:"
 
 devhelp:
        $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
        @echo
        @echo "Build finished."
        @echo "To view the help file:"

-       @echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dl"
-       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dl"
+       @echo "# mkdir -p $$HOME/.local/share/devhelp/youtube-dlc"
+       @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/youtube-dlc"

        @echo "# devhelp"
 
 epub:
        @echo "# devhelp"
 
 epub:

diff --git a/docs/conf.py b/docs/conf.py
index 0aaf1b8fcf8220301d63250e83cb1587b618388c..fa616ebbb6e19daa6f5d240614a5b89f2ac3fd00 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 #
 # coding: utf-8
 #

-# youtube-dl documentation build configuration file, created by
+# youtube-dlc documentation build configuration file, created by

 # sphinx-quickstart on Fri Mar 14 21:05:43 2014.
 #
 # This file is execfile()d with the current directory set to its
 # sphinx-quickstart on Fri Mar 14 21:05:43 2014.
 #
 # This file is execfile()d with the current directory set to its


@@ -14,7 +14,7 @@
 
 import sys
 import os
 
 import sys
 import os

-# Allows to import youtube_dl
+# Allows to import youtube_dlc

 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # -- General configuration ------------------------------------------------
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 # -- General configuration ------------------------------------------------


@@ -36,7 +36,7 @@
 master_doc = 'index'
 
 # General information about the project.
 master_doc = 'index'
 
 # General information about the project.

-project = u'youtube-dl'
+project = u'youtube-dlc'

 copyright = u'2014, Ricardo Garcia Gonzalez'
 
 # The version info for the project you're documenting, acts as replacement for
 copyright = u'2014, Ricardo Garcia Gonzalez'
 
 # The version info for the project you're documenting, acts as replacement for


@@ -44,7 +44,7 @@
 # built documents.
 #
 # The short X.Y version.
 # built documents.
 #
 # The short X.Y version.

-from youtube_dl.version import __version__
+from youtube_dlc.version import __version__

 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version
 version = __version__
 # The full version, including alpha/beta/rc tags.
 release = version


@@ -68,4 +68,4 @@
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.
 html_static_path = ['_static']
 
 # Output file base name for HTML help builder.

-htmlhelp_basename = 'youtube-dldoc'
+htmlhelp_basename = 'youtube-dlcdoc'

diff --git a/docs/index.rst b/docs/index.rst
index b746ff95baf6679b93a5836a305dfb6fe7a92000..afa26fef1e7fe0df485be5933f04e8fa5bb45675 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,13 +1,13 @@
-Welcome to youtube-dl's documentation!
+Welcome to youtube-dlc's documentation!

 ======================================
 
 ======================================
 

-*youtube-dl* is a command-line program to download videos from YouTube.com and more sites.
+*youtube-dlc* is a command-line program to download videos from YouTube.com and more sites.

 It can also be used in Python code.
 
 Developer guide
 ---------------
 
 It can also be used in Python code.
 
 Developer guide
 ---------------
 

-This section contains information for using *youtube-dl* from Python programs.
+This section contains information for using *youtube-dlc* from Python programs.

 
 .. toctree::
     :maxdepth: 2
 
 .. toctree::
     :maxdepth: 2

diff --git a/docs/module_guide.rst b/docs/module_guide.rst
index 03d72882e02f04866db41ad2b0bcb573b8c9f1dc..6413659cfdcf54b44fb6928e8fc58aa948496945 100644 (file)
--- a/docs/module_guide.rst
+++ b/docs/module_guide.rst
@@ -1,11 +1,11 @@
-Using the ``youtube_dl`` module
+Using the ``youtube_dlc`` module

 ===============================
 
 ===============================
 

-When using the ``youtube_dl`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:
+When using the ``youtube_dlc`` module, you start by creating an instance of :class:`YoutubeDL` and adding all the available extractors:

 
 .. code-block:: python
 
 
 .. code-block:: python
 

-    >>> from youtube_dl import YoutubeDL
+    >>> from youtube_dlc import YoutubeDL

     >>> ydl = YoutubeDL()
     >>> ydl.add_default_info_extractors()
 
     >>> ydl = YoutubeDL()
     >>> ydl.add_default_info_extractors()
 


@@ -22,7 +22,7 @@ You use the :meth:`YoutubeDL.extract_info` method for getting the video informat
     [youtube] BaW_jenozKc: Downloading video info webpage
     [youtube] BaW_jenozKc: Extracting video information
     >>> info['title']
     [youtube] BaW_jenozKc: Downloading video info webpage
     [youtube] BaW_jenozKc: Extracting video information
     >>> info['title']

-    'youtube-dl test video "\'/\\ä↭𝕐'
+    'youtube-dlc test video "\'/\\ä↭𝕐'

     >>> info['height'], info['width']
     (720, 1280)
 
     >>> info['height'], info['width']
     (720, 1280)
 

diff --git a/make_win.bat b/make_win.bat
index a1f692e1731665b2e01573c2981c5a3dee88295f..c5caac08ff202eaaca13fb9a0b3e206ad6133094 100644 (file)
--- a/make_win.bat
+++ b/make_win.bat
@@ -1 +1 @@
-pyinstaller.exe youtube_dl\__main__.py --onefile --name youtube-dlc
\ No newline at end of file
+pyinstaller.exe youtube_dlc\__main__.py --onefile --name youtube-dlc
\ No newline at end of file

diff --git a/setup.cfg b/setup.cfg
index da78a9c471d548a01711d37012e209f421134a37..f658aaa0ace11ac7599e26fac1c6138bea0d18aa 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,5 +2,5 @@
 universal = True
 
 [flake8]
 universal = True
 
 [flake8]

-exclude = youtube_dl/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv
+exclude = youtube_dlc/extractor/__init__.py,devscripts/buildserver.py,devscripts/lazy_load_template.py,devscripts/make_issue_template.py,setup.py,build,.git,venv

 ignore = E402,E501,E731,E741,W503
 ignore = E402,E501,E731,E741,W503

diff --git a/setup.py b/setup.py
index 23553b88a923ad8203ce5f45ee778ae4d9319ab2..083f9b0f8a0444f4fd2928a0195eca01c95f97ec 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -7,9 +7,9 @@
 import sys
 from distutils.spawn import spawn
 
 import sys
 from distutils.spawn import spawn
 

-# Get the version from youtube_dl/version.py without importing the package
-exec(compile(open('youtube_dl/version.py').read(),
-             'youtube_dl/version.py', 'exec'))
+# Get the version from youtube_dlc/version.py without importing the package
+exec(compile(open('youtube_dlc/version.py').read(),
+             'youtube_dlc/version.py', 'exec'))

 
 DESCRIPTION = 'Media downloader supporting various sites such as youtube'
 LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'
 
 DESCRIPTION = 'Media downloader supporting various sites such as youtube'
 LONG_DESCRIPTION = 'Command-line program to download videos from YouTube.com and other video sites. Based on a more active community fork.'


@@ -18,10 +18,10 @@
     print("inv")
 else:
     files_spec = [
     print("inv")
 else:
     files_spec = [

-        ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
-        ('etc/fish/completions', ['youtube-dl.fish']),
-        ('share/doc/youtube_dl', ['README.txt']),
-        ('share/man/man1', ['youtube-dl.1'])
+        ('etc/bash_completion.d', ['youtube-dlc.bash-completion']),
+        ('etc/fish/completions', ['youtube-dlc.fish']),
+        ('share/doc/youtube_dlc', ['README.txt']),
+        ('share/man/man1', ['youtube-dlc.1'])

     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []
     ]
     root = os.path.dirname(os.path.abspath(__file__))
     data_files = []


@@ -38,7 +38,7 @@
         'data_files': data_files,
     }
     #if setuptools_available:
         'data_files': data_files,
     }
     #if setuptools_available:

-    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dl:main']}
+    params['entry_points'] = {'console_scripts': ['youtube-dlc = youtube_dlc:main']}

     #else:
     #    params['scripts'] = ['bin/youtube-dlc']
 
     #else:
     #    params['scripts'] = ['bin/youtube-dlc']
 


@@ -54,7 +54,7 @@ def finalize_options(self):
 
     def run(self):
         spawn(
 
     def run(self):
         spawn(

-            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dl/extractor/lazy_extractors.py'],
+            [sys.executable, 'devscripts/make_lazy_extractors.py', 'youtube_dlc/extractor/lazy_extractors.py'],

             dry_run=self.dry_run,
         )
 
             dry_run=self.dry_run,
         )
 


@@ -69,9 +69,9 @@ def run(self):
     url="https://github.com/blackjack4494/youtube-dlc",
     # packages=setuptools.find_packages(),
        packages=[
     url="https://github.com/blackjack4494/youtube-dlc",
     # packages=setuptools.find_packages(),
        packages=[

-        'youtube_dl',
-        'youtube_dl.extractor', 'youtube_dl.downloader',
-        'youtube_dl.postprocessor'],
+        'youtube_dlc',
+        'youtube_dlc.extractor', 'youtube_dlc.downloader',
+        'youtube_dlc.postprocessor'],

     classifiers=[
            "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
     classifiers=[
            "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",

diff --git a/test/helper.py b/test/helper.py
index e62aab11e777cca955bb8a7a2149d7216430dbca..f45818b0f124d7e5ecaf70818176bc27fa46be5d 100644 (file)
--- a/test/helper.py
+++ b/test/helper.py
@@ -10,13 +10,13 @@
 import ssl
 import sys
 
 import ssl
 import sys
 

-import youtube_dl.extractor
-from youtube_dl import YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.extractor
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import (

     compat_os_name,
     compat_str,
 )
     compat_os_name,
     compat_str,
 )

-from youtube_dl.utils import (
+from youtube_dlc.utils import (

     preferredencoding,
     write_string,
 )
     preferredencoding,
     write_string,
 )


@@ -90,7 +90,7 @@ def report_warning(self, message):
 
 
 def gettestcases(include_onlymatching=False):
 
 
 def gettestcases(include_onlymatching=False):

-    for ie in youtube_dl.extractor.gen_extractors():
+    for ie in youtube_dlc.extractor.gen_extractors():

         for tc in ie.get_testcases(include_onlymatching):
             yield tc
 
         for tc in ie.get_testcases(include_onlymatching):
             yield tc
 

diff --git a/test/test_InfoExtractor.py b/test/test_InfoExtractor.py
index 71f6608feae4a5bcad37e96d74e795e7535a5dc7..bdd01e41a3e767b0e75dfc23a204ecd7e727d535 100644 (file)
--- a/test/test_InfoExtractor.py
+++ b/test/test_InfoExtractor.py
@@ -10,10 +10,10 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL, expect_dict, expect_value, http_server_port
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL, expect_dict, expect_value, http_server_port

-from youtube_dl.compat import compat_etree_fromstring, compat_http_server
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.extractor import YoutubeIE, get_info_extractor
-from youtube_dl.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError
+from youtube_dlc.compat import compat_etree_fromstring, compat_http_server
+from youtube_dlc.extractor.common import InfoExtractor
+from youtube_dlc.extractor import YoutubeIE, get_info_extractor
+from youtube_dlc.utils import encode_data_uri, strip_jsonp, ExtractorError, RegexNotFoundError

 import threading
 
 
 import threading
 
 

diff --git a/test/test_YoutubeDL.py b/test/test_YoutubeDL.py
index 1e204e551b499edead22ce65e371787ca22ffc35..6d02c2a54dbca10024ff75c7599ac2e267f63512 100644 (file)
--- a/test/test_YoutubeDL.py
+++ b/test/test_YoutubeDL.py
@@ -12,12 +12,12 @@
 import copy
 
 from test.helper import FakeYDL, assertRegexpMatches
 import copy
 
 from test.helper import FakeYDL, assertRegexpMatches

-from youtube_dl import YoutubeDL
-from youtube_dl.compat import compat_str, compat_urllib_error
-from youtube_dl.extractor import YoutubeIE
-from youtube_dl.extractor.common import InfoExtractor
-from youtube_dl.postprocessor.common import PostProcessor
-from youtube_dl.utils import ExtractorError, match_filter_func
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import compat_str, compat_urllib_error
+from youtube_dlc.extractor import YoutubeIE
+from youtube_dlc.extractor.common import InfoExtractor
+from youtube_dlc.postprocessor.common import PostProcessor
+from youtube_dlc.utils import ExtractorError, match_filter_func

 
 TEST_URL = 'http://localhost/sample.mp4'
 
 
 TEST_URL = 'http://localhost/sample.mp4'
 

diff --git a/test/test_YoutubeDLCookieJar.py b/test/test_YoutubeDLCookieJar.py
index 05f48bd7417e478ab1ae9ae7eddaca4cbc7039c3..615d8a9d882d751ad9d5640da971d1353320cf0e 100644 (file)
--- a/test/test_YoutubeDLCookieJar.py
+++ b/test/test_YoutubeDLCookieJar.py
@@ -10,7 +10,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.utils import YoutubeDLCookieJar
+from youtube_dlc.utils import YoutubeDLCookieJar

 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):
 
 
 class TestYoutubeDLCookieJar(unittest.TestCase):

diff --git a/test/test_aes.py b/test/test_aes.py
index cc89fb6ab2770ebeb4b47b5458e20399ec37e765..ef1e1b189ccd31f88fef40339f2cdf9680860bad 100644 (file)
--- a/test/test_aes.py
+++ b/test/test_aes.py
@@ -8,8 +8,8 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
-from youtube_dl.utils import bytes_to_intlist, intlist_to_bytes
+from youtube_dlc.aes import aes_decrypt, aes_encrypt, aes_cbc_decrypt, aes_cbc_encrypt, aes_decrypt_text
+from youtube_dlc.utils import bytes_to_intlist, intlist_to_bytes

 import base64
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'
 import base64
 
 # the encrypted data can be generate with 'devscripts/generate_aes_testdata.py'

diff --git a/test/test_age_restriction.py b/test/test_age_restriction.py
index 6f5513faa2c5551ce3f3c9d2967a55b28adad858..b73bdd7674cf79f40cb54792e007d806ab968af7 100644 (file)
--- a/test/test_age_restriction.py
+++ b/test/test_age_restriction.py
@@ -10,7 +10,7 @@
 from test.helper import try_rm
 
 
 from test.helper import try_rm
 
 

-from youtube_dl import YoutubeDL
+from youtube_dlc import YoutubeDL

 
 
 def _download_restricted(url, filename, age):
 
 
 def _download_restricted(url, filename, age):

diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index 81056a999d2014506b589ea4b31ab67951486f1b..7b6664cac31a0680944d7d85a2de9a1a7723313c 100644 (file)
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -12,7 +12,7 @@
 
 from test.helper import gettestcases
 
 
 from test.helper import gettestcases
 

-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (

     FacebookIE,
     gen_extractors,
     YoutubeIE,
     FacebookIE,
     gen_extractors,
     YoutubeIE,


@@ -70,7 +70,7 @@ def test_youtube_show_matching(self):
 
     def test_youtube_search_matching(self):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])
 
     def test_youtube_search_matching(self):
         self.assertMatch('http://www.youtube.com/results?search_query=making+mustard', ['youtube:search_url'])

-        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video', ['youtube:search_url'])
+        self.assertMatch('https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video', ['youtube:search_url'])

 
     def test_youtube_extract(self):
         assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)
 
     def test_youtube_extract(self):
         assertExtractId = lambda url, id: self.assertEqual(YoutubeIE.extract_id(url), id)

diff --git a/test/test_cache.py b/test/test_cache.py
index a161601420db336f949eacd68e2f846bcf8d3699..1167519d11ba1dae567567d030cbec31a54cd3ac 100644 (file)
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -13,7 +13,7 @@
 
 
 from test.helper import FakeYDL
 
 
 from test.helper import FakeYDL

-from youtube_dl.cache import Cache
+from youtube_dlc.cache import Cache

 
 
 def _is_empty(d):
 
 
 def _is_empty(d):

diff --git a/test/test_compat.py b/test/test_compat.py
index 86ff389fdfc560b987c2d82e98629a1aa7344002..8c49a001e5eabe6d058af188e1b566f7e3d58474 100644 (file)
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -10,7 +10,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_getenv,
     compat_setenv,
     compat_etree_Element,
     compat_getenv,
     compat_setenv,
     compat_etree_Element,


@@ -28,11 +28,11 @@
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'

-        compat_setenv('YOUTUBE_DL_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('YOUTUBE_DL_COMPAT_GETENV'), test_str)
+        compat_setenv('youtube_dlc_COMPAT_GETENV', test_str)
+        self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), test_str)

 
     def test_compat_setenv(self):
 
     def test_compat_setenv(self):

-        test_var = 'YOUTUBE_DL_COMPAT_SETENV'
+        test_var = 'youtube_dlc_COMPAT_SETENV'

         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)
         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)


@@ -46,11 +46,11 @@ def test_compat_expanduser(self):
         compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):
         compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):

-        import youtube_dl.compat
-        all_names = youtube_dl.compat.__all__
+        import youtube_dlc.compat
+        all_names = youtube_dlc.compat.__all__

         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),

-            dir(youtube_dl.compat))) - set(['unicode_literals'])
+            dir(youtube_dlc.compat))) - set(['unicode_literals'])

         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):

diff --git a/test/test_download.py b/test/test_download.py
index ebe820dfc1990e4df6758795345375375402900b..bcd3b40417b8e0f2b17b0de10873aa528a96f276 100644 (file)
--- a/test/test_download.py
+++ b/test/test_download.py
@@ -24,24 +24,24 @@
 import json
 import socket
 
 import json
 import socket
 

-import youtube_dl.YoutubeDL
-from youtube_dl.compat import (
+import youtube_dlc.YoutubeDL
+from youtube_dlc.compat import (

     compat_http_client,
     compat_urllib_error,
     compat_HTTPError,
 )
     compat_http_client,
     compat_urllib_error,
     compat_HTTPError,
 )

-from youtube_dl.utils import (
+from youtube_dlc.utils import (

     DownloadError,
     ExtractorError,
     format_bytes,
     UnavailableVideoError,
 )
     DownloadError,
     ExtractorError,
     format_bytes,
     UnavailableVideoError,
 )

-from youtube_dl.extractor import get_info_extractor
+from youtube_dlc.extractor import get_info_extractor

 
 RETRIES = 3
 
 
 
 RETRIES = 3
 
 

-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.YoutubeDL):

     def __init__(self, *args, **kwargs):
         self.to_stderr = self.to_screen
         self.processed_info_dicts = []
     def __init__(self, *args, **kwargs):
         self.to_stderr = self.to_screen
         self.processed_info_dicts = []


@@ -92,7 +92,7 @@ def setUp(self):
 def generator(test_case, tname):
 
     def test_template(self):
 def generator(test_case, tname):
 
     def test_template(self):

-        ie = youtube_dl.extractor.get_info_extractor(test_case['name'])()
+        ie = youtube_dlc.extractor.get_info_extractor(test_case['name'])()

         other_ies = [get_info_extractor(ie_key)() for ie_key in test_case.get('add_ie', [])]
         is_playlist = any(k.startswith('playlist') for k in test_case)
         test_cases = test_case.get(
         other_ies = [get_info_extractor(ie_key)() for ie_key in test_case.get('add_ie', [])]
         is_playlist = any(k.startswith('playlist') for k in test_case)
         test_cases = test_case.get(

diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py
index 7504722810b4e706f6b1143c7a36208ee0478749..c8e28bd3a3c51136077a1aa8adc11ec43c73b309 100644 (file)
--- a/test/test_downloader_http.py
+++ b/test/test_downloader_http.py
@@ -10,10 +10,10 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port, try_rm
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port, try_rm

-from youtube_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server
-from youtube_dl.downloader.http import HttpFD
-from youtube_dl.utils import encodeFilename
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import compat_http_server
+from youtube_dlc.downloader.http import HttpFD
+from youtube_dlc.utils import encodeFilename

 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 import threading
 
 TEST_DIR = os.path.dirname(os.path.abspath(__file__))

diff --git a/test/test_execution.py b/test/test_execution.py
index 11661bb68148f4eb229b50c37f67dc744491c7df..b18e63d73f64e0c39066a39fe3c564c050389950 100644 (file)
--- a/test/test_execution.py
+++ b/test/test_execution.py
@@ -10,7 +10,7 @@
 import subprocess
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import subprocess
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.utils import encodeArgument
+from youtube_dlc.utils import encodeArgument

 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 


@@ -23,18 +23,18 @@
 
 class TestExecution(unittest.TestCase):
     def test_import(self):
 
 class TestExecution(unittest.TestCase):
     def test_import(self):

-        subprocess.check_call([sys.executable, '-c', 'import youtube_dl'], cwd=rootDir)
+        subprocess.check_call([sys.executable, '-c', 'import youtube_dlc'], cwd=rootDir)

 
     def test_module_exec(self):
         if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution
 
     def test_module_exec(self):
         if sys.version_info >= (2, 7):  # Python 2.6 doesn't support package execution

-            subprocess.check_call([sys.executable, '-m', 'youtube_dl', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+            subprocess.check_call([sys.executable, '-m', 'youtube_dlc', '--version'], cwd=rootDir, stdout=_DEV_NULL)

 
     def test_main_exec(self):
 
     def test_main_exec(self):

-        subprocess.check_call([sys.executable, 'youtube_dl/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)
+        subprocess.check_call([sys.executable, 'youtube_dlc/__main__.py', '--version'], cwd=rootDir, stdout=_DEV_NULL)

 
     def test_cmdline_umlauts(self):
         p = subprocess.Popen(
 
     def test_cmdline_umlauts(self):
         p = subprocess.Popen(

-            [sys.executable, 'youtube_dl/__main__.py', encodeArgument('ä'), '--version'],
+            [sys.executable, 'youtube_dlc/__main__.py', encodeArgument('ä'), '--version'],

             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)
             cwd=rootDir, stdout=_DEV_NULL, stderr=subprocess.PIPE)
         _, stderr = p.communicate()
         self.assertFalse(stderr)

diff --git a/test/test_http.py b/test/test_http.py
index 3ee0a5dda8df4446f915391e031f6d13da486150..55c3c6183d7671cbe619dbb9a641b33a97b4a4aa 100644 (file)
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -9,8 +9,8 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import http_server_port

-from youtube_dl import YoutubeDL
-from youtube_dl.compat import compat_http_server, compat_urllib_request
+from youtube_dlc import YoutubeDL
+from youtube_dlc.compat import compat_http_server, compat_urllib_request

 import ssl
 import threading
 
 import ssl
 import threading
 

diff --git a/test/test_iqiyi_sdk_interpreter.py b/test/test_iqiyi_sdk_interpreter.py
index 789059dbea38026362caea2be08f9d36796a7b1d..303609baa43085a08fe282cab8e5bba6e3b5ee11 100644 (file)
--- a/test/test_iqiyi_sdk_interpreter.py
+++ b/test/test_iqiyi_sdk_interpreter.py
@@ -9,7 +9,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import FakeYDL

-from youtube_dl.extractor import IqiyiIE
+from youtube_dlc.extractor import IqiyiIE

 
 
 class IqiyiIEWithCredentials(IqiyiIE):
 
 
 class IqiyiIEWithCredentials(IqiyiIE):

diff --git a/test/test_jsinterp.py b/test/test_jsinterp.py
index c24b8ca742acc308ca9c455378564bbac053765d..97fc8d5aa88626f569126dbdba2a21828743cfdc 100644 (file)
--- a/test/test_jsinterp.py
+++ b/test/test_jsinterp.py
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.jsinterp import JSInterpreter
+from youtube_dlc.jsinterp import JSInterpreter

 
 
 class TestJSInterpreter(unittest.TestCase):
 
 
 class TestJSInterpreter(unittest.TestCase):

diff --git a/test/test_netrc.py b/test/test_netrc.py
index 7cf3a6a2e672e6300f26dcb8060bebca869f0310..566ba37a643b94b1156a38e15936748c9b2320b8 100644 (file)
--- a/test/test_netrc.py
+++ b/test/test_netrc.py
@@ -7,7 +7,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 

-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (

     gen_extractors,
 )
 
     gen_extractors,
 )
 

diff --git a/test/test_options.py b/test/test_options.py
index 3a25a6ba37ca2c7b409de640acb8fbf74dc03f0b..dce2533736525f5976469b53ac27b9a98ef38f5f 100644 (file)
--- a/test/test_options.py
+++ b/test/test_options.py
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.options import _hide_login_info
+from youtube_dlc.options import _hide_login_info

 
 
 class TestOptions(unittest.TestCase):
 
 
 class TestOptions(unittest.TestCase):

diff --git a/test/test_postprocessors.py b/test/test_postprocessors.py
index 4209d1d9a0cefa96fc5ea9d26229f6ac44116996..6f538a3da0f823361f86e84f502e58f25540594e 100644 (file)
--- a/test/test_postprocessors.py
+++ b/test/test_postprocessors.py
@@ -8,7 +8,7 @@
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import unittest
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.postprocessor import MetadataFromTitlePP
+from youtube_dlc.postprocessor import MetadataFromTitlePP

 
 
 class TestMetadataFromTitle(unittest.TestCase):
 
 
 class TestMetadataFromTitle(unittest.TestCase):

diff --git a/test/test_socks.py b/test/test_socks.py
index 1e68eb0daea04a466f07da4e790a1d25c88b5615..be52e2343e0fe28dd369f0cd4f35da0e4128f20b 100644 (file)
--- a/test/test_socks.py
+++ b/test/test_socks.py
@@ -15,7 +15,7 @@
     FakeYDL,
     get_params,
 )
     FakeYDL,
     get_params,
 )

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_str,
     compat_urllib_request,
 )
     compat_str,
     compat_urllib_request,
 )

diff --git a/test/test_subtitles.py b/test/test_subtitles.py
index 17aaaf20d9a002336af43d1afa2f7d49a186ac9a..3ca03fb6fb217c7af862b4556f4c57a95c5e9191 100644 (file)
--- a/test/test_subtitles.py
+++ b/test/test_subtitles.py
@@ -10,7 +10,7 @@
 from test.helper import FakeYDL, md5
 
 
 from test.helper import FakeYDL, md5
 
 

-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (

     YoutubeIE,
     DailymotionIE,
     TEDIE,
     YoutubeIE,
     DailymotionIE,
     TEDIE,

diff --git a/test/test_swfinterp.py b/test/test_swfinterp.py
index 9f18055e629d3c21826ad8159bdf0ae55409bca2..1a8b353e8d29df62dc53afa8f7d6181d30d023d8 100644 (file)
--- a/test/test_swfinterp.py
+++ b/test/test_swfinterp.py
@@ -14,7 +14,7 @@
 import re
 import subprocess
 
 import re
 import subprocess
 

-from youtube_dl.swfinterp import SWFInterpreter
+from youtube_dlc.swfinterp import SWFInterpreter

 
 
 TEST_DIR = os.path.join(
 
 
 TEST_DIR = os.path.join(

diff --git a/test/test_update.py b/test/test_update.py
index d9c71511db795a24d72b846ea40be574a7f4e549..1b144c43c42076062d949dcb9a55aa9ab4816524 100644 (file)
--- a/test/test_update.py
+++ b/test/test_update.py
@@ -10,7 +10,7 @@
 
 
 import json
 
 
 import json

-from youtube_dl.update import rsa_verify
+from youtube_dlc.update import rsa_verify

 
 
 class TestUpdate(unittest.TestCase):
 
 
 class TestUpdate(unittest.TestCase):

diff --git a/test/test_utils.py b/test/test_utils.py
index 0896f41506aa6d6cdb45b1c601203d6e717946d6..663a34e071909ad16d998d2239d4b6987bca53bc 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -15,7 +15,7 @@
 import json
 import xml.etree.ElementTree
 
 import json
 import xml.etree.ElementTree
 

-from youtube_dl.utils import (
+from youtube_dlc.utils import (

     age_restricted,
     args_to_str,
     encode_base_n,
     age_restricted,
     args_to_str,
     encode_base_n,


@@ -105,7 +105,7 @@
     cli_bool_option,
     parse_codecs,
 )
     cli_bool_option,
     parse_codecs,
 )

-from youtube_dl.compat import (
+from youtube_dlc.compat import (

     compat_chr,
     compat_etree_fromstring,
     compat_getenv,
     compat_chr,
     compat_etree_fromstring,
     compat_getenv,


@@ -240,12 +240,12 @@ def test_expand_path(self):
         def env(var):
             return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var)
 
         def env(var):
             return '%{0}%'.format(var) if sys.platform == 'win32' else '${0}'.format(var)
 

-        compat_setenv('YOUTUBE_DL_EXPATH_PATH', 'expanded')
-        self.assertEqual(expand_path(env('YOUTUBE_DL_EXPATH_PATH')), 'expanded')
+        compat_setenv('youtube_dlc_EXPATH_PATH', 'expanded')
+        self.assertEqual(expand_path(env('youtube_dlc_EXPATH_PATH')), 'expanded')

         self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME'))
         self.assertEqual(expand_path('~'), compat_getenv('HOME'))
         self.assertEqual(
         self.assertEqual(expand_path(env('HOME')), compat_getenv('HOME'))
         self.assertEqual(expand_path('~'), compat_getenv('HOME'))
         self.assertEqual(

-            expand_path('~/%s' % env('YOUTUBE_DL_EXPATH_PATH')),
+            expand_path('~/%s' % env('youtube_dlc_EXPATH_PATH')),

             '%s/expanded' % compat_getenv('HOME'))
 
     def test_prepend_extension(self):
             '%s/expanded' % compat_getenv('HOME'))
 
     def test_prepend_extension(self):


@@ -1388,8 +1388,8 @@ def test_caesar(self):
         self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
 
     def test_rot47(self):
         self.assertEqual(caesar('ebg', 'acegik', -2), 'abc')
 
     def test_rot47(self):

-        self.assertEqual(rot47('youtube-dl'), r'J@FEF36\5=')
-        self.assertEqual(rot47('YOUTUBE-DL'), r'*~&%&qt\s{')
+        self.assertEqual(rot47('youtube-dlc'), r'J@FEF36\5=')
+        self.assertEqual(rot47('youtube-dlc'), r'*~&%&qt\s{')

 
     def test_urshift(self):
         self.assertEqual(urshift(3, 1), 1)
 
     def test_urshift(self):
         self.assertEqual(urshift(3, 1), 1)

diff --git a/test/test_verbose_output.py b/test/test_verbose_output.py
index c1465fe8c51d8bf3789606fbf6c61da0deabfa90..462f25e03f648d79df48f35fc4a7ddfdbc1f532d 100644 (file)
--- a/test/test_verbose_output.py
+++ b/test/test_verbose_output.py
@@ -17,7 +17,7 @@ class TestVerboseOutput(unittest.TestCase):
     def test_private_info_arg(self):
         outp = subprocess.Popen(
             [
     def test_private_info_arg(self):
         outp = subprocess.Popen(
             [

-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',

                 '--username', 'johnsmith@gmail.com',
                 '--password', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 '--username', 'johnsmith@gmail.com',
                 '--password', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)


@@ -30,7 +30,7 @@ def test_private_info_arg(self):
     def test_private_info_shortarg(self):
         outp = subprocess.Popen(
             [
     def test_private_info_shortarg(self):
         outp = subprocess.Popen(
             [

-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',

                 '-u', 'johnsmith@gmail.com',
                 '-p', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 '-u', 'johnsmith@gmail.com',
                 '-p', 'secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)


@@ -43,7 +43,7 @@ def test_private_info_shortarg(self):
     def test_private_info_eq(self):
         outp = subprocess.Popen(
             [
     def test_private_info_eq(self):
         outp = subprocess.Popen(
             [

-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',

                 '--username=johnsmith@gmail.com',
                 '--password=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 '--username=johnsmith@gmail.com',
                 '--password=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)


@@ -56,7 +56,7 @@ def test_private_info_eq(self):
     def test_private_info_shortarg_eq(self):
         outp = subprocess.Popen(
             [
     def test_private_info_shortarg_eq(self):
         outp = subprocess.Popen(
             [

-                sys.executable, 'youtube_dl/__main__.py', '-v',
+                sys.executable, 'youtube_dlc/__main__.py', '-v',

                 '-u=johnsmith@gmail.com',
                 '-p=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                 '-u=johnsmith@gmail.com',
                 '-p=secret',
             ], cwd=rootDir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

diff --git a/test/test_write_annotations.py b/test/test_write_annotations.py
index 41abdfe3b99eaabf562ebabc222fc50fead77631..d98c96c15ffb00e3d495e6d5d78ae50701921d64 100644 (file)
--- a/test/test_write_annotations.py
+++ b/test/test_write_annotations.py
@@ -15,11 +15,11 @@
 
 import xml.etree.ElementTree
 
 
 import xml.etree.ElementTree
 

-import youtube_dl.YoutubeDL
-import youtube_dl.extractor
+import youtube_dlc.YoutubeDL
+import youtube_dlc.extractor

 
 
 
 

-class YoutubeDL(youtube_dl.YoutubeDL):
+class YoutubeDL(youtube_dlc.YoutubeDL):

     def __init__(self, *args, **kwargs):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen
     def __init__(self, *args, **kwargs):
         super(YoutubeDL, self).__init__(*args, **kwargs)
         self.to_stderr = self.to_screen


@@ -45,7 +45,7 @@ def setUp(self):
 
     def test_info_json(self):
         expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.
 
     def test_info_json(self):
         expected = list(EXPECTED_ANNOTATIONS)  # Two annotations could have the same text.

-        ie = youtube_dl.extractor.YoutubeIE()
+        ie = youtube_dlc.extractor.YoutubeIE()

         ydl = YoutubeDL(params)
         ydl.add_info_extractor(ie)
         ydl.download([TEST_ID])
         ydl = YoutubeDL(params)
         ydl.add_info_extractor(ie)
         ydl.download([TEST_ID])

diff --git a/test/test_youtube_chapters.py b/test/test_youtube_chapters.py
index e69c57377e617e2864a80e2e736bb72c87c4122e..4529d2e84d0e5f5f427f2078f0de782002c611b6 100644 (file)
--- a/test/test_youtube_chapters.py
+++ b/test/test_youtube_chapters.py
@@ -9,7 +9,7 @@
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import expect_value
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from test.helper import expect_value

-from youtube_dl.extractor import YoutubeIE
+from youtube_dlc.extractor import YoutubeIE

 
 
 class TestYoutubeChapters(unittest.TestCase):
 
 
 class TestYoutubeChapters(unittest.TestCase):

diff --git a/test/test_youtube_lists.py b/test/test_youtube_lists.py
index c4f0abbeaaacbe3b469320c13a205e8f738c443b..a693963ef9076e0a5bd5634b668e3fc7852acdd0 100644 (file)
--- a/test/test_youtube_lists.py
+++ b/test/test_youtube_lists.py
@@ -10,7 +10,7 @@
 from test.helper import FakeYDL
 
 
 from test.helper import FakeYDL
 
 

-from youtube_dl.extractor import (
+from youtube_dlc.extractor import (

     YoutubePlaylistIE,
     YoutubeIE,
 )
     YoutubePlaylistIE,
     YoutubeIE,
 )

diff --git a/test/test_youtube_signature.py b/test/test_youtube_signature.py
index 69df30edaa75efbeb51a1cad650c8e29b2596b66..a54b36198fd898de18fd01981317d6462ae8cc58 100644 (file)
--- a/test/test_youtube_signature.py
+++ b/test/test_youtube_signature.py
@@ -13,8 +13,8 @@
 import string
 
 from test.helper import FakeYDL
 import string
 
 from test.helper import FakeYDL

-from youtube_dl.extractor import YoutubeIE
-from youtube_dl.compat import compat_str, compat_urlretrieve
+from youtube_dlc.extractor import YoutubeIE
+from youtube_dlc.compat import compat_str, compat_urlretrieve

 
 _TESTS = [
     (
 
 _TESTS = [
     (

diff --git a/tox.ini b/tox.ini
index 9c4e4a3d1eab285d8def7fce06e7d5ceb108952e..842091d65c1adc2cfdc26b46fc4f6bf6c4ba1445 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -10,5 +10,5 @@ defaultargs = test --exclude test_download.py --exclude test_age_restriction.py
     --exclude test_subtitles.py --exclude test_write_annotations.py
     --exclude test_youtube_lists.py --exclude test_iqiyi_sdk_interpreter.py
     --exclude test_socks.py
     --exclude test_subtitles.py --exclude test_write_annotations.py
     --exclude test_youtube_lists.py --exclude test_iqiyi_sdk_interpreter.py
     --exclude test_socks.py

-commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=youtube_dl --cover-html
+commands = nosetests --verbose {posargs:{[testenv]defaultargs}}  # --with-coverage --cover-package=youtube_dlc --cover-html

                                                # test.test_download:TestDownload.test_NowVideo
                                                # test.test_download:TestDownload.test_NowVideo

diff --git a/youtube-dl.plugin.zsh b/youtube-dl.plugin.zsh
index 17ab1341af2244ece37551e8642936fd10891ac7..27537ee1187ffa2f40c3f61d873cd4d5368ba6d2 100644 (file)
--- a/youtube-dl.plugin.zsh
+++ b/youtube-dl.plugin.zsh
@@ -1,4 +1,4 @@
-# This allows the youtube-dl command to be installed in ZSH using antigen.
+# This allows the youtube-dlc command to be installed in ZSH using antigen.

 # Antigen is a bundle manager. It allows you to enhance the functionality of
 # your zsh session by installing bundles and themes easily.
 
 # Antigen is a bundle manager. It allows you to enhance the functionality of
 # your zsh session by installing bundles and themes easily.
 


@@ -6,11 +6,11 @@
 # http://antigen.sharats.me/
 # https://github.com/zsh-users/antigen
 
 # http://antigen.sharats.me/
 # https://github.com/zsh-users/antigen
 

-# Install youtube-dl:
+# Install youtube-dlc:

 # antigen bundle ytdl-org/youtube-dl
 # Bundles installed by antigen are available for use immediately.
 
 # antigen bundle ytdl-org/youtube-dl
 # Bundles installed by antigen are available for use immediately.
 

-# Update youtube-dl (and all other antigen bundles):
+# Update youtube-dlc (and all other antigen bundles):

 # antigen update
 
 # The antigen command will download the git repository to a folder and then
 # antigen update
 
 # The antigen command will download the git repository to a folder and then


@@ -18,7 +18,7 @@
 # code is documented here:
 # https://github.com/zsh-users/antigen#notes-on-writing-plugins
 
 # code is documented here:
 # https://github.com/zsh-users/antigen#notes-on-writing-plugins
 

-# This specific script just aliases youtube-dl to the python script that this
+# This specific script just aliases youtube-dlc to the python script that this

 # library provides. This requires updating the PYTHONPATH to ensure that the
 # full set of code can be located.
 # library provides. This requires updating the PYTHONPATH to ensure that the
 # full set of code can be located.

-alias youtube-dl="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dl"
+alias youtube-dlc="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dlc"

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dlc/YoutubeDL.py
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from youtube_dl/YoutubeDL.py
rename to youtube_dlc/YoutubeDL.py
index 0dc869d..f79d31d
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dlc/YoutubeDL.py
@@ -228,7 +228,7 @@ class YoutubeDL(object):
                        playlist items.
     postprocessors:    A list of dictionaries, each with an entry
                        * key:  The name of the postprocessor. See
                        playlist items.
     postprocessors:    A list of dictionaries, each with an entry
                        * key:  The name of the postprocessor. See

-                               youtube_dl/postprocessor/__init__.py for a list.
+                               youtube_dlc/postprocessor/__init__.py for a list.

                        as well as any further keyword arguments for the
                        postprocessor.
     progress_hooks:    A list of functions that get called on download
                        as well as any further keyword arguments for the
                        postprocessor.
     progress_hooks:    A list of functions that get called on download


@@ -264,7 +264,7 @@ class YoutubeDL(object):
                                            about it, warn otherwise (default)
     source_address:    Client-side IP address to bind to.
     call_home:         Boolean, true iff we are allowed to contact the
                                            about it, warn otherwise (default)
     source_address:    Client-side IP address to bind to.
     call_home:         Boolean, true iff we are allowed to contact the

-                       youtube-dl servers for debugging.
+                       youtube-dlc servers for debugging.

     sleep_interval:    Number of seconds to sleep before each download when
                        used alone or a lower bound of a range for randomized
                        sleep before each download (minimum possible number
     sleep_interval:    Number of seconds to sleep before each download when
                        used alone or a lower bound of a range for randomized
                        sleep before each download (minimum possible number


@@ -301,7 +301,7 @@ class YoutubeDL(object):
                        use downloader suggested by extractor if None.
 
     The following parameters are not used by YoutubeDL itself, they are used by
                        use downloader suggested by extractor if None.
 
     The following parameters are not used by YoutubeDL itself, they are used by

-    the downloader (see youtube_dl/downloader/common.py):
+    the downloader (see youtube_dlc/downloader/common.py):

     nopart, updatetime, buffersize, ratelimit, min_filesize, max_filesize, test,
     noresizebuffer, retries, continuedl, noprogress, consoletitle,
     xattr_set_filesize, external_downloader_args, hls_use_mpegts,
     nopart, updatetime, buffersize, ratelimit, min_filesize, max_filesize, test,
     noresizebuffer, retries, continuedl, noprogress, consoletitle,
     xattr_set_filesize, external_downloader_args, hls_use_mpegts,


@@ -441,7 +441,7 @@ def warn_if_short_id(self, argv):
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (
             if re.match(r'^-[0-9A-Za-z_-]{10}$', a)]
         if idxs:
             correct_argv = (

-                ['youtube-dl']
+                ['youtube-dlc']

                 + [a for i, a in enumerate(argv) if i not in idxs]
                 + ['--'] + [argv[i] for i in idxs]
             )
                 + [a for i, a in enumerate(argv) if i not in idxs]
                 + ['--'] + [argv[i] for i in idxs]
             )


@@ -2254,7 +2254,7 @@ def print_debug_header(self):
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 
                 self.get_encoding()))
         write_string(encoding_str, encoding=None)
 

-        self._write_string('[debug] youtube-dl version ' + __version__ + '\n')
+        self._write_string('[debug] youtube-dlc version ' + __version__ + '\n')

         if _LAZY_LOADER:
             self._write_string('[debug] Lazy loading extractors enabled' + '\n')
         try:
         if _LAZY_LOADER:
             self._write_string('[debug] Lazy loading extractors enabled' + '\n')
         try:


@@ -2352,7 +2352,7 @@ def _setup_opener(self):
         file_handler = compat_urllib_request.FileHandler()
 
         def file_open(*args, **kwargs):
         file_handler = compat_urllib_request.FileHandler()
 
         def file_open(*args, **kwargs):

-            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dl for security reasons')
+            raise compat_urllib_error.URLError('file:// scheme is explicitly disabled in youtube-dlc for security reasons')

         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(
         file_handler.file_open = file_open
 
         opener = compat_urllib_request.build_opener(

diff --git a/youtube_dl/__init__.py b/youtube_dlc/__init__.py
similarity index 99%
rename from youtube_dl/__init__.py
rename to youtube_dlc/__init__.py
index 9a659fc654d2a3af5d63e47363f8cdfdcdc0c333..a663417dab292caf7c6e4a72599a6419391a108c 100644 (file)
--- a/youtube_dl/__init__.py
+++ b/youtube_dlc/__init__.py
@@ -53,7 +53,7 @@ def _real_main(argv=None):
 
     workaround_optparse_bug9161()
 
 
     workaround_optparse_bug9161()
 

-    setproctitle('youtube-dl')
+    setproctitle('youtube-dlc')

 
     parser, opts, args = parseOpts(argv)
 
 
     parser, opts, args = parseOpts(argv)
 


@@ -455,7 +455,7 @@ def parse_retries(retries):
             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
             parser.error(
                 'You must provide at least one URL.\n'
             ydl.warn_if_short_id(sys.argv[1:] if argv is None else argv)
             parser.error(
                 'You must provide at least one URL.\n'

-                'Type youtube-dl --help to see a list of all options.')
+                'Type youtube-dlc --help to see a list of all options.')

 
         try:
             if opts.load_info_filename is not None:
 
         try:
             if opts.load_info_filename is not None:

diff --git a/youtube_dl/__main__.py b/youtube_dlc/__main__.py
old mode 100755 (executable)
new mode 100644 (file)
similarity index 73%
rename from youtube_dl/__main__.py
rename to youtube_dlc/__main__.py
index 138f5fb..0e76016
--- a/youtube_dl/__main__.py
+++ b/youtube_dlc/__main__.py
@@ -2,8 +2,8 @@
 from __future__ import unicode_literals
 
 # Execute with
 from __future__ import unicode_literals
 
 # Execute with

-# $ python youtube_dl/__main__.py (2.6+)
-# $ python -m youtube_dl          (2.7+)
+# $ python youtube_dlc/__main__.py (2.6+)
+# $ python -m youtube_dlc          (2.7+)

 
 import sys
 
 
 import sys
 


@@ -13,7 +13,7 @@
     path = os.path.realpath(os.path.abspath(__file__))
     sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 
     path = os.path.realpath(os.path.abspath(__file__))
     sys.path.insert(0, os.path.dirname(os.path.dirname(path)))
 

-import youtube_dl
+import youtube_dlc

 
 if __name__ == '__main__':
 
 if __name__ == '__main__':

-    youtube_dl.main()
+    youtube_dlc.main()

diff --git a/youtube_dl/aes.py b/youtube_dlc/aes.py
similarity index 100%
rename from youtube_dl/aes.py
rename to youtube_dlc/aes.py

diff --git a/youtube_dl/cache.py b/youtube_dlc/cache.py
similarity index 98%
rename from youtube_dl/cache.py
rename to youtube_dlc/cache.py
index 7bdade1bdb49a7406457688400830a91a98ef186..ada6aa1f28ba39f4e6f22df92e4327d81d7cd0f7 100644 (file)
--- a/youtube_dl/cache.py
+++ b/youtube_dlc/cache.py
@@ -23,7 +23,7 @@ def _get_root_dir(self):
         res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')
         res = self._ydl.params.get('cachedir')
         if res is None:
             cache_root = compat_getenv('XDG_CACHE_HOME', '~/.cache')

-            res = os.path.join(cache_root, 'youtube-dl')
+            res = os.path.join(cache_root, 'youtube-dlc')

         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):
         return expand_path(res)
 
     def _get_cache_fn(self, section, key, dtype):

diff --git a/youtube_dl/compat.py b/youtube_dlc/compat.py
similarity index 99%
rename from youtube_dl/compat.py
rename to youtube_dlc/compat.py
index 0ee9bc76020377dc811c0d06736eba8082a53dbd..1cf7efed615af3a4ec5bcdfe084ff0bf197b8b3c 100644 (file)
--- a/youtube_dl/compat.py
+++ b/youtube_dlc/compat.py
@@ -2973,7 +2973,7 @@ def compat_b64decode(s, *args, **kwargs):
 
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function
 
 if platform.python_implementation() == 'PyPy' and sys.pypy_version_info < (5, 4, 0):
     # PyPy2 prior to version 5.4.0 expects byte strings as Windows function

-    # names, see the original PyPy issue [1] and the youtube-dl one [2].
+    # names, see the original PyPy issue [1] and the youtube-dlc one [2].

     # 1. https://bitbucket.org/pypy/pypy/issues/2360/windows-ctypescdll-typeerror-function-name
     # 2. https://github.com/ytdl-org/youtube-dl/pull/4392
     def compat_ctypes_WINFUNCTYPE(*args, **kwargs):
     # 1. https://bitbucket.org/pypy/pypy/issues/2360/windows-ctypescdll-typeerror-function-name
     # 2. https://github.com/ytdl-org/youtube-dl/pull/4392
     def compat_ctypes_WINFUNCTYPE(*args, **kwargs):

diff --git a/youtube_dl/downloader/__init__.py b/youtube_dlc/downloader/__init__.py
similarity index 100%
rename from youtube_dl/downloader/__init__.py
rename to youtube_dlc/downloader/__init__.py

diff --git a/youtube_dl/downloader/common.py b/youtube_dlc/downloader/common.py
similarity index 99%
rename from youtube_dl/downloader/common.py
rename to youtube_dlc/downloader/common.py
index 1cdba89cd9b093c1cc45071d34e307028aac02ea..31c2864584b917d70cbbc903823a100d21a114dd 100644 (file)
--- a/youtube_dl/downloader/common.py
+++ b/youtube_dlc/downloader/common.py
@@ -243,7 +243,7 @@ def _report_progress_status(self, msg, is_last_line=False):
             else:
                 clear_line = ('\r\x1b[K' if sys.stderr.isatty() else '\r')
             self.to_screen(clear_line + fullmsg, skip_eol=not is_last_line)
             else:
                 clear_line = ('\r\x1b[K' if sys.stderr.isatty() else '\r')
             self.to_screen(clear_line + fullmsg, skip_eol=not is_last_line)

-        self.to_console_title('youtube-dl ' + msg)
+        self.to_console_title('youtube-dlc ' + msg)

 
     def report_progress(self, s):
         if s['status'] == 'finished':
 
     def report_progress(self, s):
         if s['status'] == 'finished':

diff --git a/youtube_dl/downloader/dash.py b/youtube_dlc/downloader/dash.py
similarity index 100%
rename from youtube_dl/downloader/dash.py
rename to youtube_dlc/downloader/dash.py

diff --git a/youtube_dl/downloader/external.py b/youtube_dlc/downloader/external.py
similarity index 100%
rename from youtube_dl/downloader/external.py
rename to youtube_dlc/downloader/external.py

diff --git a/youtube_dl/downloader/f4m.py b/youtube_dlc/downloader/f4m.py
similarity index 100%
rename from youtube_dl/downloader/f4m.py
rename to youtube_dlc/downloader/f4m.py

diff --git a/youtube_dl/downloader/fragment.py b/youtube_dlc/downloader/fragment.py
similarity index 98%
rename from youtube_dl/downloader/fragment.py
rename to youtube_dlc/downloader/fragment.py
index 02f35459e82ddb0e39dad3b7790f2db7a90d85fa..9339b3a62c4bd4d360bf719f0e1e3e16ebb0f840 100644 (file)
--- a/youtube_dl/downloader/fragment.py
+++ b/youtube_dlc/downloader/fragment.py
@@ -32,9 +32,9 @@ class FragmentFD(FileDownloader):
     keep_fragments:     Keep downloaded fragments on disk after downloading is
                         finished
 
     keep_fragments:     Keep downloaded fragments on disk after downloading is
                         finished
 

-    For each incomplete fragment download youtube-dl keeps on disk a special
+    For each incomplete fragment download youtube-dlc keeps on disk a special

     bookkeeping file with download state and metadata (in future such files will
     bookkeeping file with download state and metadata (in future such files will

-    be used for any incomplete download handled by youtube-dl). This file is
+    be used for any incomplete download handled by youtube-dlc). This file is

     used to properly handle resuming, check download file consistency and detect
     potential errors. The file has a .ytdl extension and represents a standard
     JSON file of the following format:
     used to properly handle resuming, check download file consistency and detect
     potential errors. The file has a .ytdl extension and represents a standard
     JSON file of the following format:

diff --git a/youtube_dl/downloader/hls.py b/youtube_dlc/downloader/hls.py
similarity index 100%
rename from youtube_dl/downloader/hls.py
rename to youtube_dlc/downloader/hls.py

diff --git a/youtube_dl/downloader/http.py b/youtube_dlc/downloader/http.py
similarity index 100%
rename from youtube_dl/downloader/http.py
rename to youtube_dlc/downloader/http.py

diff --git a/youtube_dl/downloader/ism.py b/youtube_dlc/downloader/ism.py
similarity index 100%
rename from youtube_dl/downloader/ism.py
rename to youtube_dlc/downloader/ism.py

diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dlc/downloader/rtmp.py
similarity index 100%
rename from youtube_dl/downloader/rtmp.py
rename to youtube_dlc/downloader/rtmp.py

diff --git a/youtube_dl/downloader/rtsp.py b/youtube_dlc/downloader/rtsp.py
similarity index 100%
rename from youtube_dl/downloader/rtsp.py
rename to youtube_dlc/downloader/rtsp.py

diff --git a/youtube_dl/downloader/youtube_live_chat.py b/youtube_dlc/downloader/youtube_live_chat.py
similarity index 100%
rename from youtube_dl/downloader/youtube_live_chat.py
rename to youtube_dlc/downloader/youtube_live_chat.py

diff --git a/youtube_dl/extractor/__init__.py b/youtube_dlc/extractor/__init__.py
similarity index 100%
rename from youtube_dl/extractor/__init__.py
rename to youtube_dlc/extractor/__init__.py

diff --git a/youtube_dl/extractor/abc.py b/youtube_dlc/extractor/abc.py
similarity index 100%
rename from youtube_dl/extractor/abc.py
rename to youtube_dlc/extractor/abc.py

diff --git a/youtube_dl/extractor/abcnews.py b/youtube_dlc/extractor/abcnews.py
similarity index 100%
rename from youtube_dl/extractor/abcnews.py
rename to youtube_dlc/extractor/abcnews.py

diff --git a/youtube_dl/extractor/abcotvs.py b/youtube_dlc/extractor/abcotvs.py
similarity index 100%
rename from youtube_dl/extractor/abcotvs.py
rename to youtube_dlc/extractor/abcotvs.py

diff --git a/youtube_dl/extractor/academicearth.py b/youtube_dlc/extractor/academicearth.py
similarity index 100%
rename from youtube_dl/extractor/academicearth.py
rename to youtube_dlc/extractor/academicearth.py

diff --git a/youtube_dl/extractor/acast.py b/youtube_dlc/extractor/acast.py
similarity index 100%
rename from youtube_dl/extractor/acast.py
rename to youtube_dlc/extractor/acast.py

diff --git a/youtube_dl/extractor/adn.py b/youtube_dlc/extractor/adn.py
similarity index 100%
rename from youtube_dl/extractor/adn.py
rename to youtube_dlc/extractor/adn.py

diff --git a/youtube_dl/extractor/adobeconnect.py b/youtube_dlc/extractor/adobeconnect.py
similarity index 100%
rename from youtube_dl/extractor/adobeconnect.py
rename to youtube_dlc/extractor/adobeconnect.py

diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dlc/extractor/adobepass.py
similarity index 100%
rename from youtube_dl/extractor/adobepass.py
rename to youtube_dlc/extractor/adobepass.py

diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dlc/extractor/adobetv.py
similarity index 100%
rename from youtube_dl/extractor/adobetv.py
rename to youtube_dlc/extractor/adobetv.py

diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dlc/extractor/adultswim.py
similarity index 100%
rename from youtube_dl/extractor/adultswim.py
rename to youtube_dlc/extractor/adultswim.py

diff --git a/youtube_dl/extractor/aenetworks.py b/youtube_dlc/extractor/aenetworks.py
similarity index 100%
rename from youtube_dl/extractor/aenetworks.py
rename to youtube_dlc/extractor/aenetworks.py

diff --git a/youtube_dl/extractor/afreecatv.py b/youtube_dlc/extractor/afreecatv.py
similarity index 100%
rename from youtube_dl/extractor/afreecatv.py
rename to youtube_dlc/extractor/afreecatv.py

diff --git a/youtube_dl/extractor/airmozilla.py b/youtube_dlc/extractor/airmozilla.py
similarity index 100%
rename from youtube_dl/extractor/airmozilla.py
rename to youtube_dlc/extractor/airmozilla.py

diff --git a/youtube_dl/extractor/aliexpress.py b/youtube_dlc/extractor/aliexpress.py
similarity index 100%
rename from youtube_dl/extractor/aliexpress.py
rename to youtube_dlc/extractor/aliexpress.py

diff --git a/youtube_dl/extractor/aljazeera.py b/youtube_dlc/extractor/aljazeera.py
similarity index 100%
rename from youtube_dl/extractor/aljazeera.py
rename to youtube_dlc/extractor/aljazeera.py

diff --git a/youtube_dl/extractor/allocine.py b/youtube_dlc/extractor/allocine.py
similarity index 100%
rename from youtube_dl/extractor/allocine.py
rename to youtube_dlc/extractor/allocine.py

diff --git a/youtube_dl/extractor/alphaporno.py b/youtube_dlc/extractor/alphaporno.py
similarity index 100%
rename from youtube_dl/extractor/alphaporno.py
rename to youtube_dlc/extractor/alphaporno.py

diff --git a/youtube_dl/extractor/amcnetworks.py b/youtube_dlc/extractor/amcnetworks.py
similarity index 100%
rename from youtube_dl/extractor/amcnetworks.py
rename to youtube_dlc/extractor/amcnetworks.py

diff --git a/youtube_dl/extractor/americastestkitchen.py b/youtube_dlc/extractor/americastestkitchen.py
similarity index 100%
rename from youtube_dl/extractor/americastestkitchen.py
rename to youtube_dlc/extractor/americastestkitchen.py

diff --git a/youtube_dl/extractor/amp.py b/youtube_dlc/extractor/amp.py
similarity index 100%
rename from youtube_dl/extractor/amp.py
rename to youtube_dlc/extractor/amp.py

diff --git a/youtube_dl/extractor/animeondemand.py b/youtube_dlc/extractor/animeondemand.py
similarity index 100%
rename from youtube_dl/extractor/animeondemand.py
rename to youtube_dlc/extractor/animeondemand.py

diff --git a/youtube_dl/extractor/anvato.py b/youtube_dlc/extractor/anvato.py
similarity index 100%
rename from youtube_dl/extractor/anvato.py
rename to youtube_dlc/extractor/anvato.py

diff --git a/youtube_dl/extractor/aol.py b/youtube_dlc/extractor/aol.py
similarity index 100%
rename from youtube_dl/extractor/aol.py
rename to youtube_dlc/extractor/aol.py

diff --git a/youtube_dl/extractor/apa.py b/youtube_dlc/extractor/apa.py
similarity index 100%
rename from youtube_dl/extractor/apa.py
rename to youtube_dlc/extractor/apa.py

diff --git a/youtube_dl/extractor/aparat.py b/youtube_dlc/extractor/aparat.py
similarity index 100%
rename from youtube_dl/extractor/aparat.py
rename to youtube_dlc/extractor/aparat.py

diff --git a/youtube_dl/extractor/appleconnect.py b/youtube_dlc/extractor/appleconnect.py
similarity index 100%
rename from youtube_dl/extractor/appleconnect.py
rename to youtube_dlc/extractor/appleconnect.py

diff --git a/youtube_dl/extractor/appletrailers.py b/youtube_dlc/extractor/appletrailers.py
similarity index 99%
rename from youtube_dl/extractor/appletrailers.py
rename to youtube_dlc/extractor/appletrailers.py
index a9ef733e011237338d904f956c4324cc6dd7a72b..b5ed2b88b3e227216db12da1936b9d4c3466efa8 100644 (file)
--- a/youtube_dl/extractor/appletrailers.py
+++ b/youtube_dlc/extractor/appletrailers.py
@@ -199,7 +199,7 @@ def _clean_json(m):
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,
                 'http_headers': {
                 'upload_date': upload_date,
                 'uploader_id': uploader_id,
                 'http_headers': {

-                    'User-Agent': 'QuickTime compatible (youtube-dl)',
+                    'User-Agent': 'QuickTime compatible (youtube-dlc)',

                 },
             })
 
                 },
             })
 

diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dlc/extractor/archiveorg.py
similarity index 100%
rename from youtube_dl/extractor/archiveorg.py
rename to youtube_dlc/extractor/archiveorg.py

diff --git a/youtube_dl/extractor/ard.py b/youtube_dlc/extractor/ard.py
similarity index 100%
rename from youtube_dl/extractor/ard.py
rename to youtube_dlc/extractor/ard.py

diff --git a/youtube_dl/extractor/arkena.py b/youtube_dlc/extractor/arkena.py
similarity index 100%
rename from youtube_dl/extractor/arkena.py
rename to youtube_dlc/extractor/arkena.py

diff --git a/youtube_dl/extractor/arte.py b/youtube_dlc/extractor/arte.py
similarity index 100%
rename from youtube_dl/extractor/arte.py
rename to youtube_dlc/extractor/arte.py

diff --git a/youtube_dl/extractor/asiancrush.py b/youtube_dlc/extractor/asiancrush.py
similarity index 100%
rename from youtube_dl/extractor/asiancrush.py
rename to youtube_dlc/extractor/asiancrush.py

diff --git a/youtube_dl/extractor/atresplayer.py b/youtube_dlc/extractor/atresplayer.py
similarity index 100%
rename from youtube_dl/extractor/atresplayer.py
rename to youtube_dlc/extractor/atresplayer.py

diff --git a/youtube_dl/extractor/atttechchannel.py b/youtube_dlc/extractor/atttechchannel.py
similarity index 100%
rename from youtube_dl/extractor/atttechchannel.py
rename to youtube_dlc/extractor/atttechchannel.py

diff --git a/youtube_dl/extractor/atvat.py b/youtube_dlc/extractor/atvat.py
similarity index 100%
rename from youtube_dl/extractor/atvat.py
rename to youtube_dlc/extractor/atvat.py

diff --git a/youtube_dl/extractor/audimedia.py b/youtube_dlc/extractor/audimedia.py
similarity index 100%
rename from youtube_dl/extractor/audimedia.py
rename to youtube_dlc/extractor/audimedia.py

diff --git a/youtube_dl/extractor/audioboom.py b/youtube_dlc/extractor/audioboom.py
similarity index 100%
rename from youtube_dl/extractor/audioboom.py
rename to youtube_dlc/extractor/audioboom.py

diff --git a/youtube_dl/extractor/audiomack.py b/youtube_dlc/extractor/audiomack.py
similarity index 100%
rename from youtube_dl/extractor/audiomack.py
rename to youtube_dlc/extractor/audiomack.py

diff --git a/youtube_dl/extractor/awaan.py b/youtube_dlc/extractor/awaan.py
similarity index 100%
rename from youtube_dl/extractor/awaan.py
rename to youtube_dlc/extractor/awaan.py

diff --git a/youtube_dl/extractor/aws.py b/youtube_dlc/extractor/aws.py
similarity index 100%
rename from youtube_dl/extractor/aws.py
rename to youtube_dlc/extractor/aws.py

diff --git a/youtube_dl/extractor/azmedien.py b/youtube_dlc/extractor/azmedien.py
similarity index 100%
rename from youtube_dl/extractor/azmedien.py
rename to youtube_dlc/extractor/azmedien.py

diff --git a/youtube_dl/extractor/baidu.py b/youtube_dlc/extractor/baidu.py
similarity index 100%
rename from youtube_dl/extractor/baidu.py
rename to youtube_dlc/extractor/baidu.py

diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dlc/extractor/bandcamp.py
similarity index 98%
rename from youtube_dl/extractor/bandcamp.py
rename to youtube_dlc/extractor/bandcamp.py
index f14b407dc82cf8f945f581ab059bd6218866eb57..b8a57e6a50b26ba61c1137b4c8c72d5fc603a8d6 100644 (file)
--- a/youtube_dl/extractor/bandcamp.py
+++ b/youtube_dlc/extractor/bandcamp.py
@@ -28,12 +28,12 @@
 class BandcampIE(InfoExtractor):
     _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<title>[^/?#&]+)'
     _TESTS = [{
 class BandcampIE(InfoExtractor):
     _VALID_URL = r'https?://[^/]+\.bandcamp\.com/track/(?P<title>[^/?#&]+)'
     _TESTS = [{

-        'url': 'http://youtube-dl.bandcamp.com/track/youtube-dl-test-song',
+        'url': 'http://youtube-dlc.bandcamp.com/track/youtube-dlc-test-song',

         'md5': 'c557841d5e50261777a6585648adf439',
         'info_dict': {
             'id': '1812978515',
             'ext': 'mp3',
         'md5': 'c557841d5e50261777a6585648adf439',
         'info_dict': {
             'id': '1812978515',
             'ext': 'mp3',

-            'title': "youtube-dl  \"'/\\\u00e4\u21ad - youtube-dl test song \"'/\\\u00e4\u21ad",
+            'title': "youtube-dlc  \"'/\\\u00e4\u21ad - youtube-dlc test song \"'/\\\u00e4\u21ad",

             'duration': 9.8485,
         },
         '_skip': 'There is a limit of 200 free downloads / month for the test song'
             'duration': 9.8485,
         },
         '_skip': 'There is a limit of 200 free downloads / month for the test song'

diff --git a/youtube_dl/extractor/bbc.py b/youtube_dlc/extractor/bbc.py
similarity index 100%
rename from youtube_dl/extractor/bbc.py
rename to youtube_dlc/extractor/bbc.py

diff --git a/youtube_dl/extractor/beampro.py b/youtube_dlc/extractor/beampro.py
similarity index 100%
rename from youtube_dl/extractor/beampro.py
rename to youtube_dlc/extractor/beampro.py

diff --git a/youtube_dl/extractor/beatport.py b/youtube_dlc/extractor/beatport.py
similarity index 100%
rename from youtube_dl/extractor/beatport.py
rename to youtube_dlc/extractor/beatport.py

diff --git a/youtube_dl/extractor/beeg.py b/youtube_dlc/extractor/beeg.py
similarity index 100%
rename from youtube_dl/extractor/beeg.py
rename to youtube_dlc/extractor/beeg.py

diff --git a/youtube_dl/extractor/behindkink.py b/youtube_dlc/extractor/behindkink.py
similarity index 100%
rename from youtube_dl/extractor/behindkink.py
rename to youtube_dlc/extractor/behindkink.py

diff --git a/youtube_dl/extractor/bellmedia.py b/youtube_dlc/extractor/bellmedia.py
similarity index 100%
rename from youtube_dl/extractor/bellmedia.py
rename to youtube_dlc/extractor/bellmedia.py

diff --git a/youtube_dl/extractor/bet.py b/youtube_dlc/extractor/bet.py
similarity index 100%
rename from youtube_dl/extractor/bet.py
rename to youtube_dlc/extractor/bet.py

diff --git a/youtube_dl/extractor/bfi.py b/youtube_dlc/extractor/bfi.py
similarity index 100%
rename from youtube_dl/extractor/bfi.py
rename to youtube_dlc/extractor/bfi.py

diff --git a/youtube_dl/extractor/bigflix.py b/youtube_dlc/extractor/bigflix.py
similarity index 100%
rename from youtube_dl/extractor/bigflix.py
rename to youtube_dlc/extractor/bigflix.py

diff --git a/youtube_dl/extractor/bild.py b/youtube_dlc/extractor/bild.py
similarity index 100%
rename from youtube_dl/extractor/bild.py
rename to youtube_dlc/extractor/bild.py

diff --git a/youtube_dl/extractor/bilibili.py b/youtube_dlc/extractor/bilibili.py
similarity index 99%
rename from youtube_dl/extractor/bilibili.py
rename to youtube_dlc/extractor/bilibili.py
index 4dc597e160bcea4f0821719dc82e2908f20d1972..d39ee8ffeca763c882747d15e82d4813503ba26c 100644 (file)
--- a/youtube_dl/extractor/bilibili.py
+++ b/youtube_dlc/extractor/bilibili.py
@@ -139,7 +139,7 @@ def _real_extract(self, url):
                 webpage, 'player parameters'))['cid'][0]
         else:
             if 'no_bangumi_tip' not in smuggled_data:
                 webpage, 'player parameters'))['cid'][0]
         else:
             if 'no_bangumi_tip' not in smuggled_data:

-                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dl with %s' % (
+                self.to_screen('Downloading episode %s. To download all videos in anime %s, re-run youtube-dlc with %s' % (

                     video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id)))
             headers = {
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
                     video_id, anime_id, compat_urlparse.urljoin(url, '//bangumi.bilibili.com/anime/%s' % anime_id)))
             headers = {
                 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',

diff --git a/youtube_dl/extractor/biobiochiletv.py b/youtube_dlc/extractor/biobiochiletv.py
similarity index 100%
rename from youtube_dl/extractor/biobiochiletv.py
rename to youtube_dlc/extractor/biobiochiletv.py

diff --git a/youtube_dl/extractor/biqle.py b/youtube_dlc/extractor/biqle.py
similarity index 100%
rename from youtube_dl/extractor/biqle.py
rename to youtube_dlc/extractor/biqle.py

diff --git a/youtube_dl/extractor/bitchute.py b/youtube_dlc/extractor/bitchute.py
similarity index 100%
rename from youtube_dl/extractor/bitchute.py
rename to youtube_dlc/extractor/bitchute.py

diff --git a/youtube_dl/extractor/bleacherreport.py b/youtube_dlc/extractor/bleacherreport.py
similarity index 100%
rename from youtube_dl/extractor/bleacherreport.py
rename to youtube_dlc/extractor/bleacherreport.py

diff --git a/youtube_dl/extractor/blinkx.py b/youtube_dlc/extractor/blinkx.py
similarity index 100%
rename from youtube_dl/extractor/blinkx.py
rename to youtube_dlc/extractor/blinkx.py

diff --git a/youtube_dl/extractor/bloomberg.py b/youtube_dlc/extractor/bloomberg.py
similarity index 100%
rename from youtube_dl/extractor/bloomberg.py
rename to youtube_dlc/extractor/bloomberg.py

diff --git a/youtube_dl/extractor/bokecc.py b/youtube_dlc/extractor/bokecc.py
similarity index 100%
rename from youtube_dl/extractor/bokecc.py
rename to youtube_dlc/extractor/bokecc.py

diff --git a/youtube_dl/extractor/bostonglobe.py b/youtube_dlc/extractor/bostonglobe.py
similarity index 100%
rename from youtube_dl/extractor/bostonglobe.py
rename to youtube_dlc/extractor/bostonglobe.py

diff --git a/youtube_dl/extractor/bpb.py b/youtube_dlc/extractor/bpb.py
similarity index 100%
rename from youtube_dl/extractor/bpb.py
rename to youtube_dlc/extractor/bpb.py

diff --git a/youtube_dl/extractor/br.py b/youtube_dlc/extractor/br.py
similarity index 100%
rename from youtube_dl/extractor/br.py
rename to youtube_dlc/extractor/br.py

diff --git a/youtube_dl/extractor/bravotv.py b/youtube_dlc/extractor/bravotv.py
similarity index 100%
rename from youtube_dl/extractor/bravotv.py
rename to youtube_dlc/extractor/bravotv.py

diff --git a/youtube_dl/extractor/breakcom.py b/youtube_dlc/extractor/breakcom.py
similarity index 100%
rename from youtube_dl/extractor/breakcom.py
rename to youtube_dlc/extractor/breakcom.py

diff --git a/youtube_dl/extractor/brightcove.py b/youtube_dlc/extractor/brightcove.py
similarity index 100%
rename from youtube_dl/extractor/brightcove.py
rename to youtube_dlc/extractor/brightcove.py

diff --git a/youtube_dl/extractor/businessinsider.py b/youtube_dlc/extractor/businessinsider.py
similarity index 100%
rename from youtube_dl/extractor/businessinsider.py
rename to youtube_dlc/extractor/businessinsider.py

diff --git a/youtube_dl/extractor/buzzfeed.py b/youtube_dlc/extractor/buzzfeed.py
similarity index 100%
rename from youtube_dl/extractor/buzzfeed.py
rename to youtube_dlc/extractor/buzzfeed.py

diff --git a/youtube_dl/extractor/byutv.py b/youtube_dlc/extractor/byutv.py
similarity index 100%
rename from youtube_dl/extractor/byutv.py
rename to youtube_dlc/extractor/byutv.py

diff --git a/youtube_dl/extractor/c56.py b/youtube_dlc/extractor/c56.py
similarity index 100%
rename from youtube_dl/extractor/c56.py
rename to youtube_dlc/extractor/c56.py

diff --git a/youtube_dl/extractor/camdemy.py b/youtube_dlc/extractor/camdemy.py
similarity index 100%
rename from youtube_dl/extractor/camdemy.py
rename to youtube_dlc/extractor/camdemy.py

diff --git a/youtube_dl/extractor/cammodels.py b/youtube_dlc/extractor/cammodels.py
similarity index 100%
rename from youtube_dl/extractor/cammodels.py
rename to youtube_dlc/extractor/cammodels.py

diff --git a/youtube_dl/extractor/camtube.py b/youtube_dlc/extractor/camtube.py
similarity index 100%
rename from youtube_dl/extractor/camtube.py
rename to youtube_dlc/extractor/camtube.py

diff --git a/youtube_dl/extractor/camwithher.py b/youtube_dlc/extractor/camwithher.py
similarity index 100%
rename from youtube_dl/extractor/camwithher.py
rename to youtube_dlc/extractor/camwithher.py

diff --git a/youtube_dl/extractor/canalc2.py b/youtube_dlc/extractor/canalc2.py
similarity index 100%
rename from youtube_dl/extractor/canalc2.py
rename to youtube_dlc/extractor/canalc2.py

diff --git a/youtube_dl/extractor/canalplus.py b/youtube_dlc/extractor/canalplus.py
similarity index 100%
rename from youtube_dl/extractor/canalplus.py
rename to youtube_dlc/extractor/canalplus.py

diff --git a/youtube_dl/extractor/canvas.py b/youtube_dlc/extractor/canvas.py
similarity index 100%
rename from youtube_dl/extractor/canvas.py
rename to youtube_dlc/extractor/canvas.py

diff --git a/youtube_dl/extractor/carambatv.py b/youtube_dlc/extractor/carambatv.py
similarity index 100%
rename from youtube_dl/extractor/carambatv.py
rename to youtube_dlc/extractor/carambatv.py

diff --git a/youtube_dl/extractor/cartoonnetwork.py b/youtube_dlc/extractor/cartoonnetwork.py
similarity index 100%
rename from youtube_dl/extractor/cartoonnetwork.py
rename to youtube_dlc/extractor/cartoonnetwork.py

diff --git a/youtube_dl/extractor/cbc.py b/youtube_dlc/extractor/cbc.py
similarity index 100%
rename from youtube_dl/extractor/cbc.py
rename to youtube_dlc/extractor/cbc.py

diff --git a/youtube_dl/extractor/cbs.py b/youtube_dlc/extractor/cbs.py
similarity index 100%
rename from youtube_dl/extractor/cbs.py
rename to youtube_dlc/extractor/cbs.py

diff --git a/youtube_dl/extractor/cbsinteractive.py b/youtube_dlc/extractor/cbsinteractive.py
similarity index 100%
rename from youtube_dl/extractor/cbsinteractive.py
rename to youtube_dlc/extractor/cbsinteractive.py

diff --git a/youtube_dl/extractor/cbslocal.py b/youtube_dlc/extractor/cbslocal.py
similarity index 100%
rename from youtube_dl/extractor/cbslocal.py
rename to youtube_dlc/extractor/cbslocal.py

diff --git a/youtube_dl/extractor/cbsnews.py b/youtube_dlc/extractor/cbsnews.py
similarity index 100%
rename from youtube_dl/extractor/cbsnews.py
rename to youtube_dlc/extractor/cbsnews.py

diff --git a/youtube_dl/extractor/cbssports.py b/youtube_dlc/extractor/cbssports.py
similarity index 100%
rename from youtube_dl/extractor/cbssports.py
rename to youtube_dlc/extractor/cbssports.py

diff --git a/youtube_dl/extractor/ccc.py b/youtube_dlc/extractor/ccc.py
similarity index 100%
rename from youtube_dl/extractor/ccc.py
rename to youtube_dlc/extractor/ccc.py

diff --git a/youtube_dl/extractor/ccma.py b/youtube_dlc/extractor/ccma.py
similarity index 100%
rename from youtube_dl/extractor/ccma.py
rename to youtube_dlc/extractor/ccma.py

diff --git a/youtube_dl/extractor/cctv.py b/youtube_dlc/extractor/cctv.py
similarity index 100%
rename from youtube_dl/extractor/cctv.py
rename to youtube_dlc/extractor/cctv.py

diff --git a/youtube_dl/extractor/cda.py b/youtube_dlc/extractor/cda.py
similarity index 100%
rename from youtube_dl/extractor/cda.py
rename to youtube_dlc/extractor/cda.py

diff --git a/youtube_dl/extractor/ceskatelevize.py b/youtube_dlc/extractor/ceskatelevize.py
similarity index 100%
rename from youtube_dl/extractor/ceskatelevize.py
rename to youtube_dlc/extractor/ceskatelevize.py

diff --git a/youtube_dl/extractor/channel9.py b/youtube_dlc/extractor/channel9.py
similarity index 100%
rename from youtube_dl/extractor/channel9.py
rename to youtube_dlc/extractor/channel9.py

diff --git a/youtube_dl/extractor/charlierose.py b/youtube_dlc/extractor/charlierose.py
similarity index 100%
rename from youtube_dl/extractor/charlierose.py
rename to youtube_dlc/extractor/charlierose.py

diff --git a/youtube_dl/extractor/chaturbate.py b/youtube_dlc/extractor/chaturbate.py
similarity index 100%
rename from youtube_dl/extractor/chaturbate.py
rename to youtube_dlc/extractor/chaturbate.py

diff --git a/youtube_dl/extractor/chilloutzone.py b/youtube_dlc/extractor/chilloutzone.py
similarity index 100%
rename from youtube_dl/extractor/chilloutzone.py
rename to youtube_dlc/extractor/chilloutzone.py

diff --git a/youtube_dl/extractor/chirbit.py b/youtube_dlc/extractor/chirbit.py
similarity index 100%
rename from youtube_dl/extractor/chirbit.py
rename to youtube_dlc/extractor/chirbit.py

diff --git a/youtube_dl/extractor/cinchcast.py b/youtube_dlc/extractor/cinchcast.py
similarity index 100%
rename from youtube_dl/extractor/cinchcast.py
rename to youtube_dlc/extractor/cinchcast.py

diff --git a/youtube_dl/extractor/cinemax.py b/youtube_dlc/extractor/cinemax.py
similarity index 100%
rename from youtube_dl/extractor/cinemax.py
rename to youtube_dlc/extractor/cinemax.py

diff --git a/youtube_dl/extractor/ciscolive.py b/youtube_dlc/extractor/ciscolive.py
similarity index 100%
rename from youtube_dl/extractor/ciscolive.py
rename to youtube_dlc/extractor/ciscolive.py

diff --git a/youtube_dl/extractor/cjsw.py b/youtube_dlc/extractor/cjsw.py
similarity index 100%
rename from youtube_dl/extractor/cjsw.py
rename to youtube_dlc/extractor/cjsw.py

diff --git a/youtube_dl/extractor/cliphunter.py b/youtube_dlc/extractor/cliphunter.py
similarity index 100%
rename from youtube_dl/extractor/cliphunter.py
rename to youtube_dlc/extractor/cliphunter.py

diff --git a/youtube_dl/extractor/clippit.py b/youtube_dlc/extractor/clippit.py
similarity index 100%
rename from youtube_dl/extractor/clippit.py
rename to youtube_dlc/extractor/clippit.py

diff --git a/youtube_dl/extractor/cliprs.py b/youtube_dlc/extractor/cliprs.py
similarity index 100%
rename from youtube_dl/extractor/cliprs.py
rename to youtube_dlc/extractor/cliprs.py

diff --git a/youtube_dl/extractor/clipsyndicate.py b/youtube_dlc/extractor/clipsyndicate.py
similarity index 100%
rename from youtube_dl/extractor/clipsyndicate.py
rename to youtube_dlc/extractor/clipsyndicate.py

diff --git a/youtube_dl/extractor/closertotruth.py b/youtube_dlc/extractor/closertotruth.py
similarity index 100%
rename from youtube_dl/extractor/closertotruth.py
rename to youtube_dlc/extractor/closertotruth.py

diff --git a/youtube_dl/extractor/cloudflarestream.py b/youtube_dlc/extractor/cloudflarestream.py
similarity index 100%
rename from youtube_dl/extractor/cloudflarestream.py
rename to youtube_dlc/extractor/cloudflarestream.py

diff --git a/youtube_dl/extractor/cloudy.py b/youtube_dlc/extractor/cloudy.py
similarity index 100%
rename from youtube_dl/extractor/cloudy.py
rename to youtube_dlc/extractor/cloudy.py

diff --git a/youtube_dl/extractor/clubic.py b/youtube_dlc/extractor/clubic.py
similarity index 100%
rename from youtube_dl/extractor/clubic.py
rename to youtube_dlc/extractor/clubic.py

diff --git a/youtube_dl/extractor/clyp.py b/youtube_dlc/extractor/clyp.py
similarity index 100%
rename from youtube_dl/extractor/clyp.py
rename to youtube_dlc/extractor/clyp.py

diff --git a/youtube_dl/extractor/cmt.py b/youtube_dlc/extractor/cmt.py
similarity index 100%
rename from youtube_dl/extractor/cmt.py
rename to youtube_dlc/extractor/cmt.py

diff --git a/youtube_dl/extractor/cnbc.py b/youtube_dlc/extractor/cnbc.py
similarity index 100%
rename from youtube_dl/extractor/cnbc.py
rename to youtube_dlc/extractor/cnbc.py

diff --git a/youtube_dl/extractor/cnn.py b/youtube_dlc/extractor/cnn.py
similarity index 100%
rename from youtube_dl/extractor/cnn.py
rename to youtube_dlc/extractor/cnn.py

diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dlc/extractor/comedycentral.py
similarity index 100%
rename from youtube_dl/extractor/comedycentral.py
rename to youtube_dlc/extractor/comedycentral.py

diff --git a/youtube_dl/extractor/common.py b/youtube_dlc/extractor/common.py
similarity index 99%
rename from youtube_dl/extractor/common.py
rename to youtube_dlc/extractor/common.py
index a61753b17cd35835474c347c2b438e5f32949d73..c1ea5d84603f9e821e789648bac743a7c6d2c9b6 100644 (file)
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dlc/extractor/common.py
@@ -269,7 +269,7 @@ class InfoExtractor(object):
                                      Set to "root" to indicate that this is a
                                      comment to the original video.
     age_limit:      Age restriction for the video, as an integer (years)
                                      Set to "root" to indicate that this is a
                                      comment to the original video.
     age_limit:      Age restriction for the video, as an integer (years)

-    webpage_url:    The URL to the video webpage, if given to youtube-dl it
+    webpage_url:    The URL to the video webpage, if given to youtube-dlc it

                     should allow to get the same result again. (It will be set
                     by YoutubeDL if it's missing)
     categories:     A list of categories that the video falls in, for example
                     should allow to get the same result again. (It will be set
                     by YoutubeDL if it's missing)
     categories:     A list of categories that the video falls in, for example


@@ -1500,7 +1500,7 @@ def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None,
         if not isinstance(manifest, compat_etree_Element) and not fatal:
             return []
 
         if not isinstance(manifest, compat_etree_Element) and not fatal:
             return []
 

-        # currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
+        # currently youtube-dlc cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy

         akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
         if akamai_pv is not None and ';' in akamai_pv.text:
             playerVerificationChallenge = akamai_pv.text.split(';')[0]
         akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
         if akamai_pv is not None and ';' in akamai_pv.text:
             playerVerificationChallenge = akamai_pv.text.split(';')[0]

diff --git a/youtube_dl/extractor/commonmistakes.py b/youtube_dlc/extractor/commonmistakes.py
similarity index 92%
rename from youtube_dl/extractor/commonmistakes.py
rename to youtube_dlc/extractor/commonmistakes.py
index 7e12499b1e83ab39026fb0448673dfdacddaf968..933b89eb3e5e649acb98764b7dcb3aaa3c78db16 100644 (file)
--- a/youtube_dl/extractor/commonmistakes.py
+++ b/youtube_dlc/extractor/commonmistakes.py
@@ -22,12 +22,12 @@ class CommonMistakesIE(InfoExtractor):
 
     def _real_extract(self, url):
         msg = (
 
     def _real_extract(self, url):
         msg = (

-            'You\'ve asked youtube-dl to download the URL "%s". '
+            'You\'ve asked youtube-dlc to download the URL "%s". '

             'That doesn\'t make any sense. '
             'Simply remove the parameter in your command or configuration.'
         ) % url
         if not self._downloader.params.get('verbose'):
             'That doesn\'t make any sense. '
             'Simply remove the parameter in your command or configuration.'
         ) % url
         if not self._downloader.params.get('verbose'):

-            msg += ' Add -v to the command line to see what arguments and configuration youtube-dl got.'
+            msg += ' Add -v to the command line to see what arguments and configuration youtube-dlc got.'

         raise ExtractorError(msg, expected=True)
 
 
         raise ExtractorError(msg, expected=True)
 
 

diff --git a/youtube_dl/extractor/commonprotocols.py b/youtube_dlc/extractor/commonprotocols.py
similarity index 100%
rename from youtube_dl/extractor/commonprotocols.py
rename to youtube_dlc/extractor/commonprotocols.py

diff --git a/youtube_dl/extractor/condenast.py b/youtube_dlc/extractor/condenast.py
similarity index 100%
rename from youtube_dl/extractor/condenast.py
rename to youtube_dlc/extractor/condenast.py

diff --git a/youtube_dl/extractor/contv.py b/youtube_dlc/extractor/contv.py
similarity index 100%
rename from youtube_dl/extractor/contv.py
rename to youtube_dlc/extractor/contv.py

diff --git a/youtube_dl/extractor/corus.py b/youtube_dlc/extractor/corus.py
similarity index 100%
rename from youtube_dl/extractor/corus.py
rename to youtube_dlc/extractor/corus.py

diff --git a/youtube_dl/extractor/coub.py b/youtube_dlc/extractor/coub.py
similarity index 100%
rename from youtube_dl/extractor/coub.py
rename to youtube_dlc/extractor/coub.py

diff --git a/youtube_dl/extractor/cracked.py b/youtube_dlc/extractor/cracked.py
similarity index 100%
rename from youtube_dl/extractor/cracked.py
rename to youtube_dlc/extractor/cracked.py

diff --git a/youtube_dl/extractor/crackle.py b/youtube_dlc/extractor/crackle.py
similarity index 100%
rename from youtube_dl/extractor/crackle.py
rename to youtube_dlc/extractor/crackle.py

diff --git a/youtube_dl/extractor/crooksandliars.py b/youtube_dlc/extractor/crooksandliars.py
similarity index 100%
rename from youtube_dl/extractor/crooksandliars.py
rename to youtube_dlc/extractor/crooksandliars.py

diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dlc/extractor/crunchyroll.py
similarity index 100%
rename from youtube_dl/extractor/crunchyroll.py
rename to youtube_dlc/extractor/crunchyroll.py

diff --git a/youtube_dl/extractor/cspan.py b/youtube_dlc/extractor/cspan.py
similarity index 100%
rename from youtube_dl/extractor/cspan.py
rename to youtube_dlc/extractor/cspan.py

diff --git a/youtube_dl/extractor/ctsnews.py b/youtube_dlc/extractor/ctsnews.py
similarity index 100%
rename from youtube_dl/extractor/ctsnews.py
rename to youtube_dlc/extractor/ctsnews.py

diff --git a/youtube_dl/extractor/ctvnews.py b/youtube_dlc/extractor/ctvnews.py
similarity index 100%
rename from youtube_dl/extractor/ctvnews.py
rename to youtube_dlc/extractor/ctvnews.py

diff --git a/youtube_dl/extractor/cultureunplugged.py b/youtube_dlc/extractor/cultureunplugged.py
similarity index 100%
rename from youtube_dl/extractor/cultureunplugged.py
rename to youtube_dlc/extractor/cultureunplugged.py

diff --git a/youtube_dl/extractor/curiositystream.py b/youtube_dlc/extractor/curiositystream.py
similarity index 100%
rename from youtube_dl/extractor/curiositystream.py
rename to youtube_dlc/extractor/curiositystream.py

diff --git a/youtube_dl/extractor/cwtv.py b/youtube_dlc/extractor/cwtv.py
similarity index 100%
rename from youtube_dl/extractor/cwtv.py
rename to youtube_dlc/extractor/cwtv.py

diff --git a/youtube_dl/extractor/dailymail.py b/youtube_dlc/extractor/dailymail.py
similarity index 100%
rename from youtube_dl/extractor/dailymail.py
rename to youtube_dlc/extractor/dailymail.py

diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dlc/extractor/dailymotion.py
similarity index 100%
rename from youtube_dl/extractor/dailymotion.py
rename to youtube_dlc/extractor/dailymotion.py

diff --git a/youtube_dl/extractor/daum.py b/youtube_dlc/extractor/daum.py
similarity index 100%
rename from youtube_dl/extractor/daum.py
rename to youtube_dlc/extractor/daum.py

diff --git a/youtube_dl/extractor/dbtv.py b/youtube_dlc/extractor/dbtv.py
similarity index 100%
rename from youtube_dl/extractor/dbtv.py
rename to youtube_dlc/extractor/dbtv.py

diff --git a/youtube_dl/extractor/dctp.py b/youtube_dlc/extractor/dctp.py
similarity index 100%
rename from youtube_dl/extractor/dctp.py
rename to youtube_dlc/extractor/dctp.py

diff --git a/youtube_dl/extractor/deezer.py b/youtube_dlc/extractor/deezer.py
similarity index 100%
rename from youtube_dl/extractor/deezer.py
rename to youtube_dlc/extractor/deezer.py

diff --git a/youtube_dl/extractor/defense.py b/youtube_dlc/extractor/defense.py
similarity index 100%
rename from youtube_dl/extractor/defense.py
rename to youtube_dlc/extractor/defense.py

diff --git a/youtube_dl/extractor/democracynow.py b/youtube_dlc/extractor/democracynow.py
similarity index 100%
rename from youtube_dl/extractor/democracynow.py
rename to youtube_dlc/extractor/democracynow.py

diff --git a/youtube_dl/extractor/dfb.py b/youtube_dlc/extractor/dfb.py
similarity index 100%
rename from youtube_dl/extractor/dfb.py
rename to youtube_dlc/extractor/dfb.py

diff --git a/youtube_dl/extractor/dhm.py b/youtube_dlc/extractor/dhm.py
similarity index 100%
rename from youtube_dl/extractor/dhm.py
rename to youtube_dlc/extractor/dhm.py

diff --git a/youtube_dl/extractor/digg.py b/youtube_dlc/extractor/digg.py
similarity index 100%
rename from youtube_dl/extractor/digg.py
rename to youtube_dlc/extractor/digg.py

diff --git a/youtube_dl/extractor/digiteka.py b/youtube_dlc/extractor/digiteka.py
similarity index 100%
rename from youtube_dl/extractor/digiteka.py
rename to youtube_dlc/extractor/digiteka.py

diff --git a/youtube_dl/extractor/discovery.py b/youtube_dlc/extractor/discovery.py
similarity index 100%
rename from youtube_dl/extractor/discovery.py
rename to youtube_dlc/extractor/discovery.py

diff --git a/youtube_dl/extractor/discoverygo.py b/youtube_dlc/extractor/discoverygo.py
similarity index 100%
rename from youtube_dl/extractor/discoverygo.py
rename to youtube_dlc/extractor/discoverygo.py

diff --git a/youtube_dl/extractor/discoverynetworks.py b/youtube_dlc/extractor/discoverynetworks.py
similarity index 100%
rename from youtube_dl/extractor/discoverynetworks.py
rename to youtube_dlc/extractor/discoverynetworks.py

diff --git a/youtube_dl/extractor/discoveryvr.py b/youtube_dlc/extractor/discoveryvr.py
similarity index 100%
rename from youtube_dl/extractor/discoveryvr.py
rename to youtube_dlc/extractor/discoveryvr.py

diff --git a/youtube_dl/extractor/disney.py b/youtube_dlc/extractor/disney.py
similarity index 100%
rename from youtube_dl/extractor/disney.py
rename to youtube_dlc/extractor/disney.py

diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dlc/extractor/dispeak.py
similarity index 100%
rename from youtube_dl/extractor/dispeak.py
rename to youtube_dlc/extractor/dispeak.py

diff --git a/youtube_dl/extractor/dlive.py b/youtube_dlc/extractor/dlive.py
similarity index 100%
rename from youtube_dl/extractor/dlive.py
rename to youtube_dlc/extractor/dlive.py

diff --git a/youtube_dl/extractor/doodstream.py b/youtube_dlc/extractor/doodstream.py
similarity index 100%
rename from youtube_dl/extractor/doodstream.py
rename to youtube_dlc/extractor/doodstream.py

diff --git a/youtube_dl/extractor/dotsub.py b/youtube_dlc/extractor/dotsub.py
similarity index 100%
rename from youtube_dl/extractor/dotsub.py
rename to youtube_dlc/extractor/dotsub.py

diff --git a/youtube_dl/extractor/douyutv.py b/youtube_dlc/extractor/douyutv.py
similarity index 100%
rename from youtube_dl/extractor/douyutv.py
rename to youtube_dlc/extractor/douyutv.py

diff --git a/youtube_dl/extractor/dplay.py b/youtube_dlc/extractor/dplay.py
similarity index 100%
rename from youtube_dl/extractor/dplay.py
rename to youtube_dlc/extractor/dplay.py

diff --git a/youtube_dl/extractor/drbonanza.py b/youtube_dlc/extractor/drbonanza.py
similarity index 100%
rename from youtube_dl/extractor/drbonanza.py
rename to youtube_dlc/extractor/drbonanza.py

diff --git a/youtube_dl/extractor/dreisat.py b/youtube_dlc/extractor/dreisat.py
similarity index 100%
rename from youtube_dl/extractor/dreisat.py
rename to youtube_dlc/extractor/dreisat.py

diff --git a/youtube_dl/extractor/dropbox.py b/youtube_dlc/extractor/dropbox.py
similarity index 90%
rename from youtube_dl/extractor/dropbox.py
rename to youtube_dlc/extractor/dropbox.py
index 14b6c00b0bd1c4d3a306b5513477e2bb6c4cd52d..9dc6614c582811a34198302929313b853045f707 100644 (file)
--- a/youtube_dl/extractor/dropbox.py
+++ b/youtube_dlc/extractor/dropbox.py
@@ -13,11 +13,11 @@ class DropboxIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
     _TESTS = [
         {
     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*'
     _TESTS = [
         {

-            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',
+            'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dlc%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0',

             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',
             'info_dict': {
                 'id': 'nelirfsxnmcfbfh',
                 'ext': 'mp4',

-                'title': 'youtube-dl test video \'ä"BaW_jenozKc'
+                'title': 'youtube-dlc test video \'ä"BaW_jenozKc'

             }
         }, {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',
             }
         }, {
             'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v',

diff --git a/youtube_dl/extractor/drtuber.py b/youtube_dlc/extractor/drtuber.py
similarity index 100%
rename from youtube_dl/extractor/drtuber.py
rename to youtube_dlc/extractor/drtuber.py

diff --git a/youtube_dl/extractor/drtv.py b/youtube_dlc/extractor/drtv.py
similarity index 100%
rename from youtube_dl/extractor/drtv.py
rename to youtube_dlc/extractor/drtv.py

diff --git a/youtube_dl/extractor/dtube.py b/youtube_dlc/extractor/dtube.py
similarity index 100%
rename from youtube_dl/extractor/dtube.py
rename to youtube_dlc/extractor/dtube.py

diff --git a/youtube_dl/extractor/dumpert.py b/youtube_dlc/extractor/dumpert.py
similarity index 100%
rename from youtube_dl/extractor/dumpert.py
rename to youtube_dlc/extractor/dumpert.py

diff --git a/youtube_dl/extractor/dvtv.py b/youtube_dlc/extractor/dvtv.py
similarity index 100%
rename from youtube_dl/extractor/dvtv.py
rename to youtube_dlc/extractor/dvtv.py

diff --git a/youtube_dl/extractor/dw.py b/youtube_dlc/extractor/dw.py
similarity index 100%
rename from youtube_dl/extractor/dw.py
rename to youtube_dlc/extractor/dw.py

diff --git a/youtube_dl/extractor/eagleplatform.py b/youtube_dlc/extractor/eagleplatform.py
similarity index 100%
rename from youtube_dl/extractor/eagleplatform.py
rename to youtube_dlc/extractor/eagleplatform.py

diff --git a/youtube_dl/extractor/ebaumsworld.py b/youtube_dlc/extractor/ebaumsworld.py
similarity index 100%
rename from youtube_dl/extractor/ebaumsworld.py
rename to youtube_dlc/extractor/ebaumsworld.py

diff --git a/youtube_dl/extractor/echomsk.py b/youtube_dlc/extractor/echomsk.py
similarity index 100%
rename from youtube_dl/extractor/echomsk.py
rename to youtube_dlc/extractor/echomsk.py

diff --git a/youtube_dl/extractor/egghead.py b/youtube_dlc/extractor/egghead.py
similarity index 100%
rename from youtube_dl/extractor/egghead.py
rename to youtube_dlc/extractor/egghead.py

diff --git a/youtube_dl/extractor/ehow.py b/youtube_dlc/extractor/ehow.py
similarity index 100%
rename from youtube_dl/extractor/ehow.py
rename to youtube_dlc/extractor/ehow.py

diff --git a/youtube_dl/extractor/eighttracks.py b/youtube_dlc/extractor/eighttracks.py
similarity index 85%
rename from youtube_dl/extractor/eighttracks.py
rename to youtube_dlc/extractor/eighttracks.py
index 9a44f89f3fe801047ef283e9b1fa410c8b88cb37..5ededd31da475ac997dc257f466bb3a0eff2ea2c 100644 (file)
--- a/youtube_dl/extractor/eighttracks.py
+++ b/youtube_dlc/extractor/eighttracks.py
@@ -18,12 +18,12 @@ class EightTracksIE(InfoExtractor):
     _VALID_URL = r'https?://8tracks\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'
     _TEST = {
         'name': 'EightTracks',
     _VALID_URL = r'https?://8tracks\.com/(?P<user>[^/]+)/(?P<id>[^/#]+)(?:#.*)?$'
     _TEST = {
         'name': 'EightTracks',

-        'url': 'http://8tracks.com/ytdl/youtube-dl-test-tracks-a',
+        'url': 'http://8tracks.com/ytdl/youtube-dlc-test-tracks-a',

         'info_dict': {
             'id': '1336550',
         'info_dict': {
             'id': '1336550',

-            'display_id': 'youtube-dl-test-tracks-a',
+            'display_id': 'youtube-dlc-test-tracks-a',

             'description': "test chars:  \"'/\\ä↭",
             'description': "test chars:  \"'/\\ä↭",

-            'title': "youtube-dl test tracks \"'/\\ä↭<>",
+            'title': "youtube-dlc test tracks \"'/\\ä↭<>",

         },
         'playlist': [
             {
         },
         'playlist': [
             {


@@ -31,7 +31,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885610',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885610',
                     'ext': 'm4a',

-                    'title': "youtue-dl project<>\"' - youtube-dl test track 1 \"'/\\\u00e4\u21ad",
+                    'title': "youtue-dl project<>\"' - youtube-dlc test track 1 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -40,7 +40,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885608',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885608',
                     'ext': 'm4a',

-                    'title': "youtube-dl project - youtube-dl test track 2 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project - youtube-dlc test track 2 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -49,7 +49,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885679',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885679',
                     'ext': 'm4a',

-                    'title': "youtube-dl project as well - youtube-dl test track 3 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 3 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -58,7 +58,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885680',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885680',
                     'ext': 'm4a',

-                    'title': "youtube-dl project as well - youtube-dl test track 4 \"'/\\\u00e4\u21ad",
+                    'title': "youtube-dlc project as well - youtube-dlc test track 4 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -67,7 +67,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885682',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885682',
                     'ext': 'm4a',

-                    'title': "PH - youtube-dl test track 5 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 5 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -76,7 +76,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885683',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885683',
                     'ext': 'm4a',

-                    'title': "PH - youtube-dl test track 6 \"'/\\\u00e4\u21ad",
+                    'title': "PH - youtube-dlc test track 6 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -85,7 +85,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885684',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885684',
                     'ext': 'm4a',

-                    'title': "phihag - youtube-dl test track 7 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 7 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             },
                     'uploader_id': 'ytdl'
                 }
             },


@@ -94,7 +94,7 @@ class EightTracksIE(InfoExtractor):
                 'info_dict': {
                     'id': '11885685',
                     'ext': 'm4a',
                 'info_dict': {
                     'id': '11885685',
                     'ext': 'm4a',

-                    'title': "phihag - youtube-dl test track 8 \"'/\\\u00e4\u21ad",
+                    'title': "phihag - youtube-dlc test track 8 \"'/\\\u00e4\u21ad",

                     'uploader_id': 'ytdl'
                 }
             }
                     'uploader_id': 'ytdl'
                 }
             }

diff --git a/youtube_dl/extractor/einthusan.py b/youtube_dlc/extractor/einthusan.py
similarity index 100%
rename from youtube_dl/extractor/einthusan.py
rename to youtube_dlc/extractor/einthusan.py

diff --git a/youtube_dl/extractor/eitb.py b/youtube_dlc/extractor/eitb.py
similarity index 100%
rename from youtube_dl/extractor/eitb.py
rename to youtube_dlc/extractor/eitb.py

diff --git a/youtube_dl/extractor/ellentube.py b/youtube_dlc/extractor/ellentube.py
similarity index 100%
rename from youtube_dl/extractor/ellentube.py
rename to youtube_dlc/extractor/ellentube.py

diff --git a/youtube_dl/extractor/elpais.py b/youtube_dlc/extractor/elpais.py
similarity index 100%
rename from youtube_dl/extractor/elpais.py
rename to youtube_dlc/extractor/elpais.py

diff --git a/youtube_dl/extractor/embedly.py b/youtube_dlc/extractor/embedly.py
similarity index 100%
rename from youtube_dl/extractor/embedly.py
rename to youtube_dlc/extractor/embedly.py

diff --git a/youtube_dl/extractor/engadget.py b/youtube_dlc/extractor/engadget.py
similarity index 100%
rename from youtube_dl/extractor/engadget.py
rename to youtube_dlc/extractor/engadget.py

diff --git a/youtube_dl/extractor/eporner.py b/youtube_dlc/extractor/eporner.py
similarity index 100%
rename from youtube_dl/extractor/eporner.py
rename to youtube_dlc/extractor/eporner.py

diff --git a/youtube_dl/extractor/eroprofile.py b/youtube_dlc/extractor/eroprofile.py
similarity index 100%
rename from youtube_dl/extractor/eroprofile.py
rename to youtube_dlc/extractor/eroprofile.py

diff --git a/youtube_dl/extractor/escapist.py b/youtube_dlc/extractor/escapist.py
similarity index 100%
rename from youtube_dl/extractor/escapist.py
rename to youtube_dlc/extractor/escapist.py

diff --git a/youtube_dl/extractor/espn.py b/youtube_dlc/extractor/espn.py
similarity index 100%
rename from youtube_dl/extractor/espn.py
rename to youtube_dlc/extractor/espn.py

diff --git a/youtube_dl/extractor/esri.py b/youtube_dlc/extractor/esri.py
similarity index 100%
rename from youtube_dl/extractor/esri.py
rename to youtube_dlc/extractor/esri.py

diff --git a/youtube_dl/extractor/europa.py b/youtube_dlc/extractor/europa.py
similarity index 100%
rename from youtube_dl/extractor/europa.py
rename to youtube_dlc/extractor/europa.py

diff --git a/youtube_dl/extractor/everyonesmixtape.py b/youtube_dlc/extractor/everyonesmixtape.py
similarity index 100%
rename from youtube_dl/extractor/everyonesmixtape.py
rename to youtube_dlc/extractor/everyonesmixtape.py

diff --git a/youtube_dl/extractor/expotv.py b/youtube_dlc/extractor/expotv.py
similarity index 100%
rename from youtube_dl/extractor/expotv.py
rename to youtube_dlc/extractor/expotv.py

diff --git a/youtube_dl/extractor/expressen.py b/youtube_dlc/extractor/expressen.py
similarity index 100%
rename from youtube_dl/extractor/expressen.py
rename to youtube_dlc/extractor/expressen.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dlc/extractor/extractors.py
similarity index 100%
rename from youtube_dl/extractor/extractors.py
rename to youtube_dlc/extractor/extractors.py

diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dlc/extractor/extremetube.py
similarity index 100%
rename from youtube_dl/extractor/extremetube.py
rename to youtube_dlc/extractor/extremetube.py

diff --git a/youtube_dl/extractor/eyedotv.py b/youtube_dlc/extractor/eyedotv.py
similarity index 100%
rename from youtube_dl/extractor/eyedotv.py
rename to youtube_dlc/extractor/eyedotv.py

diff --git a/youtube_dl/extractor/facebook.py b/youtube_dlc/extractor/facebook.py
similarity index 100%
rename from youtube_dl/extractor/facebook.py
rename to youtube_dlc/extractor/facebook.py

diff --git a/youtube_dl/extractor/faz.py b/youtube_dlc/extractor/faz.py
similarity index 100%
rename from youtube_dl/extractor/faz.py
rename to youtube_dlc/extractor/faz.py

diff --git a/youtube_dl/extractor/fc2.py b/youtube_dlc/extractor/fc2.py
similarity index 100%
rename from youtube_dl/extractor/fc2.py
rename to youtube_dlc/extractor/fc2.py

diff --git a/youtube_dl/extractor/fczenit.py b/youtube_dlc/extractor/fczenit.py
similarity index 100%
rename from youtube_dl/extractor/fczenit.py
rename to youtube_dlc/extractor/fczenit.py

diff --git a/youtube_dl/extractor/filmon.py b/youtube_dlc/extractor/filmon.py
similarity index 100%
rename from youtube_dl/extractor/filmon.py
rename to youtube_dlc/extractor/filmon.py

diff --git a/youtube_dl/extractor/filmweb.py b/youtube_dlc/extractor/filmweb.py
similarity index 100%
rename from youtube_dl/extractor/filmweb.py
rename to youtube_dlc/extractor/filmweb.py

diff --git a/youtube_dl/extractor/firsttv.py b/youtube_dlc/extractor/firsttv.py
similarity index 100%
rename from youtube_dl/extractor/firsttv.py
rename to youtube_dlc/extractor/firsttv.py

diff --git a/youtube_dl/extractor/fivemin.py b/youtube_dlc/extractor/fivemin.py
similarity index 100%
rename from youtube_dl/extractor/fivemin.py
rename to youtube_dlc/extractor/fivemin.py

diff --git a/youtube_dl/extractor/fivetv.py b/youtube_dlc/extractor/fivetv.py
similarity index 100%
rename from youtube_dl/extractor/fivetv.py
rename to youtube_dlc/extractor/fivetv.py

diff --git a/youtube_dl/extractor/flickr.py b/youtube_dlc/extractor/flickr.py
similarity index 100%
rename from youtube_dl/extractor/flickr.py
rename to youtube_dlc/extractor/flickr.py

diff --git a/youtube_dl/extractor/folketinget.py b/youtube_dlc/extractor/folketinget.py
similarity index 100%
rename from youtube_dl/extractor/folketinget.py
rename to youtube_dlc/extractor/folketinget.py

diff --git a/youtube_dl/extractor/footyroom.py b/youtube_dlc/extractor/footyroom.py
similarity index 100%
rename from youtube_dl/extractor/footyroom.py
rename to youtube_dlc/extractor/footyroom.py

diff --git a/youtube_dl/extractor/formula1.py b/youtube_dlc/extractor/formula1.py
similarity index 100%
rename from youtube_dl/extractor/formula1.py
rename to youtube_dlc/extractor/formula1.py

diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dlc/extractor/fourtube.py
similarity index 100%
rename from youtube_dl/extractor/fourtube.py
rename to youtube_dlc/extractor/fourtube.py

diff --git a/youtube_dl/extractor/fox.py b/youtube_dlc/extractor/fox.py
similarity index 100%
rename from youtube_dl/extractor/fox.py
rename to youtube_dlc/extractor/fox.py

diff --git a/youtube_dl/extractor/fox9.py b/youtube_dlc/extractor/fox9.py
similarity index 100%
rename from youtube_dl/extractor/fox9.py
rename to youtube_dlc/extractor/fox9.py

diff --git a/youtube_dl/extractor/foxgay.py b/youtube_dlc/extractor/foxgay.py
similarity index 100%
rename from youtube_dl/extractor/foxgay.py
rename to youtube_dlc/extractor/foxgay.py

diff --git a/youtube_dl/extractor/foxnews.py b/youtube_dlc/extractor/foxnews.py
similarity index 100%
rename from youtube_dl/extractor/foxnews.py
rename to youtube_dlc/extractor/foxnews.py

diff --git a/youtube_dl/extractor/foxsports.py b/youtube_dlc/extractor/foxsports.py
similarity index 100%
rename from youtube_dl/extractor/foxsports.py
rename to youtube_dlc/extractor/foxsports.py

diff --git a/youtube_dl/extractor/franceculture.py b/youtube_dlc/extractor/franceculture.py
similarity index 100%
rename from youtube_dl/extractor/franceculture.py
rename to youtube_dlc/extractor/franceculture.py

diff --git a/youtube_dl/extractor/franceinter.py b/youtube_dlc/extractor/franceinter.py
similarity index 100%
rename from youtube_dl/extractor/franceinter.py
rename to youtube_dlc/extractor/franceinter.py

diff --git a/youtube_dl/extractor/francetv.py b/youtube_dlc/extractor/francetv.py
similarity index 100%
rename from youtube_dl/extractor/francetv.py
rename to youtube_dlc/extractor/francetv.py

diff --git a/youtube_dl/extractor/freesound.py b/youtube_dlc/extractor/freesound.py
similarity index 100%
rename from youtube_dl/extractor/freesound.py
rename to youtube_dlc/extractor/freesound.py

diff --git a/youtube_dl/extractor/freespeech.py b/youtube_dlc/extractor/freespeech.py
similarity index 100%
rename from youtube_dl/extractor/freespeech.py
rename to youtube_dlc/extractor/freespeech.py

diff --git a/youtube_dl/extractor/freshlive.py b/youtube_dlc/extractor/freshlive.py
similarity index 100%
rename from youtube_dl/extractor/freshlive.py
rename to youtube_dlc/extractor/freshlive.py

diff --git a/youtube_dl/extractor/frontendmasters.py b/youtube_dlc/extractor/frontendmasters.py
similarity index 100%
rename from youtube_dl/extractor/frontendmasters.py
rename to youtube_dlc/extractor/frontendmasters.py

diff --git a/youtube_dl/extractor/funimation.py b/youtube_dlc/extractor/funimation.py
similarity index 100%
rename from youtube_dl/extractor/funimation.py
rename to youtube_dlc/extractor/funimation.py

diff --git a/youtube_dl/extractor/funk.py b/youtube_dlc/extractor/funk.py
similarity index 100%
rename from youtube_dl/extractor/funk.py
rename to youtube_dlc/extractor/funk.py

diff --git a/youtube_dl/extractor/fusion.py b/youtube_dlc/extractor/fusion.py
similarity index 100%
rename from youtube_dl/extractor/fusion.py
rename to youtube_dlc/extractor/fusion.py

diff --git a/youtube_dl/extractor/fxnetworks.py b/youtube_dlc/extractor/fxnetworks.py
similarity index 100%
rename from youtube_dl/extractor/fxnetworks.py
rename to youtube_dlc/extractor/fxnetworks.py

diff --git a/youtube_dl/extractor/gaia.py b/youtube_dlc/extractor/gaia.py
similarity index 100%
rename from youtube_dl/extractor/gaia.py
rename to youtube_dlc/extractor/gaia.py

diff --git a/youtube_dl/extractor/gameinformer.py b/youtube_dlc/extractor/gameinformer.py
similarity index 100%
rename from youtube_dl/extractor/gameinformer.py
rename to youtube_dlc/extractor/gameinformer.py

diff --git a/youtube_dl/extractor/gamespot.py b/youtube_dlc/extractor/gamespot.py
similarity index 100%
rename from youtube_dl/extractor/gamespot.py
rename to youtube_dlc/extractor/gamespot.py

diff --git a/youtube_dl/extractor/gamestar.py b/youtube_dlc/extractor/gamestar.py
similarity index 100%
rename from youtube_dl/extractor/gamestar.py
rename to youtube_dlc/extractor/gamestar.py

diff --git a/youtube_dl/extractor/gaskrank.py b/youtube_dlc/extractor/gaskrank.py
similarity index 100%
rename from youtube_dl/extractor/gaskrank.py
rename to youtube_dlc/extractor/gaskrank.py

diff --git a/youtube_dl/extractor/gazeta.py b/youtube_dlc/extractor/gazeta.py
similarity index 100%
rename from youtube_dl/extractor/gazeta.py
rename to youtube_dlc/extractor/gazeta.py

diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dlc/extractor/gdcvault.py
similarity index 100%
rename from youtube_dl/extractor/gdcvault.py
rename to youtube_dlc/extractor/gdcvault.py

diff --git a/youtube_dl/extractor/generic.py b/youtube_dlc/extractor/generic.py
similarity index 99%
rename from youtube_dl/extractor/generic.py
rename to youtube_dlc/extractor/generic.py
index 355067a509fc197c10a2085bad058d4459729bc9..aba06b328e19fad48faee2d83eb42494af672f94 100644 (file)
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dlc/extractor/generic.py
@@ -1947,7 +1947,7 @@ class GenericIE(InfoExtractor):
         },
         {
             # vshare embed
         },
         {
             # vshare embed

-            'url': 'https://youtube-dl-demo.neocities.org/vshare.html',
+            'url': 'https://youtube-dlc-demo.neocities.org/vshare.html',

             'md5': '17b39f55b5497ae8b59f5fbce8e35886',
             'info_dict': {
                 'id': '0f64ce6',
             'md5': '17b39f55b5497ae8b59f5fbce8e35886',
             'info_dict': {
                 'id': '0f64ce6',


@@ -2263,7 +2263,7 @@ def _real_extract(self, url):
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(
                     if default_search == 'auto_warning':
                         if re.match(r'^(?:url|URL)$', url):
                             raise ExtractorError(

-                                'Invalid URL:  %r . Call youtube-dl like this:  youtube-dl -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,
+                                'Invalid URL:  %r . Call youtube-dlc like this:  youtube-dlc -v "https://www.youtube.com/watch?v=BaW_jenozKc"  ' % url,

                                 expected=True)
                         else:
                             self._downloader.report_warning(
                                 expected=True)
                         else:
                             self._downloader.report_warning(


@@ -2273,7 +2273,7 @@ def _real_extract(self, url):
             if default_search in ('error', 'fixup_error'):
                 raise ExtractorError(
                     '%r is not a valid URL. '
             if default_search in ('error', 'fixup_error'):
                 raise ExtractorError(
                     '%r is not a valid URL. '

-                    'Set --default-search "ytsearch" (or run  youtube-dl "ytsearch:%s" ) to search YouTube'
+                    'Set --default-search "ytsearch" (or run  youtube-dlc "ytsearch:%s" ) to search YouTube'

                     % (url, url), expected=True)
             else:
                 if ':' not in default_search:
                     % (url, url), expected=True)
             else:
                 if ':' not in default_search:


@@ -2349,7 +2349,7 @@ def _real_extract(self, url):
             request = sanitized_Request(url)
             # Some webservers may serve compressed content of rather big size (e.g. gzipped flac)
             # making it impossible to download only chunk of the file (yet we need only 512kB to
             request = sanitized_Request(url)
             # Some webservers may serve compressed content of rather big size (e.g. gzipped flac)
             # making it impossible to download only chunk of the file (yet we need only 512kB to

-            # test whether it's HTML or not). According to youtube-dl default Accept-Encoding
+            # test whether it's HTML or not). According to youtube-dlc default Accept-Encoding

             # that will always result in downloading the whole file that is not desirable.
             # Therefore for extraction pass we have to override Accept-Encoding to any in order
             # to accept raw bytes and being able to download only a chunk.
             # that will always result in downloading the whole file that is not desirable.
             # Therefore for extraction pass we have to override Accept-Encoding to any in order
             # to accept raw bytes and being able to download only a chunk.


@@ -3372,7 +3372,7 @@ def filter_video(urls):
 
         if not found:
             # twitter:player is a https URL to iframe player that may or may not
 
         if not found:
             # twitter:player is a https URL to iframe player that may or may not

-            # be supported by youtube-dl thus this is checked the very last (see
+            # be supported by youtube-dlc thus this is checked the very last (see

             # https://dev.twitter.com/cards/types/player#On_twitter.com_via_desktop_browser)
             embed_url = self._html_search_meta('twitter:player', webpage, default=None)
             if embed_url and embed_url != url:
             # https://dev.twitter.com/cards/types/player#On_twitter.com_via_desktop_browser)
             embed_url = self._html_search_meta('twitter:player', webpage, default=None)
             if embed_url and embed_url != url:

diff --git a/youtube_dl/extractor/gfycat.py b/youtube_dlc/extractor/gfycat.py
similarity index 100%
rename from youtube_dl/extractor/gfycat.py
rename to youtube_dlc/extractor/gfycat.py

diff --git a/youtube_dl/extractor/giantbomb.py b/youtube_dlc/extractor/giantbomb.py
similarity index 100%
rename from youtube_dl/extractor/giantbomb.py
rename to youtube_dlc/extractor/giantbomb.py

diff --git a/youtube_dl/extractor/giga.py b/youtube_dlc/extractor/giga.py
similarity index 100%
rename from youtube_dl/extractor/giga.py
rename to youtube_dlc/extractor/giga.py

diff --git a/youtube_dl/extractor/gigya.py b/youtube_dlc/extractor/gigya.py
similarity index 100%
rename from youtube_dl/extractor/gigya.py
rename to youtube_dlc/extractor/gigya.py

diff --git a/youtube_dl/extractor/glide.py b/youtube_dlc/extractor/glide.py
similarity index 100%
rename from youtube_dl/extractor/glide.py
rename to youtube_dlc/extractor/glide.py

diff --git a/youtube_dl/extractor/globo.py b/youtube_dlc/extractor/globo.py
similarity index 100%
rename from youtube_dl/extractor/globo.py
rename to youtube_dlc/extractor/globo.py

diff --git a/youtube_dl/extractor/go.py b/youtube_dlc/extractor/go.py
similarity index 100%
rename from youtube_dl/extractor/go.py
rename to youtube_dlc/extractor/go.py

diff --git a/youtube_dl/extractor/godtube.py b/youtube_dlc/extractor/godtube.py
similarity index 100%
rename from youtube_dl/extractor/godtube.py
rename to youtube_dlc/extractor/godtube.py

diff --git a/youtube_dl/extractor/golem.py b/youtube_dlc/extractor/golem.py
similarity index 100%
rename from youtube_dl/extractor/golem.py
rename to youtube_dlc/extractor/golem.py

diff --git a/youtube_dl/extractor/googledrive.py b/youtube_dlc/extractor/googledrive.py
similarity index 100%
rename from youtube_dl/extractor/googledrive.py
rename to youtube_dlc/extractor/googledrive.py

diff --git a/youtube_dl/extractor/googleplus.py b/youtube_dlc/extractor/googleplus.py
similarity index 100%
rename from youtube_dl/extractor/googleplus.py
rename to youtube_dlc/extractor/googleplus.py

diff --git a/youtube_dl/extractor/googlesearch.py b/youtube_dlc/extractor/googlesearch.py
similarity index 100%
rename from youtube_dl/extractor/googlesearch.py
rename to youtube_dlc/extractor/googlesearch.py

diff --git a/youtube_dl/extractor/goshgay.py b/youtube_dlc/extractor/goshgay.py
similarity index 100%
rename from youtube_dl/extractor/goshgay.py
rename to youtube_dlc/extractor/goshgay.py

diff --git a/youtube_dl/extractor/gputechconf.py b/youtube_dlc/extractor/gputechconf.py
similarity index 100%
rename from youtube_dl/extractor/gputechconf.py
rename to youtube_dlc/extractor/gputechconf.py

diff --git a/youtube_dl/extractor/groupon.py b/youtube_dlc/extractor/groupon.py
similarity index 100%
rename from youtube_dl/extractor/groupon.py
rename to youtube_dlc/extractor/groupon.py

diff --git a/youtube_dl/extractor/hbo.py b/youtube_dlc/extractor/hbo.py
similarity index 100%
rename from youtube_dl/extractor/hbo.py
rename to youtube_dlc/extractor/hbo.py

diff --git a/youtube_dl/extractor/hearthisat.py b/youtube_dlc/extractor/hearthisat.py
similarity index 100%
rename from youtube_dl/extractor/hearthisat.py
rename to youtube_dlc/extractor/hearthisat.py

diff --git a/youtube_dl/extractor/heise.py b/youtube_dlc/extractor/heise.py
similarity index 100%
rename from youtube_dl/extractor/heise.py
rename to youtube_dlc/extractor/heise.py

diff --git a/youtube_dl/extractor/hellporno.py b/youtube_dlc/extractor/hellporno.py
similarity index 100%
rename from youtube_dl/extractor/hellporno.py
rename to youtube_dlc/extractor/hellporno.py

diff --git a/youtube_dl/extractor/helsinki.py b/youtube_dlc/extractor/helsinki.py
similarity index 100%
rename from youtube_dl/extractor/helsinki.py
rename to youtube_dlc/extractor/helsinki.py

diff --git a/youtube_dl/extractor/hentaistigma.py b/youtube_dlc/extractor/hentaistigma.py
similarity index 100%
rename from youtube_dl/extractor/hentaistigma.py
rename to youtube_dlc/extractor/hentaistigma.py

diff --git a/youtube_dl/extractor/hgtv.py b/youtube_dlc/extractor/hgtv.py
similarity index 100%
rename from youtube_dl/extractor/hgtv.py
rename to youtube_dlc/extractor/hgtv.py

diff --git a/youtube_dl/extractor/hidive.py b/youtube_dlc/extractor/hidive.py
similarity index 100%
rename from youtube_dl/extractor/hidive.py
rename to youtube_dlc/extractor/hidive.py

diff --git a/youtube_dl/extractor/historicfilms.py b/youtube_dlc/extractor/historicfilms.py
similarity index 100%
rename from youtube_dl/extractor/historicfilms.py
rename to youtube_dlc/extractor/historicfilms.py

diff --git a/youtube_dl/extractor/hitbox.py b/youtube_dlc/extractor/hitbox.py
similarity index 100%
rename from youtube_dl/extractor/hitbox.py
rename to youtube_dlc/extractor/hitbox.py

diff --git a/youtube_dl/extractor/hitrecord.py b/youtube_dlc/extractor/hitrecord.py
similarity index 100%
rename from youtube_dl/extractor/hitrecord.py
rename to youtube_dlc/extractor/hitrecord.py

diff --git a/youtube_dl/extractor/hketv.py b/youtube_dlc/extractor/hketv.py
similarity index 100%
rename from youtube_dl/extractor/hketv.py
rename to youtube_dlc/extractor/hketv.py

diff --git a/youtube_dl/extractor/hornbunny.py b/youtube_dlc/extractor/hornbunny.py
similarity index 100%
rename from youtube_dl/extractor/hornbunny.py
rename to youtube_dlc/extractor/hornbunny.py

diff --git a/youtube_dl/extractor/hotnewhiphop.py b/youtube_dlc/extractor/hotnewhiphop.py
similarity index 100%
rename from youtube_dl/extractor/hotnewhiphop.py
rename to youtube_dlc/extractor/hotnewhiphop.py

diff --git a/youtube_dl/extractor/hotstar.py b/youtube_dlc/extractor/hotstar.py
similarity index 100%
rename from youtube_dl/extractor/hotstar.py
rename to youtube_dlc/extractor/hotstar.py

diff --git a/youtube_dl/extractor/howcast.py b/youtube_dlc/extractor/howcast.py
similarity index 100%
rename from youtube_dl/extractor/howcast.py
rename to youtube_dlc/extractor/howcast.py

diff --git a/youtube_dl/extractor/howstuffworks.py b/youtube_dlc/extractor/howstuffworks.py
similarity index 100%
rename from youtube_dl/extractor/howstuffworks.py
rename to youtube_dlc/extractor/howstuffworks.py

diff --git a/youtube_dl/extractor/hrfensehen.py b/youtube_dlc/extractor/hrfensehen.py
similarity index 98%
rename from youtube_dl/extractor/hrfensehen.py
rename to youtube_dlc/extractor/hrfensehen.py
index 2beadef2cbd5815118deb1b4a459a98c60cc873b..805345e6957e829294ff02f960faaf9457663c56 100644 (file)
--- a/youtube_dl/extractor/hrfensehen.py
+++ b/youtube_dlc/extractor/hrfensehen.py
@@ -4,7 +4,7 @@
 import json
 import re
 
 import json
 import re
 

-from youtube_dl.utils import int_or_none, unified_timestamp, unescapeHTML
+from youtube_dlc.utils import int_or_none, unified_timestamp, unescapeHTML

 from .common import InfoExtractor
 
 
 from .common import InfoExtractor
 
 

diff --git a/youtube_dl/extractor/hrti.py b/youtube_dlc/extractor/hrti.py
similarity index 100%
rename from youtube_dl/extractor/hrti.py
rename to youtube_dlc/extractor/hrti.py

diff --git a/youtube_dl/extractor/huajiao.py b/youtube_dlc/extractor/huajiao.py
similarity index 100%
rename from youtube_dl/extractor/huajiao.py
rename to youtube_dlc/extractor/huajiao.py

diff --git a/youtube_dl/extractor/huffpost.py b/youtube_dlc/extractor/huffpost.py
similarity index 100%
rename from youtube_dl/extractor/huffpost.py
rename to youtube_dlc/extractor/huffpost.py

diff --git a/youtube_dl/extractor/hungama.py b/youtube_dlc/extractor/hungama.py
similarity index 100%
rename from youtube_dl/extractor/hungama.py
rename to youtube_dlc/extractor/hungama.py

diff --git a/youtube_dl/extractor/hypem.py b/youtube_dlc/extractor/hypem.py
similarity index 100%
rename from youtube_dl/extractor/hypem.py
rename to youtube_dlc/extractor/hypem.py

diff --git a/youtube_dl/extractor/ign.py b/youtube_dlc/extractor/ign.py
similarity index 100%
rename from youtube_dl/extractor/ign.py
rename to youtube_dlc/extractor/ign.py

diff --git a/youtube_dl/extractor/imdb.py b/youtube_dlc/extractor/imdb.py
similarity index 100%
rename from youtube_dl/extractor/imdb.py
rename to youtube_dlc/extractor/imdb.py

diff --git a/youtube_dl/extractor/imggaming.py b/youtube_dlc/extractor/imggaming.py
similarity index 100%
rename from youtube_dl/extractor/imggaming.py
rename to youtube_dlc/extractor/imggaming.py

diff --git a/youtube_dl/extractor/imgur.py b/youtube_dlc/extractor/imgur.py
similarity index 97%
rename from youtube_dl/extractor/imgur.py
rename to youtube_dlc/extractor/imgur.py
index a5ba03efae57e64cb0d05caaff8e9dd700aa6a0e..4dc7b0b5c0ede5df3e433890655377c22602eafa 100644 (file)
--- a/youtube_dl/extractor/imgur.py
+++ b/youtube_dlc/extractor/imgur.py
@@ -60,7 +60,7 @@ def _real_extract(self, url):
                 'width': width,
                 'height': height,
                 'http_headers': {
                 'width': width,
                 'height': height,
                 'http_headers': {

-                    'User-Agent': 'youtube-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (like wget)',

                 },
             })
 
                 },
             })
 


@@ -82,7 +82,7 @@ def _real_extract(self, url):
                 'url': self._proto_relative_url(gifd['gifUrl']),
                 'filesize': gifd.get('size'),
                 'http_headers': {
                 'url': self._proto_relative_url(gifd['gifUrl']),
                 'filesize': gifd.get('size'),
                 'http_headers': {

-                    'User-Agent': 'youtube-dl (like wget)',
+                    'User-Agent': 'youtube-dlc (like wget)',

                 },
             })
 
                 },
             })
 

diff --git a/youtube_dl/extractor/ina.py b/youtube_dlc/extractor/ina.py
similarity index 100%
rename from youtube_dl/extractor/ina.py
rename to youtube_dlc/extractor/ina.py

diff --git a/youtube_dl/extractor/inc.py b/youtube_dlc/extractor/inc.py
similarity index 100%
rename from youtube_dl/extractor/inc.py
rename to youtube_dlc/extractor/inc.py

diff --git a/youtube_dl/extractor/indavideo.py b/youtube_dlc/extractor/indavideo.py
similarity index 100%
rename from youtube_dl/extractor/indavideo.py
rename to youtube_dlc/extractor/indavideo.py

diff --git a/youtube_dl/extractor/infoq.py b/youtube_dlc/extractor/infoq.py
similarity index 100%
rename from youtube_dl/extractor/infoq.py
rename to youtube_dlc/extractor/infoq.py

diff --git a/youtube_dl/extractor/instagram.py b/youtube_dlc/extractor/instagram.py
similarity index 100%
rename from youtube_dl/extractor/instagram.py
rename to youtube_dlc/extractor/instagram.py

diff --git a/youtube_dl/extractor/internazionale.py b/youtube_dlc/extractor/internazionale.py
similarity index 100%
rename from youtube_dl/extractor/internazionale.py
rename to youtube_dlc/extractor/internazionale.py

diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dlc/extractor/internetvideoarchive.py
similarity index 100%
rename from youtube_dl/extractor/internetvideoarchive.py
rename to youtube_dlc/extractor/internetvideoarchive.py

diff --git a/youtube_dl/extractor/iprima.py b/youtube_dlc/extractor/iprima.py
similarity index 100%
rename from youtube_dl/extractor/iprima.py
rename to youtube_dlc/extractor/iprima.py

diff --git a/youtube_dl/extractor/iqiyi.py b/youtube_dlc/extractor/iqiyi.py
similarity index 100%
rename from youtube_dl/extractor/iqiyi.py
rename to youtube_dlc/extractor/iqiyi.py

diff --git a/youtube_dl/extractor/ir90tv.py b/youtube_dlc/extractor/ir90tv.py
similarity index 100%
rename from youtube_dl/extractor/ir90tv.py
rename to youtube_dlc/extractor/ir90tv.py

diff --git a/youtube_dl/extractor/itv.py b/youtube_dlc/extractor/itv.py
similarity index 100%
rename from youtube_dl/extractor/itv.py
rename to youtube_dlc/extractor/itv.py

diff --git a/youtube_dl/extractor/ivi.py b/youtube_dlc/extractor/ivi.py
similarity index 99%
rename from youtube_dl/extractor/ivi.py
rename to youtube_dlc/extractor/ivi.py
index b5a740a01e1d360ca667869edef88f85e3559842..b9cb5a8e6bba0e7d6d4de35b2e69d98d56fda67a 100644 (file)
--- a/youtube_dl/extractor/ivi.py
+++ b/youtube_dlc/extractor/ivi.py
@@ -142,7 +142,7 @@ def _real_extract(self, url):
                     continue
                 elif bundled:
                     raise ExtractorError(
                     continue
                 elif bundled:
                     raise ExtractorError(

-                        'This feature does not work from bundled exe. Run youtube-dl from sources.',
+                        'This feature does not work from bundled exe. Run youtube-dlc from sources.',

                         expected=True)
                 elif not pycryptodomex_found:
                     raise ExtractorError(
                         expected=True)
                 elif not pycryptodomex_found:
                     raise ExtractorError(

diff --git a/youtube_dl/extractor/ivideon.py b/youtube_dlc/extractor/ivideon.py
similarity index 100%
rename from youtube_dl/extractor/ivideon.py
rename to youtube_dlc/extractor/ivideon.py

diff --git a/youtube_dl/extractor/iwara.py b/youtube_dlc/extractor/iwara.py
similarity index 100%
rename from youtube_dl/extractor/iwara.py
rename to youtube_dlc/extractor/iwara.py

diff --git a/youtube_dl/extractor/izlesene.py b/youtube_dlc/extractor/izlesene.py
similarity index 100%
rename from youtube_dl/extractor/izlesene.py
rename to youtube_dlc/extractor/izlesene.py

diff --git a/youtube_dl/extractor/jamendo.py b/youtube_dlc/extractor/jamendo.py
similarity index 100%
rename from youtube_dl/extractor/jamendo.py
rename to youtube_dlc/extractor/jamendo.py

diff --git a/youtube_dl/extractor/jeuxvideo.py b/youtube_dlc/extractor/jeuxvideo.py
similarity index 100%
rename from youtube_dl/extractor/jeuxvideo.py
rename to youtube_dlc/extractor/jeuxvideo.py

diff --git a/youtube_dl/extractor/joj.py b/youtube_dlc/extractor/joj.py
similarity index 97%
rename from youtube_dl/extractor/joj.py
rename to youtube_dlc/extractor/joj.py
index 62b28e9809856abaca23c4690c4670cacc96965a..63761818350b764742a3f8057f11d0e8f350fb6e 100644 (file)
--- a/youtube_dl/extractor/joj.py
+++ b/youtube_dlc/extractor/joj.py
@@ -1,108 +1,108 @@
-# coding: utf-8\r
-from __future__ import unicode_literals\r
-\r
-import re\r
-\r
-from .common import InfoExtractor\r
-from ..compat import compat_str\r
-from ..utils import (\r
-    int_or_none,\r
-    js_to_json,\r
-    try_get,\r
-)\r
-\r
-\r
-class JojIE(InfoExtractor):\r
-    _VALID_URL = r'''(?x)\r
-                    (?:\r
-                        joj:|\r
-                        https?://media\.joj\.sk/embed/\r
-                    )\r
-                    (?P<id>[^/?#^]+)\r
-                '''\r
-    _TESTS = [{\r
-        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-        'info_dict': {\r
-            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-            'ext': 'mp4',\r
-            'title': 'NOVÉ BÝVANIE',\r
-            'thumbnail': r're:^https?://.*\.jpg$',\r
-            'duration': 3118,\r
-        }\r
-    }, {\r
-        'url': 'https://media.joj.sk/embed/9i1cxv',\r
-        'only_matching': True,\r
-    }, {\r
-        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',\r
-        'only_matching': True,\r
-    }, {\r
-        'url': 'joj:9i1cxv',\r
-        'only_matching': True,\r
-    }]\r
-\r
-    @staticmethod\r
-    def _extract_urls(webpage):\r
-        return [\r
-            mobj.group('url')\r
-            for mobj in re.finditer(\r
-                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',\r
-                webpage)]\r
-\r
-    def _real_extract(self, url):\r
-        video_id = self._match_id(url)\r
-\r
-        webpage = self._download_webpage(\r
-            'https://media.joj.sk/embed/%s' % video_id, video_id)\r
-\r
-        title = self._search_regex(\r
-            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',\r
-             r'<title>(?P<title>[^<]+)'), webpage, 'title',\r
-            default=None, group='title') or self._og_search_title(webpage)\r
-\r
-        bitrates = self._parse_json(\r
-            self._search_regex(\r
-                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',\r
-                default='{}'),\r
-            video_id, transform_source=js_to_json, fatal=False)\r
-\r
-        formats = []\r
-        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:\r
-            if isinstance(format_url, compat_str):\r
-                height = self._search_regex(\r
-                    r'(\d+)[pP]\.', format_url, 'height', default=None)\r
-                formats.append({\r
-                    'url': format_url,\r
-                    'format_id': '%sp' % height if height else None,\r
-                    'height': int(height),\r
-                })\r
-        if not formats:\r
-            playlist = self._download_xml(\r
-                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,\r
-                video_id)\r
-            for file_el in playlist.findall('./files/file'):\r
-                path = file_el.get('path')\r
-                if not path:\r
-                    continue\r
-                format_id = file_el.get('id') or file_el.get('label')\r
-                formats.append({\r
-                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(\r
-                        'dat/', '', 1),\r
-                    'format_id': format_id,\r
-                    'height': int_or_none(self._search_regex(\r
-                        r'(\d+)[pP]', format_id or path, 'height',\r
-                        default=None)),\r
-                })\r
-        self._sort_formats(formats)\r
-\r
-        thumbnail = self._og_search_thumbnail(webpage)\r
-\r
-        duration = int_or_none(self._search_regex(\r
-            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))\r
-\r
-        return {\r
-            'id': video_id,\r
-            'title': title,\r
-            'thumbnail': thumbnail,\r
-            'duration': duration,\r
-            'formats': formats,\r
-        }\r
+# coding: utf-8
+from __future__ import unicode_literals
+
+import re
+
+from .common import InfoExtractor
+from ..compat import compat_str
+from ..utils import (
+    int_or_none,
+    js_to_json,
+    try_get,
+)
+
+
+class JojIE(InfoExtractor):
+    _VALID_URL = r'''(?x)
+                    (?:
+                        joj:|
+                        https?://media\.joj\.sk/embed/
+                    )
+                    (?P<id>[^/?#^]+)
+                '''
+    _TESTS = [{
+        'url': 'https://media.joj.sk/embed/a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'info_dict': {
+            'id': 'a388ec4c-6019-4a4a-9312-b1bee194e932',
+            'ext': 'mp4',
+            'title': 'NOVÉ BÝVANIE',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'duration': 3118,
+        }
+    }, {
+        'url': 'https://media.joj.sk/embed/9i1cxv',
+        'only_matching': True,
+    }, {
+        'url': 'joj:a388ec4c-6019-4a4a-9312-b1bee194e932',
+        'only_matching': True,
+    }, {
+        'url': 'joj:9i1cxv',
+        'only_matching': True,
+    }]
+
+    @staticmethod
+    def _extract_urls(webpage):
+        return [
+            mobj.group('url')
+            for mobj in re.finditer(
+                r'<iframe\b[^>]+\bsrc=(["\'])(?P<url>(?:https?:)?//media\.joj\.sk/embed/(?:(?!\1).)+)\1',
+                webpage)]
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(
+            'https://media.joj.sk/embed/%s' % video_id, video_id)
+
+        title = self._search_regex(
+            (r'videoTitle\s*:\s*(["\'])(?P<title>(?:(?!\1).)+)\1',
+             r'<title>(?P<title>[^<]+)'), webpage, 'title',
+            default=None, group='title') or self._og_search_title(webpage)
+
+        bitrates = self._parse_json(
+            self._search_regex(
+                r'(?s)(?:src|bitrates)\s*=\s*({.+?});', webpage, 'bitrates',
+                default='{}'),
+            video_id, transform_source=js_to_json, fatal=False)
+
+        formats = []
+        for format_url in try_get(bitrates, lambda x: x['mp4'], list) or []:
+            if isinstance(format_url, compat_str):
+                height = self._search_regex(
+                    r'(\d+)[pP]\.', format_url, 'height', default=None)
+                formats.append({
+                    'url': format_url,
+                    'format_id': '%sp' % height if height else None,
+                    'height': int(height),
+                })
+        if not formats:
+            playlist = self._download_xml(
+                'https://media.joj.sk/services/Video.php?clip=%s' % video_id,
+                video_id)
+            for file_el in playlist.findall('./files/file'):
+                path = file_el.get('path')
+                if not path:
+                    continue
+                format_id = file_el.get('id') or file_el.get('label')
+                formats.append({
+                    'url': 'http://n16.joj.sk/storage/%s' % path.replace(
+                        'dat/', '', 1),
+                    'format_id': format_id,
+                    'height': int_or_none(self._search_regex(
+                        r'(\d+)[pP]', format_id or path, 'height',
+                        default=None)),
+                })
+        self._sort_formats(formats)
+
+        thumbnail = self._og_search_thumbnail(webpage)
+
+        duration = int_or_none(self._search_regex(
+            r'videoDuration\s*:\s*(\d+)', webpage, 'duration', fatal=False))
+
+        return {
+            'id': video_id,
+            'title': title,
+            'thumbnail': thumbnail,
+            'duration': duration,
+            'formats': formats,
+        }

diff --git a/youtube_dl/extractor/jove.py b/youtube_dlc/extractor/jove.py
similarity index 100%
rename from youtube_dl/extractor/jove.py
rename to youtube_dlc/extractor/jove.py

diff --git a/youtube_dl/extractor/jwplatform.py b/youtube_dlc/extractor/jwplatform.py
similarity index 100%
rename from youtube_dl/extractor/jwplatform.py
rename to youtube_dlc/extractor/jwplatform.py

diff --git a/youtube_dl/extractor/kakao.py b/youtube_dlc/extractor/kakao.py
similarity index 100%
rename from youtube_dl/extractor/kakao.py
rename to youtube_dlc/extractor/kakao.py

diff --git a/youtube_dl/extractor/kaltura.py b/youtube_dlc/extractor/kaltura.py
similarity index 100%
rename from youtube_dl/extractor/kaltura.py
rename to youtube_dlc/extractor/kaltura.py

diff --git a/youtube_dl/extractor/kanalplay.py b/youtube_dlc/extractor/kanalplay.py
similarity index 100%
rename from youtube_dl/extractor/kanalplay.py
rename to youtube_dlc/extractor/kanalplay.py

diff --git a/youtube_dl/extractor/kankan.py b/youtube_dlc/extractor/kankan.py
similarity index 100%
rename from youtube_dl/extractor/kankan.py
rename to youtube_dlc/extractor/kankan.py

diff --git a/youtube_dl/extractor/karaoketv.py b/youtube_dlc/extractor/karaoketv.py
similarity index 100%
rename from youtube_dl/extractor/karaoketv.py
rename to youtube_dlc/extractor/karaoketv.py

diff --git a/youtube_dl/extractor/karrierevideos.py b/youtube_dlc/extractor/karrierevideos.py
similarity index 100%
rename from youtube_dl/extractor/karrierevideos.py
rename to youtube_dlc/extractor/karrierevideos.py

diff --git a/youtube_dl/extractor/keezmovies.py b/youtube_dlc/extractor/keezmovies.py
similarity index 100%
rename from youtube_dl/extractor/keezmovies.py
rename to youtube_dlc/extractor/keezmovies.py

diff --git a/youtube_dl/extractor/ketnet.py b/youtube_dlc/extractor/ketnet.py
similarity index 100%
rename from youtube_dl/extractor/ketnet.py
rename to youtube_dlc/extractor/ketnet.py

diff --git a/youtube_dl/extractor/khanacademy.py b/youtube_dlc/extractor/khanacademy.py
similarity index 100%
rename from youtube_dl/extractor/khanacademy.py
rename to youtube_dlc/extractor/khanacademy.py

diff --git a/youtube_dl/extractor/kickstarter.py b/youtube_dlc/extractor/kickstarter.py
similarity index 100%
rename from youtube_dl/extractor/kickstarter.py
rename to youtube_dlc/extractor/kickstarter.py

diff --git a/youtube_dl/extractor/kinja.py b/youtube_dlc/extractor/kinja.py
similarity index 100%
rename from youtube_dl/extractor/kinja.py
rename to youtube_dlc/extractor/kinja.py

diff --git a/youtube_dl/extractor/kinopoisk.py b/youtube_dlc/extractor/kinopoisk.py
similarity index 100%
rename from youtube_dl/extractor/kinopoisk.py
rename to youtube_dlc/extractor/kinopoisk.py

diff --git a/youtube_dl/extractor/konserthusetplay.py b/youtube_dlc/extractor/konserthusetplay.py
similarity index 100%
rename from youtube_dl/extractor/konserthusetplay.py
rename to youtube_dlc/extractor/konserthusetplay.py

diff --git a/youtube_dl/extractor/krasview.py b/youtube_dlc/extractor/krasview.py
similarity index 100%
rename from youtube_dl/extractor/krasview.py
rename to youtube_dlc/extractor/krasview.py

diff --git a/youtube_dl/extractor/ku6.py b/youtube_dlc/extractor/ku6.py
similarity index 100%
rename from youtube_dl/extractor/ku6.py
rename to youtube_dlc/extractor/ku6.py

diff --git a/youtube_dl/extractor/kusi.py b/youtube_dlc/extractor/kusi.py
similarity index 100%
rename from youtube_dl/extractor/kusi.py
rename to youtube_dlc/extractor/kusi.py

diff --git a/youtube_dl/extractor/kuwo.py b/youtube_dlc/extractor/kuwo.py
similarity index 100%
rename from youtube_dl/extractor/kuwo.py
rename to youtube_dlc/extractor/kuwo.py

diff --git a/youtube_dl/extractor/la7.py b/youtube_dlc/extractor/la7.py
similarity index 100%
rename from youtube_dl/extractor/la7.py
rename to youtube_dlc/extractor/la7.py

diff --git a/youtube_dl/extractor/laola1tv.py b/youtube_dlc/extractor/laola1tv.py
similarity index 100%
rename from youtube_dl/extractor/laola1tv.py
rename to youtube_dlc/extractor/laola1tv.py

diff --git a/youtube_dl/extractor/lci.py b/youtube_dlc/extractor/lci.py
similarity index 100%
rename from youtube_dl/extractor/lci.py
rename to youtube_dlc/extractor/lci.py

diff --git a/youtube_dl/extractor/lcp.py b/youtube_dlc/extractor/lcp.py
similarity index 100%
rename from youtube_dl/extractor/lcp.py
rename to youtube_dlc/extractor/lcp.py

diff --git a/youtube_dl/extractor/lecture2go.py b/youtube_dlc/extractor/lecture2go.py
similarity index 100%
rename from youtube_dl/extractor/lecture2go.py
rename to youtube_dlc/extractor/lecture2go.py

diff --git a/youtube_dl/extractor/lecturio.py b/youtube_dlc/extractor/lecturio.py
similarity index 100%
rename from youtube_dl/extractor/lecturio.py
rename to youtube_dlc/extractor/lecturio.py

diff --git a/youtube_dl/extractor/leeco.py b/youtube_dlc/extractor/leeco.py
similarity index 100%
rename from youtube_dl/extractor/leeco.py
rename to youtube_dlc/extractor/leeco.py

diff --git a/youtube_dl/extractor/lego.py b/youtube_dlc/extractor/lego.py
similarity index 100%
rename from youtube_dl/extractor/lego.py
rename to youtube_dlc/extractor/lego.py

diff --git a/youtube_dl/extractor/lemonde.py b/youtube_dlc/extractor/lemonde.py
similarity index 100%
rename from youtube_dl/extractor/lemonde.py
rename to youtube_dlc/extractor/lemonde.py

diff --git a/youtube_dl/extractor/lenta.py b/youtube_dlc/extractor/lenta.py
similarity index 100%
rename from youtube_dl/extractor/lenta.py
rename to youtube_dlc/extractor/lenta.py

diff --git a/youtube_dl/extractor/libraryofcongress.py b/youtube_dlc/extractor/libraryofcongress.py
similarity index 100%
rename from youtube_dl/extractor/libraryofcongress.py
rename to youtube_dlc/extractor/libraryofcongress.py

diff --git a/youtube_dl/extractor/libsyn.py b/youtube_dlc/extractor/libsyn.py
similarity index 100%
rename from youtube_dl/extractor/libsyn.py
rename to youtube_dlc/extractor/libsyn.py

diff --git a/youtube_dl/extractor/lifenews.py b/youtube_dlc/extractor/lifenews.py
similarity index 100%
rename from youtube_dl/extractor/lifenews.py
rename to youtube_dlc/extractor/lifenews.py

diff --git a/youtube_dl/extractor/limelight.py b/youtube_dlc/extractor/limelight.py
similarity index 100%
rename from youtube_dl/extractor/limelight.py
rename to youtube_dlc/extractor/limelight.py

diff --git a/youtube_dl/extractor/line.py b/youtube_dlc/extractor/line.py
similarity index 100%
rename from youtube_dl/extractor/line.py
rename to youtube_dlc/extractor/line.py

diff --git a/youtube_dl/extractor/linkedin.py b/youtube_dlc/extractor/linkedin.py
similarity index 100%
rename from youtube_dl/extractor/linkedin.py
rename to youtube_dlc/extractor/linkedin.py

diff --git a/youtube_dl/extractor/linuxacademy.py b/youtube_dlc/extractor/linuxacademy.py
similarity index 100%
rename from youtube_dl/extractor/linuxacademy.py
rename to youtube_dlc/extractor/linuxacademy.py

diff --git a/youtube_dl/extractor/litv.py b/youtube_dlc/extractor/litv.py
similarity index 100%
rename from youtube_dl/extractor/litv.py
rename to youtube_dlc/extractor/litv.py

diff --git a/youtube_dl/extractor/livejournal.py b/youtube_dlc/extractor/livejournal.py
similarity index 100%
rename from youtube_dl/extractor/livejournal.py
rename to youtube_dlc/extractor/livejournal.py

diff --git a/youtube_dl/extractor/liveleak.py b/youtube_dlc/extractor/liveleak.py
similarity index 100%
rename from youtube_dl/extractor/liveleak.py
rename to youtube_dlc/extractor/liveleak.py

diff --git a/youtube_dl/extractor/livestream.py b/youtube_dlc/extractor/livestream.py
similarity index 100%
rename from youtube_dl/extractor/livestream.py
rename to youtube_dlc/extractor/livestream.py

diff --git a/youtube_dl/extractor/lnkgo.py b/youtube_dlc/extractor/lnkgo.py
similarity index 100%
rename from youtube_dl/extractor/lnkgo.py
rename to youtube_dlc/extractor/lnkgo.py

diff --git a/youtube_dl/extractor/localnews8.py b/youtube_dlc/extractor/localnews8.py
similarity index 100%
rename from youtube_dl/extractor/localnews8.py
rename to youtube_dlc/extractor/localnews8.py

diff --git a/youtube_dl/extractor/lovehomeporn.py b/youtube_dlc/extractor/lovehomeporn.py
similarity index 100%
rename from youtube_dl/extractor/lovehomeporn.py
rename to youtube_dlc/extractor/lovehomeporn.py

diff --git a/youtube_dl/extractor/lrt.py b/youtube_dlc/extractor/lrt.py
similarity index 100%
rename from youtube_dl/extractor/lrt.py
rename to youtube_dlc/extractor/lrt.py

diff --git a/youtube_dl/extractor/lynda.py b/youtube_dlc/extractor/lynda.py
similarity index 100%
rename from youtube_dl/extractor/lynda.py
rename to youtube_dlc/extractor/lynda.py

diff --git a/youtube_dl/extractor/m6.py b/youtube_dlc/extractor/m6.py
similarity index 100%
rename from youtube_dl/extractor/m6.py
rename to youtube_dlc/extractor/m6.py

diff --git a/youtube_dl/extractor/mailru.py b/youtube_dlc/extractor/mailru.py
similarity index 100%
rename from youtube_dl/extractor/mailru.py
rename to youtube_dlc/extractor/mailru.py

diff --git a/youtube_dl/extractor/malltv.py b/youtube_dlc/extractor/malltv.py
similarity index 100%
rename from youtube_dl/extractor/malltv.py
rename to youtube_dlc/extractor/malltv.py

diff --git a/youtube_dl/extractor/mangomolo.py b/youtube_dlc/extractor/mangomolo.py
similarity index 100%
rename from youtube_dl/extractor/mangomolo.py
rename to youtube_dlc/extractor/mangomolo.py

diff --git a/youtube_dl/extractor/manyvids.py b/youtube_dlc/extractor/manyvids.py
similarity index 100%
rename from youtube_dl/extractor/manyvids.py
rename to youtube_dlc/extractor/manyvids.py

diff --git a/youtube_dl/extractor/markiza.py b/youtube_dlc/extractor/markiza.py
similarity index 100%
rename from youtube_dl/extractor/markiza.py
rename to youtube_dlc/extractor/markiza.py

diff --git a/youtube_dl/extractor/massengeschmacktv.py b/youtube_dlc/extractor/massengeschmacktv.py
similarity index 100%
rename from youtube_dl/extractor/massengeschmacktv.py
rename to youtube_dlc/extractor/massengeschmacktv.py

diff --git a/youtube_dl/extractor/matchtv.py b/youtube_dlc/extractor/matchtv.py
similarity index 100%
rename from youtube_dl/extractor/matchtv.py
rename to youtube_dlc/extractor/matchtv.py

diff --git a/youtube_dl/extractor/mdr.py b/youtube_dlc/extractor/mdr.py
similarity index 100%
rename from youtube_dl/extractor/mdr.py
rename to youtube_dlc/extractor/mdr.py

diff --git a/youtube_dl/extractor/medialaan.py b/youtube_dlc/extractor/medialaan.py
similarity index 100%
rename from youtube_dl/extractor/medialaan.py
rename to youtube_dlc/extractor/medialaan.py

diff --git a/youtube_dl/extractor/mediaset.py b/youtube_dlc/extractor/mediaset.py
similarity index 100%
rename from youtube_dl/extractor/mediaset.py
rename to youtube_dlc/extractor/mediaset.py

diff --git a/youtube_dl/extractor/mediasite.py b/youtube_dlc/extractor/mediasite.py
similarity index 100%
rename from youtube_dl/extractor/mediasite.py
rename to youtube_dlc/extractor/mediasite.py

diff --git a/youtube_dl/extractor/medici.py b/youtube_dlc/extractor/medici.py
similarity index 100%
rename from youtube_dl/extractor/medici.py
rename to youtube_dlc/extractor/medici.py

diff --git a/youtube_dl/extractor/megaphone.py b/youtube_dlc/extractor/megaphone.py
similarity index 100%
rename from youtube_dl/extractor/megaphone.py
rename to youtube_dlc/extractor/megaphone.py

diff --git a/youtube_dl/extractor/meipai.py b/youtube_dlc/extractor/meipai.py
similarity index 100%
rename from youtube_dl/extractor/meipai.py
rename to youtube_dlc/extractor/meipai.py

diff --git a/youtube_dl/extractor/melonvod.py b/youtube_dlc/extractor/melonvod.py
similarity index 100%
rename from youtube_dl/extractor/melonvod.py
rename to youtube_dlc/extractor/melonvod.py

diff --git a/youtube_dl/extractor/meta.py b/youtube_dlc/extractor/meta.py
similarity index 100%
rename from youtube_dl/extractor/meta.py
rename to youtube_dlc/extractor/meta.py

diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dlc/extractor/metacafe.py
similarity index 100%
rename from youtube_dl/extractor/metacafe.py
rename to youtube_dlc/extractor/metacafe.py

diff --git a/youtube_dl/extractor/metacritic.py b/youtube_dlc/extractor/metacritic.py
similarity index 100%
rename from youtube_dl/extractor/metacritic.py
rename to youtube_dlc/extractor/metacritic.py

diff --git a/youtube_dl/extractor/mgoon.py b/youtube_dlc/extractor/mgoon.py
similarity index 100%
rename from youtube_dl/extractor/mgoon.py
rename to youtube_dlc/extractor/mgoon.py

diff --git a/youtube_dl/extractor/mgtv.py b/youtube_dlc/extractor/mgtv.py
similarity index 100%
rename from youtube_dl/extractor/mgtv.py
rename to youtube_dlc/extractor/mgtv.py

diff --git a/youtube_dl/extractor/miaopai.py b/youtube_dlc/extractor/miaopai.py
similarity index 100%
rename from youtube_dl/extractor/miaopai.py
rename to youtube_dlc/extractor/miaopai.py

diff --git a/youtube_dl/extractor/microsoftvirtualacademy.py b/youtube_dlc/extractor/microsoftvirtualacademy.py
similarity index 100%
rename from youtube_dl/extractor/microsoftvirtualacademy.py
rename to youtube_dlc/extractor/microsoftvirtualacademy.py

diff --git a/youtube_dl/extractor/ministrygrid.py b/youtube_dlc/extractor/ministrygrid.py
similarity index 100%
rename from youtube_dl/extractor/ministrygrid.py
rename to youtube_dlc/extractor/ministrygrid.py

diff --git a/youtube_dl/extractor/minoto.py b/youtube_dlc/extractor/minoto.py
similarity index 100%
rename from youtube_dl/extractor/minoto.py
rename to youtube_dlc/extractor/minoto.py

diff --git a/youtube_dl/extractor/miomio.py b/youtube_dlc/extractor/miomio.py
similarity index 100%
rename from youtube_dl/extractor/miomio.py
rename to youtube_dlc/extractor/miomio.py

diff --git a/youtube_dl/extractor/mit.py b/youtube_dlc/extractor/mit.py
similarity index 100%
rename from youtube_dl/extractor/mit.py
rename to youtube_dlc/extractor/mit.py

diff --git a/youtube_dl/extractor/mitele.py b/youtube_dlc/extractor/mitele.py
similarity index 100%
rename from youtube_dl/extractor/mitele.py
rename to youtube_dlc/extractor/mitele.py

diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dlc/extractor/mixcloud.py
similarity index 100%
rename from youtube_dl/extractor/mixcloud.py
rename to youtube_dlc/extractor/mixcloud.py

diff --git a/youtube_dl/extractor/mlb.py b/youtube_dlc/extractor/mlb.py
similarity index 100%
rename from youtube_dl/extractor/mlb.py
rename to youtube_dlc/extractor/mlb.py

diff --git a/youtube_dl/extractor/mnet.py b/youtube_dlc/extractor/mnet.py
similarity index 100%
rename from youtube_dl/extractor/mnet.py
rename to youtube_dlc/extractor/mnet.py

diff --git a/youtube_dl/extractor/moevideo.py b/youtube_dlc/extractor/moevideo.py
similarity index 100%
rename from youtube_dl/extractor/moevideo.py
rename to youtube_dlc/extractor/moevideo.py

diff --git a/youtube_dl/extractor/mofosex.py b/youtube_dlc/extractor/mofosex.py
similarity index 100%
rename from youtube_dl/extractor/mofosex.py
rename to youtube_dlc/extractor/mofosex.py

diff --git a/youtube_dl/extractor/mojvideo.py b/youtube_dlc/extractor/mojvideo.py
similarity index 100%
rename from youtube_dl/extractor/mojvideo.py
rename to youtube_dlc/extractor/mojvideo.py

diff --git a/youtube_dl/extractor/morningstar.py b/youtube_dlc/extractor/morningstar.py
similarity index 100%
rename from youtube_dl/extractor/morningstar.py
rename to youtube_dlc/extractor/morningstar.py

diff --git a/youtube_dl/extractor/motherless.py b/youtube_dlc/extractor/motherless.py
similarity index 100%
rename from youtube_dl/extractor/motherless.py
rename to youtube_dlc/extractor/motherless.py

diff --git a/youtube_dl/extractor/motorsport.py b/youtube_dlc/extractor/motorsport.py
similarity index 100%
rename from youtube_dl/extractor/motorsport.py
rename to youtube_dlc/extractor/motorsport.py

diff --git a/youtube_dl/extractor/movieclips.py b/youtube_dlc/extractor/movieclips.py
similarity index 100%
rename from youtube_dl/extractor/movieclips.py
rename to youtube_dlc/extractor/movieclips.py

diff --git a/youtube_dl/extractor/moviezine.py b/youtube_dlc/extractor/moviezine.py
similarity index 100%
rename from youtube_dl/extractor/moviezine.py
rename to youtube_dlc/extractor/moviezine.py

diff --git a/youtube_dl/extractor/movingimage.py b/youtube_dlc/extractor/movingimage.py
similarity index 100%
rename from youtube_dl/extractor/movingimage.py
rename to youtube_dlc/extractor/movingimage.py

diff --git a/youtube_dl/extractor/msn.py b/youtube_dlc/extractor/msn.py
similarity index 100%
rename from youtube_dl/extractor/msn.py
rename to youtube_dlc/extractor/msn.py

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dlc/extractor/mtv.py
similarity index 100%
rename from youtube_dl/extractor/mtv.py
rename to youtube_dlc/extractor/mtv.py

diff --git a/youtube_dl/extractor/muenchentv.py b/youtube_dlc/extractor/muenchentv.py
similarity index 100%
rename from youtube_dl/extractor/muenchentv.py
rename to youtube_dlc/extractor/muenchentv.py

diff --git a/youtube_dl/extractor/mwave.py b/youtube_dlc/extractor/mwave.py
similarity index 100%
rename from youtube_dl/extractor/mwave.py
rename to youtube_dlc/extractor/mwave.py

diff --git a/youtube_dl/extractor/mychannels.py b/youtube_dlc/extractor/mychannels.py
similarity index 100%
rename from youtube_dl/extractor/mychannels.py
rename to youtube_dlc/extractor/mychannels.py

diff --git a/youtube_dl/extractor/myspace.py b/youtube_dlc/extractor/myspace.py
similarity index 100%
rename from youtube_dl/extractor/myspace.py
rename to youtube_dlc/extractor/myspace.py

diff --git a/youtube_dl/extractor/myspass.py b/youtube_dlc/extractor/myspass.py
similarity index 100%
rename from youtube_dl/extractor/myspass.py
rename to youtube_dlc/extractor/myspass.py

diff --git a/youtube_dl/extractor/myvi.py b/youtube_dlc/extractor/myvi.py
similarity index 100%
rename from youtube_dl/extractor/myvi.py
rename to youtube_dlc/extractor/myvi.py

diff --git a/youtube_dl/extractor/myvidster.py b/youtube_dlc/extractor/myvidster.py
similarity index 100%
rename from youtube_dl/extractor/myvidster.py
rename to youtube_dlc/extractor/myvidster.py

diff --git a/youtube_dl/extractor/nationalgeographic.py b/youtube_dlc/extractor/nationalgeographic.py
similarity index 100%
rename from youtube_dl/extractor/nationalgeographic.py
rename to youtube_dlc/extractor/nationalgeographic.py

diff --git a/youtube_dl/extractor/naver.py b/youtube_dlc/extractor/naver.py
similarity index 100%
rename from youtube_dl/extractor/naver.py
rename to youtube_dlc/extractor/naver.py

diff --git a/youtube_dl/extractor/nba.py b/youtube_dlc/extractor/nba.py
similarity index 100%
rename from youtube_dl/extractor/nba.py
rename to youtube_dlc/extractor/nba.py

diff --git a/youtube_dl/extractor/nbc.py b/youtube_dlc/extractor/nbc.py
similarity index 100%
rename from youtube_dl/extractor/nbc.py
rename to youtube_dlc/extractor/nbc.py

diff --git a/youtube_dl/extractor/ndr.py b/youtube_dlc/extractor/ndr.py
similarity index 100%
rename from youtube_dl/extractor/ndr.py
rename to youtube_dlc/extractor/ndr.py

diff --git a/youtube_dl/extractor/ndtv.py b/youtube_dlc/extractor/ndtv.py
similarity index 100%
rename from youtube_dl/extractor/ndtv.py
rename to youtube_dlc/extractor/ndtv.py

diff --git a/youtube_dl/extractor/nerdcubed.py b/youtube_dlc/extractor/nerdcubed.py
similarity index 100%
rename from youtube_dl/extractor/nerdcubed.py
rename to youtube_dlc/extractor/nerdcubed.py

diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dlc/extractor/neteasemusic.py
similarity index 100%
rename from youtube_dl/extractor/neteasemusic.py
rename to youtube_dlc/extractor/neteasemusic.py

diff --git a/youtube_dl/extractor/netzkino.py b/youtube_dlc/extractor/netzkino.py
similarity index 100%
rename from youtube_dl/extractor/netzkino.py
rename to youtube_dlc/extractor/netzkino.py

diff --git a/youtube_dl/extractor/newgrounds.py b/youtube_dlc/extractor/newgrounds.py
similarity index 100%
rename from youtube_dl/extractor/newgrounds.py
rename to youtube_dlc/extractor/newgrounds.py

diff --git a/youtube_dl/extractor/newstube.py b/youtube_dlc/extractor/newstube.py
similarity index 100%
rename from youtube_dl/extractor/newstube.py
rename to youtube_dlc/extractor/newstube.py

diff --git a/youtube_dl/extractor/nextmedia.py b/youtube_dlc/extractor/nextmedia.py
similarity index 100%
rename from youtube_dl/extractor/nextmedia.py
rename to youtube_dlc/extractor/nextmedia.py

diff --git a/youtube_dl/extractor/nexx.py b/youtube_dlc/extractor/nexx.py
similarity index 100%
rename from youtube_dl/extractor/nexx.py
rename to youtube_dlc/extractor/nexx.py

diff --git a/youtube_dl/extractor/nfl.py b/youtube_dlc/extractor/nfl.py
similarity index 100%
rename from youtube_dl/extractor/nfl.py
rename to youtube_dlc/extractor/nfl.py

diff --git a/youtube_dl/extractor/nhk.py b/youtube_dlc/extractor/nhk.py
similarity index 100%
rename from youtube_dl/extractor/nhk.py
rename to youtube_dlc/extractor/nhk.py

diff --git a/youtube_dl/extractor/nhl.py b/youtube_dlc/extractor/nhl.py
similarity index 100%
rename from youtube_dl/extractor/nhl.py
rename to youtube_dlc/extractor/nhl.py

diff --git a/youtube_dl/extractor/nick.py b/youtube_dlc/extractor/nick.py
similarity index 100%
rename from youtube_dl/extractor/nick.py
rename to youtube_dlc/extractor/nick.py

diff --git a/youtube_dl/extractor/niconico.py b/youtube_dlc/extractor/niconico.py
similarity index 100%
rename from youtube_dl/extractor/niconico.py
rename to youtube_dlc/extractor/niconico.py

diff --git a/youtube_dl/extractor/ninecninemedia.py b/youtube_dlc/extractor/ninecninemedia.py
similarity index 100%
rename from youtube_dl/extractor/ninecninemedia.py
rename to youtube_dlc/extractor/ninecninemedia.py

diff --git a/youtube_dl/extractor/ninegag.py b/youtube_dlc/extractor/ninegag.py
similarity index 100%
rename from youtube_dl/extractor/ninegag.py
rename to youtube_dlc/extractor/ninegag.py

diff --git a/youtube_dl/extractor/ninenow.py b/youtube_dlc/extractor/ninenow.py
similarity index 100%
rename from youtube_dl/extractor/ninenow.py
rename to youtube_dlc/extractor/ninenow.py

diff --git a/youtube_dl/extractor/nintendo.py b/youtube_dlc/extractor/nintendo.py
similarity index 100%
rename from youtube_dl/extractor/nintendo.py
rename to youtube_dlc/extractor/nintendo.py

diff --git a/youtube_dl/extractor/njpwworld.py b/youtube_dlc/extractor/njpwworld.py
similarity index 100%
rename from youtube_dl/extractor/njpwworld.py
rename to youtube_dlc/extractor/njpwworld.py

diff --git a/youtube_dl/extractor/nobelprize.py b/youtube_dlc/extractor/nobelprize.py
similarity index 100%
rename from youtube_dl/extractor/nobelprize.py
rename to youtube_dlc/extractor/nobelprize.py

diff --git a/youtube_dl/extractor/noco.py b/youtube_dlc/extractor/noco.py
similarity index 100%
rename from youtube_dl/extractor/noco.py
rename to youtube_dlc/extractor/noco.py

diff --git a/youtube_dl/extractor/nonktube.py b/youtube_dlc/extractor/nonktube.py
similarity index 100%
rename from youtube_dl/extractor/nonktube.py
rename to youtube_dlc/extractor/nonktube.py

diff --git a/youtube_dl/extractor/noovo.py b/youtube_dlc/extractor/noovo.py
similarity index 100%
rename from youtube_dl/extractor/noovo.py
rename to youtube_dlc/extractor/noovo.py

diff --git a/youtube_dl/extractor/normalboots.py b/youtube_dlc/extractor/normalboots.py
similarity index 100%
rename from youtube_dl/extractor/normalboots.py
rename to youtube_dlc/extractor/normalboots.py

diff --git a/youtube_dl/extractor/nosvideo.py b/youtube_dlc/extractor/nosvideo.py
similarity index 100%
rename from youtube_dl/extractor/nosvideo.py
rename to youtube_dlc/extractor/nosvideo.py

diff --git a/youtube_dl/extractor/nova.py b/youtube_dlc/extractor/nova.py
similarity index 100%
rename from youtube_dl/extractor/nova.py
rename to youtube_dlc/extractor/nova.py

diff --git a/youtube_dl/extractor/nowness.py b/youtube_dlc/extractor/nowness.py
similarity index 98%
rename from youtube_dl/extractor/nowness.py
rename to youtube_dlc/extractor/nowness.py
index f26dafb8f03db4c937ace6607f2ddc795fb245de..c136bc8c0bbbdebae101aa1bfc5928435c4f45ca 100644 (file)
--- a/youtube_dl/extractor/nowness.py
+++ b/youtube_dlc/extractor/nowness.py
@@ -37,7 +37,7 @@ def _extract_url_result(self, post):
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':
                     elif source == 'youtube':
                         return self.url_result(video_id, 'Youtube')
                     elif source == 'cinematique':

-                        # youtube-dl currently doesn't support cinematique
+                        # youtube-dlc currently doesn't support cinematique

                         # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
                         pass
 
                         # return self.url_result('http://cinematique.com/embed/%s' % video_id, 'Cinematique')
                         pass
 

diff --git a/youtube_dl/extractor/noz.py b/youtube_dlc/extractor/noz.py
similarity index 100%
rename from youtube_dl/extractor/noz.py
rename to youtube_dlc/extractor/noz.py

diff --git a/youtube_dl/extractor/npo.py b/youtube_dlc/extractor/npo.py
similarity index 100%
rename from youtube_dl/extractor/npo.py
rename to youtube_dlc/extractor/npo.py

diff --git a/youtube_dl/extractor/npr.py b/youtube_dlc/extractor/npr.py
similarity index 100%
rename from youtube_dl/extractor/npr.py
rename to youtube_dlc/extractor/npr.py

diff --git a/youtube_dl/extractor/nrk.py b/youtube_dlc/extractor/nrk.py
similarity index 100%
rename from youtube_dl/extractor/nrk.py
rename to youtube_dlc/extractor/nrk.py

diff --git a/youtube_dl/extractor/nrl.py b/youtube_dlc/extractor/nrl.py
similarity index 100%
rename from youtube_dl/extractor/nrl.py
rename to youtube_dlc/extractor/nrl.py

diff --git a/youtube_dl/extractor/ntvcojp.py b/youtube_dlc/extractor/ntvcojp.py
similarity index 100%
rename from youtube_dl/extractor/ntvcojp.py
rename to youtube_dlc/extractor/ntvcojp.py

diff --git a/youtube_dl/extractor/ntvde.py b/youtube_dlc/extractor/ntvde.py
similarity index 100%
rename from youtube_dl/extractor/ntvde.py
rename to youtube_dlc/extractor/ntvde.py

diff --git a/youtube_dl/extractor/ntvru.py b/youtube_dlc/extractor/ntvru.py
similarity index 100%
rename from youtube_dl/extractor/ntvru.py
rename to youtube_dlc/extractor/ntvru.py

diff --git a/youtube_dl/extractor/nuevo.py b/youtube_dlc/extractor/nuevo.py
similarity index 100%
rename from youtube_dl/extractor/nuevo.py
rename to youtube_dlc/extractor/nuevo.py

diff --git a/youtube_dl/extractor/nuvid.py b/youtube_dlc/extractor/nuvid.py
similarity index 100%
rename from youtube_dl/extractor/nuvid.py
rename to youtube_dlc/extractor/nuvid.py

diff --git a/youtube_dl/extractor/nytimes.py b/youtube_dlc/extractor/nytimes.py
similarity index 100%
rename from youtube_dl/extractor/nytimes.py
rename to youtube_dlc/extractor/nytimes.py

diff --git a/youtube_dl/extractor/nzz.py b/youtube_dlc/extractor/nzz.py
similarity index 100%
rename from youtube_dl/extractor/nzz.py
rename to youtube_dlc/extractor/nzz.py

diff --git a/youtube_dl/extractor/odatv.py b/youtube_dlc/extractor/odatv.py
similarity index 100%
rename from youtube_dl/extractor/odatv.py
rename to youtube_dlc/extractor/odatv.py

diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dlc/extractor/odnoklassniki.py
similarity index 100%
rename from youtube_dl/extractor/odnoklassniki.py
rename to youtube_dlc/extractor/odnoklassniki.py

diff --git a/youtube_dl/extractor/oktoberfesttv.py b/youtube_dlc/extractor/oktoberfesttv.py
similarity index 100%
rename from youtube_dl/extractor/oktoberfesttv.py
rename to youtube_dlc/extractor/oktoberfesttv.py

diff --git a/youtube_dl/extractor/once.py b/youtube_dlc/extractor/once.py
similarity index 100%
rename from youtube_dl/extractor/once.py
rename to youtube_dlc/extractor/once.py

diff --git a/youtube_dl/extractor/ondemandkorea.py b/youtube_dlc/extractor/ondemandkorea.py
similarity index 100%
rename from youtube_dl/extractor/ondemandkorea.py
rename to youtube_dlc/extractor/ondemandkorea.py

diff --git a/youtube_dl/extractor/onet.py b/youtube_dlc/extractor/onet.py
similarity index 100%
rename from youtube_dl/extractor/onet.py
rename to youtube_dlc/extractor/onet.py

diff --git a/youtube_dl/extractor/onionstudios.py b/youtube_dlc/extractor/onionstudios.py
similarity index 100%
rename from youtube_dl/extractor/onionstudios.py
rename to youtube_dlc/extractor/onionstudios.py

diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dlc/extractor/ooyala.py
similarity index 100%
rename from youtube_dl/extractor/ooyala.py
rename to youtube_dlc/extractor/ooyala.py

diff --git a/youtube_dl/extractor/openload.py b/youtube_dlc/extractor/openload.py
similarity index 100%
rename from youtube_dl/extractor/openload.py
rename to youtube_dlc/extractor/openload.py

diff --git a/youtube_dl/extractor/ora.py b/youtube_dlc/extractor/ora.py
similarity index 100%
rename from youtube_dl/extractor/ora.py
rename to youtube_dlc/extractor/ora.py

diff --git a/youtube_dl/extractor/orf.py b/youtube_dlc/extractor/orf.py
similarity index 100%
rename from youtube_dl/extractor/orf.py
rename to youtube_dlc/extractor/orf.py

diff --git a/youtube_dl/extractor/outsidetv.py b/youtube_dlc/extractor/outsidetv.py
similarity index 100%
rename from youtube_dl/extractor/outsidetv.py
rename to youtube_dlc/extractor/outsidetv.py

diff --git a/youtube_dl/extractor/packtpub.py b/youtube_dlc/extractor/packtpub.py
similarity index 100%
rename from youtube_dl/extractor/packtpub.py
rename to youtube_dlc/extractor/packtpub.py

diff --git a/youtube_dl/extractor/pandoratv.py b/youtube_dlc/extractor/pandoratv.py
similarity index 100%
rename from youtube_dl/extractor/pandoratv.py
rename to youtube_dlc/extractor/pandoratv.py

diff --git a/youtube_dl/extractor/parliamentliveuk.py b/youtube_dlc/extractor/parliamentliveuk.py
similarity index 100%
rename from youtube_dl/extractor/parliamentliveuk.py
rename to youtube_dlc/extractor/parliamentliveuk.py

diff --git a/youtube_dl/extractor/patreon.py b/youtube_dlc/extractor/patreon.py
similarity index 100%
rename from youtube_dl/extractor/patreon.py
rename to youtube_dlc/extractor/patreon.py

diff --git a/youtube_dl/extractor/pbs.py b/youtube_dlc/extractor/pbs.py
similarity index 100%
rename from youtube_dl/extractor/pbs.py
rename to youtube_dlc/extractor/pbs.py

diff --git a/youtube_dl/extractor/pearvideo.py b/youtube_dlc/extractor/pearvideo.py
similarity index 100%
rename from youtube_dl/extractor/pearvideo.py
rename to youtube_dlc/extractor/pearvideo.py

diff --git a/youtube_dl/extractor/peertube.py b/youtube_dlc/extractor/peertube.py
similarity index 100%
rename from youtube_dl/extractor/peertube.py
rename to youtube_dlc/extractor/peertube.py

diff --git a/youtube_dl/extractor/people.py b/youtube_dlc/extractor/people.py
similarity index 100%
rename from youtube_dl/extractor/people.py
rename to youtube_dlc/extractor/people.py

diff --git a/youtube_dl/extractor/performgroup.py b/youtube_dlc/extractor/performgroup.py
similarity index 100%
rename from youtube_dl/extractor/performgroup.py
rename to youtube_dlc/extractor/performgroup.py

diff --git a/youtube_dl/extractor/periscope.py b/youtube_dlc/extractor/periscope.py
similarity index 100%
rename from youtube_dl/extractor/periscope.py
rename to youtube_dlc/extractor/periscope.py

diff --git a/youtube_dl/extractor/philharmoniedeparis.py b/youtube_dlc/extractor/philharmoniedeparis.py
similarity index 100%
rename from youtube_dl/extractor/philharmoniedeparis.py
rename to youtube_dlc/extractor/philharmoniedeparis.py

diff --git a/youtube_dl/extractor/phoenix.py b/youtube_dlc/extractor/phoenix.py
similarity index 100%
rename from youtube_dl/extractor/phoenix.py
rename to youtube_dlc/extractor/phoenix.py

diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dlc/extractor/photobucket.py
similarity index 100%
rename from youtube_dl/extractor/photobucket.py
rename to youtube_dlc/extractor/photobucket.py

diff --git a/youtube_dl/extractor/picarto.py b/youtube_dlc/extractor/picarto.py
similarity index 100%
rename from youtube_dl/extractor/picarto.py
rename to youtube_dlc/extractor/picarto.py

diff --git a/youtube_dl/extractor/piksel.py b/youtube_dlc/extractor/piksel.py
similarity index 100%
rename from youtube_dl/extractor/piksel.py
rename to youtube_dlc/extractor/piksel.py

diff --git a/youtube_dl/extractor/pinkbike.py b/youtube_dlc/extractor/pinkbike.py
similarity index 100%
rename from youtube_dl/extractor/pinkbike.py
rename to youtube_dlc/extractor/pinkbike.py

diff --git a/youtube_dl/extractor/pladform.py b/youtube_dlc/extractor/pladform.py
similarity index 100%
rename from youtube_dl/extractor/pladform.py
rename to youtube_dlc/extractor/pladform.py

diff --git a/youtube_dl/extractor/platzi.py b/youtube_dlc/extractor/platzi.py
similarity index 100%
rename from youtube_dl/extractor/platzi.py
rename to youtube_dlc/extractor/platzi.py

diff --git a/youtube_dl/extractor/playfm.py b/youtube_dlc/extractor/playfm.py
similarity index 100%
rename from youtube_dl/extractor/playfm.py
rename to youtube_dlc/extractor/playfm.py

diff --git a/youtube_dl/extractor/playplustv.py b/youtube_dlc/extractor/playplustv.py
similarity index 100%
rename from youtube_dl/extractor/playplustv.py
rename to youtube_dlc/extractor/playplustv.py

diff --git a/youtube_dl/extractor/plays.py b/youtube_dlc/extractor/plays.py
similarity index 100%
rename from youtube_dl/extractor/plays.py
rename to youtube_dlc/extractor/plays.py

diff --git a/youtube_dl/extractor/playtvak.py b/youtube_dlc/extractor/playtvak.py
similarity index 100%
rename from youtube_dl/extractor/playtvak.py
rename to youtube_dlc/extractor/playtvak.py

diff --git a/youtube_dl/extractor/playvid.py b/youtube_dlc/extractor/playvid.py
similarity index 100%
rename from youtube_dl/extractor/playvid.py
rename to youtube_dlc/extractor/playvid.py

diff --git a/youtube_dl/extractor/playwire.py b/youtube_dlc/extractor/playwire.py
similarity index 100%
rename from youtube_dl/extractor/playwire.py
rename to youtube_dlc/extractor/playwire.py

diff --git a/youtube_dl/extractor/pluralsight.py b/youtube_dlc/extractor/pluralsight.py
similarity index 100%
rename from youtube_dl/extractor/pluralsight.py
rename to youtube_dlc/extractor/pluralsight.py

diff --git a/youtube_dl/extractor/podomatic.py b/youtube_dlc/extractor/podomatic.py
similarity index 100%
rename from youtube_dl/extractor/podomatic.py
rename to youtube_dlc/extractor/podomatic.py

diff --git a/youtube_dl/extractor/pokemon.py b/youtube_dlc/extractor/pokemon.py
similarity index 100%
rename from youtube_dl/extractor/pokemon.py
rename to youtube_dlc/extractor/pokemon.py

diff --git a/youtube_dl/extractor/polskieradio.py b/youtube_dlc/extractor/polskieradio.py
similarity index 100%
rename from youtube_dl/extractor/polskieradio.py
rename to youtube_dlc/extractor/polskieradio.py

diff --git a/youtube_dl/extractor/popcorntimes.py b/youtube_dlc/extractor/popcorntimes.py
similarity index 100%
rename from youtube_dl/extractor/popcorntimes.py
rename to youtube_dlc/extractor/popcorntimes.py

diff --git a/youtube_dl/extractor/popcorntv.py b/youtube_dlc/extractor/popcorntv.py
similarity index 100%
rename from youtube_dl/extractor/popcorntv.py
rename to youtube_dlc/extractor/popcorntv.py

diff --git a/youtube_dl/extractor/porn91.py b/youtube_dlc/extractor/porn91.py
similarity index 100%
rename from youtube_dl/extractor/porn91.py
rename to youtube_dlc/extractor/porn91.py

diff --git a/youtube_dl/extractor/porncom.py b/youtube_dlc/extractor/porncom.py
similarity index 100%
rename from youtube_dl/extractor/porncom.py
rename to youtube_dlc/extractor/porncom.py

diff --git a/youtube_dl/extractor/pornhd.py b/youtube_dlc/extractor/pornhd.py
similarity index 100%
rename from youtube_dl/extractor/pornhd.py
rename to youtube_dlc/extractor/pornhd.py

diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dlc/extractor/pornhub.py
similarity index 100%
rename from youtube_dl/extractor/pornhub.py
rename to youtube_dlc/extractor/pornhub.py

diff --git a/youtube_dl/extractor/pornotube.py b/youtube_dlc/extractor/pornotube.py
similarity index 100%
rename from youtube_dl/extractor/pornotube.py
rename to youtube_dlc/extractor/pornotube.py

diff --git a/youtube_dl/extractor/pornovoisines.py b/youtube_dlc/extractor/pornovoisines.py
similarity index 100%
rename from youtube_dl/extractor/pornovoisines.py
rename to youtube_dlc/extractor/pornovoisines.py

diff --git a/youtube_dl/extractor/pornoxo.py b/youtube_dlc/extractor/pornoxo.py
similarity index 100%
rename from youtube_dl/extractor/pornoxo.py
rename to youtube_dlc/extractor/pornoxo.py

diff --git a/youtube_dl/extractor/presstv.py b/youtube_dlc/extractor/presstv.py
similarity index 100%
rename from youtube_dl/extractor/presstv.py
rename to youtube_dlc/extractor/presstv.py

diff --git a/youtube_dl/extractor/prosiebensat1.py b/youtube_dlc/extractor/prosiebensat1.py
similarity index 100%
rename from youtube_dl/extractor/prosiebensat1.py
rename to youtube_dlc/extractor/prosiebensat1.py

diff --git a/youtube_dl/extractor/puhutv.py b/youtube_dlc/extractor/puhutv.py
similarity index 100%
rename from youtube_dl/extractor/puhutv.py
rename to youtube_dlc/extractor/puhutv.py

diff --git a/youtube_dl/extractor/puls4.py b/youtube_dlc/extractor/puls4.py
similarity index 100%
rename from youtube_dl/extractor/puls4.py
rename to youtube_dlc/extractor/puls4.py

diff --git a/youtube_dl/extractor/pyvideo.py b/youtube_dlc/extractor/pyvideo.py
similarity index 100%
rename from youtube_dl/extractor/pyvideo.py
rename to youtube_dlc/extractor/pyvideo.py

diff --git a/youtube_dl/extractor/qqmusic.py b/youtube_dlc/extractor/qqmusic.py
similarity index 100%
rename from youtube_dl/extractor/qqmusic.py
rename to youtube_dlc/extractor/qqmusic.py

diff --git a/youtube_dl/extractor/r7.py b/youtube_dlc/extractor/r7.py
similarity index 100%
rename from youtube_dl/extractor/r7.py
rename to youtube_dlc/extractor/r7.py

diff --git a/youtube_dl/extractor/radiobremen.py b/youtube_dlc/extractor/radiobremen.py
similarity index 100%
rename from youtube_dl/extractor/radiobremen.py
rename to youtube_dlc/extractor/radiobremen.py

diff --git a/youtube_dl/extractor/radiocanada.py b/youtube_dlc/extractor/radiocanada.py
similarity index 100%
rename from youtube_dl/extractor/radiocanada.py
rename to youtube_dlc/extractor/radiocanada.py

diff --git a/youtube_dl/extractor/radiode.py b/youtube_dlc/extractor/radiode.py
similarity index 100%
rename from youtube_dl/extractor/radiode.py
rename to youtube_dlc/extractor/radiode.py

diff --git a/youtube_dl/extractor/radiofrance.py b/youtube_dlc/extractor/radiofrance.py
similarity index 100%
rename from youtube_dl/extractor/radiofrance.py
rename to youtube_dlc/extractor/radiofrance.py

diff --git a/youtube_dl/extractor/radiojavan.py b/youtube_dlc/extractor/radiojavan.py
similarity index 100%
rename from youtube_dl/extractor/radiojavan.py
rename to youtube_dlc/extractor/radiojavan.py

diff --git a/youtube_dl/extractor/rai.py b/youtube_dlc/extractor/rai.py
similarity index 100%
rename from youtube_dl/extractor/rai.py
rename to youtube_dlc/extractor/rai.py

diff --git a/youtube_dl/extractor/raywenderlich.py b/youtube_dlc/extractor/raywenderlich.py
similarity index 100%
rename from youtube_dl/extractor/raywenderlich.py
rename to youtube_dlc/extractor/raywenderlich.py

diff --git a/youtube_dl/extractor/rbmaradio.py b/youtube_dlc/extractor/rbmaradio.py
similarity index 100%
rename from youtube_dl/extractor/rbmaradio.py
rename to youtube_dlc/extractor/rbmaradio.py

diff --git a/youtube_dl/extractor/rds.py b/youtube_dlc/extractor/rds.py
similarity index 100%
rename from youtube_dl/extractor/rds.py
rename to youtube_dlc/extractor/rds.py

diff --git a/youtube_dl/extractor/redbulltv.py b/youtube_dlc/extractor/redbulltv.py
similarity index 100%
rename from youtube_dl/extractor/redbulltv.py
rename to youtube_dlc/extractor/redbulltv.py

diff --git a/youtube_dl/extractor/reddit.py b/youtube_dlc/extractor/reddit.py
similarity index 100%
rename from youtube_dl/extractor/reddit.py
rename to youtube_dlc/extractor/reddit.py

diff --git a/youtube_dl/extractor/redtube.py b/youtube_dlc/extractor/redtube.py
similarity index 100%
rename from youtube_dl/extractor/redtube.py
rename to youtube_dlc/extractor/redtube.py

diff --git a/youtube_dl/extractor/regiotv.py b/youtube_dlc/extractor/regiotv.py
similarity index 100%
rename from youtube_dl/extractor/regiotv.py
rename to youtube_dlc/extractor/regiotv.py

diff --git a/youtube_dl/extractor/rentv.py b/youtube_dlc/extractor/rentv.py
similarity index 100%
rename from youtube_dl/extractor/rentv.py
rename to youtube_dlc/extractor/rentv.py

diff --git a/youtube_dl/extractor/restudy.py b/youtube_dlc/extractor/restudy.py
similarity index 100%
rename from youtube_dl/extractor/restudy.py
rename to youtube_dlc/extractor/restudy.py

diff --git a/youtube_dl/extractor/reuters.py b/youtube_dlc/extractor/reuters.py
similarity index 100%
rename from youtube_dl/extractor/reuters.py
rename to youtube_dlc/extractor/reuters.py

diff --git a/youtube_dl/extractor/reverbnation.py b/youtube_dlc/extractor/reverbnation.py
similarity index 100%
rename from youtube_dl/extractor/reverbnation.py
rename to youtube_dlc/extractor/reverbnation.py

diff --git a/youtube_dl/extractor/rice.py b/youtube_dlc/extractor/rice.py
similarity index 100%
rename from youtube_dl/extractor/rice.py
rename to youtube_dlc/extractor/rice.py

diff --git a/youtube_dl/extractor/rmcdecouverte.py b/youtube_dlc/extractor/rmcdecouverte.py
similarity index 100%
rename from youtube_dl/extractor/rmcdecouverte.py
rename to youtube_dlc/extractor/rmcdecouverte.py

diff --git a/youtube_dl/extractor/ro220.py b/youtube_dlc/extractor/ro220.py
similarity index 100%
rename from youtube_dl/extractor/ro220.py
rename to youtube_dlc/extractor/ro220.py

diff --git a/youtube_dl/extractor/rockstargames.py b/youtube_dlc/extractor/rockstargames.py
similarity index 100%
rename from youtube_dl/extractor/rockstargames.py
rename to youtube_dlc/extractor/rockstargames.py

diff --git a/youtube_dl/extractor/roosterteeth.py b/youtube_dlc/extractor/roosterteeth.py
similarity index 100%
rename from youtube_dl/extractor/roosterteeth.py
rename to youtube_dlc/extractor/roosterteeth.py

diff --git a/youtube_dl/extractor/rottentomatoes.py b/youtube_dlc/extractor/rottentomatoes.py
similarity index 100%
rename from youtube_dl/extractor/rottentomatoes.py
rename to youtube_dlc/extractor/rottentomatoes.py

diff --git a/youtube_dl/extractor/roxwel.py b/youtube_dlc/extractor/roxwel.py
similarity index 100%
rename from youtube_dl/extractor/roxwel.py
rename to youtube_dlc/extractor/roxwel.py

diff --git a/youtube_dl/extractor/rozhlas.py b/youtube_dlc/extractor/rozhlas.py
similarity index 100%
rename from youtube_dl/extractor/rozhlas.py
rename to youtube_dlc/extractor/rozhlas.py

diff --git a/youtube_dl/extractor/rtbf.py b/youtube_dlc/extractor/rtbf.py
similarity index 100%
rename from youtube_dl/extractor/rtbf.py
rename to youtube_dlc/extractor/rtbf.py

diff --git a/youtube_dl/extractor/rte.py b/youtube_dlc/extractor/rte.py
similarity index 100%
rename from youtube_dl/extractor/rte.py
rename to youtube_dlc/extractor/rte.py

diff --git a/youtube_dl/extractor/rtl2.py b/youtube_dlc/extractor/rtl2.py
similarity index 100%
rename from youtube_dl/extractor/rtl2.py
rename to youtube_dlc/extractor/rtl2.py

diff --git a/youtube_dl/extractor/rtlnl.py b/youtube_dlc/extractor/rtlnl.py
similarity index 100%
rename from youtube_dl/extractor/rtlnl.py
rename to youtube_dlc/extractor/rtlnl.py

diff --git a/youtube_dl/extractor/rtp.py b/youtube_dlc/extractor/rtp.py
similarity index 100%
rename from youtube_dl/extractor/rtp.py
rename to youtube_dlc/extractor/rtp.py

diff --git a/youtube_dl/extractor/rts.py b/youtube_dlc/extractor/rts.py
similarity index 100%
rename from youtube_dl/extractor/rts.py
rename to youtube_dlc/extractor/rts.py

diff --git a/youtube_dl/extractor/rtve.py b/youtube_dlc/extractor/rtve.py
similarity index 100%
rename from youtube_dl/extractor/rtve.py
rename to youtube_dlc/extractor/rtve.py

diff --git a/youtube_dl/extractor/rtvnh.py b/youtube_dlc/extractor/rtvnh.py
similarity index 100%
rename from youtube_dl/extractor/rtvnh.py
rename to youtube_dlc/extractor/rtvnh.py

diff --git a/youtube_dl/extractor/rtvs.py b/youtube_dlc/extractor/rtvs.py
similarity index 100%
rename from youtube_dl/extractor/rtvs.py
rename to youtube_dlc/extractor/rtvs.py

diff --git a/youtube_dl/extractor/ruhd.py b/youtube_dlc/extractor/ruhd.py
similarity index 100%
rename from youtube_dl/extractor/ruhd.py
rename to youtube_dlc/extractor/ruhd.py

diff --git a/youtube_dl/extractor/rutube.py b/youtube_dlc/extractor/rutube.py
similarity index 100%
rename from youtube_dl/extractor/rutube.py
rename to youtube_dlc/extractor/rutube.py

diff --git a/youtube_dl/extractor/rutv.py b/youtube_dlc/extractor/rutv.py
similarity index 100%
rename from youtube_dl/extractor/rutv.py
rename to youtube_dlc/extractor/rutv.py

diff --git a/youtube_dl/extractor/ruutu.py b/youtube_dlc/extractor/ruutu.py
similarity index 100%
rename from youtube_dl/extractor/ruutu.py
rename to youtube_dlc/extractor/ruutu.py

diff --git a/youtube_dl/extractor/ruv.py b/youtube_dlc/extractor/ruv.py
similarity index 100%
rename from youtube_dl/extractor/ruv.py
rename to youtube_dlc/extractor/ruv.py

diff --git a/youtube_dl/extractor/safari.py b/youtube_dlc/extractor/safari.py
similarity index 100%
rename from youtube_dl/extractor/safari.py
rename to youtube_dlc/extractor/safari.py

diff --git a/youtube_dl/extractor/sapo.py b/youtube_dlc/extractor/sapo.py
similarity index 100%
rename from youtube_dl/extractor/sapo.py
rename to youtube_dlc/extractor/sapo.py

diff --git a/youtube_dl/extractor/savefrom.py b/youtube_dlc/extractor/savefrom.py
similarity index 100%
rename from youtube_dl/extractor/savefrom.py
rename to youtube_dlc/extractor/savefrom.py

diff --git a/youtube_dl/extractor/sbs.py b/youtube_dlc/extractor/sbs.py
similarity index 100%
rename from youtube_dl/extractor/sbs.py
rename to youtube_dlc/extractor/sbs.py

diff --git a/youtube_dl/extractor/screencast.py b/youtube_dlc/extractor/screencast.py
similarity index 100%
rename from youtube_dl/extractor/screencast.py
rename to youtube_dlc/extractor/screencast.py

diff --git a/youtube_dl/extractor/screencastomatic.py b/youtube_dlc/extractor/screencastomatic.py
similarity index 100%
rename from youtube_dl/extractor/screencastomatic.py
rename to youtube_dlc/extractor/screencastomatic.py

diff --git a/youtube_dl/extractor/scrippsnetworks.py b/youtube_dlc/extractor/scrippsnetworks.py
similarity index 100%
rename from youtube_dl/extractor/scrippsnetworks.py
rename to youtube_dlc/extractor/scrippsnetworks.py

diff --git a/youtube_dl/extractor/scte.py b/youtube_dlc/extractor/scte.py
similarity index 100%
rename from youtube_dl/extractor/scte.py
rename to youtube_dlc/extractor/scte.py

diff --git a/youtube_dl/extractor/seeker.py b/youtube_dlc/extractor/seeker.py
similarity index 100%
rename from youtube_dl/extractor/seeker.py
rename to youtube_dlc/extractor/seeker.py

diff --git a/youtube_dl/extractor/senateisvp.py b/youtube_dlc/extractor/senateisvp.py
similarity index 100%
rename from youtube_dl/extractor/senateisvp.py
rename to youtube_dlc/extractor/senateisvp.py

diff --git a/youtube_dl/extractor/sendtonews.py b/youtube_dlc/extractor/sendtonews.py
similarity index 100%
rename from youtube_dl/extractor/sendtonews.py
rename to youtube_dlc/extractor/sendtonews.py

diff --git a/youtube_dl/extractor/servus.py b/youtube_dlc/extractor/servus.py
similarity index 100%
rename from youtube_dl/extractor/servus.py
rename to youtube_dlc/extractor/servus.py

diff --git a/youtube_dl/extractor/sevenplus.py b/youtube_dlc/extractor/sevenplus.py
similarity index 100%
rename from youtube_dl/extractor/sevenplus.py
rename to youtube_dlc/extractor/sevenplus.py

diff --git a/youtube_dl/extractor/sexu.py b/youtube_dlc/extractor/sexu.py
similarity index 100%
rename from youtube_dl/extractor/sexu.py
rename to youtube_dlc/extractor/sexu.py

diff --git a/youtube_dl/extractor/seznamzpravy.py b/youtube_dlc/extractor/seznamzpravy.py
similarity index 100%
rename from youtube_dl/extractor/seznamzpravy.py
rename to youtube_dlc/extractor/seznamzpravy.py

diff --git a/youtube_dl/extractor/shahid.py b/youtube_dlc/extractor/shahid.py
similarity index 100%
rename from youtube_dl/extractor/shahid.py
rename to youtube_dlc/extractor/shahid.py

diff --git a/youtube_dl/extractor/shared.py b/youtube_dlc/extractor/shared.py
similarity index 100%
rename from youtube_dl/extractor/shared.py
rename to youtube_dlc/extractor/shared.py

diff --git a/youtube_dl/extractor/showroomlive.py b/youtube_dlc/extractor/showroomlive.py
similarity index 100%
rename from youtube_dl/extractor/showroomlive.py
rename to youtube_dlc/extractor/showroomlive.py

diff --git a/youtube_dl/extractor/sina.py b/youtube_dlc/extractor/sina.py
similarity index 100%
rename from youtube_dl/extractor/sina.py
rename to youtube_dlc/extractor/sina.py

diff --git a/youtube_dl/extractor/sixplay.py b/youtube_dlc/extractor/sixplay.py
similarity index 100%
rename from youtube_dl/extractor/sixplay.py
rename to youtube_dlc/extractor/sixplay.py

diff --git a/youtube_dl/extractor/sky.py b/youtube_dlc/extractor/sky.py
similarity index 100%
rename from youtube_dl/extractor/sky.py
rename to youtube_dlc/extractor/sky.py

diff --git a/youtube_dl/extractor/skylinewebcams.py b/youtube_dlc/extractor/skylinewebcams.py
similarity index 100%
rename from youtube_dl/extractor/skylinewebcams.py
rename to youtube_dlc/extractor/skylinewebcams.py

diff --git a/youtube_dl/extractor/skynewsarabia.py b/youtube_dlc/extractor/skynewsarabia.py
similarity index 100%
rename from youtube_dl/extractor/skynewsarabia.py
rename to youtube_dlc/extractor/skynewsarabia.py

diff --git a/youtube_dl/extractor/slideshare.py b/youtube_dlc/extractor/slideshare.py
similarity index 100%
rename from youtube_dl/extractor/slideshare.py
rename to youtube_dlc/extractor/slideshare.py

diff --git a/youtube_dl/extractor/slideslive.py b/youtube_dlc/extractor/slideslive.py
similarity index 100%
rename from youtube_dl/extractor/slideslive.py
rename to youtube_dlc/extractor/slideslive.py

diff --git a/youtube_dl/extractor/slutload.py b/youtube_dlc/extractor/slutload.py
similarity index 100%
rename from youtube_dl/extractor/slutload.py
rename to youtube_dlc/extractor/slutload.py

diff --git a/youtube_dl/extractor/smotri.py b/youtube_dlc/extractor/smotri.py
similarity index 100%
rename from youtube_dl/extractor/smotri.py
rename to youtube_dlc/extractor/smotri.py

diff --git a/youtube_dl/extractor/snotr.py b/youtube_dlc/extractor/snotr.py
similarity index 100%
rename from youtube_dl/extractor/snotr.py
rename to youtube_dlc/extractor/snotr.py

diff --git a/youtube_dl/extractor/sohu.py b/youtube_dlc/extractor/sohu.py
similarity index 99%
rename from youtube_dl/extractor/sohu.py
rename to youtube_dlc/extractor/sohu.py
index a62ed84f1e34b75a721914d68a101ad2a0bb8983..76b3cc6b6b8ef639aa7185be60e68b3383e4c2fb 100644 (file)
--- a/youtube_dl/extractor/sohu.py
+++ b/youtube_dlc/extractor/sohu.py
@@ -77,7 +77,7 @@ class SohuIE(InfoExtractor):
         'info_dict': {
             'id': '78932792',
             'ext': 'mp4',
         'info_dict': {
             'id': '78932792',
             'ext': 'mp4',

-            'title': 'youtube-dl testing video',
+            'title': 'youtube-dlc testing video',

         },
         'params': {
             'skip_download': True
         },
         'params': {
             'skip_download': True

diff --git a/youtube_dl/extractor/sonyliv.py b/youtube_dlc/extractor/sonyliv.py
similarity index 100%
rename from youtube_dl/extractor/sonyliv.py
rename to youtube_dlc/extractor/sonyliv.py

diff --git a/youtube_dl/extractor/soundcloud.py b/youtube_dlc/extractor/soundcloud.py
similarity index 99%
rename from youtube_dl/extractor/soundcloud.py
rename to youtube_dlc/extractor/soundcloud.py
index ac09cb5e615503f4ec489c8798f8205d9e218a10..ae3573680b4f47c06dbf4700d240bacdc1537c56 100644 (file)
--- a/youtube_dl/extractor/soundcloud.py
+++ b/youtube_dlc/extractor/soundcloud.py
@@ -122,7 +122,7 @@ class SoundcloudIE(InfoExtractor):
         },
         # private link
         {
         },
         # private link
         {

-            'url': 'https://soundcloud.com/jaimemf/youtube-dl-test-video-a-y-baw/s-8Pjrp',
+            'url': 'https://soundcloud.com/jaimemf/youtube-dlc-test-video-a-y-baw/s-8Pjrp',

             'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604',
             'info_dict': {
                 'id': '123998367',
             'md5': 'aa0dd32bfea9b0c5ef4f02aacd080604',
             'info_dict': {
                 'id': '123998367',

diff --git a/youtube_dl/extractor/soundgasm.py b/youtube_dlc/extractor/soundgasm.py
similarity index 100%
rename from youtube_dl/extractor/soundgasm.py
rename to youtube_dlc/extractor/soundgasm.py

diff --git a/youtube_dl/extractor/southpark.py b/youtube_dlc/extractor/southpark.py
similarity index 100%
rename from youtube_dl/extractor/southpark.py
rename to youtube_dlc/extractor/southpark.py

diff --git a/youtube_dl/extractor/spankbang.py b/youtube_dlc/extractor/spankbang.py
similarity index 100%
rename from youtube_dl/extractor/spankbang.py
rename to youtube_dlc/extractor/spankbang.py

diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dlc/extractor/spankwire.py
similarity index 100%
rename from youtube_dl/extractor/spankwire.py
rename to youtube_dlc/extractor/spankwire.py

diff --git a/youtube_dl/extractor/spiegel.py b/youtube_dlc/extractor/spiegel.py
similarity index 100%
rename from youtube_dl/extractor/spiegel.py
rename to youtube_dlc/extractor/spiegel.py

diff --git a/youtube_dl/extractor/spiegeltv.py b/youtube_dlc/extractor/spiegeltv.py
similarity index 100%
rename from youtube_dl/extractor/spiegeltv.py
rename to youtube_dlc/extractor/spiegeltv.py

diff --git a/youtube_dl/extractor/spike.py b/youtube_dlc/extractor/spike.py
similarity index 100%
rename from youtube_dl/extractor/spike.py
rename to youtube_dlc/extractor/spike.py

diff --git a/youtube_dl/extractor/sport5.py b/youtube_dlc/extractor/sport5.py
similarity index 100%
rename from youtube_dl/extractor/sport5.py
rename to youtube_dlc/extractor/sport5.py

diff --git a/youtube_dl/extractor/sportbox.py b/youtube_dlc/extractor/sportbox.py
similarity index 100%
rename from youtube_dl/extractor/sportbox.py
rename to youtube_dlc/extractor/sportbox.py

diff --git a/youtube_dl/extractor/sportdeutschland.py b/youtube_dlc/extractor/sportdeutschland.py
similarity index 100%
rename from youtube_dl/extractor/sportdeutschland.py
rename to youtube_dlc/extractor/sportdeutschland.py

diff --git a/youtube_dl/extractor/springboardplatform.py b/youtube_dlc/extractor/springboardplatform.py
similarity index 100%
rename from youtube_dl/extractor/springboardplatform.py
rename to youtube_dlc/extractor/springboardplatform.py

diff --git a/youtube_dl/extractor/sprout.py b/youtube_dlc/extractor/sprout.py
similarity index 100%
rename from youtube_dl/extractor/sprout.py
rename to youtube_dlc/extractor/sprout.py

diff --git a/youtube_dl/extractor/srgssr.py b/youtube_dlc/extractor/srgssr.py
similarity index 100%
rename from youtube_dl/extractor/srgssr.py
rename to youtube_dlc/extractor/srgssr.py

diff --git a/youtube_dl/extractor/srmediathek.py b/youtube_dlc/extractor/srmediathek.py
similarity index 100%
rename from youtube_dl/extractor/srmediathek.py
rename to youtube_dlc/extractor/srmediathek.py

diff --git a/youtube_dl/extractor/stanfordoc.py b/youtube_dlc/extractor/stanfordoc.py
similarity index 100%
rename from youtube_dl/extractor/stanfordoc.py
rename to youtube_dlc/extractor/stanfordoc.py

diff --git a/youtube_dl/extractor/steam.py b/youtube_dlc/extractor/steam.py
similarity index 100%
rename from youtube_dl/extractor/steam.py
rename to youtube_dlc/extractor/steam.py

diff --git a/youtube_dl/extractor/stitcher.py b/youtube_dlc/extractor/stitcher.py
similarity index 100%
rename from youtube_dl/extractor/stitcher.py
rename to youtube_dlc/extractor/stitcher.py

diff --git a/youtube_dl/extractor/storyfire.py b/youtube_dlc/extractor/storyfire.py
similarity index 100%
rename from youtube_dl/extractor/storyfire.py
rename to youtube_dlc/extractor/storyfire.py

diff --git a/youtube_dl/extractor/streamable.py b/youtube_dlc/extractor/streamable.py
similarity index 100%
rename from youtube_dl/extractor/streamable.py
rename to youtube_dlc/extractor/streamable.py

diff --git a/youtube_dl/extractor/streamcloud.py b/youtube_dlc/extractor/streamcloud.py
similarity index 93%
rename from youtube_dl/extractor/streamcloud.py
rename to youtube_dlc/extractor/streamcloud.py
index b97bb43741b0861ce3cf9e63f1be116687409854..32eb2b92d3a13a7edc4b728f05534afc98fdf054 100644 (file)
--- a/youtube_dl/extractor/streamcloud.py
+++ b/youtube_dlc/extractor/streamcloud.py
@@ -15,12 +15,12 @@ class StreamcloudIE(InfoExtractor):
     _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'
 
     _TESTS = [{
     _VALID_URL = r'https?://streamcloud\.eu/(?P<id>[a-zA-Z0-9_-]+)(?:/(?P<fname>[^#?]*)\.html)?'
 
     _TESTS = [{

-        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dl_test_video_____________-BaW_jenozKc.mp4.html',
+        'url': 'http://streamcloud.eu/skp9j99s4bpz/youtube-dlc_test_video_____________-BaW_jenozKc.mp4.html',

         'md5': '6bea4c7fa5daaacc2a946b7146286686',
         'info_dict': {
             'id': 'skp9j99s4bpz',
             'ext': 'mp4',
         'md5': '6bea4c7fa5daaacc2a946b7146286686',
         'info_dict': {
             'id': 'skp9j99s4bpz',
             'ext': 'mp4',

-            'title': 'youtube-dl test video  \'/\\ ä ↭',
+            'title': 'youtube-dlc test video  \'/\\ ä ↭',

         },
         'skip': 'Only available from the EU'
     }, {
         },
         'skip': 'Only available from the EU'
     }, {

diff --git a/youtube_dl/extractor/streamcz.py b/youtube_dlc/extractor/streamcz.py
similarity index 100%
rename from youtube_dl/extractor/streamcz.py
rename to youtube_dlc/extractor/streamcz.py

diff --git a/youtube_dl/extractor/streetvoice.py b/youtube_dlc/extractor/streetvoice.py
similarity index 100%
rename from youtube_dl/extractor/streetvoice.py
rename to youtube_dlc/extractor/streetvoice.py

diff --git a/youtube_dl/extractor/stretchinternet.py b/youtube_dlc/extractor/stretchinternet.py
similarity index 100%
rename from youtube_dl/extractor/stretchinternet.py
rename to youtube_dlc/extractor/stretchinternet.py

diff --git a/youtube_dl/extractor/stv.py b/youtube_dlc/extractor/stv.py
similarity index 100%
rename from youtube_dl/extractor/stv.py
rename to youtube_dlc/extractor/stv.py

diff --git a/youtube_dl/extractor/sunporno.py b/youtube_dlc/extractor/sunporno.py
similarity index 100%
rename from youtube_dl/extractor/sunporno.py
rename to youtube_dlc/extractor/sunporno.py

diff --git a/youtube_dl/extractor/sverigesradio.py b/youtube_dlc/extractor/sverigesradio.py
similarity index 100%
rename from youtube_dl/extractor/sverigesradio.py
rename to youtube_dlc/extractor/sverigesradio.py

diff --git a/youtube_dl/extractor/svt.py b/youtube_dlc/extractor/svt.py
similarity index 100%
rename from youtube_dl/extractor/svt.py
rename to youtube_dlc/extractor/svt.py

diff --git a/youtube_dl/extractor/swrmediathek.py b/youtube_dlc/extractor/swrmediathek.py
similarity index 100%
rename from youtube_dl/extractor/swrmediathek.py
rename to youtube_dlc/extractor/swrmediathek.py

diff --git a/youtube_dl/extractor/syfy.py b/youtube_dlc/extractor/syfy.py
similarity index 100%
rename from youtube_dl/extractor/syfy.py
rename to youtube_dlc/extractor/syfy.py

diff --git a/youtube_dl/extractor/sztvhu.py b/youtube_dlc/extractor/sztvhu.py
similarity index 100%
rename from youtube_dl/extractor/sztvhu.py
rename to youtube_dlc/extractor/sztvhu.py

diff --git a/youtube_dl/extractor/tagesschau.py b/youtube_dlc/extractor/tagesschau.py
similarity index 100%
rename from youtube_dl/extractor/tagesschau.py
rename to youtube_dlc/extractor/tagesschau.py

diff --git a/youtube_dl/extractor/tass.py b/youtube_dlc/extractor/tass.py
similarity index 100%
rename from youtube_dl/extractor/tass.py
rename to youtube_dlc/extractor/tass.py

diff --git a/youtube_dl/extractor/tastytrade.py b/youtube_dlc/extractor/tastytrade.py
similarity index 100%
rename from youtube_dl/extractor/tastytrade.py
rename to youtube_dlc/extractor/tastytrade.py

diff --git a/youtube_dl/extractor/tbs.py b/youtube_dlc/extractor/tbs.py
similarity index 100%
rename from youtube_dl/extractor/tbs.py
rename to youtube_dlc/extractor/tbs.py

diff --git a/youtube_dl/extractor/tdslifeway.py b/youtube_dlc/extractor/tdslifeway.py
similarity index 100%
rename from youtube_dl/extractor/tdslifeway.py
rename to youtube_dlc/extractor/tdslifeway.py

diff --git a/youtube_dl/extractor/teachable.py b/youtube_dlc/extractor/teachable.py
similarity index 100%
rename from youtube_dl/extractor/teachable.py
rename to youtube_dlc/extractor/teachable.py

diff --git a/youtube_dl/extractor/teachertube.py b/youtube_dlc/extractor/teachertube.py
similarity index 100%
rename from youtube_dl/extractor/teachertube.py
rename to youtube_dlc/extractor/teachertube.py

diff --git a/youtube_dl/extractor/teachingchannel.py b/youtube_dlc/extractor/teachingchannel.py
similarity index 100%
rename from youtube_dl/extractor/teachingchannel.py
rename to youtube_dlc/extractor/teachingchannel.py

diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dlc/extractor/teamcoco.py
similarity index 100%
rename from youtube_dl/extractor/teamcoco.py
rename to youtube_dlc/extractor/teamcoco.py

diff --git a/youtube_dl/extractor/teamtreehouse.py b/youtube_dlc/extractor/teamtreehouse.py
similarity index 100%
rename from youtube_dl/extractor/teamtreehouse.py
rename to youtube_dlc/extractor/teamtreehouse.py

diff --git a/youtube_dl/extractor/techtalks.py b/youtube_dlc/extractor/techtalks.py
similarity index 100%
rename from youtube_dl/extractor/techtalks.py
rename to youtube_dlc/extractor/techtalks.py

diff --git a/youtube_dl/extractor/ted.py b/youtube_dlc/extractor/ted.py
similarity index 100%
rename from youtube_dl/extractor/ted.py
rename to youtube_dlc/extractor/ted.py

diff --git a/youtube_dl/extractor/tele13.py b/youtube_dlc/extractor/tele13.py
similarity index 100%
rename from youtube_dl/extractor/tele13.py
rename to youtube_dlc/extractor/tele13.py

diff --git a/youtube_dl/extractor/tele5.py b/youtube_dlc/extractor/tele5.py
similarity index 100%
rename from youtube_dl/extractor/tele5.py
rename to youtube_dlc/extractor/tele5.py

diff --git a/youtube_dl/extractor/telebruxelles.py b/youtube_dlc/extractor/telebruxelles.py
similarity index 100%
rename from youtube_dl/extractor/telebruxelles.py
rename to youtube_dlc/extractor/telebruxelles.py

diff --git a/youtube_dl/extractor/telecinco.py b/youtube_dlc/extractor/telecinco.py
similarity index 100%
rename from youtube_dl/extractor/telecinco.py
rename to youtube_dlc/extractor/telecinco.py

diff --git a/youtube_dl/extractor/telegraaf.py b/youtube_dlc/extractor/telegraaf.py
similarity index 100%
rename from youtube_dl/extractor/telegraaf.py
rename to youtube_dlc/extractor/telegraaf.py

diff --git a/youtube_dl/extractor/telemb.py b/youtube_dlc/extractor/telemb.py
similarity index 100%
rename from youtube_dl/extractor/telemb.py
rename to youtube_dlc/extractor/telemb.py

diff --git a/youtube_dl/extractor/telequebec.py b/youtube_dlc/extractor/telequebec.py
similarity index 100%
rename from youtube_dl/extractor/telequebec.py
rename to youtube_dlc/extractor/telequebec.py

diff --git a/youtube_dl/extractor/teletask.py b/youtube_dlc/extractor/teletask.py
similarity index 100%
rename from youtube_dl/extractor/teletask.py
rename to youtube_dlc/extractor/teletask.py

diff --git a/youtube_dl/extractor/telewebion.py b/youtube_dlc/extractor/telewebion.py
similarity index 100%
rename from youtube_dl/extractor/telewebion.py
rename to youtube_dlc/extractor/telewebion.py

diff --git a/youtube_dl/extractor/tennistv.py b/youtube_dlc/extractor/tennistv.py
similarity index 100%
rename from youtube_dl/extractor/tennistv.py
rename to youtube_dlc/extractor/tennistv.py

diff --git a/youtube_dl/extractor/tenplay.py b/youtube_dlc/extractor/tenplay.py
similarity index 100%
rename from youtube_dl/extractor/tenplay.py
rename to youtube_dlc/extractor/tenplay.py

diff --git a/youtube_dl/extractor/testurl.py b/youtube_dlc/extractor/testurl.py
similarity index 100%
rename from youtube_dl/extractor/testurl.py
rename to youtube_dlc/extractor/testurl.py

diff --git a/youtube_dl/extractor/tf1.py b/youtube_dlc/extractor/tf1.py
similarity index 100%
rename from youtube_dl/extractor/tf1.py
rename to youtube_dlc/extractor/tf1.py

diff --git a/youtube_dl/extractor/tfo.py b/youtube_dlc/extractor/tfo.py
similarity index 100%
rename from youtube_dl/extractor/tfo.py
rename to youtube_dlc/extractor/tfo.py

diff --git a/youtube_dl/extractor/theintercept.py b/youtube_dlc/extractor/theintercept.py
similarity index 100%
rename from youtube_dl/extractor/theintercept.py
rename to youtube_dlc/extractor/theintercept.py

diff --git a/youtube_dl/extractor/theplatform.py b/youtube_dlc/extractor/theplatform.py
similarity index 100%
rename from youtube_dl/extractor/theplatform.py
rename to youtube_dlc/extractor/theplatform.py

diff --git a/youtube_dl/extractor/thescene.py b/youtube_dlc/extractor/thescene.py
similarity index 100%
rename from youtube_dl/extractor/thescene.py
rename to youtube_dlc/extractor/thescene.py

diff --git a/youtube_dl/extractor/thestar.py b/youtube_dlc/extractor/thestar.py
similarity index 100%
rename from youtube_dl/extractor/thestar.py
rename to youtube_dlc/extractor/thestar.py

diff --git a/youtube_dl/extractor/thesun.py b/youtube_dlc/extractor/thesun.py
similarity index 100%
rename from youtube_dl/extractor/thesun.py
rename to youtube_dlc/extractor/thesun.py

diff --git a/youtube_dl/extractor/theweatherchannel.py b/youtube_dlc/extractor/theweatherchannel.py
similarity index 100%
rename from youtube_dl/extractor/theweatherchannel.py
rename to youtube_dlc/extractor/theweatherchannel.py

diff --git a/youtube_dl/extractor/thisamericanlife.py b/youtube_dlc/extractor/thisamericanlife.py
similarity index 100%
rename from youtube_dl/extractor/thisamericanlife.py
rename to youtube_dlc/extractor/thisamericanlife.py

diff --git a/youtube_dl/extractor/thisav.py b/youtube_dlc/extractor/thisav.py
similarity index 100%
rename from youtube_dl/extractor/thisav.py
rename to youtube_dlc/extractor/thisav.py

diff --git a/youtube_dl/extractor/thisoldhouse.py b/youtube_dlc/extractor/thisoldhouse.py
similarity index 100%
rename from youtube_dl/extractor/thisoldhouse.py
rename to youtube_dlc/extractor/thisoldhouse.py

diff --git a/youtube_dl/extractor/threeqsdn.py b/youtube_dlc/extractor/threeqsdn.py
similarity index 100%
rename from youtube_dl/extractor/threeqsdn.py
rename to youtube_dlc/extractor/threeqsdn.py

diff --git a/youtube_dl/extractor/tiktok.py b/youtube_dlc/extractor/tiktok.py
similarity index 100%
rename from youtube_dl/extractor/tiktok.py
rename to youtube_dlc/extractor/tiktok.py

diff --git a/youtube_dl/extractor/tinypic.py b/youtube_dlc/extractor/tinypic.py
similarity index 100%
rename from youtube_dl/extractor/tinypic.py
rename to youtube_dlc/extractor/tinypic.py

diff --git a/youtube_dl/extractor/tmz.py b/youtube_dlc/extractor/tmz.py
similarity index 100%
rename from youtube_dl/extractor/tmz.py
rename to youtube_dlc/extractor/tmz.py

diff --git a/youtube_dl/extractor/tnaflix.py b/youtube_dlc/extractor/tnaflix.py
similarity index 100%
rename from youtube_dl/extractor/tnaflix.py
rename to youtube_dlc/extractor/tnaflix.py

diff --git a/youtube_dl/extractor/toggle.py b/youtube_dlc/extractor/toggle.py
similarity index 100%
rename from youtube_dl/extractor/toggle.py
rename to youtube_dlc/extractor/toggle.py

diff --git a/youtube_dl/extractor/tonline.py b/youtube_dlc/extractor/tonline.py
similarity index 100%
rename from youtube_dl/extractor/tonline.py
rename to youtube_dlc/extractor/tonline.py

diff --git a/youtube_dl/extractor/toongoggles.py b/youtube_dlc/extractor/toongoggles.py
similarity index 100%
rename from youtube_dl/extractor/toongoggles.py
rename to youtube_dlc/extractor/toongoggles.py

diff --git a/youtube_dl/extractor/toutv.py b/youtube_dlc/extractor/toutv.py
similarity index 100%
rename from youtube_dl/extractor/toutv.py
rename to youtube_dlc/extractor/toutv.py

diff --git a/youtube_dl/extractor/toypics.py b/youtube_dlc/extractor/toypics.py
similarity index 100%
rename from youtube_dl/extractor/toypics.py
rename to youtube_dlc/extractor/toypics.py

diff --git a/youtube_dl/extractor/traileraddict.py b/youtube_dlc/extractor/traileraddict.py
similarity index 100%
rename from youtube_dl/extractor/traileraddict.py
rename to youtube_dlc/extractor/traileraddict.py

diff --git a/youtube_dl/extractor/trilulilu.py b/youtube_dlc/extractor/trilulilu.py
similarity index 100%
rename from youtube_dl/extractor/trilulilu.py
rename to youtube_dlc/extractor/trilulilu.py

diff --git a/youtube_dl/extractor/trunews.py b/youtube_dlc/extractor/trunews.py
similarity index 100%
rename from youtube_dl/extractor/trunews.py
rename to youtube_dlc/extractor/trunews.py

diff --git a/youtube_dl/extractor/trutv.py b/youtube_dlc/extractor/trutv.py
similarity index 100%
rename from youtube_dl/extractor/trutv.py
rename to youtube_dlc/extractor/trutv.py

diff --git a/youtube_dl/extractor/tube8.py b/youtube_dlc/extractor/tube8.py
similarity index 100%
rename from youtube_dl/extractor/tube8.py
rename to youtube_dlc/extractor/tube8.py

diff --git a/youtube_dl/extractor/tubitv.py b/youtube_dlc/extractor/tubitv.py
similarity index 100%
rename from youtube_dl/extractor/tubitv.py
rename to youtube_dlc/extractor/tubitv.py

diff --git a/youtube_dl/extractor/tudou.py b/youtube_dlc/extractor/tudou.py
similarity index 100%
rename from youtube_dl/extractor/tudou.py
rename to youtube_dlc/extractor/tudou.py

diff --git a/youtube_dl/extractor/tumblr.py b/youtube_dlc/extractor/tumblr.py
similarity index 100%
rename from youtube_dl/extractor/tumblr.py
rename to youtube_dlc/extractor/tumblr.py

diff --git a/youtube_dl/extractor/tunein.py b/youtube_dlc/extractor/tunein.py
similarity index 100%
rename from youtube_dl/extractor/tunein.py
rename to youtube_dlc/extractor/tunein.py

diff --git a/youtube_dl/extractor/tunepk.py b/youtube_dlc/extractor/tunepk.py
similarity index 100%
rename from youtube_dl/extractor/tunepk.py
rename to youtube_dlc/extractor/tunepk.py

diff --git a/youtube_dl/extractor/turbo.py b/youtube_dlc/extractor/turbo.py
similarity index 100%
rename from youtube_dl/extractor/turbo.py
rename to youtube_dlc/extractor/turbo.py

diff --git a/youtube_dl/extractor/turner.py b/youtube_dlc/extractor/turner.py
similarity index 100%
rename from youtube_dl/extractor/turner.py
rename to youtube_dlc/extractor/turner.py

diff --git a/youtube_dl/extractor/tv2.py b/youtube_dlc/extractor/tv2.py
similarity index 100%
rename from youtube_dl/extractor/tv2.py
rename to youtube_dlc/extractor/tv2.py

diff --git a/youtube_dl/extractor/tv2dk.py b/youtube_dlc/extractor/tv2dk.py
similarity index 100%
rename from youtube_dl/extractor/tv2dk.py
rename to youtube_dlc/extractor/tv2dk.py

diff --git a/youtube_dl/extractor/tv2hu.py b/youtube_dlc/extractor/tv2hu.py
similarity index 100%
rename from youtube_dl/extractor/tv2hu.py
rename to youtube_dlc/extractor/tv2hu.py

diff --git a/youtube_dl/extractor/tv4.py b/youtube_dlc/extractor/tv4.py
similarity index 100%
rename from youtube_dl/extractor/tv4.py
rename to youtube_dlc/extractor/tv4.py

diff --git a/youtube_dl/extractor/tv5mondeplus.py b/youtube_dlc/extractor/tv5mondeplus.py
similarity index 100%
rename from youtube_dl/extractor/tv5mondeplus.py
rename to youtube_dlc/extractor/tv5mondeplus.py

diff --git a/youtube_dl/extractor/tva.py b/youtube_dlc/extractor/tva.py
similarity index 100%
rename from youtube_dl/extractor/tva.py
rename to youtube_dlc/extractor/tva.py

diff --git a/youtube_dl/extractor/tvanouvelles.py b/youtube_dlc/extractor/tvanouvelles.py
similarity index 100%
rename from youtube_dl/extractor/tvanouvelles.py
rename to youtube_dlc/extractor/tvanouvelles.py

diff --git a/youtube_dl/extractor/tvc.py b/youtube_dlc/extractor/tvc.py
similarity index 100%
rename from youtube_dl/extractor/tvc.py
rename to youtube_dlc/extractor/tvc.py

diff --git a/youtube_dl/extractor/tvigle.py b/youtube_dlc/extractor/tvigle.py
similarity index 100%
rename from youtube_dl/extractor/tvigle.py
rename to youtube_dlc/extractor/tvigle.py

diff --git a/youtube_dl/extractor/tvland.py b/youtube_dlc/extractor/tvland.py
similarity index 100%
rename from youtube_dl/extractor/tvland.py
rename to youtube_dlc/extractor/tvland.py

diff --git a/youtube_dl/extractor/tvn24.py b/youtube_dlc/extractor/tvn24.py
similarity index 100%
rename from youtube_dl/extractor/tvn24.py
rename to youtube_dlc/extractor/tvn24.py

diff --git a/youtube_dl/extractor/tvnet.py b/youtube_dlc/extractor/tvnet.py
similarity index 100%
rename from youtube_dl/extractor/tvnet.py
rename to youtube_dlc/extractor/tvnet.py

diff --git a/youtube_dl/extractor/tvnoe.py b/youtube_dlc/extractor/tvnoe.py
similarity index 100%
rename from youtube_dl/extractor/tvnoe.py
rename to youtube_dlc/extractor/tvnoe.py

diff --git a/youtube_dl/extractor/tvnow.py b/youtube_dlc/extractor/tvnow.py
similarity index 100%
rename from youtube_dl/extractor/tvnow.py
rename to youtube_dlc/extractor/tvnow.py

diff --git a/youtube_dl/extractor/tvp.py b/youtube_dlc/extractor/tvp.py
similarity index 100%
rename from youtube_dl/extractor/tvp.py
rename to youtube_dlc/extractor/tvp.py

diff --git a/youtube_dl/extractor/tvplay.py b/youtube_dlc/extractor/tvplay.py
similarity index 100%
rename from youtube_dl/extractor/tvplay.py
rename to youtube_dlc/extractor/tvplay.py

diff --git a/youtube_dl/extractor/tvplayer.py b/youtube_dlc/extractor/tvplayer.py
similarity index 100%
rename from youtube_dl/extractor/tvplayer.py
rename to youtube_dlc/extractor/tvplayer.py

diff --git a/youtube_dl/extractor/tweakers.py b/youtube_dlc/extractor/tweakers.py
similarity index 100%
rename from youtube_dl/extractor/tweakers.py
rename to youtube_dlc/extractor/tweakers.py

diff --git a/youtube_dl/extractor/twentyfourvideo.py b/youtube_dlc/extractor/twentyfourvideo.py
similarity index 100%
rename from youtube_dl/extractor/twentyfourvideo.py
rename to youtube_dlc/extractor/twentyfourvideo.py

diff --git a/youtube_dl/extractor/twentymin.py b/youtube_dlc/extractor/twentymin.py
similarity index 100%
rename from youtube_dl/extractor/twentymin.py
rename to youtube_dlc/extractor/twentymin.py

diff --git a/youtube_dl/extractor/twentythreevideo.py b/youtube_dlc/extractor/twentythreevideo.py
similarity index 100%
rename from youtube_dl/extractor/twentythreevideo.py
rename to youtube_dlc/extractor/twentythreevideo.py

diff --git a/youtube_dl/extractor/twitcasting.py b/youtube_dlc/extractor/twitcasting.py
similarity index 100%
rename from youtube_dl/extractor/twitcasting.py
rename to youtube_dlc/extractor/twitcasting.py

diff --git a/youtube_dl/extractor/twitch.py b/youtube_dlc/extractor/twitch.py
similarity index 100%
rename from youtube_dl/extractor/twitch.py
rename to youtube_dlc/extractor/twitch.py

diff --git a/youtube_dl/extractor/twitter.py b/youtube_dlc/extractor/twitter.py
similarity index 100%
rename from youtube_dl/extractor/twitter.py
rename to youtube_dlc/extractor/twitter.py

diff --git a/youtube_dl/extractor/udemy.py b/youtube_dlc/extractor/udemy.py
similarity index 99%
rename from youtube_dl/extractor/udemy.py
rename to youtube_dlc/extractor/udemy.py
index 2a4faecefbc271f1f88dfe38d2fe284e0bbd9158..60e364d301feae058ae2eda4a7b46f7103ec3439 100644 (file)
--- a/youtube_dl/extractor/udemy.py
+++ b/youtube_dlc/extractor/udemy.py
@@ -143,7 +143,7 @@ def _download_webpage_handle(self, *args, **kwargs):
             raise ExtractorError(
                 'Udemy asks you to solve a CAPTCHA. Login with browser, '
                 'solve CAPTCHA, then export cookies and pass cookie file to '
             raise ExtractorError(
                 'Udemy asks you to solve a CAPTCHA. Login with browser, '
                 'solve CAPTCHA, then export cookies and pass cookie file to '

-                'youtube-dl with --cookies.', expected=True)
+                'youtube-dlc with --cookies.', expected=True)

         return ret
 
     def _download_json(self, url_or_request, *args, **kwargs):
         return ret
 
     def _download_json(self, url_or_request, *args, **kwargs):

diff --git a/youtube_dl/extractor/udn.py b/youtube_dlc/extractor/udn.py
similarity index 100%
rename from youtube_dl/extractor/udn.py
rename to youtube_dlc/extractor/udn.py

diff --git a/youtube_dl/extractor/ufctv.py b/youtube_dlc/extractor/ufctv.py
similarity index 100%
rename from youtube_dl/extractor/ufctv.py
rename to youtube_dlc/extractor/ufctv.py

diff --git a/youtube_dl/extractor/uktvplay.py b/youtube_dlc/extractor/uktvplay.py
similarity index 100%
rename from youtube_dl/extractor/uktvplay.py
rename to youtube_dlc/extractor/uktvplay.py

diff --git a/youtube_dl/extractor/umg.py b/youtube_dlc/extractor/umg.py
similarity index 100%
rename from youtube_dl/extractor/umg.py
rename to youtube_dlc/extractor/umg.py

diff --git a/youtube_dl/extractor/unistra.py b/youtube_dlc/extractor/unistra.py
similarity index 100%
rename from youtube_dl/extractor/unistra.py
rename to youtube_dlc/extractor/unistra.py

diff --git a/youtube_dl/extractor/unity.py b/youtube_dlc/extractor/unity.py
similarity index 100%
rename from youtube_dl/extractor/unity.py
rename to youtube_dlc/extractor/unity.py

diff --git a/youtube_dl/extractor/uol.py b/youtube_dlc/extractor/uol.py
similarity index 100%
rename from youtube_dl/extractor/uol.py
rename to youtube_dlc/extractor/uol.py

diff --git a/youtube_dl/extractor/uplynk.py b/youtube_dlc/extractor/uplynk.py
similarity index 100%
rename from youtube_dl/extractor/uplynk.py
rename to youtube_dlc/extractor/uplynk.py

diff --git a/youtube_dl/extractor/urort.py b/youtube_dlc/extractor/urort.py
similarity index 100%
rename from youtube_dl/extractor/urort.py
rename to youtube_dlc/extractor/urort.py

diff --git a/youtube_dl/extractor/urplay.py b/youtube_dlc/extractor/urplay.py
similarity index 100%
rename from youtube_dl/extractor/urplay.py
rename to youtube_dlc/extractor/urplay.py

diff --git a/youtube_dl/extractor/usanetwork.py b/youtube_dlc/extractor/usanetwork.py
similarity index 100%
rename from youtube_dl/extractor/usanetwork.py
rename to youtube_dlc/extractor/usanetwork.py

diff --git a/youtube_dl/extractor/usatoday.py b/youtube_dlc/extractor/usatoday.py
similarity index 100%
rename from youtube_dl/extractor/usatoday.py
rename to youtube_dlc/extractor/usatoday.py

diff --git a/youtube_dl/extractor/ustream.py b/youtube_dlc/extractor/ustream.py
similarity index 100%
rename from youtube_dl/extractor/ustream.py
rename to youtube_dlc/extractor/ustream.py

diff --git a/youtube_dl/extractor/ustudio.py b/youtube_dlc/extractor/ustudio.py
similarity index 100%
rename from youtube_dl/extractor/ustudio.py
rename to youtube_dlc/extractor/ustudio.py

diff --git a/youtube_dl/extractor/varzesh3.py b/youtube_dlc/extractor/varzesh3.py
similarity index 100%
rename from youtube_dl/extractor/varzesh3.py
rename to youtube_dlc/extractor/varzesh3.py

diff --git a/youtube_dl/extractor/vbox7.py b/youtube_dlc/extractor/vbox7.py
similarity index 100%
rename from youtube_dl/extractor/vbox7.py
rename to youtube_dlc/extractor/vbox7.py

diff --git a/youtube_dl/extractor/veehd.py b/youtube_dlc/extractor/veehd.py
similarity index 100%
rename from youtube_dl/extractor/veehd.py
rename to youtube_dlc/extractor/veehd.py

diff --git a/youtube_dl/extractor/veoh.py b/youtube_dlc/extractor/veoh.py
similarity index 100%
rename from youtube_dl/extractor/veoh.py
rename to youtube_dlc/extractor/veoh.py

diff --git a/youtube_dl/extractor/vesti.py b/youtube_dlc/extractor/vesti.py
similarity index 100%
rename from youtube_dl/extractor/vesti.py
rename to youtube_dlc/extractor/vesti.py

diff --git a/youtube_dl/extractor/vevo.py b/youtube_dlc/extractor/vevo.py
similarity index 100%
rename from youtube_dl/extractor/vevo.py
rename to youtube_dlc/extractor/vevo.py

diff --git a/youtube_dl/extractor/vgtv.py b/youtube_dlc/extractor/vgtv.py
similarity index 100%
rename from youtube_dl/extractor/vgtv.py
rename to youtube_dlc/extractor/vgtv.py

diff --git a/youtube_dl/extractor/vh1.py b/youtube_dlc/extractor/vh1.py
similarity index 100%
rename from youtube_dl/extractor/vh1.py
rename to youtube_dlc/extractor/vh1.py

diff --git a/youtube_dl/extractor/vice.py b/youtube_dlc/extractor/vice.py
similarity index 100%
rename from youtube_dl/extractor/vice.py
rename to youtube_dlc/extractor/vice.py

diff --git a/youtube_dl/extractor/vidbit.py b/youtube_dlc/extractor/vidbit.py
similarity index 100%
rename from youtube_dl/extractor/vidbit.py
rename to youtube_dlc/extractor/vidbit.py

diff --git a/youtube_dl/extractor/viddler.py b/youtube_dlc/extractor/viddler.py
similarity index 100%
rename from youtube_dl/extractor/viddler.py
rename to youtube_dlc/extractor/viddler.py

diff --git a/youtube_dl/extractor/videa.py b/youtube_dlc/extractor/videa.py
similarity index 100%
rename from youtube_dl/extractor/videa.py
rename to youtube_dlc/extractor/videa.py

diff --git a/youtube_dl/extractor/videodetective.py b/youtube_dlc/extractor/videodetective.py
similarity index 100%
rename from youtube_dl/extractor/videodetective.py
rename to youtube_dlc/extractor/videodetective.py

diff --git a/youtube_dl/extractor/videofyme.py b/youtube_dlc/extractor/videofyme.py
similarity index 100%
rename from youtube_dl/extractor/videofyme.py
rename to youtube_dlc/extractor/videofyme.py

diff --git a/youtube_dl/extractor/videomore.py b/youtube_dlc/extractor/videomore.py
similarity index 100%
rename from youtube_dl/extractor/videomore.py
rename to youtube_dlc/extractor/videomore.py

diff --git a/youtube_dl/extractor/videopress.py b/youtube_dlc/extractor/videopress.py
similarity index 100%
rename from youtube_dl/extractor/videopress.py
rename to youtube_dlc/extractor/videopress.py

diff --git a/youtube_dl/extractor/vidio.py b/youtube_dlc/extractor/vidio.py
similarity index 100%
rename from youtube_dl/extractor/vidio.py
rename to youtube_dlc/extractor/vidio.py

diff --git a/youtube_dl/extractor/vidlii.py b/youtube_dlc/extractor/vidlii.py
similarity index 100%
rename from youtube_dl/extractor/vidlii.py
rename to youtube_dlc/extractor/vidlii.py

diff --git a/youtube_dl/extractor/vidme.py b/youtube_dlc/extractor/vidme.py
similarity index 100%
rename from youtube_dl/extractor/vidme.py
rename to youtube_dlc/extractor/vidme.py

diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dlc/extractor/vidzi.py
similarity index 96%
rename from youtube_dl/extractor/vidzi.py
rename to youtube_dlc/extractor/vidzi.py
index 42ea4952c381b497b6f01abcb44212339563e0a3..4e79a0b84b8ca04ea537646aee4b593872351829 100644 (file)
--- a/youtube_dl/extractor/vidzi.py
+++ b/youtube_dlc/extractor/vidzi.py
@@ -20,7 +20,7 @@ class VidziIE(InfoExtractor):
         'info_dict': {
             'id': 'cghql9yq6emu',
             'ext': 'mp4',
         'info_dict': {
             'id': 'cghql9yq6emu',
             'ext': 'mp4',

-            'title': 'youtube-dl test video  1\\\\2\'3/4<5\\\\6ä7↭',
+            'title': 'youtube-dlc test video  1\\\\2\'3/4<5\\\\6ä7↭',

         },
         'params': {
             # m3u8 download
         },
         'params': {
             # m3u8 download

diff --git a/youtube_dl/extractor/vier.py b/youtube_dlc/extractor/vier.py
similarity index 100%
rename from youtube_dl/extractor/vier.py
rename to youtube_dlc/extractor/vier.py

diff --git a/youtube_dl/extractor/viewlift.py b/youtube_dlc/extractor/viewlift.py
similarity index 100%
rename from youtube_dl/extractor/viewlift.py
rename to youtube_dlc/extractor/viewlift.py

diff --git a/youtube_dl/extractor/viidea.py b/youtube_dlc/extractor/viidea.py
similarity index 100%
rename from youtube_dl/extractor/viidea.py
rename to youtube_dlc/extractor/viidea.py

diff --git a/youtube_dl/extractor/viki.py b/youtube_dlc/extractor/viki.py
similarity index 100%
rename from youtube_dl/extractor/viki.py
rename to youtube_dlc/extractor/viki.py

diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dlc/extractor/vimeo.py
similarity index 99%
rename from youtube_dl/extractor/vimeo.py
rename to youtube_dlc/extractor/vimeo.py
index 421795b94d9f6cf10fe3d5725503baa86383062c..bbd7d06db3c943f1009b3d345b1513ed91ceaaca 100644 (file)
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dlc/extractor/vimeo.py
@@ -287,7 +287,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '56015672',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '56015672',
                 'ext': 'mp4',

-                'title': "youtube-dl test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",
+                'title': "youtube-dlc test video - \u2605 \" ' \u5e78 / \\ \u00e4 \u21ad \U0001d550",

                 'description': 'md5:2d3305bad981a06ff79f027f19865021',
                 'timestamp': 1355990239,
                 'upload_date': '20121220',
                 'description': 'md5:2d3305bad981a06ff79f027f19865021',
                 'timestamp': 1355990239,
                 'upload_date': '20121220',


@@ -347,7 +347,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',

-                'title': 'youtube-dl password protected test video',
+                'title': 'youtube-dlc password protected test video',

                 'timestamp': 1371200155,
                 'upload_date': '20130614',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'timestamp': 1371200155,
                 'upload_date': '20130614',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',


@@ -358,7 +358,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             },
             'params': {
                 'format': 'best[protocol=https]',
             },
             'params': {
                 'format': 'best[protocol=https]',

-                'videopassword': 'youtube-dl',
+                'videopassword': 'youtube-dlc',

             },
         },
         {
             },
         },
         {


@@ -473,7 +473,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '68375962',
                 'ext': 'mp4',

-                'title': 'youtube-dl password protected test video',
+                'title': 'youtube-dlc password protected test video',

                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'uploader_id': 'user18948128',
                 'uploader': 'Jaime Marquínez Ferrándiz',
                 'uploader_url': r're:https?://(?:www\.)?vimeo\.com/user18948128',
                 'uploader_id': 'user18948128',
                 'uploader': 'Jaime Marquínez Ferrándiz',


@@ -481,7 +481,7 @@ class VimeoIE(VimeoBaseInfoExtractor):
             },
             'params': {
                 'format': 'best[protocol=https]',
             },
             'params': {
                 'format': 'best[protocol=https]',

-                'videopassword': 'youtube-dl',
+                'videopassword': 'youtube-dlc',

             },
         },
         {
             },
         },
         {


@@ -600,7 +600,7 @@ def _real_extract(self, url):
                 if b'Because of its privacy settings, this video cannot be played here' in errmsg:
                     raise ExtractorError(
                         'Cannot download embed-only video without embedding '
                 if b'Because of its privacy settings, this video cannot be played here' in errmsg:
                     raise ExtractorError(
                         'Cannot download embed-only video without embedding '

-                        'URL. Please call youtube-dl with the URL of the page '
+                        'URL. Please call youtube-dlc with the URL of the page '

                         'that embeds this video.',
                         expected=True)
             raise
                         'that embeds this video.',
                         expected=True)
             raise


@@ -917,7 +917,7 @@ class VimeoAlbumIE(VimeoBaseInfoExtractor):
         },
         'playlist_count': 1,
         'params': {
         },
         'playlist_count': 1,
         'params': {

-            'videopassword': 'youtube-dl',
+            'videopassword': 'youtube-dlc',

         }
     }]
     _PAGE_SIZE = 100
         }
     }]
     _PAGE_SIZE = 100

diff --git a/youtube_dl/extractor/vimple.py b/youtube_dlc/extractor/vimple.py
similarity index 100%
rename from youtube_dl/extractor/vimple.py
rename to youtube_dlc/extractor/vimple.py

diff --git a/youtube_dl/extractor/vine.py b/youtube_dlc/extractor/vine.py
similarity index 100%
rename from youtube_dl/extractor/vine.py
rename to youtube_dlc/extractor/vine.py

diff --git a/youtube_dl/extractor/viqeo.py b/youtube_dlc/extractor/viqeo.py
similarity index 100%
rename from youtube_dl/extractor/viqeo.py
rename to youtube_dlc/extractor/viqeo.py

diff --git a/youtube_dl/extractor/viu.py b/youtube_dlc/extractor/viu.py
similarity index 100%
rename from youtube_dl/extractor/viu.py
rename to youtube_dlc/extractor/viu.py

diff --git a/youtube_dl/extractor/vk.py b/youtube_dlc/extractor/vk.py
similarity index 100%
rename from youtube_dl/extractor/vk.py
rename to youtube_dlc/extractor/vk.py

diff --git a/youtube_dl/extractor/vlive.py b/youtube_dlc/extractor/vlive.py
similarity index 100%
rename from youtube_dl/extractor/vlive.py
rename to youtube_dlc/extractor/vlive.py

diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dlc/extractor/vodlocker.py
similarity index 100%
rename from youtube_dl/extractor/vodlocker.py
rename to youtube_dlc/extractor/vodlocker.py

diff --git a/youtube_dl/extractor/vodpl.py b/youtube_dlc/extractor/vodpl.py
similarity index 100%
rename from youtube_dl/extractor/vodpl.py
rename to youtube_dlc/extractor/vodpl.py

diff --git a/youtube_dl/extractor/vodplatform.py b/youtube_dlc/extractor/vodplatform.py
similarity index 100%
rename from youtube_dl/extractor/vodplatform.py
rename to youtube_dlc/extractor/vodplatform.py

diff --git a/youtube_dl/extractor/voicerepublic.py b/youtube_dlc/extractor/voicerepublic.py
similarity index 100%
rename from youtube_dl/extractor/voicerepublic.py
rename to youtube_dlc/extractor/voicerepublic.py

diff --git a/youtube_dl/extractor/voot.py b/youtube_dlc/extractor/voot.py
similarity index 100%
rename from youtube_dl/extractor/voot.py
rename to youtube_dlc/extractor/voot.py

diff --git a/youtube_dl/extractor/voxmedia.py b/youtube_dlc/extractor/voxmedia.py
similarity index 100%
rename from youtube_dl/extractor/voxmedia.py
rename to youtube_dlc/extractor/voxmedia.py

diff --git a/youtube_dl/extractor/vrak.py b/youtube_dlc/extractor/vrak.py
similarity index 100%
rename from youtube_dl/extractor/vrak.py
rename to youtube_dlc/extractor/vrak.py

diff --git a/youtube_dl/extractor/vrt.py b/youtube_dlc/extractor/vrt.py
similarity index 100%
rename from youtube_dl/extractor/vrt.py
rename to youtube_dlc/extractor/vrt.py

diff --git a/youtube_dl/extractor/vrv.py b/youtube_dlc/extractor/vrv.py
similarity index 100%
rename from youtube_dl/extractor/vrv.py
rename to youtube_dlc/extractor/vrv.py

diff --git a/youtube_dl/extractor/vshare.py b/youtube_dlc/extractor/vshare.py
similarity index 100%
rename from youtube_dl/extractor/vshare.py
rename to youtube_dlc/extractor/vshare.py

diff --git a/youtube_dl/extractor/vube.py b/youtube_dlc/extractor/vube.py
similarity index 100%
rename from youtube_dl/extractor/vube.py
rename to youtube_dlc/extractor/vube.py

diff --git a/youtube_dl/extractor/vuclip.py b/youtube_dlc/extractor/vuclip.py
similarity index 100%
rename from youtube_dl/extractor/vuclip.py
rename to youtube_dlc/extractor/vuclip.py

diff --git a/youtube_dl/extractor/vvvvid.py b/youtube_dlc/extractor/vvvvid.py
similarity index 100%
rename from youtube_dl/extractor/vvvvid.py
rename to youtube_dlc/extractor/vvvvid.py

diff --git a/youtube_dl/extractor/vyborymos.py b/youtube_dlc/extractor/vyborymos.py
similarity index 100%
rename from youtube_dl/extractor/vyborymos.py
rename to youtube_dlc/extractor/vyborymos.py

diff --git a/youtube_dl/extractor/vzaar.py b/youtube_dlc/extractor/vzaar.py
similarity index 100%
rename from youtube_dl/extractor/vzaar.py
rename to youtube_dlc/extractor/vzaar.py

diff --git a/youtube_dl/extractor/wakanim.py b/youtube_dlc/extractor/wakanim.py
similarity index 100%
rename from youtube_dl/extractor/wakanim.py
rename to youtube_dlc/extractor/wakanim.py

diff --git a/youtube_dl/extractor/walla.py b/youtube_dlc/extractor/walla.py
similarity index 100%
rename from youtube_dl/extractor/walla.py
rename to youtube_dlc/extractor/walla.py

diff --git a/youtube_dl/extractor/washingtonpost.py b/youtube_dlc/extractor/washingtonpost.py
similarity index 100%
rename from youtube_dl/extractor/washingtonpost.py
rename to youtube_dlc/extractor/washingtonpost.py

diff --git a/youtube_dl/extractor/wat.py b/youtube_dlc/extractor/wat.py
similarity index 100%
rename from youtube_dl/extractor/wat.py
rename to youtube_dlc/extractor/wat.py

diff --git a/youtube_dl/extractor/watchbox.py b/youtube_dlc/extractor/watchbox.py
similarity index 100%
rename from youtube_dl/extractor/watchbox.py
rename to youtube_dlc/extractor/watchbox.py

diff --git a/youtube_dl/extractor/watchindianporn.py b/youtube_dlc/extractor/watchindianporn.py
similarity index 100%
rename from youtube_dl/extractor/watchindianporn.py
rename to youtube_dlc/extractor/watchindianporn.py

diff --git a/youtube_dl/extractor/wdr.py b/youtube_dlc/extractor/wdr.py
similarity index 100%
rename from youtube_dl/extractor/wdr.py
rename to youtube_dlc/extractor/wdr.py

diff --git a/youtube_dl/extractor/webcaster.py b/youtube_dlc/extractor/webcaster.py
similarity index 100%
rename from youtube_dl/extractor/webcaster.py
rename to youtube_dlc/extractor/webcaster.py

diff --git a/youtube_dl/extractor/webofstories.py b/youtube_dlc/extractor/webofstories.py
similarity index 100%
rename from youtube_dl/extractor/webofstories.py
rename to youtube_dlc/extractor/webofstories.py

diff --git a/youtube_dl/extractor/weibo.py b/youtube_dlc/extractor/weibo.py
similarity index 100%
rename from youtube_dl/extractor/weibo.py
rename to youtube_dlc/extractor/weibo.py

diff --git a/youtube_dl/extractor/weiqitv.py b/youtube_dlc/extractor/weiqitv.py
similarity index 100%
rename from youtube_dl/extractor/weiqitv.py
rename to youtube_dlc/extractor/weiqitv.py

diff --git a/youtube_dl/extractor/wistia.py b/youtube_dlc/extractor/wistia.py
similarity index 100%
rename from youtube_dl/extractor/wistia.py
rename to youtube_dlc/extractor/wistia.py

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dlc/extractor/worldstarhiphop.py
similarity index 100%
rename from youtube_dl/extractor/worldstarhiphop.py
rename to youtube_dlc/extractor/worldstarhiphop.py

diff --git a/youtube_dl/extractor/wsj.py b/youtube_dlc/extractor/wsj.py
similarity index 100%
rename from youtube_dl/extractor/wsj.py
rename to youtube_dlc/extractor/wsj.py

diff --git a/youtube_dl/extractor/wwe.py b/youtube_dlc/extractor/wwe.py
similarity index 100%
rename from youtube_dl/extractor/wwe.py
rename to youtube_dlc/extractor/wwe.py

diff --git a/youtube_dl/extractor/xbef.py b/youtube_dlc/extractor/xbef.py
similarity index 100%
rename from youtube_dl/extractor/xbef.py
rename to youtube_dlc/extractor/xbef.py

diff --git a/youtube_dl/extractor/xboxclips.py b/youtube_dlc/extractor/xboxclips.py
similarity index 100%
rename from youtube_dl/extractor/xboxclips.py
rename to youtube_dlc/extractor/xboxclips.py

diff --git a/youtube_dl/extractor/xfileshare.py b/youtube_dlc/extractor/xfileshare.py
similarity index 100%
rename from youtube_dl/extractor/xfileshare.py
rename to youtube_dlc/extractor/xfileshare.py

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dlc/extractor/xhamster.py
similarity index 100%
rename from youtube_dl/extractor/xhamster.py
rename to youtube_dlc/extractor/xhamster.py

diff --git a/youtube_dl/extractor/xiami.py b/youtube_dlc/extractor/xiami.py
similarity index 100%
rename from youtube_dl/extractor/xiami.py
rename to youtube_dlc/extractor/xiami.py

diff --git a/youtube_dl/extractor/ximalaya.py b/youtube_dlc/extractor/ximalaya.py
similarity index 100%
rename from youtube_dl/extractor/ximalaya.py
rename to youtube_dlc/extractor/ximalaya.py

diff --git a/youtube_dl/extractor/xminus.py b/youtube_dlc/extractor/xminus.py
similarity index 100%
rename from youtube_dl/extractor/xminus.py
rename to youtube_dlc/extractor/xminus.py

diff --git a/youtube_dl/extractor/xnxx.py b/youtube_dlc/extractor/xnxx.py
similarity index 100%
rename from youtube_dl/extractor/xnxx.py
rename to youtube_dlc/extractor/xnxx.py

diff --git a/youtube_dl/extractor/xstream.py b/youtube_dlc/extractor/xstream.py
similarity index 100%
rename from youtube_dl/extractor/xstream.py
rename to youtube_dlc/extractor/xstream.py

diff --git a/youtube_dl/extractor/xtube.py b/youtube_dlc/extractor/xtube.py
similarity index 100%
rename from youtube_dl/extractor/xtube.py
rename to youtube_dlc/extractor/xtube.py

diff --git a/youtube_dl/extractor/xuite.py b/youtube_dlc/extractor/xuite.py
similarity index 100%
rename from youtube_dl/extractor/xuite.py
rename to youtube_dlc/extractor/xuite.py

diff --git a/youtube_dl/extractor/xvideos.py b/youtube_dlc/extractor/xvideos.py
similarity index 100%
rename from youtube_dl/extractor/xvideos.py
rename to youtube_dlc/extractor/xvideos.py

diff --git a/youtube_dl/extractor/xxxymovies.py b/youtube_dlc/extractor/xxxymovies.py
similarity index 100%
rename from youtube_dl/extractor/xxxymovies.py
rename to youtube_dlc/extractor/xxxymovies.py

diff --git a/youtube_dl/extractor/yahoo.py b/youtube_dlc/extractor/yahoo.py
similarity index 100%
rename from youtube_dl/extractor/yahoo.py
rename to youtube_dlc/extractor/yahoo.py

diff --git a/youtube_dl/extractor/yandexdisk.py b/youtube_dlc/extractor/yandexdisk.py
similarity index 100%
rename from youtube_dl/extractor/yandexdisk.py
rename to youtube_dlc/extractor/yandexdisk.py

diff --git a/youtube_dl/extractor/yandexmusic.py b/youtube_dlc/extractor/yandexmusic.py
similarity index 99%
rename from youtube_dl/extractor/yandexmusic.py
rename to youtube_dlc/extractor/yandexmusic.py
index 08d35e04c968a497bc28f4c3207e8d63432bd8d4..4358bc83669ffab11e5dab39444ddce1acdab2cd 100644 (file)
--- a/youtube_dl/extractor/yandexmusic.py
+++ b/youtube_dlc/extractor/yandexmusic.py
@@ -27,12 +27,12 @@ def _handle_error(response):
     @staticmethod
     def _raise_captcha():
         raise ExtractorError(
     @staticmethod
     def _raise_captcha():
         raise ExtractorError(

-            'YandexMusic has considered youtube-dl requests automated and '
+            'YandexMusic has considered youtube-dlc requests automated and '

             'asks you to solve a CAPTCHA. You can either wait for some '
             'time until unblocked and optionally use --sleep-interval '
             'in future or alternatively you can go to https://music.yandex.ru/ '
             'solve CAPTCHA, then export cookies and pass cookie file to '
             'asks you to solve a CAPTCHA. You can either wait for some '
             'time until unblocked and optionally use --sleep-interval '
             'in future or alternatively you can go to https://music.yandex.ru/ '
             'solve CAPTCHA, then export cookies and pass cookie file to '

-            'youtube-dl with --cookies',
+            'youtube-dlc with --cookies',

             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):
             expected=True)
 
     def _download_webpage_handle(self, *args, **kwargs):

diff --git a/youtube_dl/extractor/yandexvideo.py b/youtube_dlc/extractor/yandexvideo.py
similarity index 100%
rename from youtube_dl/extractor/yandexvideo.py
rename to youtube_dlc/extractor/yandexvideo.py

diff --git a/youtube_dl/extractor/yapfiles.py b/youtube_dlc/extractor/yapfiles.py
similarity index 100%
rename from youtube_dl/extractor/yapfiles.py
rename to youtube_dlc/extractor/yapfiles.py

diff --git a/youtube_dl/extractor/yesjapan.py b/youtube_dlc/extractor/yesjapan.py
similarity index 100%
rename from youtube_dl/extractor/yesjapan.py
rename to youtube_dlc/extractor/yesjapan.py

diff --git a/youtube_dl/extractor/yinyuetai.py b/youtube_dlc/extractor/yinyuetai.py
similarity index 100%
rename from youtube_dl/extractor/yinyuetai.py
rename to youtube_dlc/extractor/yinyuetai.py

diff --git a/youtube_dl/extractor/ynet.py b/youtube_dlc/extractor/ynet.py
similarity index 100%
rename from youtube_dl/extractor/ynet.py
rename to youtube_dlc/extractor/ynet.py

diff --git a/youtube_dl/extractor/youjizz.py b/youtube_dlc/extractor/youjizz.py
similarity index 100%
rename from youtube_dl/extractor/youjizz.py
rename to youtube_dlc/extractor/youjizz.py

diff --git a/youtube_dl/extractor/youku.py b/youtube_dlc/extractor/youku.py
similarity index 100%
rename from youtube_dl/extractor/youku.py
rename to youtube_dlc/extractor/youku.py

diff --git a/youtube_dl/extractor/younow.py b/youtube_dlc/extractor/younow.py
similarity index 100%
rename from youtube_dl/extractor/younow.py
rename to youtube_dlc/extractor/younow.py

diff --git a/youtube_dl/extractor/youporn.py b/youtube_dlc/extractor/youporn.py
similarity index 100%
rename from youtube_dl/extractor/youporn.py
rename to youtube_dlc/extractor/youporn.py

diff --git a/youtube_dl/extractor/yourporn.py b/youtube_dlc/extractor/yourporn.py
similarity index 100%
rename from youtube_dl/extractor/yourporn.py
rename to youtube_dlc/extractor/yourporn.py

diff --git a/youtube_dl/extractor/yourupload.py b/youtube_dlc/extractor/yourupload.py
similarity index 100%
rename from youtube_dl/extractor/yourupload.py
rename to youtube_dlc/extractor/yourupload.py

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dlc/extractor/youtube.py
similarity index 99%
rename from youtube_dl/extractor/youtube.py
rename to youtube_dlc/extractor/youtube.py
index 70a5bd3b0f77e0e6c08e946e219cd7544beefa8f..395cbf6a27a8d3046338f629b2ef57a85043ee8b 100644 (file)
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dlc/extractor/youtube.py
@@ -560,16 +560,16 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',

-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'title': 'youtube-dlc test video "\'/\\ä↭𝕐',

                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
                 'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
                 'upload_date': '20121002',
                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'channel_id': 'UCLqxVugv74EIW3VWh2NOa3Q',
                 'channel_url': r're:https?://(?:www\.)?youtube\.com/channel/UCLqxVugv74EIW3VWh2NOa3Q',
                 'upload_date': '20121002',

-                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
+                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .',

                 'categories': ['Science & Technology'],
                 'categories': ['Science & Technology'],

-                'tags': ['youtube-dl'],
+                'tags': ['youtube-dlc'],

                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,


@@ -641,14 +641,14 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',
             'info_dict': {
                 'id': 'BaW_jenozKc',
                 'ext': 'mp4',

-                'title': 'youtube-dl test video "\'/\\ä↭𝕐',
+                'title': 'youtube-dlc test video "\'/\\ä↭𝕐',

                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'upload_date': '20121002',
                 'uploader': 'Philipp Hagemeister',
                 'uploader_id': 'phihag',
                 'uploader_url': r're:https?://(?:www\.)?youtube\.com/user/phihag',
                 'upload_date': '20121002',

-                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de .',
+                'description': 'test chars:  "\'/\\ä↭𝕐\ntest URL: https://github.com/rg3/youtube-dl/issues/1892\n\nThis is a test video for youtube-dlc.\n\nFor more information, contact phihag@phihag.de .',

                 'categories': ['Science & Technology'],
                 'categories': ['Science & Technology'],

-                'tags': ['youtube-dl'],
+                'tags': ['youtube-dlc'],

                 'duration': 10,
                 'view_count': int,
                 'like_count': int,
                 'duration': 10,
                 'view_count': int,
                 'like_count': int,


@@ -2600,7 +2600,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFVb7Iudeipvc2BCavECqzc',

-            'title': 'youtube-dl public playlist',
+            'title': 'youtube-dlc public playlist',

         },
         'playlist_count': 1,
     }, {
         },
         'playlist_count': 1,
     }, {


@@ -2609,7 +2609,7 @@ class YoutubePlaylistIE(YoutubePlaylistBaseInfoExtractor):
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',
             'uploader_id': 'UCmlqkdCBesrv2Lak1mF_MxA',
             'uploader': 'Sergey M.',
             'id': 'PL4lCao7KL_QFodcLWhDpGCYnngnHtQ-Xf',

-            'title': 'youtube-dl empty playlist',
+            'title': 'youtube-dlc empty playlist',

         },
         'playlist_count': 0,
     }, {
         },
         'playlist_count': 0,
     }, {


@@ -3235,10 +3235,10 @@ class YoutubeSearchURLIE(YoutubeSearchBaseInfoExtractor):
     IE_NAME = 'youtube:search_url'
     _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)'
     _TESTS = [{
     IE_NAME = 'youtube:search_url'
     _VALID_URL = r'https?://(?:www\.)?youtube\.com/results\?(.*?&)?(?:search_query|q)=(?P<query>[^&]+)(?:[&]|$)'
     _TESTS = [{

-        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dl+test+video&filters=video&lclk=video',
+        'url': 'https://www.youtube.com/results?baz=bar&search_query=youtube-dlc+test+video&filters=video&lclk=video',

         'playlist_mincount': 5,
         'info_dict': {
         'playlist_mincount': 5,
         'info_dict': {

-            'title': 'youtube-dl test video',
+            'title': 'youtube-dlc test video',

         }
     }, {
         'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',
         }
     }, {
         'url': 'https://www.youtube.com/results?q=test&sp=EgQIBBgB',


@@ -3422,9 +3422,9 @@ def _real_extract(self, url):
         raise ExtractorError(
             'Did you forget to quote the URL? Remember that & is a meta '
             'character in most shells, so you want to put the URL in quotes, '
         raise ExtractorError(
             'Did you forget to quote the URL? Remember that & is a meta '
             'character in most shells, so you want to put the URL in quotes, '

-            'like  youtube-dl '
+            'like  youtube-dlc '

             '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '
             '"https://www.youtube.com/watch?feature=foo&v=BaW_jenozKc" '

-            ' or simply  youtube-dl BaW_jenozKc  .',
+            ' or simply  youtube-dlc BaW_jenozKc  .',

             expected=True)
 
 
             expected=True)
 
 

diff --git a/youtube_dl/extractor/zapiks.py b/youtube_dlc/extractor/zapiks.py
similarity index 100%
rename from youtube_dl/extractor/zapiks.py
rename to youtube_dlc/extractor/zapiks.py

diff --git a/youtube_dl/extractor/zaq1.py b/youtube_dlc/extractor/zaq1.py
similarity index 100%
rename from youtube_dl/extractor/zaq1.py
rename to youtube_dlc/extractor/zaq1.py

diff --git a/youtube_dl/extractor/zattoo.py b/youtube_dlc/extractor/zattoo.py
similarity index 100%
rename from youtube_dl/extractor/zattoo.py
rename to youtube_dlc/extractor/zattoo.py

diff --git a/youtube_dl/extractor/zdf.py b/youtube_dlc/extractor/zdf.py
similarity index 100%
rename from youtube_dl/extractor/zdf.py
rename to youtube_dlc/extractor/zdf.py

diff --git a/youtube_dl/extractor/zingmp3.py b/youtube_dlc/extractor/zingmp3.py
similarity index 100%
rename from youtube_dl/extractor/zingmp3.py
rename to youtube_dlc/extractor/zingmp3.py

diff --git a/youtube_dl/extractor/zype.py b/youtube_dlc/extractor/zype.py
similarity index 100%
rename from youtube_dl/extractor/zype.py
rename to youtube_dlc/extractor/zype.py

diff --git a/youtube_dl/jsinterp.py b/youtube_dlc/jsinterp.py
similarity index 100%
rename from youtube_dl/jsinterp.py
rename to youtube_dlc/jsinterp.py

diff --git a/youtube_dl/options.py b/youtube_dlc/options.py
similarity index 96%
rename from youtube_dl/options.py
rename to youtube_dlc/options.py
index 6d5ac62b3bab68de226060c6bcd3cd9299f02825..2cc5eee742dcef08553b12082c10b0e9f23248fb 100644 (file)
--- a/youtube_dl/options.py
+++ b/youtube_dlc/options.py
@@ -57,33 +57,33 @@ def _readOptions(filename_bytes, default=[]):
     def _readUserConf():
         xdg_config_home = compat_getenv('XDG_CONFIG_HOME')
         if xdg_config_home:
     def _readUserConf():
         xdg_config_home = compat_getenv('XDG_CONFIG_HOME')
         if xdg_config_home:

-            userConfFile = os.path.join(xdg_config_home, 'youtube-dl', 'config')
+            userConfFile = os.path.join(xdg_config_home, 'youtube-dlc', 'config')

             if not os.path.isfile(userConfFile):
             if not os.path.isfile(userConfFile):

-                userConfFile = os.path.join(xdg_config_home, 'youtube-dl.conf')
+                userConfFile = os.path.join(xdg_config_home, 'youtube-dlc.conf')

         else:
         else:

-            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl', 'config')
+            userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc', 'config')

             if not os.path.isfile(userConfFile):
             if not os.path.isfile(userConfFile):

-                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dl.conf')
+                userConfFile = os.path.join(compat_expanduser('~'), '.config', 'youtube-dlc.conf')

         userConf = _readOptions(userConfFile, None)
 
         if userConf is None:
             appdata_dir = compat_getenv('appdata')
             if appdata_dir:
                 userConf = _readOptions(
         userConf = _readOptions(userConfFile, None)
 
         if userConf is None:
             appdata_dir = compat_getenv('appdata')
             if appdata_dir:
                 userConf = _readOptions(

-                    os.path.join(appdata_dir, 'youtube-dl', 'config'),
+                    os.path.join(appdata_dir, 'youtube-dlc', 'config'),

                     default=None)
                 if userConf is None:
                     userConf = _readOptions(
                     default=None)
                 if userConf is None:
                     userConf = _readOptions(

-                        os.path.join(appdata_dir, 'youtube-dl', 'config.txt'),
+                        os.path.join(appdata_dir, 'youtube-dlc', 'config.txt'),

                         default=None)
 
         if userConf is None:
             userConf = _readOptions(
                         default=None)
 
         if userConf is None:
             userConf = _readOptions(

-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf'),

                 default=None)
         if userConf is None:
             userConf = _readOptions(
                 default=None)
         if userConf is None:
             userConf = _readOptions(

-                os.path.join(compat_expanduser('~'), 'youtube-dl.conf.txt'),
+                os.path.join(compat_expanduser('~'), 'youtube-dlc.conf.txt'),

                 default=None)
 
         if userConf is None:
                 default=None)
 
         if userConf is None:


@@ -168,14 +168,14 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     general.add_option(
         '--default-search',
         dest='default_search', metavar='PREFIX',
     general.add_option(
         '--default-search',
         dest='default_search', metavar='PREFIX',

-        help='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.')
+        help='Use this prefix for unqualified URLs. For example "gvsearch2:" downloads two videos from google videos for youtube-dlc "large apple". Use the value "auto" to let youtube-dlc 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.')

     general.add_option(
         '--ignore-config',
         action='store_true',
         help='Do not read configuration files. '
     general.add_option(
         '--ignore-config',
         action='store_true',
         help='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)')
+        'When given in the global configuration file /etc/youtube-dlc.conf: '
+        'Do not read the user configuration in ~/.config/youtube-dlc/config '
+        '(%APPDATA%/youtube-dlc/config.txt on Windows)')

     general.add_option(
         '--config-location',
         dest='config_location', metavar='PATH',
     general.add_option(
         '--config-location',
         dest='config_location', metavar='PATH',


@@ -357,7 +357,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     authentication.add_option(
         '-p', '--password',
         dest='password', metavar='PASSWORD',
     authentication.add_option(
         '-p', '--password',
         dest='password', metavar='PASSWORD',

-        help='Account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Account password. If this option is left out, youtube-dlc will ask interactively.')

     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',
     authentication.add_option(
         '-2', '--twofactor',
         dest='twofactor', metavar='TWOFACTOR',


@@ -383,7 +383,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     adobe_pass.add_option(
         '--ap-password',
         dest='ap_password', metavar='PASSWORD',
     adobe_pass.add_option(
         '--ap-password',
         dest='ap_password', metavar='PASSWORD',

-        help='Multiple-system operator account password. If this option is left out, youtube-dl will ask interactively.')
+        help='Multiple-system operator account password. If this option is left out, youtube-dlc will ask interactively.')

     adobe_pass.add_option(
         '--ap-list-mso',
         action='store_true', dest='ap_list_mso', default=False,
     adobe_pass.add_option(
         '--ap-list-mso',
         action='store_true', dest='ap_list_mso', default=False,


@@ -670,11 +670,11 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,
     verbosity.add_option(
         '-C', '--call-home',
         dest='call_home', action='store_true', default=False,

-        help='Contact the youtube-dl server for debugging')
+        help='Contact the youtube-dlc server for debugging')

     verbosity.add_option(
         '--no-call-home',
         dest='call_home', action='store_false', default=False,
     verbosity.add_option(
         '--no-call-home',
         dest='call_home', action='store_false', default=False,

-        help='Do NOT contact the youtube-dl server for debugging')
+        help='Do NOT contact the youtube-dlc server for debugging')

 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(
 
     filesystem = optparse.OptionGroup(parser, 'Filesystem Options')
     filesystem.add_option(


@@ -720,7 +720,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
     filesystem.add_option(
         '-c', '--continue',
         action='store_true', dest='continue_dl', default=True,
     filesystem.add_option(
         '-c', '--continue',
         action='store_true', dest='continue_dl', default=True,

-        help='Force resume of partially downloaded files. By default, youtube-dl will resume downloads if possible.')
+        help='Force resume of partially downloaded files. By default, youtube-dlc will resume downloads if possible.')

     filesystem.add_option(
         '--no-continue',
         action='store_false', dest='continue_dl',
     filesystem.add_option(
         '--no-continue',
         action='store_false', dest='continue_dl',


@@ -755,7 +755,7 @@ def _comma_separated_values_options_callback(option, opt_str, value, parser):
         help='File to read cookies from and dump cookie jar in')
     filesystem.add_option(
         '--cache-dir', dest='cachedir', default=None, metavar='DIR',
         help='File to read cookies from and dump cookie jar in')
     filesystem.add_option(
         '--cache-dir', dest='cachedir', default=None, metavar='DIR',

-        help='Location in the filesystem where youtube-dl can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dl or ~/.cache/youtube-dl . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')
+        help='Location in the filesystem where youtube-dlc can store some downloaded information permanently. By default $XDG_CACHE_HOME/youtube-dlc or ~/.cache/youtube-dlc . At the moment, only YouTube player files (for videos with obfuscated signatures) are cached, but that may change.')

     filesystem.add_option(
         '--no-cache-dir', action='store_const', const=False, dest='cachedir',
         help='Disable filesystem caching')
     filesystem.add_option(
         '--no-cache-dir', action='store_const', const=False, dest='cachedir',
         help='Disable filesystem caching')


@@ -892,14 +892,14 @@ def compat_conf(conf):
         if '--config-location' in command_line_conf:
             location = compat_expanduser(opts.config_location)
             if os.path.isdir(location):
         if '--config-location' in command_line_conf:
             location = compat_expanduser(opts.config_location)
             if os.path.isdir(location):

-                location = os.path.join(location, 'youtube-dl.conf')
+                location = os.path.join(location, 'youtube-dlc.conf')

             if not os.path.exists(location):
                 parser.error('config-location %s does not exist.' % location)
             custom_conf = _readOptions(location)
         elif '--ignore-config' in command_line_conf:
             pass
         else:
             if not os.path.exists(location):
                 parser.error('config-location %s does not exist.' % location)
             custom_conf = _readOptions(location)
         elif '--ignore-config' in command_line_conf:
             pass
         else:

-            system_conf = _readOptions('/etc/youtube-dl.conf')
+            system_conf = _readOptions('/etc/youtube-dlc.conf')

             if '--ignore-config' not in system_conf:
                 user_conf = _readUserConf()
 
             if '--ignore-config' not in system_conf:
                 user_conf = _readUserConf()
 

diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dlc/postprocessor/__init__.py
similarity index 100%
rename from youtube_dl/postprocessor/__init__.py
rename to youtube_dlc/postprocessor/__init__.py

diff --git a/youtube_dl/postprocessor/common.py b/youtube_dlc/postprocessor/common.py
similarity index 100%
rename from youtube_dl/postprocessor/common.py
rename to youtube_dlc/postprocessor/common.py

diff --git a/youtube_dl/postprocessor/embedthumbnail.py b/youtube_dlc/postprocessor/embedthumbnail.py
similarity index 100%
rename from youtube_dl/postprocessor/embedthumbnail.py
rename to youtube_dlc/postprocessor/embedthumbnail.py

diff --git a/youtube_dl/postprocessor/execafterdownload.py b/youtube_dlc/postprocessor/execafterdownload.py
similarity index 100%
rename from youtube_dl/postprocessor/execafterdownload.py
rename to youtube_dlc/postprocessor/execafterdownload.py

diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dlc/postprocessor/ffmpeg.py
similarity index 99%
rename from youtube_dl/postprocessor/ffmpeg.py
rename to youtube_dlc/postprocessor/ffmpeg.py
index 5f7298345b3f550c9a8d8b7ba2b602d2f084ed36..dbc736c50930670303783c047ce261067a57c744 100644 (file)
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dlc/postprocessor/ffmpeg.py
@@ -533,7 +533,7 @@ def can_merge(self):
         if is_outdated_version(
                 self._versions[self.basename], required_version):
             warning = ('Your copy of %s is outdated and unable to properly mux separate video and audio files, '
         if is_outdated_version(
                 self._versions[self.basename], required_version):
             warning = ('Your copy of %s is outdated and unable to properly mux separate video and audio files, '

-                       'youtube-dl will download single file media. '
+                       'youtube-dlc will download single file media. '

                        'Update %s to version %s or newer to fix this.') % (
                            self.basename, self.basename, required_version)
             if self._downloader:
                        'Update %s to version %s or newer to fix this.') % (
                            self.basename, self.basename, required_version)
             if self._downloader:

diff --git a/youtube_dl/postprocessor/metadatafromtitle.py b/youtube_dlc/postprocessor/metadatafromtitle.py
similarity index 100%
rename from youtube_dl/postprocessor/metadatafromtitle.py
rename to youtube_dlc/postprocessor/metadatafromtitle.py

diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dlc/postprocessor/xattrpp.py
similarity index 100%
rename from youtube_dl/postprocessor/xattrpp.py
rename to youtube_dlc/postprocessor/xattrpp.py

diff --git a/youtube_dl/socks.py b/youtube_dlc/socks.py
similarity index 100%
rename from youtube_dl/socks.py
rename to youtube_dlc/socks.py

diff --git a/youtube_dl/swfinterp.py b/youtube_dlc/swfinterp.py
similarity index 100%
rename from youtube_dl/swfinterp.py
rename to youtube_dlc/swfinterp.py

diff --git a/youtube_dl/update.py b/youtube_dlc/update.py
similarity index 93%
rename from youtube_dl/update.py
rename to youtube_dlc/update.py
index 84c9646171e0b8f8d6a6397bff5339205cdadcd7..d95a07c0ca94b01b836bc7b62bfc5fc505f66873 100644 (file)
--- a/youtube_dl/update.py
+++ b/youtube_dlc/update.py
@@ -38,7 +38,7 @@ def update_self(to_screen, verbose, opener):
     UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
 
     if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'):
     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.')
+        to_screen('It looks like you installed youtube-dlc with a package manager, pip, setup.py or a tarball. Please use that to update.')

         return
 
     # Check if there is a new version
         return
 
     # Check if there is a new version


@@ -50,7 +50,7 @@ def update_self(to_screen, verbose, opener):
         to_screen('ERROR: can\'t find the current version. Please try again later.')
         return
     if newversion == __version__:
         to_screen('ERROR: can\'t find the current version. Please try again later.')
         return
     if newversion == __version__:

-        to_screen('youtube-dl is up-to-date (' + __version__ + ')')
+        to_screen('youtube-dlc is up-to-date (' + __version__ + ')')

         return
 
     # Download and check versions info
         return
 
     # Download and check versions info


@@ -76,7 +76,7 @@ def update_self(to_screen, verbose, opener):
     def version_tuple(version_str):
         return tuple(map(int, version_str.split('.')))
     if version_tuple(__version__) >= version_tuple(version_id):
     def version_tuple(version_str):
         return tuple(map(int, version_str.split('.')))
     if version_tuple(__version__) >= version_tuple(version_id):

-        to_screen('youtube-dl is up to date (%s)' % __version__)
+        to_screen('youtube-dlc is up to date (%s)' % __version__)

         return
 
     to_screen('Updating to version ' + version_id + ' ...')
         return
 
     to_screen('Updating to version ' + version_id + ' ...')


@@ -126,14 +126,14 @@ def version_tuple(version_str):
             return
 
         try:
             return
 
         try:

-            bat = os.path.join(directory, 'youtube-dl-updater.bat')
+            bat = os.path.join(directory, 'youtube-dlc-updater.bat')

             with io.open(bat, 'w') as batfile:
                 batfile.write('''
 @echo off
 echo Waiting for file handle to be closed ...
 ping 127.0.0.1 -n 5 -w 1000 > NUL
 move /Y "%s.new" "%s" > NUL
             with io.open(bat, 'w') as batfile:
                 batfile.write('''
 @echo off
 echo Waiting for file handle to be closed ...
 ping 127.0.0.1 -n 5 -w 1000 > NUL
 move /Y "%s.new" "%s" > NUL

-echo Updated youtube-dl to version %s.
+echo Updated youtube-dlc to version %s.

 start /b "" cmd /c del "%%~f0"&exit /b"
                 \n''' % (exe, exe, version_id))
 
 start /b "" cmd /c del "%%~f0"&exit /b"
                 \n''' % (exe, exe, version_id))
 


@@ -171,7 +171,7 @@ def version_tuple(version_str):
             to_screen('ERROR: unable to overwrite current version')
             return
 
             to_screen('ERROR: unable to overwrite current version')
             return
 

-    to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')
+    to_screen('Updated youtube-dlc. Restart youtube-dlc to use the new version.')

 
 
 def get_notes(versions, fromVersion):
 
 
 def get_notes(versions, fromVersion):

diff --git a/youtube_dl/utils.py b/youtube_dlc/utils.py
similarity index 99%
rename from youtube_dl/utils.py
rename to youtube_dlc/utils.py
index c73f5e0ca4db667ad79b1428d94d46b987736bdd..7dafacac2a1c43fb43a081fdc277f2df08cf2707 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dlc/utils.py
@@ -2317,12 +2317,12 @@ def make_HTTPS_handler(params, **kwargs):
 
 def bug_reports_message():
     if ytdl_is_updateable():
 
 def bug_reports_message():
     if ytdl_is_updateable():

-        update_cmd = 'type  youtube-dl -U  to update'
+        update_cmd = 'type  youtube-dlc -U  to update'

     else:
         update_cmd = 'see  https://yt-dl.org/update  on how to update'
     msg = '; please report this issue on https://yt-dl.org/bug .'
     msg += ' Make sure you are using the latest version; %s.' % update_cmd
     else:
         update_cmd = 'see  https://yt-dl.org/update  on how to update'
     msg = '; please report this issue on https://yt-dl.org/bug .'
     msg += ' Make sure you are using the latest version; %s.' % update_cmd

-    msg += ' Be sure to call youtube-dl with the --verbose flag and include its complete output.'
+    msg += ' Be sure to call youtube-dlc with the --verbose flag and include its complete output.'

     return msg
 
 
     return msg
 
 


@@ -2336,7 +2336,7 @@ class ExtractorError(YoutubeDLError):
 
     def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None):
         """ tb, if given, is the original traceback (so that it can be printed out).
 
     def __init__(self, msg, tb=None, expected=False, cause=None, video_id=None):
         """ tb, if given, is the original traceback (so that it can be printed out).

-        If expected is set, this is a normal error message and most likely not a bug in youtube-dl.
+        If expected is set, this is a normal error message and most likely not a bug in youtube-dlc.

         """
 
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):
         """
 
         if sys.exc_info()[0] in (compat_urllib_error.URLError, socket.timeout, UnavailableVideoError):


@@ -2745,7 +2745,7 @@ class YoutubeDLCookieJar(compat_cookiejar.MozillaCookieJar):
     _HTTPONLY_PREFIX = '#HttpOnly_'
     _ENTRY_LEN = 7
     _HEADER = '''# Netscape HTTP Cookie File
     _HTTPONLY_PREFIX = '#HttpOnly_'
     _ENTRY_LEN = 7
     _HEADER = '''# Netscape HTTP Cookie File

-# This file is generated by youtube-dl.  Do not edit.
+# This file is generated by youtube-dlc.  Do not edit.

 
 '''
     _CookieFileEntry = collections.namedtuple(
 
 '''
     _CookieFileEntry = collections.namedtuple(


@@ -3732,7 +3732,7 @@ def get_exe_version(exe, args=['--version'],
     or False if the executable is not present """
     try:
         # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers
     or False if the executable is not present """
     try:
         # STDIN should be redirected too. On UNIX-like systems, ffmpeg triggers

-        # SIGTTOU if youtube-dl is run in the background.
+        # SIGTTOU if youtube-dlc is run in the background.

         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
         out, _ = subprocess.Popen(
             [encodeArgument(exe)] + args,
         # See https://github.com/ytdl-org/youtube-dl/issues/955#issuecomment-209789656
         out, _ = subprocess.Popen(
             [encodeArgument(exe)] + args,


@@ -4144,7 +4144,7 @@ def is_outdated_version(version, limit, assume_new=True):
 
 
 def ytdl_is_updateable():
 
 
 def ytdl_is_updateable():

-    """ Returns if youtube-dl can be updated with -U """
+    """ Returns if youtube-dlc can be updated with -U """

     from zipimport import zipimporter
 
     return isinstance(globals().get('__loader__'), zipimporter) or hasattr(sys, 'frozen')
     from zipimport import zipimporter
 
     return isinstance(globals().get('__loader__'), zipimporter) or hasattr(sys, 'frozen')


@@ -5353,7 +5353,7 @@ def proxy_open(self, req, proxy, type):
             return None  # No Proxy
         if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
             req.add_header('Ytdl-socks-proxy', proxy)
             return None  # No Proxy
         if compat_urlparse.urlparse(proxy).scheme.lower() in ('socks', 'socks4', 'socks4a', 'socks5'):
             req.add_header('Ytdl-socks-proxy', proxy)

-            # youtube-dl's http/https handlers do wrapping the socket with socks
+            # youtube-dlc's http/https handlers do wrapping the socket with socks

             return None
         return compat_urllib_request.ProxyHandler.proxy_open(
             self, req, proxy, type)
             return None
         return compat_urllib_request.ProxyHandler.proxy_open(
             self, req, proxy, type)


@@ -5626,7 +5626,7 @@ def write_xattr(path, key, value):
                 # TODO: fallback to CLI tools
                 raise XAttrUnavailableError(
                     'python-pyxattr is detected but is too old. '
                 # TODO: fallback to CLI tools
                 raise XAttrUnavailableError(
                     'python-pyxattr is detected but is too old. '

-                    'youtube-dl requires %s or above while your version is %s. '
+                    'youtube-dlc requires %s or above while your version is %s. '

                     'Falling back to other xattr implementations' % (
                         pyxattr_required_version, xattr.__version__))
 
                     'Falling back to other xattr implementations' % (
                         pyxattr_required_version, xattr.__version__))
 

diff --git a/youtube_dl/version.py b/youtube_dlc/version.py
similarity index 100%
rename from youtube_dl/version.py
rename to youtube_dlc/version.py