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

initial support for update

Browse Source 
stubbed out mostly
This commit is contained in:
Campbell Barton
2014-12-04 12:58:53 +01:00
parent 2cd93b317c
commit 63078e277b
2 changed files with 96 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
client/cli/bam.py
View File

@@ -22,6 +22,8 @@
Blender asset manager
"""
import os
import json
# ------------------
# Ensure module path
@@ -121,7 +123,14 @@ class bam_config:
abort=abort,
descr="bam session"
)
return session_rootdir[:-len(bam_config.SESSION_FILE)]
if session_rootdir is not None:
return session_rootdir[:-len(bam_config.SESSION_FILE)]
else:
if abort:
if not os.path.isdir(session_rootdir):
fatal("Expected a directory (%r)" % session_rootdir)
return None
@staticmethod
def load(id_="config", cwd=None, abort=False):
@@ -223,10 +232,7 @@ class bam_session:
os.path.join(session_rootdir, ".bam_tmp.zip"),
}
with open(os.path.join(session_rootdir, ".bam_paths_uuid.json"), 'r') as f:
import json
paths_uuid = json.load(f)
del json
paths_uuid = bam_session.load_paths_uuid(session_rootdir)
for f_rel, sha1 in paths_uuid.items():
f_abs = os.path.join(session_rootdir, f_rel)
@@ -268,6 +274,13 @@ class bam_session:
if paths_uuid_update is not None:
paths_uuid_update[f_rel] = sha1_from_file(f_abs)
@staticmethod
def load_paths_uuid(session_rootdir):
import json
import os
with open(os.path.join(session_rootdir, ".bam_paths_uuid.json")) as f:
return json.load(f)
class bam_commands:
"""
@@ -347,7 +360,7 @@ class bam_commands:
print("Session %r created" % session_name)
@staticmethod
def checkout(path, output_dir=None):
def checkout(path, output_dir=None, session_rootdir_partial=None):
import sys
import os
import requests
@@ -369,6 +382,9 @@ class bam_commands:
dst_dir = output_dir
del output_dir
if session_rootdir_partial:
pass
payload = {
"filepath": path,
"command": "checkout",
@@ -430,6 +446,43 @@ class bam_commands:
sys.stdout.write("\nwritten: %r\n" % dst_dir)
@staticmethod
def update(paths):
# Load project configuration
cfg = bam_config.load(abort=True)
# TODO(cam) multiple paths
session_rootdir = bam_config.find_sessiondir(paths[0], abort=True)
paths_uuid = bam_session.load_paths_uuid(session_rootdir)
if not paths_uuid:
print("Nothing to update!")
return
# -------------------------------------------------------------------------------
# TODO(cam) don't guess this important info
import os
import json
files = os.listdir(session_rootdir)
files_blend = [f for f in files if f.endswith(".blend")]
if files_blend:
file = files_blend[0]
else:
file = files[0]
with open(os.path.join(session_rootdir, ".bam_paths_remap.json")) as f:
paths_remap = json.load(f)
paths_remap_relbase = paths_remap.get(".", "")
path = os.path.join(paths_remap_relbase, file)
# -------------------------------------------------------------------------------
# Send to sever sha PUT
# retrieve zip GET
# merge sessions
bam_commands.checkout(
path,
output_dir=session_rootdir.rstrip(os.sep) + ".tmp",
session_rootdir_partial=session_rootdir,
)
@staticmethod
def commit(paths, message):
import os
@@ -438,13 +491,7 @@ class bam_commands:
# Load project configuration
cfg = bam_config.load(abort=True)
# TODO(cam) ignore files
# TODO(cam) multiple paths
session_rootdir = paths[0]
if not os.path.isdir(session_rootdir):
fatal("Expected a directory (%r)" % session_rootdir)
session_rootdir = bam_config.find_sessiondir(paths[0], abort=True)
basedir = bam_config.find_basedir(
cwd=session_rootdir,
@@ -462,9 +509,7 @@ class bam_commands:
session_rootdir)
# make a zipfile from session
import json
with open(os.path.join(session_rootdir, ".bam_paths_uuid.json")) as f:
paths_uuid = json.load(f)
paths_uuid = bam_session.load_paths_uuid(session_rootdir)
# No longer used
"""
@@ -844,6 +889,21 @@ def create_argparse_checkout(subparsers):
)
def create_argparse_update(subparsers):
subparse = subparsers.add_parser(
"update", aliases=("up",),
help="Update a local session with changes from the remote project",
)
subparse.add_argument(
dest="paths", nargs="*",
help="Path(s) to operate on",
)
subparse.set_defaults(
func=lambda args:
bam_commands.update(args.paths or ["."]),
)
def create_argparse_commit(subparsers):
subparse = subparsers.add_parser(
"commit", aliases=("ci",),
@@ -864,22 +924,6 @@ def create_argparse_commit(subparsers):
)
def create_argparse_update(subparsers):
subparse = subparsers.add_parser(
"update", aliases=("up",),
help="Update a local session with changes from the remote project",
)
subparse.add_argument(
dest="paths", nargs="+",
help="Path(s) to operate on",
)
subparse.set_defaults(
func=lambda args:
# TODO
print(args),
)
def create_argparse_revert(subparsers):
subparse = subparsers.add_parser(
"revert", aliases=("rv",),

20
tests/test_cli.py
View File

@@ -801,6 +801,14 @@ class BamCommitTest(BamSessionTestCase):
["M", "d_dir/d_subdir/d_nested/d.data"],
], ret)
class BamCheckoutTest(BamSessionTestCase):
"""Test for the `bam checkout` command.
"""
def __init__(self, *args):
self.init_defaults()
super().__init__(*args)
def test_checkout(self):
session_name = "mysession"
file_name = "other_file.txt"
@@ -825,6 +833,18 @@ class BamCommitTest(BamSessionTestCase):
file_data_test = file_quick_read(os.path.join(session_path, file_name))
self.assertEqual(file_data, file_data_test)
def test_update_blank(self):
session_name = "mysession"
proj_path, session_path = self.init_session(session_name)
stdout, stderr = bam_run(["update"], session_path)
# Empty and new session should not update at all
self.assertEqual("", stderr)
self.assertEqual("Nothing to update!\n", stdout)
#stdout, stderr = bam_run(["checkout"], session_path)
class BamBlendTest(BamSimpleTestCase):