Version 0.2 released

nutti · nutti · commit 0793cbbfbb81 · 2017-04-02T12:15:57.000+09:00
diff --git a/build.js b/build.js
@@ -8,10 +8,8 @@ packager({
     dir: "./build/client",
     out: "./build/app",
     icon: "./icon/icon.ico",
-    //platform: "win32",
-    //arch: "x64",
-    platform: "all",
-    arch: "all",
+    platform: "win32,linux",
+    arch: "x64",
     electronVersion: "1.3.4",
     overwrite: true,
     asar: true,
diff --git a/build_mac.js b/build_mac.js
@@ -0,0 +1,34 @@
+const packager = require('electron-packager');
+const fs = require('fs');
+const fsext = require('fs-extra');
+const package = require('./package.json');
+
+packager({
+    name: package['name'],
+    dir: "./build/client",
+    out: "./build/app",
+    icon: "./icon/icon.icns",
+    platform: "darwin",
+    arch: "all",
+    electronVersion: "1.3.4",
+    overwrite: true,
+    asar: true,
+    prune: true,
+    ignore: "node_modules/electron-connect",
+    "appVersion": package['version'],
+    "version-string": {
+        companyName: "colorful-pico.net",
+        FileDescription: package['name'],
+        OriginalFilename: package['name'] + ".exe",
+        ProductName: package['name'],
+        InternalName: package['name']
+    }
+}, function (err, appPaths) {
+    if (err) { console.log(err); return; }
+    for (var i = 0; i < appPaths.length; ++i) {
+        var path = appPaths[i];
+        console.log("Build is done. (path=" + path + ")");
+        fs.mkdirSync(path + '/config');
+        fsext.copySync('./config/config.json', path + '/config/config.json');
+    }
+});
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Blender_Add-on_Manager",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Blender Add-on Manager",
   "main": "main.js",
   "scripts": {
diff --git a/src/client/html/index.html b/src/client/html/index.html
@@ -32,6 +32,19 @@
                 <div class="blender-version selectbox-wrapper" ng-show="showBlVerSelect">
                     <select class="selectbox" name="blVerSelect" ng-change="onAddonSelectorChanged()" ng-model="blVerSelect" ng-options="ver as ver for ver in blVerList">
                     </select>
+                    <!-- <div class="custom-dir-panel" ng-if="targetIsCustomDir()">
+                        <input type="text" ng-model="customAddonDir" readonly>
+                        <div class="text-button-wrapper">
+                            <div class="text-button" ng-click="openCustomAddonDir()">
+                                Open
+                            </div>
+                            <div class="text-button" ng-click="addCustomAddonDir()">
+                                Add
+                            </div>
+                        </div>
+                        <select class="selectbox" ng-change="onAddonSelectorChanged()" ng-model="customAddonDirSelect", ng-options="var as ver for ver in customAddonDirList">
+                        </select>
+                    </div> -->
                 </div>
                 <div class="menu-item-title">
                     Addon List
diff --git a/src/client/html/partials/addon-info/buttons.html b/src/client/html/partials/addon-info/buttons.html
@@ -1,3 +1,8 @@
+<div class="text-button-wrapper">
+    <div class="link text-button" data-repo-index="{{i}}" ng-click="onLnBtnClicked($event); $event.stopPropagation();">
+        Link
+    </div>
+</div>
 <div class="text-button-wrapper" ng-if="getAddonStatus(key) === 'NOT_INSTALLED'">
     <div class="download text-button" data-repo-index="{{i}}" ng-click="!isOpsLocked && onDlBtnClicked($event); $event.stopPropagation();" ng-class="{locked: isOpsLocked}">
         Install
diff --git a/src/client/js/app.js b/src/client/js/app.js
@@ -2,9 +2,11 @@
 
 import fs from 'fs';
 import fsext from 'fs-extra';
-import path from 'path';
 import del from 'del';
+import electron from 'electron';
+import * as Utils from 'utils';
 
+let cwd = Utils.getCwd();
 
 import BlAddonDB from 'bl_add-on_db';
 const builder = new BlAddonDB();
@@ -15,17 +17,15 @@ const taskMgr = new TaskMgr();
 import Logger from 'logger';
 const logger = new Logger();
 import * as BlAddon from 'bl-addon';
-import * as Utils from 'utils';
 
 
-var DB_DIR = path.resolve('./db');
-var API_VERSION_FILE = path.resolve('./db/version');
-var GITHUB_ADDONS_DB = path.resolve('./db/add-on_list.db');
-var INSTALLED_ADDONS_DB = path.resolve('./db/installed_add-on_list.db');
-var CONFIG_FILE_PATH = path.resolve('./config/config.json');
+var DB_DIR = cwd + '/db';
+var API_VERSION_FILE = cwd + '/db/version';
+var GITHUB_ADDONS_DB = cwd + '/db/add-on_list.db';
+var INSTALLED_ADDONS_DB = cwd + '/db/installed_add-on_list.db';
+var CONFIG_FILE_PATH = cwd + '/config/config.json';
 var BL_INFO_UNDEF = "626c5f696e666f5f@UNDEF";
 
-
 var config = null;
 var app = angular.module('blAddonMgr', [])
 
@@ -120,6 +120,7 @@ app.controller('MainController', function ($scope, $timeout) {
     }
 
     $scope.blVerList = checker.getInstalledBlVers();
+    //$scope.blVerList.push('Custom');
     $scope.addonCategories = [
         {id: 1, name: 'All', value: 'All'},
         {id: 2, name: '3D View', value: '3D View'},
@@ -146,6 +147,7 @@ app.controller('MainController', function ($scope, $timeout) {
         {id: 2, name: 'GitHub', value: 'github'},
         {id: 3, name: 'Update', value: 'update'}
     ];
+    $scope.customAddonDirList = [];
 
     $scope.githubAddons = loadGitHubAddonDB();
     $scope.installedAddons = loadInstalledAddonsDB();
@@ -256,6 +258,37 @@ app.controller('MainController', function ($scope, $timeout) {
         return $scope.addonStatus[key]['status'][$scope.blVerSelect];
     };
 
+    $scope.targetIsCustomDir = () => {
+        return $scope.blVerSelect === 'Custom';
+    };
+
+    $scope.customAddonDir = "";
+
+    $scope.openCustomAddonDir = () => {
+        const remote = electron.remote;
+        const dialog = remote.dialog;
+        dialog.showOpenDialog(null, {
+            properties: ['openDirectory'],
+            title: 'Select Custom Add-on Folder',
+            defaultPath: '.'
+        }, (folderName) => {
+            $scope.customAddonDir = folderName;
+            redrawApp();
+        });
+    };
+
+    $scope.addCustomAddonDir = () => {
+        let total = $scope.customAddonDirList.length;
+        let dir = $scope.customAddonDir;
+        if (!Utils.isDirectory(dir)) { return; }
+        console.log(dir);
+        $scope.customAddonDirList.push({
+            id: total,
+            dir: dir
+        });
+        consle.log($scope.customAddonDirList);
+    };
+
     function onAddonSelectorChanged() {
         // collect filter condition
         var activeList = $scope.addonLists[$scope.addonListActive]['value'];
@@ -320,7 +353,8 @@ app.controller('MainController', function ($scope, $timeout) {
         }
         main.repoList = addons;
 
-        async function installAddon(repo, cb) {
+
+        async function installAddon(key, repo, cb) {
             try {
                 logger.category('app').info("Downloding add-on '" + repo['bl_info']['name'] + "' from " + repo['download_url']);
                 let target = checker.getAddonPath($scope.blVerSelect);
@@ -338,34 +372,53 @@ app.controller('MainController', function ($scope, $timeout) {
                 const extract = await Utils.extractZipFile(downloadTo, target, true);
 
                 let extractedPath = target + checker.getPathSeparator() + repo['repo_name'] + '-master';
-                let srcPath = repo['src_dir'] + "/" + repo['src_main'];
-                let sp = srcPath.split("/");
-                let copiedFile = "";
-                let targetName = sp[sp.length - 1];
+                let srcPath = extractedPath + repo['src_dir'] + '/' + repo['src_main'];
+                let sp = srcPath.split(/[\/\\]/);
+                let copingFiles = [];
+                let isPackage = false;
+                // Package
+                if (sp[sp.length - 1] == "__init__.py") {
+                    isPackage = true;
+                }
+                // Module
+                else {
+                    isPackage = false;
+                }
                 advanceProgressAndUpdate();
                 advanceProgressAndUpdate();
+                let basePath = "";
                 for (let i = 0; i < sp.length - 1; ++i) {
-                    copiedFile += sp[i] + checker.getPathSeparator();
+                    basePath += sp[i] + checker.getPathSeparator();
                 }
-                // File
-                if (targetName != "__init__.py") {
-                    copiedFile += targetName;
+                if (isPackage) {
+                    let list = fs.readdirSync(basePath);
+                    for (let i = 0; i < list.length; ++i) {
+                        copingFiles.push({ 'path': basePath + list[i], 'filename': list[i]} );
+                    }
                 }
-                // Directory
                 else {
-                    targetName = sp[sp.length - 2];
+                    let modPath = basePath + checker.getPathSeparator() + sp[sp.length - 1];
+                    copingFiles.push({'path': modPath, 'filename': sp[sp.length - 1]});
                 }
-                let source = extractedPath + copiedFile;
                 // copy add-on to add-on directory
-                fsext.copySync(source, target + checker.getPathSeparator() + targetName);
+                let targetDir = target;
+                if (isPackage) {
+                    targetDir = target + checker.getPathSeparator() + key;
+                    fs.mkdirSync(targetDir);
+                }
+                for (let i = 0; i < copingFiles.length; ++i) {
+                    let source = copingFiles[i]['path'];
+                    let target = targetDir + checker.getPathSeparator() + copingFiles[i]['filename'];
+                    fsext.copySync(source, target);
+                }
                 advanceProgressAndUpdate();
                 // delete garbage data
                 del.sync([extractedPath], {force: true});
 
                 cb();
             }
             catch (e) {
-                logger.category('app').err(e);
+                logger.category('app').error(e);
             }
         }
 
@@ -378,12 +431,20 @@ app.controller('MainController', function ($scope, $timeout) {
             logger.category('app').info("Deleted '" + deleteFrom + "'");
         }
 
+        function onLnBtnClicked($event) {
+            let repoIndex = $($event.target).data('repo-index');
+            let repo = $scope.addonStatus[main.repoList[repoIndex]]['github'];
+            let url = repo['url'];
+            electron.shell.openExternal(url);
+        }
+
         function onDlBtnClicked($event) {
             setTaskAndUpdate('INSTALL');
             let repoIndex = $($event.target).data('repo-index');
             let repo = $scope.addonStatus[main.repoList[repoIndex]]['github'];
+            let key = main.repoList[repoIndex];
             $scope.isOpsLocked = true;
-            installAddon(repo, () => {
+            installAddon(key, repo, () => {
                 try {
                     advanceProgressAndUpdate();
                     updateInstalledAddonDB();
@@ -419,14 +480,15 @@ app.controller('MainController', function ($scope, $timeout) {
             let repoIndex = $($event.target).data('repo-index');
             let repoInstalled = $scope.addonStatus[main.repoList[repoIndex]]['installed'][blVer];
             let repoGitHub = $scope.addonStatus[main.repoList[repoIndex]]['github'];
+            let key = main.repoList[repoIndex];
             $scope.isOpsLocked = true;
             try {
                 removeAddon(repoInstalled);
             }
             catch (e) {
                 logger.category('app').err(e);
             }
-            installAddon(repoGitHub, () => {
+            installAddon(key, repoGitHub, () => {
                 try {
                     advanceProgressAndUpdate();
                     updateInstalledAddonDB();
@@ -440,6 +502,8 @@ app.controller('MainController', function ($scope, $timeout) {
             });
         }
 
+        // "Link" button
+        $scope.onLnBtnClicked = onLnBtnClicked;
         // "Download" button
         $scope.onDlBtnClicked = onDlBtnClicked;
         // "Remove" button
diff --git a/src/client/sass/components/_button.scss b/src/client/sass/components/_button.scss
@@ -18,6 +18,30 @@
             background-color: $button-hover-bgcolor;
         }
     }
+    .remove {
+        color: $body-color + #442020;
+        background-color: $button-bgcolor + #440000;
+        &:hover {
+            color: $body-color + #300000;
+            background-color: $button-hover-bgcolor + #300000;
+        }
+    }
+    .update {
+        color: $body-color + #202044;
+        background-color: $button-bgcolor + #000044;
+        &:hover {
+            color: $body-color + #000030;
+            background-color: $button-hover-bgcolor + #000030;
+        }
+    }
+    .download {
+        color: $body-color + #103310;
+        background-color: $button-hover-bgcolor + #002500;
+        &:hover {
+            color: $body-color + #101810;
+            background-color: $button-hover-bgcolor + #001500;
+        }
+    }
     .locked {
         color: $body-color - #202020;
         background-color: $button-bgcolor - #202020;
@@ -27,12 +51,4 @@
             background-color: $button-bgcolor - #202020;
         }
     }
-    .remove {
-        color: $body-color + #442020;
-        background-color: $button-bgcolor + #440000;
-    }
-    .update {
-        color: $body-color + #202044;
-        background-color: $button-bgcolor + #000044;
-    }
 }
diff --git a/src/client/sass/lib/_variables.scss b/src/client/sass/lib/_variables.scss
@@ -15,7 +15,7 @@ $selector-hover-color: #E0E0E0;
 $selector-hover-bgcolor: #393939;
 
 $button-bgcolor: #404040;
-$button-hover-bgcolor: #606060;
+$button-hover-bgcolor: $button-bgcolor - #101010;
 
 $selectbox-bgcolor: $button-bgcolor;
 $selectbox-hover-bgcolor: $button-hover-bgcolor;
diff --git a/src/lib/js/bl-addon.js b/src/lib/js/bl-addon.js
@@ -107,7 +107,7 @@ export function filterAddons(addons, source, status, blVer, category, regex) {
         let categoryMatched = (category.indexOf('All') != -1) || (category.indexOf(elm['bl_info']['category']) != -1);
 
         // filtered by search string
-        let regexp = new RegExp(regex);
+        let regexp = new RegExp(regex, "i");
         let nameMatched = (elm['bl_info']['name'] != undefined && elm['bl_info']['name'].match(regexp) != null);
         let authorMatched = (elm['bl_info']['author'] != undefined && elm['bl_info']['author'].match(regexp) != null);
         let descMatched = (elm['bl_info']['description'] != undefined && elm['bl_info']['description'].match(regexp) != null);
diff --git a/src/lib/js/logger.js b/src/lib/js/logger.js
@@ -4,10 +4,15 @@ import path from 'path';
 import log4js from 'log4js';
 import log4jsExt from 'log4js-extend';
 
+import * as Utils from 'utils';
+
+const MAX_LOG_SIZE = 3 * 1024 * 1024;       // 3MiB
+const MAX_BACKUPS = 3;
 
 export default class Logger
 {
     constructor () {
+        let cwd = Utils.getCwd();
         let config = {
           "log4js": {
             "level": "ALL",
@@ -16,14 +21,18 @@ export default class Logger
                 {
                   "category": "lib",
                   "type": "file",
-                  "filename": "logs/lib.log"
+                  "backups": MAX_BACKUPS,
+                  "maxLogSize": MAX_LOG_SIZE,
+                  "filename": cwd + "/logs/lib.log"
                 },
                 {
                   "category": "app",
                   "type": "file",
-                  "filename": "logs/app.log"
+                  "backups": MAX_BACKUPS,
+                  "maxLogSize": MAX_LOG_SIZE,
+                  "filename": cwd + "/logs/app.log"
                 }
-              ]
+             ]
             }
           }
         };
diff --git a/src/lib/js/utils.js b/src/lib/js/utils.js
diff --git a/src/server/js/bladdon_collector.js b/src/server/js/bladdon_collector.js
diff --git a/src/server/js/test_db.js b/src/server/js/test_db.js
diff --git a/src/server/server.py b/src/server/server.py

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Blender_Add-on_Manager",`
`3`		`- "version": "0.1.0",`
	`3`	`+ "version": "0.2.0",`
`4`	`4`	`"description": "Blender Add-on Manager",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`