Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use git submodules instead of having the ci add youtube-dl #37

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Use git submodules instead of having the ci add youtube-dl #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94cad27
Added youtube-dl and youtube-dlp (original shortname yt-dlp) as submo…
nullket Nov 10, 2021
2246443
Do not download and integrate youtube-dl (or forks) during the run of…
nullket Nov 10, 2021
660074b
Create build-addon.yml
nullket Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/scripts/build-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ git config --global user.email "tristanteufel@googlemail.com"
git config --global user.name "firsttris"

cd ..
# youtube_dl
wget ${YOUTUBE_DL}
unzip master.zip
cp -R youtube-dl-master/youtube_dl ${ADDON_NAME}
# clone repo
git clone https://${GH_REPO}
git clone https://${GH_REPO_PYTHON3}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build-addon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
env:
GH_REPO: "github.com/firsttris/repository.sendtokodi.git"
GH_REPO_PYTHON3: "github.com/firsttris/repository.sendtokodi.python3.git"
YOUTUBE_DL: https://github.com/rg3/youtube-dl/archive/master.zip
VERSION: 0.1.${{github.run_id}}
ADDON_NAME: plugin.video.sendtokodi
REPO_NAME: repository.sendtokodi
Expand All @@ -18,5 +17,7 @@ jobs:
TOKEN: ${{secrets.PAT}}
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- run: chmod +x ${GITHUB_WORKSPACE}/.github/scripts/build-script.sh
- run: ${GITHUB_WORKSPACE}/.github/scripts/build-script.sh
- run: ${GITHUB_WORKSPACE}/.github/scripts/build-script.sh
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "lib/youtube-dl"]
path = lib/youtube-dl
url = https://github.com/ytdl-org/youtube-dl.git
[submodule "lib/yt-dlp"]
path = lib/yt-dlp
url = https://github.com/yt-dlp/yt-dlp.git
51 changes: 0 additions & 51 deletions .travis.yml
View file
Open in desktop

This file was deleted.

Empty file added lib/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions lib/youtube-dl
Open in desktop
Submodule youtube-dl added at a80358
1 change: 1 addition & 0 deletions lib/yt-dlp
Open in desktop
Submodule yt-dlp added at 9ebf3c
2 changes: 1 addition & 1 deletion service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def strptime(date_string, format):

patchYoutubeDL()

from youtube_dl import YoutubeDL
from lib.youtube-dl.youtube_dl import YoutubeDL


def showInfoNotification(message):
Expand Down