Merge branch 'redesign2017' of /f/gitRepositories/judo into redesign2018

2019-01-08 14:38:33 +01:00
parent 9c2af1f3bf 43f485628f
commit 1823d03ef9
11 changed files with 70 additions and 25 deletions
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -8,22 +8,20 @@ include Makefile.cfg
 #ftpPassword = eeloor0D
 #httpUrlBase = http://cwsvjudo-media-2018.unaux.com/

-
 ftpServer = cwsvjudo.bplaced.net
 ftpUser = cwsvjudo
 ftpPassword = ***REMOVED***
 httpUrlBase = http://cwsvjudo.bplaced.net.net/

-#ftpPathBase = /htdocs
-ftpPathBase = /www
 ftpFilePath = videoalben/videoalben.2018
+ftpPathBase = /www

 vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
 dryRun = --dry-run
 timeHandling= --only-newer
 lftpNetLimitRate = 0

-vidGalInsertScript = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+vidGalInsertScript = /d/tempcwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py



@@ -32,7 +30,7 @@ all:

 .PHONY: ftpUpload
 ftpUpload:
-	lftp -e '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; ' \
+	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 \
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
@@ -1,5 +1,7 @@
 FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
+#FFMPEG = ffmpeg
 GUETZLI = /d/projekte/tests/guetzli.git/bin/Release/guetzli.exe
+#GUETZLI = /home/marko/proggis/guetzli/bin/Release/guetzli

 DEFAULT_FFMPEG = ffmpeg
 #DEFAULT_FFMPEG = /c/proggis/media/editoren/ffmpeg-4.0.2-win64-static/bin/ffmpeg.exe
@@ -19,6 +21,10 @@ VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODE
 VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC))

 defaultTargetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))
