From 472f506817bb1af2fceb039ba148d15723944562 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 25 Feb 2016 13:47:30 -0600 Subject: Improve progress bar handling for backup / restore / image flash The progress bar will now be updated during image backups, restores and during image flashing (except for sparse images which will require significant changes to libsparse, and except for mtd nand using flash_utils). The progress bar will now be updated mid-file for file systems (tar) so the user will see changes even during large file backup / restore. Add a new progress tracking class to simplify handling of progress bar updates. The class will only update the progress bar 5 times a second to reduce the CPU load from updating the GUI frequently which does affect backup times. Change-Id: Iff382faef3df1f86604af336c1a8ce8993cd12c5 --- twrpTar.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'twrpTar.hpp') diff --git a/twrpTar.hpp b/twrpTar.hpp index a486c4174..8ef50207f 100644 --- a/twrpTar.hpp +++ b/twrpTar.hpp @@ -1,5 +1,5 @@ /* - Copyright 2012 bigbiff/Dees_Troy TeamWin + Copyright 2012 to 2016 bigbiff/Dees_Troy TeamWin This file is part of TWRP/TeamWin Recovery Project. TWRP is free software: you can redistribute it and/or modify @@ -28,6 +28,7 @@ extern "C" { #include #include #include "twrpDU.hpp" +#include "progresstracking.hpp" using namespace std; @@ -45,8 +46,8 @@ class twrpTar { public: twrpTar(); virtual ~twrpTar(); - int createTarFork(const unsigned long long *overall_size, const unsigned long long *other_backups_size, pid_t &fork_pid); - int extractTarFork(const unsigned long long *overall_size, unsigned long long *other_backups_size); + int createTarFork(ProgressTracking *progress, pid_t &fork_pid); + int extractTarFork(ProgressTracking *progress); void setfn(string fn); void setdir(string dir); void setsize(unsigned long long backup_size); @@ -87,6 +88,7 @@ private: unsigned long long Total_Backup_Size; bool include_root_dir; TAR *t; + tartype_t tar_type; // Only used in createTar() but variable must persist while the tar is open int fd; pid_t pigz_pid; pid_t oaes_pid; -- cgit v1.2.3