From 1f422394eb8f0826cca4880874404d47596146be Mon Sep 17 00:00:00 2001
From: marko <marko@helko>
Date: Wed, 27 Mar 2019 17:22:55 +0100
Subject: [PATCH] =?UTF-8?q?-=20Upload=20teilweise=20entfernt=20(ist=20aber?=
 =?UTF-8?q?=20sowieso=20das=20falsche=20Makefile)=20=09modified:=20=20=20h?=
 =?UTF-8?q?omepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.?=
 =?UTF-8?q?vidstab=20-=20Variable=20f=C3=BCr=20getVideoDuration=20=09modif?=
 =?UTF-8?q?ied:=20=20=20homepage/redesign2018/markdownExperiment/src/Makef?=
 =?UTF-8?q?iles/Makefile.vidstabTest=20-=20veralteten=20Link=20korrigiert?=
 =?UTF-8?q?=20=09modified:=20=20=20homepage/redesign2018/markdownExperimen?=
 =?UTF-8?q?t/src/md/hilfsmittel.md=20=09modified:=20=20=20homepage/redesig?=
 =?UTF-8?q?n2018/markdownExperiment/src/yaml/index.subNav.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Makefiles/Makefile.vidstab            | 20 +++++++++----------
 .../src/Makefiles/Makefile.vidstabTest        |  7 +++++--
 .../markdownExperiment/src/md/hilfsmittel.md  |  2 +-
 .../src/yaml/index.subNav.yaml                |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
index 7f2f90b..87de5c9 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
@@ -257,16 +257,16 @@ videos/webm/%.webm: videos/aufnahmen/elly/%.mp4
 		-an \
 		-f webm \
 	"$@"
-	curl \
-		--upload-file "$@" \
-		--user cwsvjudo:Dee4oquu \
-		"ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
-		--ftp-create-dirs
-	curl \
-		--upload-file "$@" \
-		--user cwsvjudo:***REMOVED*** \
-		"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
-		--ftp-create-dirs
+#	curl \
+#		--upload-file "$@" \
+#		--user cwsvjudo:Dee4oquu \
+#		"ftp://cwsvjudo.square7.net/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
+#		--ftp-create-dirs
+#	curl \
+#		--upload-file "$@" \
+#		--user cwsvjudo:***REMOVED*** \
+#		"ftp://cwsvjudo.bplaced.net/www/videoalben/videoalben.2018/$(VID_GAL_DIR)/$(patsubst videos/%,%,$@)" \
+#		--ftp-create-dirs
 
 videos/thumbnails/%.jpg: videos/webm/%.webm
 	mkdir -p videos/thumbnails
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
index d827f68..32ce5fa 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
@@ -6,6 +6,9 @@ GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
 DEFAULT_FFMPEG = ffmpeg
 #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
 
+GET_VIDEO_DURATION_JSON = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
+
+
 # Für eine schnelle Komprimierung libvpx, sonst vp9
 DEFAULT_VID_CODEC_HEIGHT = 360
 DEFAULT_VID_CODEC_WIDTH  = -2
@@ -121,7 +124,7 @@ videos/.forCompressing/%.firstPassLog-0.log: videos/.forCompressing/%.video vide
 # Die erste Abhängigkeit muss das quellVideo sein!
 videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf videos/.forCompressing/%.firstPassLog-0.log
 	mkdir -p videos/webm
-	~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<
+	$(GET_VIDEO_DURATION_JSON) $<
 #		-b:v $(VID_CODEC_BITRATE) \
 # Second Pass
 	$(FFMPEG) -i $< \
@@ -130,7 +133,7 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 		-pass 2 \
 		-passlogfile "$(basename $<).firstPassLog" \
 		$(VID_CODEC_DEADLINE) \
-		-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
+		-b:v $(shell $(GET_VIDEO_DURATION_JSON) $<)k \
 		-aspect $(ffmpegDisplayAspectRatio)\
 		-threads 1 \
 		-speed 0 \
diff --git a/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md b/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
index 13f785c..c5178f8 100644
--- a/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
+++ b/homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
@@ -1,6 +1,6 @@
 ---
 lang: de
-title: "Helferlein für das Juodtraining"
+title: "Helferlein für das Judotraining"
 description: "Kleine Helferlein für das Training, insbesondere das Judotraining"
 author: "marko"
 keywords:
diff --git a/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml b/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
index 0cbd470..c01dbc0 100644
--- a/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
+++ b/homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
@@ -6,5 +6,5 @@ subNav:
 	- *galerien
 	- *kontakt
 	- *judoWiki
-	- *extras
+	- *tools
 ...