marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Einschränkung auf einzelne Seiten, Tage und userHashes

Browse Source 
modified:   redesign2018/markdownExperiment/admin/phpcount/phpcountLog.php
- vergeblicher Versuch die fehlerhafte Anzeige bei deaktiviertem JS zu
beheben
	modified:   redesign2018/markdownExperiment/phpLib/imgGallery/index.php.tmpl
- Anpassungen von Hand für einzelne Spezialfälle (@todo eifachere
Individualkonfiguration)
	modified:   redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	modified:   redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
- Konzept einer neuen Videogalerie
	modified:   redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
	new file:   redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
	new file:   redesign2018/markdownExperiment/src/galleryHelper/videoGalleryVue.tmpl.php
	new file:   redesign2018/markdownExperiment/src/galleryHelper/yamlRead.py
This commit is contained in:
marko
2018-12-05 12:55:32 +01:00
parent 9b1a33ab0f
commit 9c2af1f3bf
8 changed files with 566 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
View File

@@ -1,15 +1,27 @@
# Upload der Videogalleriedateien auf einen Webspace und Eintragen in
# die "Videodatenbank"
include Makefile.cfg
ftpServer = ftpupload.net
ftpUser = unaux_22935783
ftpPassword = eeloor0D
#ftpServer = ftpupload.net
#ftpUser = unaux_22935783
#ftpPassword = eeloor0D
#httpUrlBase = http://cwsvjudo-media-2018.unaux.com/
ftpPathBase = /htdocs
ftpServer = cwsvjudo.bplaced.net
ftpUser = cwsvjudo
ftpPassword = ***REMOVED***
httpUrlBase = http://cwsvjudo.bplaced.net.net/
#ftpPathBase = /htdocs
ftpPathBase = /www
ftpFilePath = videoalben/videoalben.2018
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
@@ -20,14 +32,14 @@ all:
.PHONY: ftpUpload
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; ' \
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; ' \
-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;\
for file in videos/webm/*; do \
filename=$${file##*/}; \
$(vidGalInsertScript) \
--shiaiYamlFile=./shiaiData.yaml \
--vidUrl="$(httpUrlBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm/$${filename}" \
--posterUrl="$(httpUrlBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
--checkSum=$${filename%.*};\
done;\