Merge pull request #115 from nuxa17/master

Restore backup using tar

Author: mrrfv

README.md

@@ -104,6 +104,7 @@ Open Android Backup doesn't automatically load hooks, and you have to allow the
 - `cecho <text>` lets you have yellow terminal output.
 - `wait_for_enter` waits for a keypress, and is compatible with unattended mode.
 - `get_file <phone_directory> <phone_file> <destination>` lets you copy files off the device with the best reliability and speed, an alternative to `adb pull`. Useful for backing up data.
+- `send_file <directory> <file> <destination>` is used to send files to the device, utilizing either `adb` or `tar` depending on user preference.
 - `adb push <file> <destination>` lets you upload files to the device, useful when restoring your data.
 
 *Required functions*

backup.sh

@@ -91,14 +91,14 @@ fi
 clear
 
 if [ ! -v export_method ]; then
-  cecho "Choose the exporting method."
+  cecho "Choose the exporting/importing method."
   cecho "- Pick 'tar' first, as it is fast and most reliable, but might not work on all devices."
   cecho "- If the script crashes, pick 'adb' instead, which works on all devices."
   cecho "Press Enter to pick your preferred method."
   wait_for_enter
 
   export_methods=( 'tar' 'adb' )
-  select_option_from_list "Choose the exporting method." export_methods[@] export_method
+  select_option_from_list "Choose the exporting/importing method." export_methods[@] export_method
 fi
 
 clear

functions/helper.sh

@@ -207,6 +207,15 @@ function get_file() {
   fi
 }
 
+# Usage: send_file <directory> <file> <destination>
+function send_file() {
+  if [ "$export_method" = 'tar' ]; then
+    (tar -c -C "$1" "$2" 2> /dev/null | pv -p --timer --rate --bytes | adb exec-in tar -C "$3" -xf -) || cecho "Errors occurred while restoring $2 - this file (or multiple files) might've been ignored." 1>&2
+  else # we're falling back to adb push if the variable is empty/unset
+    adb push "$1"/"$2" "$3" || cecho "Errors occurred while restoring $2 - this file (or multiple files) might've been ignored." 1>&2
+  fi
+}
+
 # Usage: directory_ok <directory>
 # Returns 0 (true) or 1 (false)
 function directory_ok() {

functions/restore_func.sh

@@ -126,14 +126,14 @@ function restore_func() {
     set -e
   fi
 
-  # TODO: use tar to restore data to internal storage instead of adb push
 
   if [ "$restore_storage" = "yes" ]; then
     # Restore internal storage
     cecho "Restoring internal storage."
-    adb push ./backup-tmp/Storage/ /storage/emulated/0/
+    send_file ./backup-tmp/Storage/ . /storage/emulated/0/
   fi
 
+
   if [ "$restore_contacts" = "yes" ]; then
     # Restore contacts
     cecho "Pushing backed up contacts to device."