diff --git a/client/gui/browser.py b/client/gui/browser.py index 8ad71e7..e9f4d00 100755 --- a/client/gui/browser.py +++ b/client/gui/browser.py @@ -147,7 +147,7 @@ class Application(tk.Frame): def calc_label_text(): return "Path: " + "/".join(self.path_handle.path) - def exec_path_folder(idname, but_path): + def exec_path_dir(idname, but_path): self.path_handle.append_path(idname) print(self.path_handle.path) @@ -178,14 +178,14 @@ class Application(tk.Frame): # import random # random.shuffle(items) - for name_short, name_full, item_type in [("..", "", "folder")] + items: + for name_short, name_full, item_type in [("..", "", "dir")] + items: print(name_short, name_full, item_type) - if item_type == "folder": + if item_type == "dir": but = tk.Label(self.frame, text="(/)", width=3, borderwidth="1", relief="solid") but.grid(row=row, column=0) self.grid_members.append(but) - def fn(idname=name_short, but_path=but_path): exec_path_folder(idname, but_path) + def fn(idname=name_short, but_path=but_path): exec_path_dir(idname, but_path) but = tk.Button(self.frame, text=name_short + "/", fg="green", command=fn) but.grid(row=row, column=1, sticky="nw") diff --git a/webservice/bam/application/__init__.py b/webservice/bam/application/__init__.py index c81a3e0..d85c20d 100644 --- a/webservice/bam/application/__init__.py +++ b/webservice/bam/application/__init__.py @@ -88,9 +88,9 @@ class FilesListAPI(Resource): absolute_path = os.path.join(absolute_path_root, f) if os.path.isdir(absolute_path): - items_list.append((f, relative_path, 'folder')) + items_list.append((f, relative_path, "dir")) else: - items_list.append((f, relative_path, 'file')) + items_list.append((f, relative_path, "file")) project_files = dict( parent_path=parent_path, diff --git a/webservice/bam/config.py.example b/webservice/bam/config.py.example index 99e4490..02ff6e5 100644 --- a/webservice/bam/config.py.example +++ b/webservice/bam/config.py.example @@ -1,7 +1,7 @@ -class Config(object): - DEBUG=True +class Config: + DEBUG = True class Development(Config): - STORAGE_PATH='/Volumes/PROJECTS/storage' - UPLOAD_FOLDER = '/Volumes/PROJECTS/storage_staging' + STORAGE_PATH = "/Volumes/PROJECTS/storage" + UPLOAD_FOLDER = "/Volumes/PROJECTS/storage_staging" ALLOWED_EXTENSIONS = {'txt', 'mp4', 'png', 'jpg', 'jpeg', 'gif', 'blend', 'zip'}