X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=cumulus-sync;h=9f31a29b8131a6b8e2641aab6d20c3f20dfd07c9;hp=8a474a5b55f56231539fba46017f69d8d5caaac7;hb=HEAD;hpb=c343597dac79f9edc63d95d881625a317fadb1d9 diff --git a/cumulus-sync b/cumulus-sync index 8a474a5..9f31a29 100755 --- a/cumulus-sync +++ b/cumulus-sync @@ -20,6 +20,8 @@ # Tool for copying cumulus archives from one source to another. +from __future__ import division, print_function, unicode_literals + import os, sys # Automatically set Python path, based on script directory. This should be @@ -43,14 +45,14 @@ for s in snapshots: items_required.add(s) d = cumulus.parse_full(source.load_snapshot(s)) items_required.update(d['Segments'].split()) -print "Required:", items_required +print("Required:", len(items_required)) files_present = set() for filetype in cumulus.SEARCH_PATHS: for (name, path) in store2.list_generic(filetype): items_required.discard(name) files_present.add(path) -print "Files already present:", sorted(files_present) +print("Files already present:", len(sorted(files_present))) files_required = [] items_found = set() @@ -61,9 +63,6 @@ for filetype in cumulus.SEARCH_PATHS: items_found.add(name) files_required.sort() -print "Missing:", items_required.difference(items_found) -print "Required files:", files_required - -for f in files_required: - print f +for i, f in enumerate(files_required): + print("[%d/%d] %s" % (i + 1, len(files_required), f)) store2.raw_backend.put(f, store1.raw_backend.get(f))