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

Makefile für Upload auf dedyn umgestellt

Browse Source 
geändert:       homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	geändert:       homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
This commit is contained in:
marko
2019-01-14 17:07:02 +01:00
parent 2a2cf9a44e
commit ff72c3e21f
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;\

2
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
View File

@@ -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'],