From 3fdcda46629e8e7fc19e89c51350b1e6f151e05e Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 30 Nov 2016 12:29:37 -0600 Subject: Improve backup & wipe exclusion handling Rename twrpDU.* to exclude.* Remove global variable for du and replace with partition specific variables. Use separate exclusion lists for backups and wiping. Clean up some includes Fix some parenthesis in twrp.cpp that I messed up. Note: twrpTarMain command line utility compiles but probably does not work correctly yet due to not properly setting part_settings Change-Id: Idec9c3e6a8782ba53f3420fa79ba33394f4f85fb --- partitionmanager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'partitionmanager.cpp') diff --git a/partitionmanager.cpp b/partitionmanager.cpp index b04cc9ab8..079d476b3 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -40,7 +40,7 @@ #include "twrp-functions.hpp" #include "fixContexts.hpp" #include "twrpDigest.hpp" -#include "twrpDU.hpp" +#include "exclude.hpp" #include "set_metadata.h" #include "tw_atomic.hpp" #include "gui/gui.hpp" @@ -835,9 +835,10 @@ int TWPartitionManager::Run_Backup(bool adbbackup) { int total_time = (int) difftime(total_stop, total_start); uint64_t actual_backup_size; - if (!adbbackup) - actual_backup_size = du.Get_Folder_Size(part_settings.Backup_Folder); - else + if (!adbbackup) { + TWExclude twe; + actual_backup_size = twe.Get_Folder_Size(part_settings.Backup_Folder); + } else actual_backup_size = part_settings.file_bytes + part_settings.img_bytes; actual_backup_size /= (1024LLU * 1024LLU); -- cgit v1.2.3