Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes and refactoring in json export code #4785

Merged
merged 2 commits into from
Dec 5, 2022
+18 −23
Merged

Minor fixes and refactoring in json export code #4785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca4599
Minor fixes in sv_IO_panel.py
Andrej730 Dec 2, 2022
c55da58
Minor refactoring in sv_IO_panel.py
Andrej730 Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 18 additions & 23 deletions ui/sv_IO_panel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
import zipfile
import os
import json
from os.path import basename, dirname
from pathlib import Path
from time import localtime, strftime
from typing import Tuple

import bpy

Expand Down Expand Up @@ -109,7 +108,7 @@ class SvNodeTreeExporter(bpy.types.Operator):

filepath: bpy.props.StringProperty(
name="File Path",
description="Filepath used for exporting too",
description="Filepath used for exporting to",
maxlen=1024, default="", subtype='FILE_PATH')

filter_glob: bpy.props.StringProperty(
Expand All @@ -132,12 +131,15 @@ def execute(self, context):

ng = bpy.data.node_groups[self.id_tree]

destination_path = self.filepath
if not destination_path.lower().endswith('.json'):
destination_path += '.json'
destination_path = Path(self.filepath)

# future: should check if filepath is a folder or ends in \
if destination_path.is_dir():
msg = 'folder was selected instead of file - didn\'t export'
self.report({"WARNING"}, msg)
warning(msg)
return {'CANCELLED'}

destination_path = destination_path.with_suffix('.json')
layout_dict = JSONExporter.get_tree_structure(ng, self.selected_only)

if not layout_dict:
Expand All @@ -147,27 +149,20 @@ def execute(self, context):
return {'CANCELLED'}

indent = None if self.compact else 2
json.dump(layout_dict, open(destination_path, 'w'), indent=indent) # json_struct doesn't expect sort_keys = True
msg = 'exported to: ' + destination_path
with open(destination_path, 'w') as fpo:
json.dump(layout_dict, fpo, indent=indent) # json_struct doesn't expect sort_keys = True
msg = 'exported to: ' + str(destination_path)
self.report({"INFO"}, msg)
info(msg)

if self.compress:
comp_mode = zipfile.ZIP_DEFLATED
archive_path = destination_path.with_suffix('.zip')

# destination path = /a../b../c../somename.json
base = basename(destination_path) # somename.json
basedir = dirname(destination_path) # /a../b../c../

# somename.zip
final_archivename = base.replace('.json', '') + '.zip'

# /a../b../c../somename.zip
fullpath = os.path.join(basedir, final_archivename)

with zipfile.ZipFile(fullpath, 'w', compression=comp_mode) as myzip:
myzip.write(destination_path, arcname=base)
info('wrote: %s', final_archivename)
with zipfile.ZipFile(archive_path, 'w', compression=comp_mode) as myzip:
# need to specify arcname otherwise it'll copy the entire path
myzip.write(destination_path, arcname=destination_path.name)
info('wrote: %s', archive_path.name)

return {'FINISHED'}

Expand Down Expand Up @@ -413,7 +408,7 @@ def execute(self, context):
def invoke(self, context, event):
wm = context.window_manager
return wm.invoke_props_dialog(self)

def draw(self, context):
try:
col = self.layout.column(heading="Options") # new syntax in >= 2.90
Expand Down