From 3fba00811122c06778d14ccd0e27fa8f32e89fb1 Mon Sep 17 00:00:00 2001
From: Unknown <blackjack4494@web.de>
Date: Wed, 2 Sep 2020 22:03:33 +0200
Subject: [PATCH] [skip travis] tweaks
---
bin/youtube-dl | 6 ------
devscripts/make_contributing.py | 4 ++--
docs/supportedsites.md | 5 +++++
setup.py | 10 +++++-----
youtube-dl.plugin.zsh | 24 ------------------------
5 files changed, 12 insertions(+), 37 deletions(-)
delete mode 100755 bin/youtube-dl
delete mode 100644 youtube-dl.plugin.zsh
diff --git a/bin/youtube-dl b/bin/youtube-dl
deleted file mode 100755
index fc3cc8ad8..000000000
--- a/bin/youtube-dl
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import youtube_dl
-
-if __name__ == '__main__':
- youtube_dl.main()
diff --git a/devscripts/make_contributing.py b/devscripts/make_contributing.py
index f18de0560..5a068c90c 100755
--- a/devscripts/make_contributing.py
+++ b/devscripts/make_contributing.py
@@ -11,7 +11,7 @@ def main():
options, args = parser.parse_args()
if len(args) != 2:
parser.error('Expected an input and an output filename')
-
+'''
infile, outfile = args
with io.open(infile, encoding='utf-8') as inf:
@@ -27,7 +27,7 @@ def main():
with io.open(outfile, 'w', encoding='utf-8') as outf:
outf.write(out)
-
+'''
if __name__ == '__main__':
main()
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 35c1050e5..e42498b2d 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -224,6 +224,7 @@
- **Disney**
- **dlive:stream**
- **dlive:vod**
+ - **DoodStream**
- **Dotsub**
- **DouyuShow**
- **DouyuTV**: 斗鱼
@@ -352,6 +353,7 @@
- **hotstar:playlist**
- **Howcast**
- **HowStuffWorks**
+ - **hrfernsehen**
- **HRTi**
- **HRTiPlaylist**
- **Huajiao**: 花椒直播
@@ -835,6 +837,9 @@
- **stanfordoc**: Stanford Open ClassRoom
- **Steam**
- **Stitcher**
+ - **StoryFire**
+ - **StoryFireSeries**
+ - **StoryFireUser**
- **Streamable**
- **streamcloud.eu**
- **StreamCZ**
diff --git a/setup.py b/setup.py
index 083f9b0f8..81e22e891 100644
--- a/setup.py
+++ b/setup.py
@@ -67,11 +67,11 @@ setup(
long_description=LONG_DESCRIPTION,
# long_description_content_type="text/markdown",
url="https://github.com/blackjack4494/youtube-dlc",
- # packages=setuptools.find_packages(),
- packages=[
- 'youtube_dlc',
- 'youtube_dlc.extractor', 'youtube_dlc.downloader',
- 'youtube_dlc.postprocessor'],
+ packages=setuptools.find_packages(),
+ #packages=[
+ # 'youtube_dlc',
+ # 'youtube_dlc.extractor', 'youtube_dlc.downloader',
+ # 'youtube_dlc.postprocessor'],
classifiers=[
"Topic :: Multimedia :: Video",
"Development Status :: 5 - Production/Stable",
diff --git a/youtube-dl.plugin.zsh b/youtube-dl.plugin.zsh
deleted file mode 100644
index 27537ee11..000000000
--- a/youtube-dl.plugin.zsh
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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 documentation:
-# http://antigen.sharats.me/
-# https://github.com/zsh-users/antigen
-
-# Install youtube-dlc:
-# antigen bundle ytdl-org/youtube-dl
-# Bundles installed by antigen are available for use immediately.
-
-# Update youtube-dlc (and all other antigen bundles):
-# antigen update
-
-# The antigen command will download the git repository to a folder and then
-# execute an enabling script (this file). The complete process for loading the
-# code is documented here:
-# https://github.com/zsh-users/antigen#notes-on-writing-plugins
-
-# 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.
-alias youtube-dlc="PYTHONPATH=$(dirname $0) $(dirname $0)/bin/youtube-dlc"