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

- Arbeitsversionen

Browse Source 
modified:   homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
	modified:   homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
	modified:   homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
This commit is contained in:
marko
2018-11-23 12:00:18 +01:00
parent 0948251fac
commit c3a324fa4e
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,11 @@ 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 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) -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
for file in videos/webm/*; do \ # for file in videos/webm/*; do \
filename=$${file##*/}; \ # filename=$${file##*/}; \
$(vidGalInsertScript) --shiaiYamlFile=./shiaiData.yaml --vidUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/webm/$${filename}" --checkSum=$${filename%.*};\ # $(vidGalInsertScript) \
done;\ # --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;\

20
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGal.php
View File

@@ -18,29 +18,33 @@ if($_GET['action'] == "INSERT"){
$wkId = $_GET['wkId']; $wkId = $_GET['wkId'];
$checkSum = urldecode( $_GET['checkSum'] ); $checkSum = urldecode( $_GET['checkSum'] );
$vidUrl = urldecode( $_GET['vidUrl'] ); $vidUrl = urldecode( $_GET['vidUrl'] );
$posterUrl = urldecode( $_GET['posterUrl'] );
echo("CheckSum is ".$checkSum); echo("CheckSum is ".$checkSum."\n");
echo("vidUrl is ".$vidUrl); echo("vidUrl is ".$vidUrl."\n");
echo("posterUrl is ".$posterUrl."\n");
$vidQuery = $vidQuery =
$cwsvJudoDbConnection->prepare( $cwsvJudoDbConnection->prepare(
"INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url ) VALUES ( :wkId, HEX(:checkSum), :vidUrl);" "INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( :wkId, UNHEX(:checkSum), :vidUrl, :posterUrl );"
); );
$vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT); $vidQuery->bindParam(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum ); $vidQuery->bindParam(':checkSum', $checkSum );
$vidQuery->bindParam(':vidUrl', $vidUrl ); $vidQuery->bindParam(':vidUrl', $vidUrl );
$vidQuery->bindParam(':posterUrl', $posterUrl );
echo("INSERT IGNORE INTO cwsvjudo.`shiai.videos` ( wkId, checkSum, url, posterUrl ) VALUES ( ".$wkId.", UNHEX('".$checkSum."' ), '".$vidUrl."', '".$posterUrl."' );\n");
$vidQuery->execute(); $vidQuery->execute();
$vidQuery = $vidQuery =
$cwsvJudoDbConnection->prepare( $cwsvJudoDbConnection->prepare(
"UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl WHERE checkSum=HEX( :checkSum );" "UPDATE cwsvjudo.`shiai.videos` SET wkId=:wkId, url=:vidUrl, posterUrl=:posterUrl WHERE checkSum=UNHEX( :checkSum );"
// "UPDATE cwsvjudo.`shiai.videos` 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(':wkId', intval($wkId), PDO::PARAM_INT);
$vidQuery->bindParam(':checkSum', $checkSum ); $vidQuery->bindParam(':checkSum', $checkSum );
$vidQuery->bindParam(':vidUrl', $vidUrl ); $vidQuery->bindParam(':vidUrl', $vidUrl );
$vidQuery->bindParam(':posterUrl', $posterUrl );
echo( "UPDATE cwsvjudo.`shiai.videos` SET wkId=".$wkId.", url='".$vidUrl."', posterUrl='".$posterUrl."' WHERE checkSum=UNHEX( '".$checkSum."' );\n");
$vidQuery->execute(); $vidQuery->execute();
} }
@@ -64,8 +68,8 @@ if($_GET['action'] == "INSERT"){
<body> <body>
<?php <?php
var_dump($_GET); //var_dump($_GET);
var_dump($wkVideos); //var_dump($wkVideos);
?> ?>
</body> </body>

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

@@ -13,6 +13,7 @@ argParser = argparse.ArgumentParser()
#argParser.add_argument("wkId", type=int) #argParser.add_argument("wkId", type=int)
argParser.add_argument("--checkSum") argParser.add_argument("--checkSum")
argParser.add_argument("--vidUrl") argParser.add_argument("--vidUrl")
argParser.add_argument("--posterUrl")
argParser.add_argument("--shiaiYamlFile") argParser.add_argument("--shiaiYamlFile")
argv = argParser.parse_args() argv = argParser.parse_args()
@@ -26,7 +27,8 @@ payLoad = {
'action' : "INSERT", 'action' : "INSERT",
'wkId' : shiaiData['wkId'], 'wkId' : shiaiData['wkId'],
'checkSum': urllib.parse.quote(argv.checkSum), 'checkSum': urllib.parse.quote(argv.checkSum),
'vidUrl' : urllib.parse.quote(argv.vidUrl) 'vidUrl' : urllib.parse.quote(argv.vidUrl),
'posterUrl' : urllib.parse.quote(argv.posterUrl)
} }
r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***')) r = requests.get('http://cwsvjudo.bplaced.net/admin/vidGal.php', params=payLoad, auth=('marko', '***REMOVED***'))