Browse Source

reboots recovery for install operations, renamed flag to merge_flag

master
Raphael Roberts 8 years ago
parent
commit
d059cb7a76
  1. 16
      adb.py

16
adb.py

@ -153,12 +153,12 @@ fi'''
if remote_type != "na": if remote_type != "na":
if remote_type == "directory" and not remote.endswith('/'): if remote_type == "directory" and not remote.endswith('/'):
remote += '/' remote += '/'
flag = False
merge_flag = False
if os.path.exists(local): if os.path.exists(local):
last = os.path.split(local)[-1] last = os.path.split(local)[-1]
real_dir = local real_dir = local
local = os.path.join(defaults['local']['temp'],last) local = os.path.join(defaults['local']['temp'],last)
flag = True
merge_flag = True
try: try:
self.adb("pull","-a",remote,local) self.adb("pull","-a",remote,local)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
@ -166,7 +166,7 @@ fi'''
pass pass
else: else:
raise e raise e
if flag:
if merge_flag:
merge(local,real_dir) merge(local,real_dir)
if os.path.exists(local) and del_duplicates: if os.path.exists(local) and del_duplicates:
shutil.rmtree(local) shutil.rmtree(local)
@ -201,7 +201,7 @@ fi'''
while True: while True:
infos = get_info() infos = get_info()
if len(infos) > 0: if len(infos) > 0:
self.__dict__.update(get_info()[self.serial])
self.__dict__.update(infos[self.serial])
break break
time.sleep(1) time.sleep(1)
@ -224,6 +224,8 @@ fi'''
#twrp #twrp
def backup(self,*partitions,name = None): def backup(self,*partitions,name = None):
if self.mode != 'recovery':
self.reboot('recovery')
backupdir = defaults['local']['TWRP'] backupdir = defaults['local']['TWRP']
options_dict = { options_dict = {
"system": "S", "system": "S",
@ -247,11 +249,13 @@ fi'''
self.move(phone_dir,filename) self.move(phone_dir,filename)
def wipe(self,partition): def wipe(self,partition):
if self.mode != 'recovery':
self.reboot('recovery')
self.shell("twrp","wipe",partition) self.shell("twrp","wipe",partition)
def install(self,name): def install(self,name):
if self.mode != 'recovery':
self.reboot('recovery')
if os.path.exists(name): if os.path.exists(name):
local_name = name local_name = name
name = os.path.split(name)[-1] name = os.path.split(name)[-1]

Loading…
Cancel
Save