abdullah/adb-sync
1
0
Fork 0
mirror of https://github.com/google/adb-sync.git synced 2026-01-03 09:58:01 +00:00
Code Issues Releases Wiki Activity

Implement rsync-like path munging.

Browse Source
This commit is contained in:
Rudolf Polzer
2014-09-08 09:42:43 +02:00
parent a01bf3b565
commit 18dbd52b91
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
adb-sync
View File

@@ -580,7 +580,9 @@ def main(*args):
parser.add_argument('source', metavar='SRC', type=str, parser.add_argument('source', metavar='SRC', type=str,
help='The directory to read files/directories from. '+ help='The directory to read files/directories from. '+
'This must be a local path if -R is not specified, '+ 'This must be a local path if -R is not specified, '+
'and an Android path if -R is specified.') 'and an Android path if -R is specified. If SRC does '+
'not end with a final slash, its last path component '+
'is appended to DST (like rsync does).')
parser.add_argument('destination', metavar='DST', type=str, parser.add_argument('destination', metavar='DST', type=str,
help='The directory to write files/directories to. '+ help='The directory to write files/directories to. '+
'This must be an Android path if -R is not specified, '+ 'This must be an Android path if -R is not specified, '+
@@ -633,8 +635,17 @@ def main(*args):
'be done.') 'be done.')
args = parser.parse_args() args = parser.parse_args()
local = args.source local = args.source.encode('utf-8')
remote = args.destination remote = args.destination.encode('utf-8')
# rsync-like path munging to make remote specifications shorter.
pos = local.rfind(b'/')
if pos >= 0:
if pos == len(local)-1:
# Final slash: copy to the destination "as is".
local = local[:-1]
else:
# No final slash: destination name == source name.
remote += local[pos:]
adb = args.adb.encode('utf-8').split(b' ') adb = args.adb.encode('utf-8').split(b' ')
if args.device: if args.device:
adb += [b'-d'] adb += [b'-d']
@@ -668,8 +679,7 @@ def main(*args):
parser.print_help() parser.print_help()
return return
syncer = FileSyncer(adb, syncer = FileSyncer(adb, local, remote,
local.encode('utf-8'), remote.encode('utf-8'),
local_to_remote, remote_to_local, preserve_times, local_to_remote, remote_to_local, preserve_times,
delete_missing, allow_overwrite, allow_replace, dry_run) delete_missing, allow_overwrite, allow_replace, dry_run)
if not syncer.IsWorking(): if not syncer.IsWorking():