fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

[WIP] Merge splitted files

Browse source
This commit is contained in:
nemunaire 2016-12-14 13:14:22 +01:00
commit 0083c6ec17
2 changed files with 69 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

53
admin/api/file.go
View file

@ -6,6 +6,7 @@ import (
"encoding/base32" "encoding/base32"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -19,8 +20,15 @@ var CloudDAVBase string
var CloudUsername string var CloudUsername string
var CloudPassword string var CloudPassword string
type uploadedFile struct {
URI string
Digest []byte
Path string
Parts []string
}
func createExerciceFile(theme fic.Theme, exercice fic.Exercice, args map[string]string, body []byte) (interface{}, error) { func createExerciceFile(theme fic.Theme, exercice fic.Exercice, args map[string]string, body []byte) (interface{}, error) {
var uf map[string]string var uf uploadedFile
if err := json.Unmarshal(body, &uf); err != nil { if err := json.Unmarshal(body, &uf); err != nil {
return nil, err return nil, err
} }
@ -30,16 +38,39 @@ func createExerciceFile(theme fic.Theme, exercice fic.Exercice, args map[string]
var fromURI string var fromURI string
var getFile func(string) (error) var getFile func(string) (error)
if URI, ok := uf["URI"]; ok { if uf.URI != "" {
hash = sha512.Sum512([]byte(URI)) hash = sha512.Sum512([]byte(uf.URI))
logStr = "Import file from Cloud: " + URI + " =>" logStr = "Import file from Cloud: " + uf.URI + " =>"
fromURI = URI fromURI = uf.URI
getFile = func(dest string) error { return getCloudFile(URI, dest); } getFile = func(dest string) error { return getCloudFile(uf.URI, dest); }
} else if path, ok := uf["path"]; ok { } else if uf.Path != "" && len(uf.Parts) > 0 {
hash = sha512.Sum512([]byte(path)) hash = sha512.Sum512([]byte(uf.Path))
logStr = "Import file from local FS: " + path + " =>" logStr = fmt.Sprintf("Import file from local FS: %s =>", uf.Parts)
fromURI = path fromURI = uf.Path
getFile = func(dest string) error { return os.Symlink(path, dest); } getFile = func(dest string) error {
if fdto, err := os.Create(dest); err != nil {
return err
} else {
writer := bufio.NewWriter(fdto)
for _, partname := range uf.Parts {
if fdfrm, err := os.Open(partname); err != nil {
return err
} else {
reader := bufio.NewReader(fdfrm)
reader.WriteTo(writer)
writer.Flush()
fdfrm.Close()
}
}
fdto.Close()
}
return nil
}
} else if uf.Path != "" {
hash = sha512.Sum512([]byte(uf.Path))
logStr = "Import file from local FS: " + uf.Path + " =>"
fromURI = uf.Path
getFile = func(dest string) error { return os.Symlink(uf.Path, dest); }
} else { } else {
return nil, errors.New("URI or path not filled") return nil, errors.New("URI or path not filled")
} }

53
admin/fill_exercices.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
BASEURL="http://localhost:8081/admin" BASEURL="http://localhost:8081"
BASEURI="https://owncloud.srs.epita.fr/remote.php/webdav/FIC 2017" BASEURI="https://owncloud.srs.epita.fr/remote.php/webdav/FIC 2017"
BASEFILE="/mnt/fic/" BASEFILE="/mnt/fic/"
CLOUDPASS=nemunaire:'p0WJ$&I#OWEtC5UI4@dD' CLOUDPASS=nemunaire:'p0WJ$&I#OWEtC5UI4@dD'
@ -20,7 +20,7 @@ new_exercice() {
GAIN="$5" GAIN="$5"
VIDEO="$6" VIDEO="$6"
curl -f -s -d "{\"title\": \"$TITLE\", \"statement\": \"$STATEMENT\", \"depend\": $DEPEND, \"gain\": $GAIN, \"videoURI\": \"$VIDEO\"}" "${BASEURL}/api/themes/$THEME" | curl -f -s -d "{\"title\": \"$TITLE\", \"statement\": \"$STATEMENT\", \"depend\": $DEPEND, \"gain\": $GAIN, \"videoURI\": \"$VIDEO\"}" "${BASEURL}/api/themes/$THEME/exercices/" |
grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+" grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+"
} }
@ -28,19 +28,18 @@ new_file() {
THEME="$1" THEME="$1"
EXERCICE="$2" EXERCICE="$2"
URI="$3" URI="$3"
shift 3 ARGS="$4"
PARTS= echo "$ARGS" | while read arg
while [ -z "$1" ]
do do
[ -z "${PARTS}" ] && PARTS="[" || PARTS="${PARTS}," [ -z "${PARTS}" ] || PARTS="${PARTS},"
PARTS="${PARTS}\"$1\"" PARTS="${PARTS}\"$arg\""
done done
PARTS="${PARTS}]"
# curl -f -s -d "{\"URI\": \"${BASEFILE}${URI}\"}" "${BASEURL}/api/themes/$THEME/$EXERCICE/files" | # curl -f -s -d "{\"URI\": \"${BASEFILE}${URI}\"}" "${BASEURL}/api/themes/$THEME/$EXERCICE/files" |
curl -f -s -d "{\"path\": \"${BASEFILE}${URI}\", \"parts\": ${PARTS}}" "${BASEURL}/api/themes/$THEME/$EXERCICE/files" | curl -f -s -d @- "${BASEURL}/api/themes/$THEME/exercices/$EXERCICE/files" <<EOF | grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+"
grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+" {"path": "${BASEFILE}${URI}", "parts": [${PARTS}]}
EOF
} }
new_hint() { new_hint() {
@ -50,7 +49,7 @@ new_hint() {
CONTENT=`echo "$4" | sed 's/"/\\\\"/g' | sed ':a;N;$!ba;s/\n/<br>/g'` CONTENT=`echo "$4" | sed 's/"/\\\\"/g' | sed ':a;N;$!ba;s/\n/<br>/g'`
COST="$5" COST="$5"
curl -f -s -d "{\"title\": \"$TITLE\", \"content\": \"$CONTENT\", \"cost\": \"$COST\"}" "${BASEURL}/api/themes/$THEME/$EXERCICE/hints" | curl -f -s -d "{\"title\": \"$TITLE\", \"content\": \"$CONTENT\", \"cost\": $COST}" "${BASEURL}/api/themes/$THEME/exercices/$EXERCICE/hints" |
grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+" grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+"
} }
@ -60,7 +59,7 @@ new_key() {
NAME="$3" NAME="$3"
KEY=`echo $4 | sed 's/"/\\\\"/g' | sed 's#\\\\#\\\\\\\\#g'` KEY=`echo $4 | sed 's/"/\\\\"/g' | sed 's#\\\\#\\\\\\\\#g'`
curl -f -s -d "{\"name\": \"$NAME\", \"key\": \"$KEY\"}" "${BASEURL}/api/themes/$THEME/$EXERCICE/keys" | curl -f -s -d "{\"name\": \"$NAME\", \"key\": \"$KEY\"}" "${BASEURL}/api/themes/$THEME/exercices/$EXERCICE/keys" |
grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+" grep -Eo '"id":[0-9]+,' | grep -Eo "[0-9]+"
} }
@ -68,7 +67,7 @@ get_dir_from_cloud() {
curl -f -s -X PROPFIND -u "${CLOUDPASS}" "${BASEURI}$1" | xmllint --format - | grep 'd:href' | sed -E 's/^.*>(.*)<.*$/\1/' curl -f -s -X PROPFIND -u "${CLOUDPASS}" "${BASEURI}$1" | xmllint --format - | grep 'd:href' | sed -E 's/^.*>(.*)<.*$/\1/'
} }
get_dir() { get_dir() {
ls "${BASEFILE}$1" ls "${BASEFILE}$1" 2> /dev/null
} }
#alias get_dir=get_dir_from_cloud #alias get_dir=get_dir_from_cloud
@ -76,7 +75,7 @@ get_file_from_cloud() {
curl -f -s -u "${CLOUDPASS}" "${BASEURI}$1" | tr -d '\r' curl -f -s -u "${CLOUDPASS}" "${BASEURI}$1" | tr -d '\r'
} }
get_file() { get_file() {
cat "${BASEFILE}$1" | tr -d '\r' cat "${BASEFILE}$1" 2> /dev/null | tr -d '\r'
} }
#alias get_file=get_file_from_cloud #alias get_file=get_file_from_cloud
@ -100,7 +99,7 @@ do
LAST=null LAST=null
EXO_NUM=0 EXO_NUM=0
get_dir "${THM_BASEURI}" | sed 1d | while read f; do basename "$f"; done | while read EXO_URI get_dir "${THM_BASEURI}" | while read f; do basename "$f"; done | while read EXO_URI
do do
case ${EXO_URI} in case ${EXO_URI} in
[0-9]-*) [0-9]-*)
@ -118,6 +117,7 @@ do
EXO_BASEURI="${EXO_URI}/" EXO_BASEURI="${EXO_URI}/"
EXO_VIDEO=$(get_dir "${THM_BASEURI}${EXO_BASEURI}/resolution/" | grep -E "\.(mov|mkv|mp4|avi|flv|ogv|webm)$" | while read f; do basename $f; done | tail -1) EXO_VIDEO=$(get_dir "${THM_BASEURI}${EXO_BASEURI}/resolution/" | grep -E "\.(mov|mkv|mp4|avi|flv|ogv|webm)$" | while read f; do basename $f; done | tail -1)
[ -n "$EXO_VIDEO" ] && EXO_VIDEO="/resolution${THM_BASEURI}${EXO_BASEURI}resolution/${EXO_VIDEO}"
if [ "${LAST}" = "null" ]; then if [ "${LAST}" = "null" ]; then
echo ">>> Assuming this exercice has no dependency" echo ">>> Assuming this exercice has no dependency"
@ -130,7 +130,7 @@ do
EXO_SCENARIO=$(get_file "${THM_BASEURI}${EXO_BASEURI}/scenario.txt") EXO_SCENARIO=$(get_file "${THM_BASEURI}${EXO_BASEURI}/scenario.txt")
EXO_ID=`new_exercice "${THEME_ID}" "${EXO_NAME}" "${EXO_SCENARIO}" "${LAST}" "${EXO_GAIN}" "/resolution${THM_BASEURI}${EXO_BASEURI}resolution/${EXO_VIDEO}"` EXO_ID=`new_exercice "${THEME_ID}" "${EXO_NAME}" "${EXO_SCENARIO}" "${LAST}" "${EXO_GAIN}" "${EXO_VIDEO}"`
if [ -z "$EXO_ID" ]; then if [ -z "$EXO_ID" ]; then
echo -e "\e[31;01m!!! An error occured during exercice add.\e[00m" echo -e "\e[31;01m!!! An error occured during exercice add.\e[00m"
continue continue
@ -160,26 +160,27 @@ do
# Hints # Hints
EXO_HINT=$(get_file "${THM_BASEURI}${EXO_BASEURI}/hint.txt") EXO_HINT=$(get_file "${THM_BASEURI}${EXO_BASEURI}/hint.txt")
HINT_ID=`new_hint "${THEME_ID}" "${EXO_ID}" "Astuce #1" "${EXO_HINT}" "1"` if [ -n "$EXO_HINT" ]; then
if [ -z "$HINT_ID" ]; then HINT_ID=`new_hint "${THEME_ID}" "${EXO_ID}" "Astuce #1" "${EXO_HINT}" "1"`
echo -e "\e[31;01m!!! An error occured during hint import!\e[00m (title=Astuce $1;content=${EXO_HINT};cost=1)" if [ -z "$HINT_ID" ]; then
else echo -e "\e[31;01m!!! An error occured during hint import!\e[00m (title=Astuce $1;content=${EXO_HINT};cost=1)"
echo -e "\e[32m>>> New key added:\e[00m $KEY_ID - $KEY_NAME" else
echo -e "\e[32m>>> New key added:\e[00m $KEY_ID - $KEY_NAME"
fi
fi fi
# Files: splited # Files: splited
get_dir "${THM_BASEURI}${EXO_BASEURI}files/" | grep -v DIGESTS.txt | grep '[0-9][0-9]$' | sed -E 's/\.?([0-9][0-9])$//' | sort | uniq | while read f; do basename "$f"; done | while read FILE_URI get_dir "${THM_BASEURI}${EXO_BASEURI}files/" | grep -v DIGESTS.txt | grep '[0-9][0-9]$' | sed -E 's/\.?([0-9][0-9])$//' | sort | uniq | while read f; do basename "$f"; done | while read FILE_URI
do do
PARTS= PARTS=
for part in $(ls | grep "${FILE_URI}" | sort) for part in "$(get_dir "${THM_BASEURI}${EXO_BASEURI}files/" | grep "${FILE_URI}" | sort)"
do do
PARTS="${PARTS} '${THM_BASEURI}${EXO_BASEURI}files/${part}'" PARTS="${PARTS}${BASEFILE}${THM_BASEURI}${EXO_BASEURI}files/${part}\n"
done done
echo "Import splited file ${THM_BASEURI}${EXO_BASEURI}files/${FILE_URI} from ${PART}" echo "Import splited file ${THM_BASEURI}${EXO_BASEURI}files/${FILE_URI} from `echo ${PART} | tr '\n' ' '`"
FILE_ID=`new_file "${THEME_ID}" "${EXO_ID}" "${THM_BASEURI}${EXO_BASEURI}files/${FILE_URI}" ${PARTS}` FILE_ID=`new_file "${THEME_ID}" "${EXO_ID}" "${THM_BASEURI}${EXO_BASEURI}files/${FILE_URI}" "${PARTS}"`
if [ -z "$FILE_ID" ]; then if [ -z "$FILE_ID" ]; then
echo -e "\e[31;01m!!! An error occured during file import! Please check path.\e[00m" echo -e "\e[31;01m!!! An error occured during file import! Please check path.\e[00m"
else else