From c3a324fa4e3741bef2030d9dd33c5bb00478c5ac Mon Sep 17 00:00:00 2001
From: marko <marko@helko>
Date: Fri, 23 Nov 2018 12:00:18 +0100
Subject: [PATCH] - Arbeitsversionen 	modified:  
 homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload 
 modified:  
 homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php 
 modified:  
 homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py

---
 .../src/Makefiles/Makefile.ftpUpload          | 12 +++++++----
 .../src/galleryHelper/vidGal.php              | 20 +++++++++++--------
 .../src/galleryHelper/vidGalInsert.py         |  4 +++-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
index 9fe7b08..064ed7e 100644
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -23,7 +23,11 @@ ftpUpload:
 	lftp -e 'set net:limit-rate 25600; 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}" --checkSum=$${filename%.*};\
-	done;\
+#	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;\
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
index f88279e..9513974 100644
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
@@ -18,29 +18,33 @@ if($_GET['action'] == "INSERT"){
 	$wkId = $_GET['wkId'];
 	$checkSum = urldecode( $_GET['checkSum'] );
 	$vidUrl = urldecode( $_GET['vidUrl'] );
+	$posterUrl = urldecode( $_GET['posterUrl'] );
 
-	echo("CheckSum is ".$checkSum);
-	echo("vidUrl is ".$vidUrl);
+	echo("CheckSum is ".$checkSum."\n");
+	echo("vidUrl is ".$vidUrl."\n");
+	echo("posterUrl is ".$posterUrl."\n");
 	
 	$vidQuery = 
 		$cwsvJudoDbConnection->prepare(
-			"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);"
+			"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( :wkId, UNHEX(:checkSum), :vidUrl, :posterUrl );"
 		);
 		$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
 		$vidQuery->bindParam(':checkSum', $checkSum );
 		$vidQuery->bindParam(':vidUrl', $vidUrl );
-
+		$vidQuery->bindParam(':posterUrl', $posterUrl );
+	echo("INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( ".$wkId.", UNHEX('".$checkSum."' ), '".$vidUrl."', '".$posterUrl."' );\n");
 	$vidQuery->execute();
 
 	$vidQuery = 
 		$cwsvJudoDbConnection->prepare(
-			"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl WHERE checkSum=HEX( :checkSum );"
+			"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl, posterUrl=:posterUrl WHERE checkSum=UNHEX( :checkSum );"
 //			"UPDATE cwsvjudo.`shiai.videos` url=:vidUrl WHERE checkSum=HEX(:checkSum);"
 		);
 		$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
 		$vidQuery->bindParam(':checkSum', $checkSum );
 		$vidQuery->bindParam(':vidUrl', $vidUrl );
-
+		$vidQuery->bindParam(':posterUrl', $posterUrl );
+	echo( "UPDATE cwsvjudo.`shiai.videos` SET wkId=".$wkId.", url='".$vidUrl."', posterUrl='".$posterUrl."' WHERE checkSum=UNHEX( '".$checkSum."' );\n");
 	$vidQuery->execute();
 }
 
@@ -64,8 +68,8 @@ if($_GET['action'] == "INSERT"){
 	<body>
 <?php
 
-var_dump($_GET);
-var_dump($wkVideos);
+//var_dump($_GET);
+//var_dump($wkVideos);
 
 ?>
 	</body>
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
index 7027920..d2bc080 100644
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
@@ -13,6 +13,7 @@ argParser = argparse.ArgumentParser()
 #argParser.add_argument("wkId", type=int)
 argParser.add_argument("--checkSum")
 argParser.add_argument("--vidUrl")
+argParser.add_argument("--posterUrl")
 argParser.add_argument("--shiaiYamlFile")
 
 argv = argParser.parse_args()
@@ -26,7 +27,8 @@ payLoad = {
 	'action'  : "INSERT", 
 	'wkId'    : shiaiData['wkId'], 
 	'checkSum': urllib.parse.quote(argv.checkSum), 
-	'vidUrl'  : urllib.parse.quote(argv.vidUrl)
+	'vidUrl'  : urllib.parse.quote(argv.vidUrl),
+	'posterUrl'  : urllib.parse.quote(argv.posterUrl)
 }
 
 r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))