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

Cleanup: simplify basepath handling

Browse Source
This commit is contained in:
Campbell Barton
2014-11-05 16:27:55 +01:00
parent a31a3b643e
commit de3eca018a
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/cli/bam.py
View File

@@ -47,7 +47,7 @@ class bam_config:
CONFIG_DIR = ".bam" CONFIG_DIR = ".bam"
@staticmethod @staticmethod
def find_basedir(cwd=None): def find_basedir(cwd=None, suffix=None):
""" """
Return the config path (or None when not found) Return the config path (or None when not found)
Actually should raise an error? Actually should raise an error?
@@ -66,6 +66,8 @@ class bam_config:
while parent != parent_prev: while parent != parent_prev:
test_dir = os.path.join(parent, bam_config.CONFIG_DIR) test_dir = os.path.join(parent, bam_config.CONFIG_DIR)
if os.path.isdir(test_dir): if os.path.isdir(test_dir):
if suffix is not None:
test_dir = os.path.join(test_dir, suffix)
return test_dir return test_dir
parent_prev = parent parent_prev = parent
@@ -75,20 +77,15 @@ class bam_config:
@staticmethod @staticmethod
def load(id_="config", cwd=None): def load(id_="config", cwd=None):
import os filepath = bam_config.find_basedir(cwd=cwd, suffix=id_)
basedir = bam_config.find_basedir(cwd=cwd)
filepath = os.path.join(basedir, id_)
with open(filepath, 'r') as f: with open(filepath, 'r') as f:
import json import json
return json.load(f) return json.load(f)
@staticmethod @staticmethod
def write(id_, data, cwd=None): def write(id_="config", data=None, cwd=None):
import os filepath = bam_config.find_basedir(cwd=cwd, suffix=id_)
basedir = bam_config.find_basedir(cwd=cwd)
filepath = os.path.join(basedir, id_)
with open(filepath, 'w') as f: with open(filepath, 'w') as f:
import json import json
@@ -127,18 +124,18 @@ class bam_utils:
# Create the project directory inside the current directory # Create the project directory inside the current directory
os.mkdir(project_directory_path) os.mkdir(project_directory_path)
# Create the .bam folder # Create the .bam folder
bam_folder = os.path.join(project_directory_path, bam_config.CONFIG_DIR) bam_basedir = os.path.join(project_directory_path, bam_config.CONFIG_DIR)
os.mkdir(bam_folder) os.mkdir(bam_basedir)
# Add a config file with project url, username and password # Add a config file with project url, username and password
bam_config.write( bam_config.write(
"config", data={
{"url": url, "url": url,
"user": "bam", "user": "bam",
"password": "bam", "password": "bam",
"config_version": 1 "config_version": 1
}, },
cwd=bam_folder) cwd=project_directory_path)
print("Project %r initialized" % project_directory_name) print("Project %r initialized" % project_directory_name)