archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for blendfile walker iterating over same paths twice

Browse Source 
also fixes sha1 checks
This commit is contained in:
Campbell Barton
2014-11-04 16:18:16 +01:00
parent 49cdaa3b5d
commit 23cb474214
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/cli/bam
View File

@@ -200,7 +200,7 @@ class bam_utils:
params=payload, params=payload,
auth=('bam', 'bam'), auth=('bam', 'bam'),
files=files) files=files)
print(r.text) print("Return is:", r.text)
files['file'].close() files['file'].close()
os.remove(temp_zip) os.remove(temp_zip)
@@ -239,7 +239,7 @@ def subcommand_checkout_cb(args):
bam_utils.checkout(args.paths) bam_utils.checkout(args.paths)
def subcommand_commit_cb(args): def subcommand_commit_cb(args):
bam_utils.commit(args.paths) bam_utils.commit(args.paths, args.message)
def subcommand_update_cb(args): def subcommand_update_cb(args):

1
packer/blendfile_path_walker.py
View File

@@ -213,6 +213,7 @@ class FilePath:
if sub_block is not None: if sub_block is not None:
yield from block_expand(sub_block, sub_block.code) yield from block_expand(sub_block, sub_block.code)
else: else:
if code == b'ID':
yield block yield block
else: else:
expand_codes = None expand_codes = None

3
packer/packer.py
View File

@@ -156,9 +156,8 @@ def pack(blendfile_src, blendfile_dst, mode='FILE',
sha1.update(data) sha1.update(data)
return sha1.hexdigest() return sha1.hexdigest()
for src, dst in path_copy_files: for src, dst in path_copy_files:
paths_uuid[os.path.relpath(dst, base_dir_dst).decode('utf-8')] = sha1_for_file(dst) paths_uuid[os.path.relpath(dst, base_dir_dst).decode('utf-8')] = sha1_for_file(src)
# XXX, better way to store temp target # XXX, better way to store temp target
blendfile_dst_tmp = temp_remap_cb(blendfile_src, 0) blendfile_dst_tmp = temp_remap_cb(blendfile_src, 0)
paths_uuid[os.path.basename(blendfile_src).decode('utf-8')] = sha1_for_file(blendfile_dst_tmp) paths_uuid[os.path.basename(blendfile_src).decode('utf-8')] = sha1_for_file(blendfile_dst_tmp)