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

Erste funktionierende Version des Eintragens in die Videodatenbank

Browse Source 
- Ein paar temporäre Dateien/Verzeichnisse
	modified:   .gitignore
- schon lange überfällige Graphiken
	new file:   markdownExperiment/graphiken/icons/HTML5_1Color_Black.svg
	new file:   markdownExperiment/graphiken/icons/arrowRightDown.svg
	new file:   markdownExperiment/graphiken/icons/calendarIcon.svg
	new file:   markdownExperiment/graphiken/icons/clockIconFriendly.svg
	new file:   markdownExperiment/graphiken/icons/contact4Ways.svg
	new file:   markdownExperiment/graphiken/icons/filmrolle-grau.svg
	new file:   markdownExperiment/graphiken/icons/gallery.svg
	new file:   markdownExperiment/graphiken/icons/kamera-grau.svg
	new file:   markdownExperiment/graphiken/icons/newsFeedIcon.svg
	new file:   markdownExperiment/graphiken/icons/newsIcon.svg
	new file:   markdownExperiment/graphiken/icons/star.svg
	new file:   markdownExperiment/graphiken/icons/terminKalender.svg
	new file:   markdownExperiment/graphiken/icons/wikipediaW.svg
- nach dem upload werden die Videos jetzt auch in die Datenbank eingetragen
	modified:   markdownExperiment/src/Makefiles/Makefile.ftpUpload
	renamed:    markdownExperiment/src/galleryTemplates/vidGal.php -> markdownExperiment/src/galleryHelper/vidGal.php
	new file:   markdownExperiment/src/galleryHelper/vidGalInsert.py
	deleted:    markdownExperiment/src/galleryTemplates/vidGalInsert.py
- gehörte hier eigentlich nicht hin
	deleted:    ../../shiai/shiai.2017/teilnehmer/teilnehmerListe.fods
This commit is contained in:
marko
2018-11-20 14:42:20 +01:00
parent 7d67ab9fa4
commit 1432c50d25
19 changed files with 207 additions and 2366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,17 +4,26 @@ ftpServer = ftpupload.net
ftpUser = unaux_22935783
ftpPassword = eeloor0D
ftpPathBase = /htdocs/videoalben/videoalben.2018
ftpPathBase = /htdocs
ftpFilePath = videoalben/videoalben.2018
vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
dryRun = --dry-run
timeHandling= --only-newer
vidGalInsertScript = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
.PHONY: all
all:
.PHONY: ftpUpload
ftpUpload:
lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm; quit; ' \
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;\

17
homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGal.php → homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
View File

@@ -14,15 +14,28 @@ include_once("config.inc.php");
$cwsvJudoDbConnection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
if($_GET['action'] == "INSERT"){
echo("Inserting");
echo("Inserting\n");
$wkId = $_GET['wkId'];
$checkSum = urldecode( $_GET['checkSum'] );
$vidUrl = urldecode( $_GET['vidUrl'] );
echo("CheckSum is ".$checkSum);
echo("vidUrl is ".$vidUrl);
$vidQuery =
$cwsvJudoDbConnection->prepare(
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);"
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);"
);
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum );
$vidQuery->bindParam(':vidUrl', $vidUrl );
$vidQuery->execute();
$vidQuery =
$cwsvJudoDbConnection->prepare(
"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl WHERE checkSum=HEX( :checkSum );"
// "UPDATE cwsvjudo.`shiai.videos` url=:vidUrl WHERE checkSum=HEX(:checkSum);"
);
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum );

34
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py Normal file
View File

@@ -0,0 +1,34 @@
#!/usr/bin/env python3
import requests
import urllib.parse
import argparse
import yaml
wkId = 311
checkSum = "b674aaaa71d18a8ef1e616fb94ddc399e9e3214bbc8497768217278d546c00d63741ad6cbbcfd0e95f518da39fbaee67b5b92fb4f4b5f3933a9bf08e38bb8283"
argParser = argparse.ArgumentParser()
#argParser.add_argument("wkId", type=int)
argParser.add_argument("--checkSum")
argParser.add_argument("--vidUrl")
argParser.add_argument("--shiaiYamlFile")
argv = argParser.parse_args()
with open(argv.shiaiYamlFile, 'r') as yamlFile:
shiaiData = yaml.safe_load(yamlFile)
print(shiaiData['wkId'])
payLoad = {
'action' : "INSERT",
'wkId' : shiaiData['wkId'],
'checkSum': urllib.parse.quote(argv.checkSum),
'vidUrl' : urllib.parse.quote(argv.vidUrl)
}
r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))
print(r.text)

14
homepage/redesign2018/markdownExperiment/src/galleryTemplates/vidGalInsert.py
View File

@@ -1,14 +0,0 @@
#!/usr/bin/env python3
import requests
import urllib.parse
wkId = 311
checkSum = "b674aaaa71d18a8ef1e616fb94ddc399e9e3214bbc8497768217278d546c00d63741ad6cbbcfd0e95f518da39fbaee67b5b92fb4f4b5f3933a9bf08e38bb8283"
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***'))
print(r.text)