diff options
| -rw-r--r-- | repo.py | 64 |
1 files changed, 22 insertions, 42 deletions
@@ -63,37 +63,16 @@ def generate_backup_name(): return datetime.datetime.now().strftime('%Y%m%d-%H%M%S') -def clean_meta(meta): - """Migrate metadata from previous formats.""" - meta.pop('ctime', None) # ctime is no longer used - if meta.pop('is_dir', None): - meta['type'] = 'D' # replace is_dir with type - mode = meta['mode'] - if mode != stat.S_IMODE(mode): - meta['mode'] = stat.S_IMODE(mode) - if stat.S_ISDIR(mode): - meta['type'] = 'D' - meta['size'] = 0 - elif stat.S_ISCHR(mode): - meta['type'] = 'C' - meta['size'] = 0 - elif stat.S_ISBLK(mode): - meta['type'] = 'B' - meta['size'] = 0 - elif stat.S_ISFIFO(mode): - meta['type'] = 'F' - meta['size'] = 0 - elif stat.S_ISLNK(mode): - meta['type'] = 'L' - meta['size'] = 0 - elif stat.S_ISSOCK(mode): - meta['type'] = 'S' - meta['size'] = 0 - elif stat.S_ISREG(mode): - meta['type'] = 'R' - else: - meta['type'] = '?' - return meta +# mapping from stat's modes to our file types +_mode_map = { + stat.S_IFDIR: 'D', + stat.S_IFCHR: 'C', + stat.S_IFBLK: 'B', + stat.S_IFREG: 'R', + stat.S_IFIFO: 'F', + stat.S_IFLNK: 'L', + stat.S_IFSOCK: 'S', +} class Repository(object): @@ -199,18 +178,19 @@ class Repository(object): def read_fileslist(self, filename): """Read a file list from the repository and return information one line at a time.""" - # we take advantage of the fact that the JSON file contains a single - # path per line (otherwise we would have to load the whole file in - # memory) with self.read_file(filename) as f: - line = f.next() - if line != '[\n': - raise ValueError('error on first line') - for line in f: - if line != ']\n': - yield clean_meta(json.loads(line.rstrip('\n,'))) - if line != ']\n': - raise ValueError('error on last line') + for meta in json.load(f): + # migrate metadata from previous formats + meta.pop('ctime', None) # ctime is no longer used + if meta.pop('is_dir', None): + meta['type'] = 'D' # replace is_dir with type + mode = meta['mode'] + if mode != stat.S_IMODE(mode): + meta['mode'] = stat.S_IMODE(mode) + meta['type'] = _mode_map.get(stat.S_IFMT(mode), '?') + if meta['type'] in 'DCBFLS': + meta['size'] = 0 + yield meta def get_passphrase(self): if not self._passphrase: |