diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest index a81df43..16dd26b 100644 --- a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest +++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest @@ -18,7 +18,7 @@ VID_CODEC_HEIGHT := $(if $(VID_CODEC_HEIGHT),$(VID_CODEC_HEIGHT),$(DEFAULT_VID_C VID_CODEC_WIDTH := $(if $(VID_CODEC_WIDTH),$(VID_CODEC_WIDTH),$(DEFAULT_VID_CODEC_WIDTH)) VID_CODEC := $(if $(VID_CODEC),$(VID_CODEC),$(DEFAULT_VID_CODEC)) - +targetSourceDirectories = $(sort $(dir $(wildcard ./videos/aufnahmen/*/))) targetSourceDir = videos/aufnahmen/ sourceVideos = $(wildcard videos/.forCompressing/*.video) @@ -69,10 +69,12 @@ targets: # checkSum=$$(sha512sum $${file});\ # ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ # done; - for file in $(targetSourceDir)/*.*;\ - do \ - checkSum=$$(sha512sum $${file});\ - ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ + for directory in $(targetSourceDirectories) ;\ + do for file in $${directory}/*.*;\ + do \ + checkSum=$$(sha512sum $${file});\ + ln -f $${file} videos/.forCompressing/$${checkSum%%\ *}.video;\ + done;\ done; # Die Stabilisierungsberechnung: diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGalInsert.py b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGalInsert.py index d4728d7..fe4557d 100644 --- a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGalInsert.py +++ b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGalInsert.py @@ -6,7 +6,7 @@ import urllib.parse wkId = 311 checkSum = "b674aaaa71d18a8ef1e616fb94ddc399e9e3214bbc8497768217278d546c00d63741ad6cbbcfd0e95f518da39fbaee67b5b92fb4f4b5f3933a9bf08e38bb8283" -payLoad = {"action": "INSERT", "wkId": wkId, "checkSum": checkSum} +payLoad = {'action': "INSERT", 'wkId': wkId, 'checkSum': urllib.parse.urlencode(checkSum), 'vidUrl': urllib.parse.urlencode(vidUrl) } #r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php?action=INSERT&wkId='+str(wkId)+'&checkSum='+urllib.parse.urlencode(checkSum), auth=('marko', '***REMOVED***')) r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))