1 Commits

Author SHA1 Message Date
zjamnik 9dd4ebec45 partial upload initial not working 2026-02-21 02:43:50 +01:00
2 changed files with 96 additions and 31 deletions
-1
View File
@@ -1,3 +1,2 @@
token.txt token.txt
trimUploader.ini trimUploader.ini
ZiplineUploader.exe
+95 -29
View File
@@ -8,59 +8,125 @@ trimPattern := IniRead("trimUploader.ini", "location", "trimPattern", "*_trim.mp
ziplineURL := IniRead("trimUploader.ini", "location", "ziplineURL", "PROVIDE ZIPLINE URL") ziplineURL := IniRead("trimUploader.ini", "location", "ziplineURL", "PROVIDE ZIPLINE URL")
ziplineFolder := IniRead("trimUploader.ini", "location", "ziplineFolder", "PROVIDE FOLDER ID") ziplineFolder := IniRead("trimUploader.ini", "location", "ziplineFolder", "PROVIDE FOLDER ID")
ziplineToken := IniRead("trimUploader.ini", "location", "ziplineToken", "PROVIDE ZIPLINE TOKEN") ziplineToken := IniRead("trimUploader.ini", "location", "ziplineToken", "PROVIDE ZIPLINE TOKEN")
chunkSize := IniRead("trimUploader.ini", "location", "chunkSize", "26214400")
chunkThreshold := IniRead("trimUploader.ini", "location", "chunkThreshold", "99614720")
IniWrite(momentsPath, "trimUploader.ini", "location", "momentsPath") IniWrite(momentsPath, "trimUploader.ini", "location", "momentsPath")
IniWrite(trimPattern, "trimUploader.ini", "location", "trimPattern") IniWrite(trimPattern, "trimUploader.ini", "location", "trimPattern")
IniWrite(ziplineURL, "trimUploader.ini", "location", "ziplineURL") IniWrite(ziplineURL, "trimUploader.ini", "location", "ziplineURL")
IniWrite(ziplineFolder, "trimUploader.ini", "location", "ziplineFolder") IniWrite(ziplineFolder, "trimUploader.ini", "location", "ziplineFolder")
IniWrite(ziplineToken, "trimUploader.ini", "location", "ziplineToken") IniWrite(ziplineToken, "trimUploader.ini", "location", "ziplineToken")
IniWrite(chunkSize, "trimUploader.ini", "location", "chunkSize")
IniWrite(chunkThreshold, "trimUploader.ini", "location", "chunkThreshold")
loop { loop {
uploadedURLs := "" uploadedURLs := ""
uploadedFiles := 0 uploadedFiles := 0
Loop Files momentsPath "\" trimPattern, "F" { Loop Files momentsPath "\" trimPattern, "F" {
; Check file size to avoid upload mid export
fileSize := 0 fileSize := 0
while (fileSize < FileGetSize()) { while (fileSize < FileGetSize()) {
Sleep(200)
fileSize := FileGetSize() fileSize := FileGetSize()
Sleep(200)
} }
; ; Build curl command chunkNum := Floor(fileSize / chunkSize)
; cmd := 'curl -s -H "Authorization: ' ziplineToken '" ' filePath := A_LoopFileFullPath
; cmd .= '-H "x-zipline-original-name: true" ' fileName := A_LoopFileName
; cmd .= '-H "x-zipline-p-format: name" '
; cmd .= '-H "x-zipline-folder: ' ziplineFolder '" '
; cmd .= '-H "x-zipline-filename: ' StrReplace(A_LoopFileName, ".mp4", "") '" '
; cmd .= '-F "file=@' A_LoopFileFullPath ';type=video/mp4" '
; cmd .= '"' ZiplineURL '/api/upload"'
; ; MsgBox(cmd) if (chunkNum > 0) {
; -------------------------
; 2. UPLOAD CHUNKS
; -------------------------
fileToUpload := FileOpen(filePath, "r")
chunkIndex := 0
partialIdentifier := ""
mime := "video/mp4"
; ; Run curl and capture output while !fileToUpload.AtEOF {
; RunWait(A_ComSpec " /c " cmd " | clip", , "Hide") chunk := fileToUpload.Read(chunkSize)
; output := A_Clipboard
tmpChunk := A_Temp "\chunk.tmp"
try {
FileDelete tmpChunk
} catch Error {
}
FileAppend chunk, tmpChunk, "RAW"
MsgBox FileGetSize(tmpChunk)
uploadCmd := 'curl -s -X POST '
; uploadCmd .= '-H "content-type: multipart/form-data;" '
uploadCmd .= Format('-H "Authorization: {1}" ', ziplineToken)
uploadCmd .= '-H "x-zipline-format: name" '
uploadCmd .= '-H "x-zipline-original-name: true" '
uploadCmd .= Format('-H "x-zipline-p-content-length: {1}" ', fileSize)
uploadCmd .= Format('-H "x-zipline-p-content-type: {1}" ', mime)
uploadCmd .= Format('-H "x-zipline-p-filename: {1}" ', fileName)
; uploadCmd .= Format('-H "x-zipline-folder: {1}" ', ziplineFolder)
if (chunkIndex > 0) {
uploadCmd .= Format('-H "x-zipline-p-identifier: {1}" ', partialIdentifier)
}
if (chunkIndex = chunkNum) {
uploadCmd .= '-H "x-zipline-p-lastchunk: true" '
} else {
uploadCmd .= '-H "x-zipline-p-lastchunk: false" '
}
uploadCmd .= Format('-F "file=@{1}" ', tmpChunk)
uploadCmd .= Format('"{1}/api/upload/partial"', ziplineURL,)
MsgBox uploadCmd
resp := RunWaitGet(uploadCmd)
partialResult := JsonExtract(resp, "partialSuccess")
if (chunkIndex = 0) {
partialIdentifier := JsonExtract(resp, "partialIdentifier")
}
if !partialResult {
MsgBox "Chunk upload failed at index " chunkIndex "`nResponse:`n" resp
return
}
chunkIndex++
}
fileToUpload.Close()
finishResp := RunWaitGet(resp)
finalUrl := JsonExtract(finishResp, "url")
}
; Extract URL from JSON ; Extract URL from JSON
; if RegExMatch(output, '"url":"(.*?)"', &m) { if ( not finalUrl = "") {
; url := m[1] uploadedURLs .= finalUrl "`n"
; uploadedURLs .= url "`n" uploadedFiles++
; uploadedFiles++
FileCopy(A_LoopFileFullPath, "\\192.168.0.20\nextcloud\fireshare\fireshare_videos\*.*") try {
FileDelete(A_LoopFileFullPath) FileDelete(A_LoopFileFullPath)
} catch Error {
; try { }
; } catch Error { } else {
MsgBox "Failed to extract URL.`nResponse:`n" finishResp
; } }
; } else {
; MsgBox "Failed to extract URL.`nResponse:`n" output
; }
} }
; if ( not uploadedURLs = "") { if ( not uploadedURLs = "") {
; A_Clipboard := uploadedURLs A_Clipboard := uploadedURLs
; TrayTip "Zipline Upload", "Uploaded " uploadedFiles " file(s)", 1 TrayTip "Zipline Upload", "Uploaded " uploadedFiles " file(s)", 1
; } }
Sleep(5000) Sleep(5000)
} }
RunWaitGet(cmd, options := "Hide") {
tmp := A_Temp "\curl_out.txt"
RunWait(A_ComSpec ' /c ' cmd ' > "' tmp '"', , options)
return FileRead(tmp)
}
JsonExtract(json, key) {
if RegExMatch(json, '"' key '":"(.*?)"', &m)
return m[1]
return ""
}