From ff72c3e21fc4056671fe695dbee4354a661a5c17 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Mon, 14 Jan 2019 17:07:02 +0100
Subject: [PATCH] =?UTF-8?q?Makefile=20f=C3=BCr=20Upload=20auf=20dedyn=20um?=
 =?UTF-8?q?gestellt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	geändert:       homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	geändert:       homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
---
 .../src/Makefiles/Makefile.ftpUpload          | 26 ++++++++++++-------
 .../src/galleryHelper/vidGalInsert.py         |  2 ++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
index 1beed8a..23f2d1e 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -20,8 +20,9 @@ timeHandling= --only-newer
 lftpNetLimitRate = 0
 
 
-vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+domain = cwsvJudo.dedyn.io
 
+vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
 
 
 .PHONY: all
@@ -32,11 +33,18 @@ ftpUpload:
 	lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
 		-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
 	
-#	for file in videos/webm/*; do \
-#		filename=$${file##*/}; \
-#		$(vidGalInsertScript) \
-#			--shiaiYamlFile=./shiaiData.yaml \
-#			--vidUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/webm/$${filename}" \
-#			--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
-#			--checkSum=$${filename%.*};\
-#	done;\
+registerFiles:
+	for file in videos/webm/*; do \
+		fullfilename=$$(readlink -f $${file}); \
+		filename=$${file##*/}; \
+		#echo "File: " $${file}; \
+		#echo "fullFilename: " $${fullfilename}; \
+		#echo "Filename: " $${filename}; \
+		#echo "checkSum: " $${filename%.*}; \
+		sudo ln --symbolic --force $${fullfilename} /var/www/html/webm/$${filename}; \
+		echo $(vidGalInsertScript) \
+			--shiaiYamlFile=./shiaiData.yaml \
+			--vidUrl="http://$(domain)/webm/$${filename}" \
+			--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
+			--checkSum=$${filename%.*}; \
+	done;\
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
index d2bc080..02d5ccf 100755
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
@@ -23,6 +23,8 @@ with open(argv.shiaiYamlFile, 'r') as yamlFile:
     shiaiData = yaml.safe_load(yamlFile)
     print(shiaiData['wkId'])
 
+print(" checkSum: ", argv.checkSum)
+
 payLoad = {
 	'action'  : "INSERT", 
 	'wkId'    : shiaiData['wkId'],