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

update browser

Browse Source
This commit is contained in:
Campbell Barton
2014-10-30 15:07:02 +01:00
parent 26b429783e
commit 57b40a7dcb
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/gui/browser.py
View File

@@ -75,11 +75,14 @@ class PathHandle:
@staticmethod @staticmethod
def download_from_server(path, idname, file_type, local_filename=None): def download_from_server(path, idname, file_type, local_filename=None):
import requests import requests
payload = {"filepath": "/".join(path) + "/" + idname} payload = {
"filepath": "/".join(path) + "/" + idname,
"command": "checkout",
}
r = requests.get(PathHandle.request_url(file_type), params=payload, auth=("bam", "bam"), stream=True) r = requests.get(PathHandle.request_url(file_type), params=payload, auth=("bam", "bam"), stream=True)
local_filename = payload['filepath'].split('/')[-1] local_filename = payload['filepath'].split('/')[-1]
if file_type == "file_deps": if file_type == "file":
local_filename += ".zip" local_filename += ".zip"
with open(local_filename, 'wb') as f: with open(local_filename, 'wb') as f:
@@ -149,7 +152,7 @@ class Application(tk.Frame):
self.repopulate() self.repopulate()
def exec_path_blendfile(idname): def exec_path_blendfile(idname):
self.path_handle.download_from_server(self.path_handle.path, idname, "file_deps") self.path_handle.download_from_server(self.path_handle.path, idname, "file")
self.repopulate() self.repopulate()
js = self.path_handle.json js = self.path_handle.json

4
webservice/bam/application/__init__.py
View File

@@ -176,8 +176,8 @@ class FileAPI(Resource):
import packer import packer
print("AAA", filepath) print(" Source path:", filepath)
print("NNN", filepath_zip) print(" Zip path:", filepath_zip)
try: try:
packer.pack(filepath.encode('utf-8'), filepath_zip[-1].encode('utf-8'), mode='ZIP') packer.pack(filepath.encode('utf-8'), filepath_zip[-1].encode('utf-8'), mode='ZIP')