Lino/StickExporterTX
1
0
Fork 0
mirror of https://github.com/LinoSchmidt/StickExporterTX.git synced 2026-03-21 01:51:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed blenderScript.py permission Problem

Browse Source
This commit is contained in:
Lino Schmidt
2022-05-16 23:45:15 +02:00
parent bf131e1f13
commit 429e4a28a3
5 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/blenderScript.py
View File

@@ -6,7 +6,10 @@ import sys
import bpy
import xml.etree.ElementTree as ET
settings = ET.parse("")
argv = sys.argv
argv = argv[argv.index("--") + 1:]
settings = ET.parse(argv[0])
logger = logging.getLogger('simple_example')
logger.setLevel(logging.INFO)

2
installer-builder.iss
View File

@@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "StickExporterTX"
#define MyAppVersion "0.6.1"
#define MyAppVersion "0.6.2"
#define MyAppPublisher "Lino Schmidt"
#define MyAppURL "https://stickexportertx.lino3d.de"
#define MyAppExeName "stickexportertx.exe"

18
package-lock.json generated
View File

@@ -1,18 +1,17 @@
{
"name": "stickexportertx",
"version": "0.6.1",
"version": "0.6.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "stickexportertx",
"version": "0.6.1",
"version": "0.6.2",
"license": "MIT",
"dependencies": {
"@electron/remote": "^2.0.8",
"electron-log": "^4.4.7",
"electron-squirrel-startup": "^1.0.0",
"line-replace": "^2.0.1",
"xml-formatter": "^2.6.1"
},
"devDependencies": {
@@ -4286,14 +4285,6 @@
"json-buffer": "3.0.0"
}
},
"node_modules/line-replace": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/line-replace/-/line-replace-2.0.1.tgz",
"integrity": "sha512-CSr3f6gynLCA9R+RBS0IDIfv7a8OAXcuyq+CHgq0WzbQ7KSJQfF5DgtpRVxpSp1KBNXogtzbNqAeUjrmHYTPYA==",
"bin": {
"line-replace": "bin/index.js"
}
},
"node_modules/load-json-file": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -10165,11 +10156,6 @@
"json-buffer": "3.0.0"
}
},
"line-replace": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/line-replace/-/line-replace-2.0.1.tgz",
"integrity": "sha512-CSr3f6gynLCA9R+RBS0IDIfv7a8OAXcuyq+CHgq0WzbQ7KSJQfF5DgtpRVxpSp1KBNXogtzbNqAeUjrmHYTPYA=="
},
"load-json-file": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",

7
package.json
View File

@@ -1,7 +1,7 @@
{
"name": "stickexportertx",
"productName": "StickExporterTX",
"version": "0.6.1",
"version": "0.6.2",
"description": "A 3D Stick Exporter for EdgeTX/OpenTX Logs.",
"main": "src/index.js",
"scripts": {
@@ -10,7 +10,9 @@
"make": "electron-forge make",
"publish": "electron-forge publish",
"lint": "echo \"No linting configured\"",
"package-win": "electron-packager . stickexportertx --overwrite --asar=true --platform=win32 --arch=ia32 --icon=icon.ico --prune=true --out=release-builds --version-string.CompanyName=\"Lino Schmidt\" --version-string.FileDescription=\"3D Stick Exporter for EdgeTX/OpenTX Logs\" --version-string.ProductName=StickExporterTX"
"package-win": "electron-packager . stickexportertx --overwrite --asar=true --platform=win32 --arch=ia32 --icon=icon.ico --prune=true --out=release-builds --version-string.CompanyName=\"Lino Schmidt\" --version-string.FileDescription=\"3D Stick Exporter for EdgeTX/OpenTX Logs\" --version-string.ProductName=StickExporterTX",
"package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=icon.icns --prune=true --out=release-builds",
"package-lx": "electron-packager . stickexportertx --overwrite --asar=true --platform=linux --arch=x64 --icon=icon.png --prune=true --out=release-builds"
},
"keywords": [],
"author": {
@@ -49,7 +51,6 @@
"@electron/remote": "^2.0.8",
"electron-log": "^4.4.7",
"electron-squirrel-startup": "^1.0.0",
"line-replace": "^2.0.1",
"xml-formatter": "^2.6.1"
},
"devDependencies": {

17
src/js/render.js
View File

@@ -24,7 +24,6 @@ const fs = require("fs");
const formatXml = require("xml-formatter");
const {dialog, app} = require("@electron/remote");
const path = require('path');
const lineReplace = require('line-replace');
const dataFolder = app.getPath('userData');
const SettingFolder = path.join(dataFolder, "settings.xml");
@@ -33,27 +32,13 @@ const blenderPath = path.join("assets", "blender", "blender");
const templatePath = path.join("assets", "template.blend");
const blenderScriptPath = path.join("assets", "blenderScript.py");
lineReplace({
file: blenderScriptPath,
line: 9,
text: 'settings = ET.parse("' + SettingFolder.replaceAll('\\', '/') + '")',
addNewLine: true,
callback: ({error}) => {
if(error != null) {
statusDisplay.innerHTML = "Something went wrong! Check Logs.";
statusDisplay.style.color = "red";
logger.error(error);
}
}
});
logger.transports.console.format = "{h}:{i}:{s} {text}";
logger.transports.file.getFile();
logger.transports.file.resolvePath = () => path.join(dataFolder, "logs", "main.log");
function startRender() {
const {exec} = require("child_process");
var blenderCons = exec('"' + blenderPath + '" "' + templatePath + '" --background --python "' + blenderScriptPath + '"', {maxBuffer: Infinity});
var blenderCons = exec('"' + blenderPath + '" "' + templatePath + '" --background --python "' + blenderScriptPath + '" -- "' + SettingFolder.replaceAll('\\', '/') + '"', {maxBuffer: Infinity});
frames = "0";
lastFrame = "0";