+VID_CODEC_DEADLINE := -deadline best
+#VID_CODEC_DEADLINE := -deadline realtime
+
+targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/)))

 targetSourceDirectories := $(if $(targetSourceDirectories), $(targetSourceDirectories), $(defaultTargetSourceDirectories))
 sourceVideos = $(wildcard videos/.forCompressing/*.video)
@@ -114,7 +120,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 $<
 #		-b:v $(VID_CODEC_BITRATE) \
 # Second Pass
 	$(FFMPEG) -i $< \
@@ -122,9 +128,15 @@ videos/webm/%.webm: videos/.forCompressing/%.video videos/.forCompressing/%.trf
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-passlogfile "$(basename $<).firstPassLog" \
+<<<<<<< HEAD
 		-deadline best \
 		-b:v $(shell /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
 		-aspect $(ffmpegDisplayAspectRatio)\
+=======
+		$(VID_CODEC_DEADLINE) \
+		-b:v $(shell ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py $<)k \
+		-aspect 16:9 \
+>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
 		-threads 1 \
 		-speed 0 \
 		-tile-columns 0 \
@@ -145,4 +157,10 @@ videos/thumbnails/%.png: videos/.forCompressing/%.video
 	$(FFMPEG) -i "$<" -filter:v $(ffmpegVideoFilterDeinterlace)$(ffmpegVideoScaleFilter)thumbnail -frames:v 1 "$@"

 videos/thumbnails/%.jpg: videos/thumbnails/%.png
+<<<<<<< HEAD
 	$(GUETZLI) --quality 90 "$<" "$@"
+=======
+#	$(GUETZLI) --quality 90 "$<" "$@"
+	convert "$<" "$@"
+
+>>>>>>> a763569bdbb2f100ce14b50dcb7828db4e6f4852
--- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vp9
@@ -3,11 +3,11 @@ include Makefile.cfg
 # Standardwerte

 # Für eine schnelle Komprimierung
-DEFAULT_VID_CODEC = libvpx 
+#DEFAULT_VID_CODEC = libvpx 
 DEFAULT_VID_CODEC_BITRATE = 500k
 DEFAULT_VID_CODEC_HEIGHT = 320
 #DEFAULT_VID_CODEC_BITRATE = 250k
-#DEFAULT_VID_CODEC = libvpx-vp9
+DEFAULT_VID_CODEC = libvpx-vp9


 # Standardwerte auf die benutzen Variablen schreiben, falls diese noch 
@@ -62,7 +62,8 @@ TEST:
 videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -73,7 +74,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360 \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -97,7 +99,8 @@ videos/webm/%.webm: videos/aufnahmen/mögel/%.MP4
 videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 	mkdir -p videos/webm
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 1 \
 		-b:v $(VID_CODEC_BITRATE) \
@@ -108,7 +111,8 @@ videos/webm/%.webm: videos/aufnahmen/moegel/%.MP4
 		-y \
 	/dev/null
 	ffmpeg -i $^ \
-		-filter:v yadif=0:0:0,scale=-1:480 \
+		-aspect 16:9 \
+		-filter:v yadif=0:0:0,scale=640:360:flags=lanczos \
 		-codec:v $(VID_CODEC) \
 		-pass 2 \
 		-b:v $(VID_CODEC_BITRATE) \
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
@@ -34,7 +34,7 @@ def probe(vid_file_path):

    pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
    out, err = pipe.communicate()
-    return json.loads(out)
+    return json.loads(out.decode('utf-8'))


 def duration(vid_file_path):
--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
@@ -1,7 +1,7 @@
 <?php
+$basePath = "/users/cwsvjudo/www";
 include_once("config.inc.php");

-	$basePath = "/users/cwsvjudo/www";

 	require_once($basePath."/config/cwsvJudo.config.php");

--- a/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
+++ b/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/listEvents.php
@@ -27,14 +27,16 @@
 		
 		$eventList = getAllEvents($mysqli);
 		foreach($eventList as $event){
-			$wkData = getWkData($mysqli, $event['wkId']);
+//			$wkData = getWkData($mysqli, $event['wkId']);
+			$wkData = getWkEventData($mysqli, $event['id']);
+//			var_dump($wkData);
 ?>
 		<div class="wkBox">
-			[<?php echo $event['id']?>] -- <?php echo mb_convert_encoding($wkData['Veranstaltung'], 'UTF-8', 'ISO-8859-1');?>
+			[<?php echo $event['id']?>] -- <?php echo $wkData['Veranstaltung'];?>
 				<ul>
 					<li>Meldefrist: <?php echo $event['meldefrist'];?></li>
 					<li>Datum: <?php echo $wkData['Datum'];?></li>
-					<li>Altersklassen: <?php echo mb_convert_encoding($wkData['Altersklassen'],'UTF-8');?></li>
+					<li>Altersklassen: <?php echo $wkData['Altersklassen'];?></li>
 					<li><?php echo $event['wkId'];?></li>
 				</ul>
 				<form action="./showEvent.php" method="post">
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/admin/showEvent.php
@@ -175,6 +175,11 @@
 					echo("<tr><th>Name</th><th>Vorname</th><th>Masse</th><th>Platz</th><th>starterId</th><th>fahrtId</th></tr>");

 					foreach( $starterData as $starter ){
+						if( empty($starter) ){
+							echo("Keine ".$typeKey." für dieses Event!");
+							continue;
+						}
+						
 						if($starter['type'] != $typeKey) continue;
 						echo("<tr>");
 							$userData = getUserData($mysqli, $starter['userId']);
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/index.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/index.php
@@ -98,20 +98,21 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 				}
 				else{
 					foreach($wkEventData as $wkEvent){
+//						var_dump($wkEvent);
 ?>
 						<div class="wkInfoCard">
-							<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['Datum'] );?>">
+							<time class="wkInfoCardDate" datetime="<?php echo( $wkEvent['date'] );?>">
 								<span class="wkInfoCardDateWeekday">
-									<?php echo( strftime("%a", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%a", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateDay">
-									<?php echo( strftime("%d", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%d", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateMonth">
-									<?php echo( strftime("%b", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%b", strtotime($wkEvent['date'])));?>
 								</span>
 								<span class="wkInfoCardDateYear">
-									<?php echo( strftime("%Y", strtotime($wkEvent['Datum'])));?>
+									<?php echo( strftime("%Y", strtotime($wkEvent['date'])));?>
 								</span>
 							</time>

@@ -119,7 +120,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 								<div class="wkInfoCardWkInfo">
 									<h4 class="fontWeightLighter" ><?php echo( $wkEvent['Veranstaltung'] );?></h4>
 									<dl>
-										<dt>Datum</dt><dd><time datetime="<?php echo( $wkEvent['Datum'] );?>"><?php echo( $wkEvent['Datum'] );?></time></dd>
+										<dt>Datum</dt><dd><time datetime="<?php echo( $wkEvent['date'] );?>"><?php echo( $wkEvent['date'] );?></time></dd>
 										<dt>Altersklassen</dt><dd><?php echo( $wkEvent['Altersklassen'] );?></dd>
 										<dt>Eingeschrieben als</dt><dd><?php echo( $startTyp[$wkEvent['type']] );?></dd>
 									</dl>
@@ -132,7 +133,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 									<a href ="/ressourcen/phpLib/calendar.php?wkID=<?php echo $wkEvent['lfdeNr']?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
 										Termin als iCal
 									</a>
-									<a href ="<?php echo( addToGcalUrl( $wkEvent['Veranstaltung'], $wkEvent['Datum'] ) );?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
+									<a href ="<?php echo( addToGcalUrl( $wkEvent['Veranstaltung'], $wkEvent['date'] ) );?>" class="wkInfoCardButton wkInfoCardButtonSuccess wkInfoCardButtonRaised">
 										In den Google Calendar
 									</a>
 								</div>
@@ -211,6 +212,7 @@ setlocale (LC_ALL, 'de_DE@euro', 'de_DE', 'de', 'ge');
 ?>
 				<h3><?php echo( $wkEvent['Veranstaltung'] );?></h3>
 				<?php
+					//var_dump($wkEvent);
 					echo( 
 						htmlWkEvent(
 							$wkEvent, 
--- a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipoLib.inc.php
@@ -343,6 +343,21 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 	// Bei einem leeren Ergebnis (NULL oder leeres Array) soll ein leeres Array zurückgeliefert werden
 	if( empty($ret) ) return array();

+// @todo: nur temporär: fehlende Wettkampdaten aus den Metadaten ergänzen
+if( empty($ret['wkId']) ){
+	$tmpWkEvent = json_decode($ret['bemerkungen'], true);
+	if(!empty($tmpWkEvent)){
+//	var_dump( $tmpWkEvent );
+//	var_dump( json_decode($aWkEvent['bemerkungen'], true) );
+		$ret['Datum'] = $tmpWkEvent['Datum'];
+		$ret['Veranstaltung'] = $tmpWkEvent['Veranstaltung'];
+		$ret['Altersklassen'] = $tmpWkEvent['Altersklassen'];
+		$ret['bemerkungen'] = $tmpWkEvent['bemerkungen'];
+	}
+}
+
+
+
 // Zeichensatzkonvertierung
 	array_walk(
 		$ret,
@@ -352,6 +367,7 @@ if( (string)(int)$anEventId != $anEventId ) return $ret;
 		$someOptions
 	);

+
 return $ret;
 }

--- a/homepage/redesign2018/markdownExperiment/zopfli
+++ b/homepage/redesign2018/markdownExperiment/zopfli