diff --git a/onlineTraining/Makefile b/onlineTraining/Makefile index 4d384d7..821d956 100644 --- a/onlineTraining/Makefile +++ b/onlineTraining/Makefile @@ -40,3 +40,6 @@ links: download: make --file=Makefile.d/Makefile.youtube-dl +.PHONY: videos +videos: + make --file=Makefile.d/Makefile.clips all diff --git a/onlineTraining/Makefile.d/Makefile.clips b/onlineTraining/Makefile.d/Makefile.clips new file mode 100644 index 0000000..b2a2c3c --- /dev/null +++ b/onlineTraining/Makefile.d/Makefile.clips @@ -0,0 +1,11 @@ +jsonClips := $(wildcard clips.d/*.json) +jsonTaisoClips := $(wildcard clips.d/taiso/*.json) + +webmClips := $(patsubst clips.d/%.json, videos.d/%.webm, $(jsonClips)) +webmTaisoClips := $(patsubst clips.d/taiso/%.json, videos.d/taiso/%.webm, $(jsonTaisoClips)) + +.PHONY: all +all: $(webmClips) $(webmTaisoClips) + +videos.d/%.webm: clips.d/%.json + ./yt-clipper.py $^ diff --git a/onlineTraining/clips.d/anfersen.json b/onlineTraining/clips.d/anfersen.json new file mode 100644 index 0000000..cf635a0 --- /dev/null +++ b/onlineTraining/clips.d/anfersen.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/embed/6wcWZZw6RGk", + "target": "videos.d/anfersen.webm", + "from": "01:40.208", + "to": "01:54.625", + "crop": {"x": 581, "y": 32, "w": 1309, "h": 1018} +}] diff --git a/onlineTraining/clips.d/handtuchzug.json b/onlineTraining/clips.d/handtuchzug.json new file mode 100644 index 0000000..4154815 --- /dev/null +++ b/onlineTraining/clips.d/handtuchzug.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/embed/HZ7Y41JVoZ8", + "target": "videos.d/handtuchzug.webm", + "from": "02:37.880", + "to": "02:54.200" +}] diff --git a/onlineTraining/clips.d/harei-ushiro.json b/onlineTraining/clips.d/harei-ushiro.json new file mode 100644 index 0000000..edf2574 --- /dev/null +++ b/onlineTraining/clips.d/harei-ushiro.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/watch?v=DsMj71FhToo", + "target": "videos.d/harei-ushiro.webm", + "from": "03:31.344", + "to": "04:21.294", + "crop": {"x": 656, "y": 0, "w": 1264, "h": 1018} +}] diff --git a/onlineTraining/clips.d/harei-yoko-tsugiAshi.json b/onlineTraining/clips.d/harei-yoko-tsugiAshi.json new file mode 100644 index 0000000..e01b13c --- /dev/null +++ b/onlineTraining/clips.d/harei-yoko-tsugiAshi.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/watch?v=DsMj71FhToo", + "target": "videos.d/DeAshiBarei-TsugiAshi.webm", + "from": "02:55.442", + "to": "03:23.803", + "crop": {"x": 656, "y": 0, "w": 1264, "h": 1018} +}] diff --git a/onlineTraining/clips.d/harei-yoko.json b/onlineTraining/clips.d/harei-yoko.json new file mode 100644 index 0000000..8b29cf0 --- /dev/null +++ b/onlineTraining/clips.d/harei-yoko.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/watch?v=DsMj71FhToo", + "target": "videos.d/harei-yoko.webm", + "from": "02:29.750", + "to": "02:48.035", + "crop": {"x": 656, "y": 0, "w": 1264, "h": 1018} +}] diff --git a/onlineTraining/clips.d/hopserlauf.json b/onlineTraining/clips.d/hopserlauf.json new file mode 100644 index 0000000..efe37f2 --- /dev/null +++ b/onlineTraining/clips.d/hopserlauf.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/embed/6wcWZZw6RGk", + "target": "videos.d/hopserlauf.webm", + "from": "01:09.000", + "to": "01:24.833", + "crop": {"x": 581, "y": 32, "w": 1309, "h": 1018} +}] diff --git a/onlineTraining/clips.d/indianer.json b/onlineTraining/clips.d/indianer.json new file mode 100644 index 0000000..f9fc8ca --- /dev/null +++ b/onlineTraining/clips.d/indianer.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/embed/6wcWZZw6RGk", + "target": "videos.d/indianer.webm", + "from": "04:36.917", + "to": "05:05.458", + "crop": {"x": 581, "y": 32, "w": 1309, "h": 1018} +}] diff --git a/onlineTraining/clips.d/kniehebelauf.json b/onlineTraining/clips.d/kniehebelauf.json new file mode 100644 index 0000000..d739122 --- /dev/null +++ b/onlineTraining/clips.d/kniehebelauf.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/embed/6wcWZZw6RGk", + "target": "videos.d/kniehebelauf.webm", + "from": "01:24.917", + "to": "01:39.542", + "crop": {"x": 581, "y": 32, "w": 1309, "h": 1018} +}] diff --git a/onlineTraining/clips.d/kodokanEingang-kniebeuge.json b/onlineTraining/clips.d/kodokanEingang-kniebeuge.json new file mode 100644 index 0000000..9e3753c --- /dev/null +++ b/onlineTraining/clips.d/kodokanEingang-kniebeuge.json @@ -0,0 +1,7 @@ +[{ + "source": "https://www.youtube.com/embed/6wcWZZw6RGk", + "target": "videos.d/***REMOVED***Eingang-kniebeuge.webm", + "from": "03:45.250", + "to": "04:05.167", + "crop": {"x": 581, "y": 32, "w": 1309, "h": 1018} +}] diff --git a/onlineTraining/clips.d/loecherlaufen.json b/onlineTraining/clips.d/loecherlaufen.json new file mode 100644 index 0000000..f25e813 --- /dev/null +++ b/onlineTraining/clips.d/loecherlaufen.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/embed/jxt1gagi6C4", + "target": "videos.d/loecherlaufen.webm", + "from": "05:44.633", + "to": "06:17.949" +}] diff --git a/onlineTraining/clips.d/loecherspringen.json b/onlineTraining/clips.d/loecherspringen.json new file mode 100644 index 0000000..c1db896 --- /dev/null +++ b/onlineTraining/clips.d/loecherspringen.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/embed/jxt1gagi6C4", + "target": "videos.d/loecherspringen.webm", + "from": "05:01.483", + "to": "05:06.399" +}] diff --git a/onlineTraining/clips.d/sockenkreisel.json b/onlineTraining/clips.d/sockenkreisel.json new file mode 100644 index 0000000..6b1b020 --- /dev/null +++ b/onlineTraining/clips.d/sockenkreisel.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/embed/HZ7Y41JVoZ8", + "target": "videos.d/sockenkreisel.webm", + "from": "05:21.240", + "to": "05:34.880" +}] diff --git a/onlineTraining/clips.d/taiso/beingraetche.json b/onlineTraining/clips.d/taiso/beingraetche.json new file mode 100644 index 0000000..8e14786 --- /dev/null +++ b/onlineTraining/clips.d/taiso/beingraetche.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/watch?v=oFBJH1dddGg", + "target": "videos.d/taiso/beingraetche.webm", + "from": "01.368", + "to": "06.774" +}] diff --git a/onlineTraining/clips.d/taiso/schultereindrehen.json b/onlineTraining/clips.d/taiso/schultereindrehen.json new file mode 100644 index 0000000..f5bd72c --- /dev/null +++ b/onlineTraining/clips.d/taiso/schultereindrehen.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/watch?v=uOmLFzjECP4", + "target": "videos.d/taiso/schultereindrehen.webm", + "from": "02.119", + "to": "17.033" +}] diff --git a/onlineTraining/clips.d/taiso/sumo.json b/onlineTraining/clips.d/taiso/sumo.json new file mode 100644 index 0000000..57aa998 --- /dev/null +++ b/onlineTraining/clips.d/taiso/sumo.json @@ -0,0 +1,6 @@ +[{ + "source": "https://www.youtube.com/embed/zDj1Yf4d07I", + "target": "videos.d/taiso/sumo.webm", + "from": "03.103", + "to": "20.804" +}] diff --git a/onlineTraining/images.d/seefahrt.d/lego-568039.jpg b/onlineTraining/images.d/seefahrt.d/lego-568039.jpg new file mode 100644 index 0000000..1048d18 Binary files /dev/null and b/onlineTraining/images.d/seefahrt.d/lego-568039.jpg differ diff --git a/onlineTraining/trainings.d/onlineTraining-2021-03-17.md b/onlineTraining/trainings.d/onlineTraining-2021-03-17.md new file mode 100644 index 0000000..fff24ad --- /dev/null +++ b/onlineTraining/trainings.d/onlineTraining-2021-03-17.md @@ -0,0 +1,13 @@ +--- +title: onlineTraining 2021-03-17 +... + +# Erwärmung + +Der Reihe rum jeder eine Übung vormachen + +# Timer + +[Timer](http://natemago.github.io/tabata-timer/) + + diff --git a/onlineTraining/trainings.d/seefahrt.md b/onlineTraining/trainings.d/seefahrt.md index 0890906..0951155 100644 --- a/onlineTraining/trainings.d/seefahrt.md +++ b/onlineTraining/trainings.d/seefahrt.md @@ -19,7 +19,7 @@ Wir laufen den Strand entlang. # Schiff gesichtet {data-background="images.d/seefahrt.d/ship-5822314.jpg"} -Tasächlich erspähen wir ein Schiff. Um zu erreichen, bevor es ablegt, +Tasächlich erspähen wir ein Schiff. Um es zu erreichen, bevor es ablegt, müssen wir uns aber beeilen. # Kniehebelauf {data-background-video="videos.d/kniehebelauf.webm" data-background-video-loop="loop"} @@ -66,12 +66,13 @@ Unsere Überfahrt verdienen wir uns, indem wir arbeiten. - Arme machen mit! - 3-mal 30 sek -# In der Nacht {data-background="images.d/seefahrt.d/pumuckl-und-der-blaue-klabauter_sz-442700.jpg"} +# In der Nacht {data-background="images.d/seefahrt.d/moon-5803873.jpg"} Während der Nacht erwachen wir durch ein Geräusch. Wir sehen uns in der -Kajüte um und entdecken einen Klabautermann. Wir entschließen uns, ihn zu fangen. +Kajüte um und entdecken einen Klabautermann. Wir entschließen uns, ihn +zu fangen. -# Hinterher {data-background="images.d/seefahrt.d/pumuckl-und-der-blaue-klabauter_sz-442700.jpg"} +# Hinterher {data-background="images.d/seefahrt.d/Klabautermann_on_ship.jpg"} Zuerst springt er immer wieder durch offene Luken, Bullaugen und Ladeklappen. Wir immer hinterher diff --git a/onlineTraining/yt-clipper.py b/onlineTraining/yt-clipper.py index d17a5bb..cbf550f 100755 --- a/onlineTraining/yt-clipper.py +++ b/onlineTraining/yt-clipper.py @@ -5,8 +5,9 @@ import json import ffmpeg import subprocess import glob +import sys -jsonFileName = "clips.json" +jsonFileName = sys.argv[1] #jsonFileName = "***REMOVED***Kniebeuge.json" clipDict = {}