gupload: Handle more possible api errors when uploading

Handle edgecase when curl http code is 000 in case of resumeable uploads more robust checking when generating upload link
labbots · Oct 20, 2020 · 39f8cfd · 39f8cfd
1 parent 4889060
commit 39f8cfd
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/bash/drive-utils.bash b/bash/drive-utils.bash
@@ -173,8 +173,12 @@ _generate_upload_link() {
         -D - || :)" && _clear_line 1 1>&2
     _clear_line 1 1>&2
 
-    uploadlink="$(read -r firstline <<< "${uploadlink/*[L,l]ocation: /}" && printf "%s\n" "${firstline//$'\r'/}")"
-    { [[ -n ${uploadlink} ]] && return 0; } || return 1
+    case "${uploadlink}" in
+        *'ocation: '*'upload_id'*) uploadlink="$(read -r firstline <<< "${uploadlink/*[L,l]ocation: /}" && printf "%s\n" "${firstline//$'\r'/}")" && return 0 ;;
+        '' | *) return 1 ;;
+    esac
+
+    return 0
 }
 
 # Curl command to push the file to google drive.
@@ -327,7 +331,7 @@ _upload_file() {
                     _full_upload || return 1
                 fi
                 ;;
-            40[0-9]) # Dead Resumable URI give 40* status
+            40[0-9] | 000) # Dead Resumable URI give 40* status
                 _full_upload
                 ;;
             201 | 200) # Completed Resumable URI give 20* status

diff --git a/bash/release/gupload b/bash/release/gupload
@@ -562,8 +562,12 @@ _generate_upload_link() {
         -D - || :)" && _clear_line 1 1>&2
     _clear_line 1 1>&2
 
-    uploadlink="$(read -r firstline <<< "${uploadlink/*[L,l]ocation: /}" && printf "%s\n" "${firstline//$'\r'/}")"
-    { [[ -n ${uploadlink} ]] && return 0; } || return 1
+    case "${uploadlink}" in
+        *'ocation: '*'upload_id'*) uploadlink="$(read -r firstline <<< "${uploadlink/*[L,l]ocation: /}" && printf "%s\n" "${firstline//$'\r'/}")" && return 0 ;;
+        '' | *) return 1 ;;
+    esac
+
+    return 0
 }
 
 # Curl command to push the file to google drive.
@@ -716,7 +720,7 @@ _upload_file() {
                     _full_upload || return 1
                 fi
                 ;;
-            40[0-9]) # Dead Resumable URI give 40* status
+            40[0-9] | 000) # Dead Resumable URI give 40* status
                 _full_upload
                 ;;
             201 | 200) # Completed Resumable URI give 20* status

diff --git a/sh/drive-utils.sh b/sh/drive-utils.sh
@@ -173,8 +173,12 @@ _generate_upload_link() {
         -D - || :)" && _clear_line 1 1>&2
     _clear_line 1 1>&2
 
-    uploadlink_upload_file="$(printf "%s\n" "${uploadlink_upload_file##*[L,l]ocation: }" | while read -r line; do printf "%s\n" "${line%%$(printf '\r')}" && break; done)"
-    { [ -n "${uploadlink_upload_file}" ] && return 0; } || return 1
+    case "${uploadlink_upload_file}" in
+        *'ocation: '*'upload_id'*) uploadlink_upload_file="$(printf "%s\n" "${uploadlink_upload_file##*[L,l]ocation: }" | while read -r line; do printf "%s\n" "${line%%$(printf '\r')}" && break; done)" && return 0 ;;
+        '' | *) return 1 ;;
+    esac
+
+    return 0
 }
 
 # Curl command to push the file to google drive.
@@ -329,7 +333,7 @@ _upload_file() {
                     _full_upload || return 1
                 fi
                 ;;
-            40[0-9]) # Dead Resumable URI give 40* status
+            40[0-9] | 000) # Dead Resumable URI give 40* status
                 _full_upload
                 ;;
             201 | 200) # Completed Resumable URI give 20* status

diff --git a/sh/release/gupload b/sh/release/gupload
@@ -540,8 +540,12 @@ _generate_upload_link() {
         -D - || :)" && _clear_line 1 1>&2
     _clear_line 1 1>&2
 
-    uploadlink_upload_file="$(printf "%s\n" "${uploadlink_upload_file##*[L,l]ocation: }" | while read -r line; do printf "%s\n" "${line%%$(printf '\r')}" && break; done)"
-    { [ -n "${uploadlink_upload_file}" ] && return 0; } || return 1
+    case "${uploadlink_upload_file}" in
+        *'ocation: '*'upload_id'*) uploadlink_upload_file="$(printf "%s\n" "${uploadlink_upload_file##*[L,l]ocation: }" | while read -r line; do printf "%s\n" "${line%%$(printf '\r')}" && break; done)" && return 0 ;;
+        '' | *) return 1 ;;
+    esac
+
+    return 0
 }
 
 # Curl command to push the file to google drive.
@@ -696,7 +700,7 @@ _upload_file() {
                     _full_upload || return 1
                 fi
                 ;;
-            40[0-9]) # Dead Resumable URI give 40* status
+            40[0-9] | 000) # Dead Resumable URI give 40* status
                 _full_upload
                 ;;
             201 | 200) # Completed Resumable URI give 20* status