From 24cac52f15340685352477a418f415556a101559 Mon Sep 17 00:00:00 2001 From: Nutti Date: Wed, 29 Nov 2017 21:42:13 +0900 Subject: [PATCH] Version 1.1 released --- README.md | 97 +++++++-- README_jp.md | 116 ++++++++++- images/favorite_button.png | 3 + images/favorite_button_favorited.png | 3 + images/migrate_addon.png | 3 + images/migrate_addon_hover.png | 3 + package.json | 2 +- src/client/html/index.html | 1 + .../html/partials/addon-info/buttons.html | 8 +- .../html/partials/addon-info/github.html | 46 +++-- .../html/partials/addon-info/installed.html | 46 +++-- .../html/partials/customdir-list-popup.html | 2 +- src/client/html/partials/error-popup.html | 2 +- src/client/html/partials/footer.html | 8 +- src/client/html/partials/header.html | 11 +- .../html/partials/ignore-list-popup.html | 2 +- src/client/html/partials/menu.html | 10 +- .../html/partials/migrate-addon-popup.html | 40 ++++ src/client/js/addon.js | 8 +- src/client/js/app.js | 185 +++++++++++++++++- src/client/js/db.js | 12 +- src/client/js/task.js | 5 +- src/client/js/ui.js | 11 ++ src/client/sass/components/_button.scss | 1 - src/client/sass/components/_popup.scss | 62 ++++++ src/client/sass/lib/_mixins.scss | 16 +- src/client/sass/lib/_variables.scss | 2 +- src/client/sass/modules/_app.scss | 2 +- src/client/sass/modules/_container.scss | 123 +++++++----- src/client/sass/modules/_footer.scss | 18 +- src/client/sass/modules/_menu.scss | 4 +- src/lib/js/blam-constants.js | 9 +- src/lib/js/blam-custom-dir.js | 4 +- src/lib/js/blam-db-writer.js | 13 ++ src/lib/js/blam-db.js | 56 ++---- src/lib/js/blam-favorite.js | 61 ++++++ src/lib/js/blam-os.js | 3 +- src/lib/js/blam-translations.js | 54 +++++ src/lib/js/blam.js | 13 +- src/lib/js/lang/lang-es.js | 39 ++++ src/lib/js/task.js | 6 +- src/lib/js/utils.js | 9 +- src/server/js/bladdon_cleaner.js | 115 ++++++++++- src/server/server.py | 124 ++++++++++-- 44 files changed, 1123 insertions(+), 235 deletions(-) create mode 100644 images/favorite_button.png create mode 100644 images/favorite_button_favorited.png create mode 100644 images/migrate_addon.png create mode 100644 images/migrate_addon_hover.png create mode 100644 src/client/html/partials/migrate-addon-popup.html create mode 100644 src/lib/js/blam-favorite.js create mode 100644 src/lib/js/blam-translations.js create mode 100644 src/lib/js/lang/lang-es.js diff --git a/README.md b/README.md index 98dbaf7..a8f4fea 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ You can install/uninstall/update all add-on's released on GitHub with this appli |Version|Download URL| |---|---| +|1.1|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v1.1)| |1.0|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v1.0)| |0.3|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.3)| |0.2|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.2)| @@ -16,8 +17,12 @@ You can install/uninstall/update all add-on's released on GitHub with this appli ## Support Languages -**English** only. +The list of languages supported by this application is shown below. +If you want to support other languages, please send me translated strings. +* English (Default) +* Spanish + * Contributed by @Oxer ## Features @@ -28,6 +33,8 @@ This application has features as follows. * Install add-on released on GitHub * Uninstall add-on which is already installed (only **External** support level) * Update add-on released on GitHub + * Favorite +* Migrate add-ons among different Blender version ## Tutorials @@ -47,9 +54,10 @@ See the link below for further details. |Version|Release Date|Change Log| |---|---|---| -|1.0|2017.X.XX|[1] Manage Custom Add-on Folder
[2] Ignore List
[3] Sorting Option in Add-on List
[4] Delete Add-on whose link is already broken automatically (server).
[5] Fix bug
- Failed to detect add-ons whose path contains "."| -|0.3|2017.4.11|[1] Move config/DB file to user directory
[2] Improve server's stability
[3] Error popup
[4] Fix bug
- Failed to run application developed by unidentified developer on macOS
- Failed to load add-on at Blender installed by this application| -|0.2|2017.4.2|[1] Support macOS
[2] Add features
- Link button to Add-on repository
- Case-insensitive search
[3]Fix bug
- Failed to install when ```__init__.py``` is located on the top directory| +|1.1|2017.11.29|[1] Add features
- Favorite
- Migrate Add-on among different Blender version
[2] Support Language
- Spanish
[3] Add scroll bar
[4] Update Add-on Database API (server)
[5] Improve deletion algorithm on the add-on DB cleaner (server)| +|1.0|2017.11.9|[1] Add features
- Manage Custom Add-on Folder
- Ignore List
[2] Add Sorting Option in Add-on List
[3] Delete Add-on whose link is already broken automatically (server)
[4] Fix bug
- Failed to detect add-ons whose path contains "."| +|0.3|2017.4.11|[1] Move config/DB file to user directory
[2] Improve server's stability
[3] Error popup
[4] Fix bug
- Failed to run application developed by unidentified developer on macOS
- Failed to load add-on installed by this application at Blender| +|0.2|2017.4.2|[1] Support macOS
[2] Add feature
- Link button to Add-on repository
[3] Add Case-insensitive search
[4] Fix bug
- Failed to install when ```__init__.py``` is located on the top directory| |0.1|2017.3.25|First release for testing| @@ -67,31 +75,84 @@ DO NOT send pull request to **master** branch. https://github.com/nutti/Blender-Add-on-Manager/tree/develop +### Testing + +only application is available. + +#### Application + To build and run application for testing. ```sh -$ git clone https://github.com/nutti/Blender-Add-on-Manager.git -$ cd Blender-Add-on-Manager -$ npm install -$ bower install -$ gulp -$ gulp start + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ npm install + $ bower install + $ gulp + $ gulp start ``` -To build application for relase. +### Release + +#### Application + +To build and pack application for release. ```sh -$ git clone https://github.com/nutti/Blender-Add-on-Manager.git -$ cd Blender-Add-on-Manager -$ npm install -$ bower install -$ gulp + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ npm install + $ bower install + $ gulp -$ npm run build # for Windows/linux + $ npm run build # for Windows/linux or -$ node build_mac.js # for macOS + $ git-lfs pull + $ node build_mac.js # for macOS +``` + +#### Server + +To build and launch server for release. (Linux only) + +```sh + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ vim src/lib/js/blam-constants.js +# comment constant definition "USER_DIR" for client, +# and uncomment constant definition "USER_DIR" for server. + + $ npm install + $ npm install electron@1.7.9 + $ bower install + $ gulp + +# make configuration file for logging into GitHub + $ vim config.json +# { +# "github": { +# "username": , +# "password": +# } +# } + +# install python dependencies + $ mkdir venv + $ virtualenv venv + $ source venv/bin/activate + $ pip install -r requirements.txt + +# run API server + $ cd src/server + $ sh run.sh +# run Blender add-on information collector + $ cd ../.. + $ cd build/server/js + $ forever start bladdon_collector.js +# run Blender add-on information cleaner (optional) + $ node bladdon_cleaner.js ``` diff --git a/README_jp.md b/README_jp.md index f3ad718..3bb2cbb 100644 --- a/README_jp.md +++ b/README_jp.md @@ -3,17 +3,27 @@ GitHubで公開されているアドオンを管理するためのツールです。 本ツールを利用することで、GitHubで公開されている全てのアドオンについて管理することができます。 -**現在、テスト目的でツールを公開しています。不具合の修正は適宜行っていますが、まだ多数の潜在的な不具合が存在すると考えられますので、ご利用は自己責任で行ってください。** ## ダウンロードURL |バージョン|URL| |---|---| -|0.1|Download| +|1.1|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v1.1)| +|1.0|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v1.0)| +|0.3|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.3)| +|0.2|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.2)| +|0.1|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.1)| + ## 対応言語 -英語のみ +現在、本アプリケーションでサポートしている言語は以下の通りです。 +サポートしたい言語がありましたら、翻訳内容を送ってください。 + +* 英語（デフォルト） +* スペイン語 + * 提供者：@Oxer + ## 提供機能 @@ -24,6 +34,9 @@ GitHubで公開されているアドオンを管理するためのツールで * GitHub上で公開されているアドオンのインストール * インストール済みのアドオンのアンインストール（サポートレベルがExternalのアドオンのみ） * GitHub上で公開されているアドオンのアップデート + * お気に入り +* 異なるバージョンのBlender間でのアドオン移行 + ## 使い方 @@ -35,11 +48,19 @@ GitHubで公開されているアドオンを管理するためのツールで Blenderアドオンマネージャは現在進行中のプロジェクトです。 より詳細な情報については、以下のリンク先を参照してください。 +* [Blender Artist Thread](https://blenderartists.org/forum/showthread.php?418833-Blender-Add-on-Manager-(About-2-000-add-ons-are-available)) + + ## 更新履歴 -|バージョン|URL| -|---|---| -|0.1|テスト版公開| +|バージョン|リリース日|更新内容| +|---|---|---| +|1.1|2017.11.29|[1] 新機能追加
- お気に入り
- 異なるバージョン間でのアドオン移行
[2] 言語サポート
- スペイン語
[3] スクロールバー追加
[4] データベースのAPIを更新 (サーバ)
[5] データベースからのアドオン削除アルゴリズム改良 (サーバ)| +|1.0|2017.11.9|[1] 新機能追加
- カスタムディレクトリ上に配置されたアドオンの管理
- アドオンのブロック
[2] アドオンの表示順序選択
[3] リンク切れのアドオン削除 (サーバ)
[4] バグ修正
- パスに "." を含むアドオン情報の取得に失敗| +|0.3|2017.4.11|[1] configファイルとデータベースファイルをユーザのホームディレクトリに配置
[2] サーバサイドプログラムの安定性向上
[3] エラー時にポップアップ表示
[4] バグ修正
- 開発元が未確認のためにmacOSでアプリを起動できない
- 本アプリでインストールしたアドオンをBlenderで開けない| +|0.2|2017.4.2|[1] macOSサポート
[2] 新機能追加
- アドオンのリポジトリへのリンクジャンプ
[3] 大文字/小文字を判別しない検索
[4] バグ修正
- ```__init__.py``` がディレクトリ直下に置かれていた場合にインストールできない| +|0.1|2017.3.25|テスト向けリリース| + ## 不具合報告、機能追加依頼 @@ -52,6 +73,89 @@ https://github.com/nutti/Blender-Add-on-Manager-for-GitHub/issues 本ツールの開発に対する修正などを行いたい方は **develop** ブランチへPull Requestすることで修正依頼を行ってください。 **master** ブランチへのPull Requestは禁止します。 +https://github.com/nutti/Blender-Add-on-Manager/tree/develop + + +### テスト + +テストはアプリケーションのみ対応しています。 + +#### アプリケーション + +アプリケーションをビルド＆テストするためには、以下の手順に従います。 + +```sh + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ npm install + $ bower install + $ gulp + $ gulp start +``` + +### リリース + +#### アプリケーション + +アプリケーションのリリース版は、以下の手順で作成します。 + +```sh + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ npm install + $ bower install + $ gulp + + $ npm run build # Windows/Linux向け + +or + + $ node build_mac.js # MacOS向け +``` + +#### サーバ + +サーバサイドプログラムのリリース版のビルドと、各種サーバの立ち上げは以下の手順で行います（Linux上でのみ動作可能です）。 + + +```sh + $ git clone https://github.com/nutti/Blender-Add-on-Manager.git + $ cd Blender-Add-on-Manager + $ vim src/lib/js/blam-constants.js +# クライアントの定数定義 "USER_DIR" をコメント +# サーバの定数定義 "USER_DIR" のコメントを外す + + $ npm install + $ npm install electron@1.7.9 + $ bower install + $ gulp + +# GitHubにログインするための設定ファイルを作成 + $ vim config.json +# { +# "github": { +# "username": , +# "password": +# } +# } + +# Pythonの依存するパッケージをインストール + $ mkdir venv + $ virtualenv venv + $ source venv/bin/activate + $ pip install -r requirements.txt + +# APIサーバを立ち上げ + $ cd src/server + $ sh run.sh +# GitHubからのアドオン情報収集デーモンを立ち上げ + $ cd ../.. + $ cd build/server/js + $ forever start bladdon_collector.js +# アドオンデータベースクリーナの立ち上げ (任意) + $ node bladdon_cleaner.js +``` + ## ライセンス 本ツールは **MIT** ライセンスが適用されています。 diff --git a/images/favorite_button.png b/images/favorite_button.png new file mode 100644 index 0000000..07c6629 --- /dev/null +++ b/images/favorite_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b0094e5d62743d7c331739e92f27d86fca7b78e7bf7285a66d8c42122dca6c4 +size 17525 diff --git a/images/favorite_button_favorited.png b/images/favorite_button_favorited.png new file mode 100644 index 0000000..43d2aa3 --- /dev/null +++ b/images/favorite_button_favorited.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa88f855449ae20210ca08caf251446599f2937ee99f2b4355c046bc7acfb3e6 +size 12421 diff --git a/images/migrate_addon.png b/images/migrate_addon.png new file mode 100644 index 0000000..9909082 --- /dev/null +++ b/images/migrate_addon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73f1611b58e924619e827cb060b6d99df458784420b9c88b37ee7c1b73e8fda4 +size 7246 diff --git a/images/migrate_addon_hover.png b/images/migrate_addon_hover.png new file mode 100644 index 0000000..425993e --- /dev/null +++ b/images/migrate_addon_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cde98be59a96cb0af80bcfa81697498bb752607ea26d5b689ed7694fad5bf2bc +size 7194 diff --git a/package.json b/package.json index db37f93..da55a87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Blender_Add-on_Manager", - "version": "1.0.0", + "version": "1.1.0", "description": "Blender Add-on Manager", "main": "main.js", "scripts": { diff --git a/src/client/html/index.html b/src/client/html/index.html index e2a7710..2da760f 100755 --- a/src/client/html/index.html +++ b/src/client/html/index.html @@ -46,6 +46,7 @@
+
diff --git a/src/client/html/partials/addon-info/buttons.html b/src/client/html/partials/addon-info/buttons.html index 1c9e4e2..d14a6db 100644 --- a/src/client/html/partials/addon-info/buttons.html +++ b/src/client/html/partials/addon-info/buttons.html @@ -1,20 +1,20 @@
- Link + {{blamTranslate('Link');}}
- Install + {{blamTranslate('Install');}}
- Update + {{blamTranslate('Update');}}
- Remove + {{blamTranslate('Remove');}}
diff --git a/src/client/html/partials/addon-info/github.html b/src/client/html/partials/addon-info/github.html index b3bfa3b..7a4203f 100644 --- a/src/client/html/partials/addon-info/github.html +++ b/src/client/html/partials/addon-info/github.html @@ -1,22 +1,36 @@
-
- {{blStr('name', addonStatus[key].github.bl_info.name);}} +
+
+
+
+ +
+
+ +
+
+
+ {{blStr('name', addonStatus[key].github.bl_info.name);}} +
+
+
+ {{blamTranslate(blStr('description', addonStatus[key].github.bl_info.description));}} +
+
+ {{blStr('author', addonStatus[key].github.bl_info.author);}} +
-
- {{blStr('description', addonStatus[key].github.bl_info.description);}} -
-
- {{blStr('author', addonStatus[key].github.bl_info.author);}} -
-
- {{blStr('version', addonStatus[key].github.bl_info.version);}} -
-
- {{blStr('bl-version', addonStatus[key].github.bl_info.blender);}} -
-
- {{blStr('category', addonStatus[key].github.bl_info.category);}} +
+
+ {{blStr('version', addonStatus[key].github.bl_info.version);}} +
+
+ {{blStr('bl-version', addonStatus[key].github.bl_info.blender);}} +
+
+ {{blStr('category', addonStatus[key].github.bl_info.category);}} +
diff --git a/src/client/html/partials/addon-info/installed.html b/src/client/html/partials/addon-info/installed.html index 0a23964..5fbd696 100644 --- a/src/client/html/partials/addon-info/installed.html +++ b/src/client/html/partials/addon-info/installed.html @@ -1,22 +1,36 @@
-
- {{blStr('name', addonStatus[key].installed[targetDir].bl_info.name);}} +
+
+
+
+ +
+
+ +
+
+
+ {{blStr('name', addonStatus[key].installed[targetDir].bl_info.name);}} +
+
+
+ {{blamTranslate(blStr('description', addonStatus[key].installed[targetDir].bl_info.description));}} +
+
+ {{blStr('author', addonStatus[key].installed[targetDir].bl_info.author);}} +
-
- {{blStr('description', addonStatus[key].installed[targetDir].bl_info.description);}} -
-
- {{blStr('author', addonStatus[key].installed[targetDir].bl_info.author);}} -
-
- {{blStr('version', addonStatus[key].installed[targetDir].bl_info.version);}} -
-
- {{blStr('bl-version', addonStatus[key].installed[targetDir].bl_info.blender);}} -
-
- {{blStr('category', addonStatus[key].installed[targetDir].bl_info.category);}} +
+
+ {{blStr('version', addonStatus[key].installed[targetDir].bl_info.version);}} +
+
+ {{blStr('bl-version', addonStatus[key].installed[targetDir].bl_info.blender);}} +
+
+ {{blStr('category', addonStatus[key].installed[targetDir].bl_info.category);}} +
diff --git a/src/client/html/partials/customdir-list-popup.html b/src/client/html/partials/customdir-list-popup.html index 4e3112e..77d0e27 100644 --- a/src/client/html/partials/customdir-list-popup.html +++ b/src/client/html/partials/customdir-list-popup.html @@ -59,7 +59,7 @@

Add New Custom Directory

- Close + {{blamTranslate('Close');}}
diff --git a/src/client/html/partials/error-popup.html b/src/client/html/partials/error-popup.html index e237886..e42514c 100644 --- a/src/client/html/partials/error-popup.html +++ b/src/client/html/partials/error-popup.html @@ -10,7 +10,7 @@

{{ errMsg }}

- Close + {{blamTranslate('Close');}}
diff --git a/src/client/html/partials/footer.html b/src/client/html/partials/footer.html index 724739c..87c717f 100644 --- a/src/client/html/partials/footer.html +++ b/src/client/html/partials/footer.html @@ -1,8 +1,14 @@ +
+
+ +
+
- {{ task.progress }} + {{ task.progress }} .
diff --git a/src/client/html/partials/header.html b/src/client/html/partials/header.html index 126d11b..39c92be 100644 --- a/src/client/html/partials/header.html +++ b/src/client/html/partials/header.html @@ -19,6 +19,11 @@ Manage Custom Installation Target
+
+ +
@@ -29,16 +34,16 @@
-
-
+
- +
diff --git a/src/client/html/partials/ignore-list-popup.html b/src/client/html/partials/ignore-list-popup.html index 6984804..9994c5c 100644 --- a/src/client/html/partials/ignore-list-popup.html +++ b/src/client/html/partials/ignore-list-popup.html @@ -32,7 +32,7 @@

Ignored Add-on List

- Close + {{blamTranslate('Close');}}
diff --git a/src/client/html/partials/menu.html b/src/client/html/partials/menu.html index 9e051c5..7df3969 100644 --- a/src/client/html/partials/menu.html +++ b/src/client/html/partials/menu.html @@ -1,23 +1,23 @@
- Version + {{blamTranslate('Version');}}
- Addon List + {{blamTranslate('Addon List');}}
  • - {{list.name}} + {{blamTranslate(list.name);}}
    • - Category + {{blamTranslate('Category');}}
  • - {{category.name}} + {{blamTranslate(category.name)}}
    • diff --git a/src/client/html/partials/migrate-addon-popup.html b/src/client/html/partials/migrate-addon-popup.html new file mode 100644 index 0000000..7cb86b1 --- /dev/null +++ b/src/client/html/partials/migrate-addon-popup.html @@ -0,0 +1,40 @@ +
    +
    +

    Migrate Addons

    +
    +
    + +

    Source Version

    +
    +
    + +
    +
    + + +

    Target Version

    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + Migrate +
    +
    +
    +
    + {{blamTranslate('Close');}} +
    +
    +
    +
    +
    +
    diff --git a/src/client/js/addon.js b/src/client/js/addon.js index cccd401..b5175bb 100644 --- a/src/client/js/addon.js +++ b/src/client/js/addon.js @@ -82,16 +82,14 @@ async function installAddon($scope, key, repo, cb) { function removeAddon($scope, repo) { try { - var deleteFrom = repo['src_path']; - if (!deleteFrom) { throw new Error(deleteFrom + "is not found"); } + let deleteFrom = repo['src_path']; + if (!deleteFrom) { throw new Error(deleteFrom + " is not found"); } logger.category('app').info("Deleting '" + deleteFrom + "' ..."); advanceProgressAndUpdate($scope); - var result = del.sync([deleteFrom], {force: true}); + let result = del.sync([deleteFrom], {force: true}); logger.category('app').info("Deleted '" + deleteFrom + "'"); } catch (e) { handleException($scope, e); } } - - diff --git a/src/client/js/app.js b/src/client/js/app.js index 27eeb54..fb447ca 100755 --- a/src/client/js/app.js +++ b/src/client/js/app.js @@ -14,8 +14,12 @@ import BlamCustomDir from 'blam-custom-dir'; const blamCustomDir = new BlamCustomDir(); import BlamLocal from 'blam-local'; const blamLocal = new BlamLocal(blamCustomDir, blamOS); +import BlamFavorite from 'blam-favorite'; +const blamFavorite = new BlamFavorite(); import BlamIgnore from 'blam-ignore'; const blamIgnore = new BlamIgnore(); +import BlamTranslations from 'blam-translations'; +const blamTranslations = new BlamTranslations(); import TaskMgr from 'task'; const taskMgr = new TaskMgr(); import Logger from 'logger'; @@ -23,25 +27,56 @@ const logger = new Logger(); import * as Blam from 'blam'; import { - DB_DIR, API_VERSION_FILE, GITHUB_ADDONS_DB, INSTALLED_ADDONS_DB, IGNORE_ADDONS_DB, - CUSTOM_DIR_DB, CONFIG_DIR, CONFIG_FILE_PATH, BL_INFO_UNDEF, CONFIG_FILE_INIT + DB_DIR, API_VERSION_FILE, GITHUB_ADDONS_DB, INSTALLED_ADDONS_DB, + FAVORITE_ADDONS_DB, IGNORE_ADDONS_DB, CUSTOM_DIR_DB, CONFIG_DIR, + CONFIG_FILE_PATH, BL_INFO_UNDEF, CONFIG_FILE_INIT } from 'blam-constants'; var config = null; var app = angular.module('blAddonMgr', []) - app.controller('MainController', function ($scope, $timeout) { var main = this; main.repoList = []; + function adjustBodyHeight() { + let hh = $('.app-body .header').outerHeight(); + let fh = $('.app-body .footer').outerHeight(); + let h = $(window).height() - hh - fh; + $('.app-body .container').css('height', h); + $('.app-body .menu').css('height', h); + } + + // for displaying scroll bar + $(window).resize( () => { + adjustBodyHeight(); + }); + $(window).ready( () => { + adjustBodyHeight(); + }); + $scope.blVerList = blamOS.getBlenderVersions(); $scope.blVerList.push('Custom'); $scope.blVerSelect = $scope.blVerList[0]; $scope.showBlVerSelect = true; + $scope.langList = ['Language:']; + Array.prototype.push.apply($scope.langList, blamTranslations.supportedLanguages()); + $scope.langSelect = 'Language:'; + blamTranslations.setLanguage('Default (English)'); + + $scope.blamTranslate = (key) => { + return blamTranslations.translate(key); + }; + + $scope.onLangSelectorChanged = () => { + if ($scope.langSelect != 'Language:') { + blamTranslations.setLanguage($scope.langSelect); + } + }; + $scope.addonOrderItemList = [ {name: 'Sort:', value: ''}, {name: 'Add-on Name', value: 'ADDON_NAME'}, @@ -51,7 +86,6 @@ app.controller('MainController', function ($scope, $timeout) { $scope.onAddonSelectorChanged = onAddonSelectorChanged; - //$scope.blVerList.push('Custom'); $scope.addonCategories = [ {id: 1, name: 'All', value: 'All'}, {id: 2, name: '3D View', value: '3D View'}, @@ -76,7 +110,8 @@ app.controller('MainController', function ($scope, $timeout) { $scope.addonLists = [ {id: 1, name: 'Installed', value: 'installed'}, {id: 2, name: 'GitHub', value: 'github'}, - {id: 3, name: 'Update', value: 'update'} + {id: 3, name: 'Update', value: 'update'}, + {id: 4, name: 'Favorite', value: 'favorite'}, ]; $scope.customDirItemList = []; $scope.addonListActive = 1; @@ -182,6 +217,10 @@ app.controller('MainController', function ($scope, $timeout) { return $scope.addonStatus[key]['status'][$scope.targetDir]; }; + $scope.isAddonFavorited = (key) => { + return $scope.addonStatus[key]['favorited']; + }; + $scope.onOpenCustomDirBtnClicked = () => { const remote = electron.remote; const dialog = remote.dialog; @@ -230,6 +269,76 @@ app.controller('MainController', function ($scope, $timeout) { showCustomdirListPopup($scope); }; + $scope.onMigAddonBtnClicked = () => { + showMigAddonPopup($scope); + }; + + $scope.onMigBtnClicked = () => { + let src = $scope.blVerSrc; + let tgt = $scope.blVerTgt; + migrateAddon(src, tgt) + }; + + function migrateAddon(verSrc, verTgt) { + // check installed add-on + let addonListSrc = {}; + let addonListTgt = {}; + for (let key in $scope.addonStatus) { + let addon = $scope.addonStatus[key]; + if (addon['installed'] === undefined) { continue; } + + if (addon['installed'][verSrc] !== undefined) { + addonListSrc[key] = addon['installed'][verSrc]; + } + + if (addon['installed'][verTgt] !== undefined) { + addonListTgt[key] = addon['installed'][verTgt]; + } + } + + // check add-ons will be migrated + let migrateAddons = {}; + for (let key in addonListSrc) { + // skip add-on already installed + if (addonListTgt[key] !== undefined) { continue; } + + migrateAddons[key] = {}; + migrateAddons[key]['src'] = addonListSrc[key]; + migrateAddons[key]['tgt'] = addonListTgt[key]; + } + + // migrate add-ons + for (let key in migrateAddons) { + let src = migrateAddons[key]['src']; + let tgt = migrateAddons[key]['tgt']; + + if (tgt !== undefined) { + // delete add-on at first + let deleteFrom = tgt['src_path'] + if (!deleteFrom) { throw new Error(deleteFrom + " is not found"); } + let result = del.sync([deleteFrom], {force: true}); + } + + // then, copy add-on + let tgtPath = blamOS.getAddonPath(verTgt); + if (tgtPath === null) { + // try to make add-on dir. + blamOS.createAddonDir(verTgt); + tgtPath = blamOS.getAddonPath(verTgt); + if (tgtPath == null) { throw new Error("Failed to make add-on directory"); } + } + let addonPath = tgtPath + blamOS.getPathSeparator() + key; + fs.mkdirSync(addonPath); + fsext.copySync(src['src_path'], addonPath); + } + + updateInstalledAddonDB($scope); + onAddonSelectorChanged(); + redrawApp($scope); + + hideMigAddonPopup($scope); + } + function onAddonSelectorChanged() { // collect filter condition @@ -318,6 +427,38 @@ app.controller('MainController', function ($scope, $timeout) { } $scope.addonInfoTpl = 'partials/addon-info/github.html'; break; + case 'favorite': + logger.category('app').info("Show Favorited add-on list"); + if ($scope.addonStatus) { + let addon_keys = Blam.filterAddons( + $scope.addonStatus, + 'github', + ['INSTALLED', 'NOT_INSTALLED', 'UPDATABLE'], + $scope.targetDir, + activeCategory, + searchStr, + blamIgnore.getList()); + // filtered by favorited + let favList = blamFavorite.getList(); + addon_keys = addon_keys.filter( (key) => { + for (let i in favList) { + let fav = favList[i]; + if (fav === key) { + return true; + } + } + return false; + }); + addons = Blam.sortAddons( + $scope.addonStatus, + addon_keys, + 'github', + $scope.targetDir, + $scope.addonOrderItemSelect.value, + $scope.addonOrder); + } + $scope.addonInfoTpl = 'partials/addon-info/github.html'; + break; default: return; } @@ -399,6 +540,27 @@ app.controller('MainController', function ($scope, $timeout) { }); } + function onFavBtnClicked($event) { + try { + let repoIndex = $($event.target).data('repo-index'); + let key = main.repoList[repoIndex]; + if (!blamFavorite.favorited(key)) { + blamFavorite.addItem(key); + } + else { + blamFavorite.removeItem(key); + } + blamFavorite.saveTo(FAVORITE_ADDONS_DB); + updateInstalledAddonDB($scope); + redrawApp($scope); + } + catch (e) { + handleException($scope, e); + } + } + + // "Fav" button + $scope.onFavBtnClicked = onFavBtnClicked; // "Link" button $scope.onLnBtnClicked = onLnBtnClicked; // "Download" button @@ -443,7 +605,6 @@ app.controller('MainController', function ($scope, $timeout) { if (!apiURLs) { throw new Error("Invalid API URL"); } - const version = await blamDB.makeAPIStatusFile(API_VERSION_FILE); const fetch = await blamDB.fetchFromServer(apiURLs, proxyURL); blamDB.saveTo(GITHUB_ADDONS_DB); @@ -451,11 +612,13 @@ app.controller('MainController', function ($scope, $timeout) { loadGitHubAddonDB(); loadInstalledAddonsDB(); + loadFavoriteAddonDB(); loadIgnoreAddonDB(); loadCustomDirDB(); $scope.addonStatus = Blam.updateAddonStatus(blamDB.getAddonList(), blamLocal.getAddonList(), - $scope.blVerList); + $scope.blVerList, + blamFavorite.getList()); updateIgnoreList($scope); updateCustomDirList($scope); @@ -481,6 +644,10 @@ app.controller('MainController', function ($scope, $timeout) { hideCustomdirListPopup($scope); }; + $scope.closeMigAddonPopup = () => { + hideMigAddonPopup($scope); + }; + async function updateGitHubAddonDB($scope) { let proxyURL = Utils.getProxyURL(config); let apiURLs = Utils.getAPIURL(config); @@ -496,7 +663,6 @@ app.controller('MainController', function ($scope, $timeout) { } // update DB files - const version = await blamDB.makeAPIStatusFile(API_VERSION_FILE); const fetch = await blamDB.fetchFromServer(apiURLs, proxyURL); blamDB.saveTo(GITHUB_ADDONS_DB); @@ -504,7 +670,8 @@ app.controller('MainController', function ($scope, $timeout) { // update app's internal DB data $scope.addonStatus = Blam.updateAddonStatus(blamDB.getAddonList(), blamLocal.getAddonList(), - $scope.blVerList); + $scope.blVerList, + blamFavorite.getList()); onAddonSelectorChanged(); // unlock app diff --git a/src/client/js/db.js b/src/client/js/db.js index 2b7a580..eb14e53 100644 --- a/src/client/js/db.js +++ b/src/client/js/db.js @@ -1,7 +1,8 @@ 'use strict'; import { - DB_DIR, GITHUB_ADDONS_DB, INSTALLED_ADDONS_DB, IGNORE_ADDONS_DB, CUSTOM_DIR_DB + DB_DIR, GITHUB_ADDONS_DB, INSTALLED_ADDONS_DB, FAVORITE_ADDONS_DB, + IGNORE_ADDONS_DB, CUSTOM_DIR_DB } from 'blam-constants'; @@ -19,6 +20,12 @@ function loadInstalledAddonsDB() { blamLocal.loadFrom(INSTALLED_ADDONS_DB); } +function loadFavoriteAddonDB() { + if (!Utils.isExistFile(FAVORITE_ADDONS_DB)) { return; } + logger.category('app').info("Loading favorite add-ons DB file ..."); + blamFavorite.loadFrom(FAVORITE_ADDONS_DB); +} + function loadIgnoreAddonDB() { if (!Utils.isExistFile(IGNORE_ADDONS_DB)) { return; } logger.category('app').info("Loading ignore add-ons DB file ..."); @@ -43,5 +50,6 @@ function updateInstalledAddonDB($scope) { loadInstalledAddonsDB(); $scope.addonStatus = Blam.updateAddonStatus(blamDB.getAddonList(), blamLocal.getAddonList(), - $scope.blVerList); + $scope.blVerList, + blamFavorite.getList()); } diff --git a/src/client/js/task.js b/src/client/js/task.js index dd88499..b8caa88 100644 --- a/src/client/js/task.js +++ b/src/client/js/task.js @@ -16,7 +16,7 @@ function updateTask($scope) { setTimeout(function () { $scope.task = { - 'progress': taskMgr.genProgressString(), + 'progress': taskMgr.genProgressString($scope.blamTranslate), 'progressRate': taskMgr.getCurTaskProgressRate() }; $scope.$apply(); @@ -28,7 +28,7 @@ function completeTask($scope, addon) advanceProgressAndUpdate($scope); setTimeout(function () { $scope.task = { - 'progress': taskMgr.genProgressString() + " '" + addon + "'", + 'progress': taskMgr.genProgressString($scope.blamTranslate) + " '" + addon + "'", 'progressRate': 1.0 }; $scope.$apply(); @@ -73,4 +73,3 @@ taskMgr.addItems( ] ) taskMgr.setCompletionString('UPDATE', 'Updated Add-on'); - diff --git a/src/client/js/ui.js b/src/client/js/ui.js index d3cf670..7155a0c 100644 --- a/src/client/js/ui.js +++ b/src/client/js/ui.js @@ -52,3 +52,14 @@ function hideCustomdirListPopup($scope) { $('.customdir-list-popup-background').css('display', 'none'); } +// show migrate-adddon popup +function showMigAddonPopup($scope) { + $('.migrate-addon-popup').css('display', 'block'); + $('.migrate-addon-popup-background').css('display', 'block'); +} + +// close migrate-addon popup +function hideMigAddonPopup($scope) { + $('.migrate-addon-popup').css('display', 'none'); + $('.migrate-addon-popup-background').css('display', 'none'); +} diff --git a/src/client/sass/components/_button.scss b/src/client/sass/components/_button.scss index 96e925c..6dacf9e 100644 --- a/src/client/sass/components/_button.scss +++ b/src/client/sass/components/_button.scss @@ -13,7 +13,6 @@ background-color: $button-bgcolor; border: 1px solid #000000; padding: 5px; - //margin: 3px; width: 100%; text-align: center; &:hover { diff --git a/src/client/sass/components/_popup.scss b/src/client/sass/components/_popup.scss index fb68ca0..5162684 100644 --- a/src/client/sass/components/_popup.scss +++ b/src/client/sass/components/_popup.scss @@ -162,4 +162,66 @@ background-color: #000000; z-index: 100; } + .migrate-addon-popup { + display: none; + width: $popup-width; + height: $popup-height; + margin-left: - $popup-width / 2; + margin-top: - $popup-height / 2; + position: fixed; + top: 50%; + left: 50%; + background-color: #252525; + z-index: 101; + box-shadow: 0px 0px 20px 20px rgba(0,0,0,1.0); + .migrate-addon-popup-header { + h3 { + font-size: 2rem; + padding-left: 1rem; + margin: 1.0rem; + } + } + .migrate-addon-popup-body { + color: $body-color - #303030; + padding-left: 6rem; + padding-top: 1rem; + h4 { + color: $body-color - #202020; + font-size: 1.3rem; + margin: 1.0rem; + } + .ui { + @include selectbox(41rem); + @include text-box(40rem); + display: flex; + padding-left: 2rem; + padding-bottom: 0.5rem; + .buttons { + position: relative; + @include text-button(7rem); + left: -1rem; + } + } + } + .migrate-addon-popup-footer { + padding-right: 3rem; + position: absolute; + top: $popup-height - 70px; + left: $popup-width - 405px; + .buttons { + @include text-button(10rem); + } + } + } + .migrate-addon-popup-background { + display: none; + width: 100%; + height: 100%; + position: fixed; + top: 0; + left: 0; + opacity: 0.7; + background-color: #000000; + z-index: 100; + } } diff --git a/src/client/sass/lib/_mixins.scss b/src/client/sass/lib/_mixins.scss index 3126c59..fd9c09a 100644 --- a/src/client/sass/lib/_mixins.scss +++ b/src/client/sass/lib/_mixins.scss @@ -1,5 +1,19 @@ -@mixin scrollbar() { +@mixin scrollbar($width) { ::-webkit-scrollbar { + width: $width; + background: #222222; + &:hover { + background: #444444; + } + } + ::-webkit-scrollbar-thumb { + background: #666666; + width: $width; + &:hover { + background: #999999; + } + } + ::-webkit-scrollbar-corner { display: none; } } diff --git a/src/client/sass/lib/_variables.scss b/src/client/sass/lib/_variables.scss index 414246a..91095b3 100644 --- a/src/client/sass/lib/_variables.scss +++ b/src/client/sass/lib/_variables.scss @@ -21,7 +21,7 @@ $selectbox-bgcolor: $button-bgcolor; $selectbox-hover-bgcolor: $button-hover-bgcolor; $header-height: 5.0rem; -$footer-height: 3.0rem; +$footer-height: 3.5rem; $progressbar-color: #333366; $progressbar-complete-color: $progressbar-color + #777799; diff --git a/src/client/sass/modules/_app.scss b/src/client/sass/modules/_app.scss index 92c4d6d..456d182 100644 --- a/src/client/sass/modules/_app.scss +++ b/src/client/sass/modules/_app.scss @@ -1,6 +1,6 @@ .frame { @include box-sizing(border-box); - @include scrollbar(); + @include scrollbar(3px); height: 100%; overflow: auto; } diff --git a/src/client/sass/modules/_container.scss b/src/client/sass/modules/_container.scss index 00635e3..e02d299 100644 --- a/src/client/sass/modules/_container.scss +++ b/src/client/sass/modules/_container.scss @@ -3,16 +3,15 @@ background-color: $container-bgcolor; width: 100% - $menu-width; max-width: 100% - $menu-width; - padding-top: $header-height; - padding-bottom: $footer-height; + margin-top: $header-height; + margin-bottom: $footer-height; .addon-info { @include box-sizing(border-box); padding: 1rem; .addon-item { @include border-radius(5px); @include box-sizing(border-box); - width: 70%; - max-width: 70%; + @include fixed-width(80%); border: 0.1rem solid #000000; background-color: $addonitem-bgcolor; padding: 1rem; @@ -20,63 +19,85 @@ margin-right: auto; margin-top: 1rem; margin-bottom: 1rem; - .name { - font-size: 1.7rem; - font-weight: bold; - margin-top: 0.5rem; - margin-bottom: 0.5rem; - } - .description { - font-size: 1.2rem; - color: $body-color - #101010; - margin-top: 1.0rem; - margin-bottom: 1.0rem; - } - .author { - color: $body-color - #404040; - font-size: 1.0rem; - margin-top: 1.5rem; - margin-bottom: 1.5rem; - } - .version { - position: relative; - top: -10.0rem; - text-align: right; - img { - position: relative; - width: 1rem; - top: 0.13rem; - right: 0.1rem; + + .addon-item-left { + @include fixed-width(75%); + display: inline-block; + .addon-item-header { + margin-top: 0.5rem; + margin-bottom: 0.5rem; + .name { + display: inline-block; + padding-left: 0.5rem; + font-size: 1.7rem; + font-weight: bold; + } + .favorite { + display: inline-block; + left: 0.0rem; + top: 0.0rem; + + font-size: 4.0rem; + img { + display: block; + width: 1.3rem; + height: 1.3rem; + cursor: pointer; + } + } } - } - .bl-version { - position: relative; - top: -10.0rem; - text-align: right; - img { - position: relative; - width: 1.2rem; - top: 0.25rem; - right: 0rem; + .description { + font-size: 1.2rem; + color: $body-color - #101010; + margin-top: 1.0rem; + margin-bottom: 1.0rem; + } + .author { + color: $body-color - #404040; + font-size: 1.0rem; + margin-top: 1.5rem; } } - .category { - position: relative; - top: -10.0rem; - margin-bottom: -7.0rem; - text-align: right; - img { - position: relative; - width: 1rem; - top: 0.2rem; - right: 0rem; + + .addon-item-right { + @include fixed-width(24%); + display: inline-block; + vertical-align: top; + .version { + text-align: right; + img { + position: relative; + width: 1rem; + top: 0.13rem; + right: 0.1rem; + } + } + .bl-version { + text-align: right; + img { + position: relative; + width: 1.2rem; + top: 0.25rem; + right: 0rem; + } + } + .category { + text-align: right; + img { + position: relative; + width: 1rem; + top: 0.2rem; + right: 0rem; + } } } + .buttons { @include text-button(8rem); text-align: right; padding-right: 1rem; } + } } } diff --git a/src/client/sass/modules/_footer.scss b/src/client/sass/modules/_footer.scss index 077d144..5a81736 100644 --- a/src/client/sass/modules/_footer.scss +++ b/src/client/sass/modules/_footer.scss @@ -5,12 +5,19 @@ width: 100%; height: $footer-height; background-color: $footer-bgcolor; + .language-panel { + @include selectbox(80%); + width: 20%; + padding-left: 0.5rem; + display: inline-block; + } .progress-panel { width: 70%; - height: $footer-height; + height: $footer-height - 0.8rem; margin-left: auto; margin-right: auto; padding-top: 0.8rem; + display: inline-block; .progress { width: 80%; margin-left: auto; @@ -18,5 +25,14 @@ text-align: center; } } + ::-webkit-scrollbar { + display: none; + } + ::-webkit-scrollbar-thumb { + display: none; + } + ::-webkit-scrollbar-corner { + display: none; + } } } diff --git a/src/client/sass/modules/_menu.scss b/src/client/sass/modules/_menu.scss index 1315f43..e04282f 100644 --- a/src/client/sass/modules/_menu.scss +++ b/src/client/sass/modules/_menu.scss @@ -5,8 +5,8 @@ width: $menu-width; max-width: $menu-width; background-color: $menu-bgcolor; - padding-top: $header-height; - padding-bottom: $footer-height; + margin-top: $header-height; + margin-bottom: $footer-height; .menu-item-title { text-align: center; padding: 1.0rem; diff --git a/src/lib/js/blam-constants.js b/src/lib/js/blam-constants.js index c27c74c..41e364a 100644 --- a/src/lib/js/blam-constants.js +++ b/src/lib/js/blam-constants.js @@ -2,6 +2,9 @@ import electron from 'electron'; +// API Version +export const API_VERSION = "1.0.0"; + // for clients export const USER_DIR = electron.remote.app.getPath('userData'); // for servers @@ -10,6 +13,7 @@ export const DB_DIR = USER_DIR + '/db'; export const API_VERSION_FILE = DB_DIR + '/version'; export const GITHUB_ADDONS_DB = DB_DIR + '/add-on_list.db'; export const INSTALLED_ADDONS_DB = DB_DIR + '/installed_add-on_list.db'; +export const FAVORITE_ADDONS_DB = DB_DIR + '/favorite_add-on_list.db'; export const IGNORE_ADDONS_DB = DB_DIR + '/ignore_add-on_list.db'; export const CUSTOM_DIR_DB = DB_DIR + '/custom_dir_list.db'; export const CONFIG_DIR = USER_DIR + '/config'; @@ -27,16 +31,17 @@ export const MAX_LOG_SIZE = 3 * 1024 * 1024; // 3MiB export const MAX_BACKUPS = 3; export const LOG_DIR = USER_DIR + '/logs'; -export const CONFIG_FILE_INIT = +export const CONFIG_FILE_INIT= `{ "db": { "server": "colorful-pico.net", "port": "5000", "api": "/api/bl-addon-db", + "version": "${API_VERSION}", "endpoint": { "addon-list": "/addon-list", "addon-total": "/addon-total", - "version": "/version", + "versions": "/versions", "services": "/services" } } diff --git a/src/lib/js/blam-custom-dir.js b/src/lib/js/blam-custom-dir.js index 6a45c04..d0114ce 100644 --- a/src/lib/js/blam-custom-dir.js +++ b/src/lib/js/blam-custom-dir.js @@ -3,8 +3,6 @@ import fs from 'fs'; import * as Utils from 'utils'; -import Logger from 'logger'; -const logger = new Logger(); export default class BlamCustomDir { @@ -61,7 +59,7 @@ export default class BlamCustomDir let json = JSON.parse(data); this['customDirList'] = json['customDirList'] || []; this['currentTarget'] = json['currentTarget'] || ""; - + return 0; } diff --git a/src/lib/js/blam-db-writer.js b/src/lib/js/blam-db-writer.js index ce671a3..de8b067 100644 --- a/src/lib/js/blam-db-writer.js +++ b/src/lib/js/blam-db-writer.js @@ -70,6 +70,19 @@ export default class DBWriter }); } + countAll() { + return new Promise( (resolve) => { + if (!this['collection']) { throw new Error("Collection is null"); } + + this['collection'].count({}, (err, count) => { + if (err) { + throw new Error("Failed to process countAll"); + } + resolve(count); + }); + }); + } + findOne(key) { return new Promise( (resolve) => { if (!this['collection']) { throw new Error("Collection is null"); } diff --git a/src/lib/js/blam-db.js b/src/lib/js/blam-db.js index b7cf764..b9a262c 100644 --- a/src/lib/js/blam-db.js +++ b/src/lib/js/blam-db.js @@ -194,6 +194,16 @@ export default class BlamDB this['addonList'] = repoInfos; } + async isBlInfoValid(src_raw_url) { + var self_ = this; + let srcBody = await self_._getMainSrc(src_raw_url); + if (!srcBody) { return false; } + let info = self_._parseMainSrc(srcBody); + if (!info) { return false; } + + return true; + } + saveTo(file) { fs.writeFileSync(file, JSON.stringify(this['addonList'], null, ' ')); } @@ -213,7 +223,8 @@ export default class BlamDB // remove addons: release add-on should be removed let isAddonRelease = elm['src_dir'].match(/release\/scripts\/addons/); // remove addon_contrib: this is very large file - let isAddonContrib = elm['src_dir'].match(/script\/addons_contrib/); + let isAddonContrib = elm['src_dir'].match(/scripts\/addons_contrib/) || + elm['src_dir'].match(/script\/addons_contrib/); // remove addon_extern: includes meta-androcto's add-on database. this is also very large file let isAddonExtern = elm['src_dir'].match(/scripts\/addons_extern/); // remove test addon: Nutti's test repository about sample add-on @@ -301,48 +312,6 @@ export default class BlamDB return this['addonList']; } - // make API status file - makeAPIStatusFile(filename) { - let self_ = this; - return new Promise( (resolve) => { - let apiURLs = Utils.getAPIURL(self_.config); - if (!apiURLs) { throw new Error("Invalid API URL"); } - // if there is DB file on local, delete it - if (Utils.isExistFile(filename)) { - fs.unlinkSync(filename); - logger.category('lib').info("Removed old API status file"); - } - // request callback - let onRequest = (err, res, body) => { - if (err) { throw new Error("Failed to fetch data from API.\n" + JSON.stringify(err)); } - if (res.statusCode != 200) { throw new Error("Failed to fetch data from API. (status=" + res.statusCode + ")"); } - - fs.appendFileSync(filename, JSON.stringify(body, null, ' ')); - logger.category('lib').info("API status data is saved to " + filename); - resolve(); - }; - - // send request to api server - let proxyURL = Utils.getProxyURL(self_.config); - if (proxyURL) { - logger.category('lib').info("Use proxy server"); - request({ - tunnel: true, - url: apiURLs['version'], - json: true, - proxy: proxyURL - }, onRequest); - } - else { - logger.category('lib').info("Not use proxy server"); - request({ - url: apiURLs['version'], - json: true, - }, onRequest); - } - }); - } - // fetch add-on information from server, and save to local DB file fetchFromServer(apiURLs, proxyURL) { @@ -360,7 +329,6 @@ export default class BlamDB }; // send request to api server - if (proxyURL) { logger.category('lib').info("Use proxy server"); request({ diff --git a/src/lib/js/blam-favorite.js b/src/lib/js/blam-favorite.js new file mode 100644 index 0000000..89ec446 --- /dev/null +++ b/src/lib/js/blam-favorite.js @@ -0,0 +1,61 @@ +'use strict'; + +import fs from 'fs'; + +import * as Utils from 'utils'; + +export default class BlamFavorite +{ + constructor() { + this['favList'] = [] + } + + addItem(item) { + let index = this['favList'].indexOf(item); + if (index != -1) { return false; } + + this['favList'].push(item); + + return true; + } + + favorited(item) { + let index = this['favList'].indexOf(item); + if (index == -1) { return false; } + + return true; + } + + removeItem(item) { + let index = this['favList'].indexOf(item); + if (index == -1) { return false; } + + this['favList'].splice(index, 1); + + return true; + } + + getList() { + return this['favList']; + } + + loadFrom(file) { + if (!Utils.isExistFile(file)) { return 1; } + + let data = fs.readFileSync(file, 'utf8'); + let json = JSON.parse(data); + this['favList'] = json['addons']; + + return 0; + } + + saveTo(file) { + fs.writeFileSync(file, JSON.stringify( + { + 'addons': this['favList'], + }, + null, + ' ' + )); + } +} diff --git a/src/lib/js/blam-os.js b/src/lib/js/blam-os.js index b754575..b61016c 100644 --- a/src/lib/js/blam-os.js +++ b/src/lib/js/blam-os.js @@ -144,7 +144,7 @@ export default class BlamOS getOSType() { return this['osInfo']['type']; } - + getPathSeparator() { return this['pathSeparator']; } @@ -158,6 +158,7 @@ export default class BlamOS return this['blVers']; } + getAddonPath(blVer) { let osType = this.getOSType(); let loginUser = this.getLoginUser(); diff --git a/src/lib/js/blam-translations.js b/src/lib/js/blam-translations.js new file mode 100644 index 0000000..f385bcf --- /dev/null +++ b/src/lib/js/blam-translations.js @@ -0,0 +1,54 @@ +'use strict'; + +// external modules +import * as LangES from 'lang/lang-es'; + +// own modules +import Logger from 'logger'; +const logger = new Logger(); + +export default class BlamTranslations +{ + constructor() { + this['dict'] = { "Default (English)": {} }; + this['currentLang'] = "Default (English)"; + + this._buildDict(); + } + + _buildDict() { + for (let key in LangES.langESDict) { + this['dict'][key] = LangES.langESDict[key]; + } + } + + supportedLanguages() { + let langs = [] + for (let key in this['dict']) { + langs.push(key); + } + return langs; + } + + setLanguage(lang) { + let supported = this.supportedLanguages(); + for (let i = 0; i < supported.length; ++i) { + if (supported[i] == lang) { + this['currentLang'] = lang; + return true; + } + } + + return false; // not supported + } + + translate(key) { + let lang = this['currentLang']; + + if (this['dict'][lang][key] === undefined) { + return key; + } + + return this['dict'][lang][key]; + } +} diff --git a/src/lib/js/blam.js b/src/lib/js/blam.js index 76c0a83..b9aef68 100644 --- a/src/lib/js/blam.js +++ b/src/lib/js/blam.js @@ -179,7 +179,7 @@ export function sortAddons(addons, keys, list, target, item, order) return keys; } -export function updateAddonStatus(github, installed, blVers) +export function updateAddonStatus(github, installed, blVers, favList) { // key-- // |- github-- @@ -188,6 +188,7 @@ export function updateAddonStatus(github, installed, blVers) // | |- blVer // | |- bl_info // |- status + // |- favorited let addonStatus = {}; // setup add-on list on GitHub @@ -270,6 +271,16 @@ export function updateAddonStatus(github, installed, blVers) if (addonStatus[k]['status'] == undefined) { addonStatus[k]['status'] = {}; } + + // check if the add-on is favorited + addonStatus[k]['favorited'] = false; + for (let i in favList) { + let fav = favList[i]; + if (fav == k) { + addonStatus[k]['favorited'] = true; + } + } + // check not only installed but also other version let instList = Object.keys(installed['default']); let customInstList = Object.keys(installed['custom']); diff --git a/src/lib/js/lang/lang-es.js b/src/lib/js/lang/lang-es.js new file mode 100644 index 0000000..152c766 --- /dev/null +++ b/src/lib/js/lang/lang-es.js @@ -0,0 +1,39 @@ +export const langESDict = { + "Spanish": { + "Version": "Versión", + "Addon List": "Lista de Añadidos", + "Installed": "Instalado", + "Update": "Actualizar", + "Category": "Categoría", + "All": "Todo", + "3D View": "Vista 3D", + "Add Curve": "Añadir Curva", + "Add Mesh": "Añadir Malla", + "Animation": "Animación", + "Development": "Desarrollo", + "Game Engine": "Motor de Juegos", + "Import-Export": "Importar-Exportar", + "Mesh": "Malla", + "Node": "Nodo", + "Object": "Objeto", + "Paint": "Pintar", + "Pie Menu": "Menú Circular", + "Render": "Renderizar", + "Rigging": "Rigging", + "System": "Sistema", + "UI": "Interfaz", + "Sort:": "Ordenar:", + "Add-on Name": "Nombre de Añadido", + "Author": "Autor", + "Ascend": "Ascendente", + "Descend": "Descendente", + "(No Description)": "(Sin Descripción)", + "Link": "Enlace", + "Install": "Instalar", + "Remove": "Eliminar", + "Downloading Add-on ...": "Descargando Añadido", + "Installed Add-on": "Añadido Instalado", + "Deleted Add-on": "Añadido Borrado", + "Close": "Cerrar" + } +}; diff --git a/src/lib/js/task.js b/src/lib/js/task.js index f26ffcc..effe1ef 100755 --- a/src/lib/js/task.js +++ b/src/lib/js/task.js @@ -86,16 +86,16 @@ export default class TaskMgr return (progress + 1) * 1.0 / taskList[curTask]['items'].length; } - genProgressString() { + genProgressString(translator) { let curTask = this['curTask']; let taskList = this['taskList']; if (!taskList[curTask]) { return ""; } if (this.taskInProgress(curTask)) { - return this.getCurTaskItem() + " (" + this.getCurTaskProgress() + "/" + this.getTaskItemTotal() + ")"; + return translator(this.getCurTaskItem()) + " (" + this.getCurTaskProgress() + "/" + this.getTaskItemTotal() + ")"; } else if (this.taskCompleted(curTask)) { - return taskList[curTask]['completion']; + return translator(taskList[curTask]['completion']); } return ""; diff --git a/src/lib/js/utils.js b/src/lib/js/utils.js index 531383f..89c2818 100644 --- a/src/lib/js/utils.js +++ b/src/lib/js/utils.js @@ -84,9 +84,10 @@ export function isAPIConfigValid(config) { if (!config['db']['server']) { return false; } if (!config['db']['port']) { return false; } if (!config['db']['api']) { return false; } + if (!config['db']['version']) { return false; } if (!config['db']['endpoint']) { return false; } if (!config['db']['endpoint']['addon-list']) { return false; } - if (!config['db']['endpoint']['version']) { return false; } + if (!config['db']['endpoint']['versions']) { return false; } return true; } @@ -99,11 +100,12 @@ export function getAPIURL(config) { + config['db']['server'] + ':' + config['db']['port'] - + config['db']['api']; + + config['db']['api'] + + '/v' + config['db']['version']; let apis = { 'list_github': base + config['db']['endpoint']['addon-list'] + '/github', - 'version': base + config['db']['endpoint']['version'], + 'versions': base + config['db']['endpoint']['versions'], }; return apis; @@ -194,4 +196,3 @@ export function getRemoteFileSize(config, url) { }); }); } - diff --git a/src/server/js/bladdon_cleaner.js b/src/server/js/bladdon_cleaner.js index 89ec479..9295787 100644 --- a/src/server/js/bladdon_cleaner.js +++ b/src/server/js/bladdon_cleaner.js @@ -6,6 +6,8 @@ import request from 'request'; import DBWriter from 'blam-db-writer'; const dbWriter = new DBWriter(); +import BlamDB from 'blam-db'; +const blamDB = new BlamDB(); const CONFIG_FILE = process.cwd() + '/config.json'; @@ -51,34 +53,131 @@ config = JSON.parse(text); console.log("Parsed configuration file."); // cleanup link downed addons -async function cleanupAddons() { - console.log("Start cleaning up ..."); +async function cleanupAddons(start, end) { + console.log("Start cleanup ..."); console.log("Initializing DBWriter ..."); await dbWriter.init(); + + let all = await dbWriter.countAll(); + if (all < end) { + end = all; + } + let total = end - start + 1; let addonList = await dbWriter.findAll(); + let remain = total; + + let deleted = 0; + let clean = 0; + let target = 0; + let i = 0; + console.log("Finding all DB records ..."); for (let addon = await addonList.next(); addon != null; addon = await addonList.next()) { let name = addon['bl_info']['name']; - let url = addon['url']; let key = addon['key']; - console.log("Checking '" + name + "' ..."); + // skip until start comes + ++i; + if (i < start) { continue; } + + // all addons are checked + if (remain == 0) { break; } + + console.log("[" + (target+1) + "/" + total + "] Checking '" + name + "' ..."); + --remain; + ++target; + + // remove excluded add-ons + console.log(" Check: Excluded add-ons"); + let srcDir = addon['src_dir']; + // release add-on + if (srcDir.match(/release\/scripts\/addons/)) { + console.log(" '" + name + "' is release add-on. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + // contrib add-on + else if (srcDir.match(/scripts\/addons_contrib/) || srcDir.match(/script\/addons_contrib/)) { + console.log(" '" + name + "' is contrib add-on. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + // extern add-on (meta-androcto's add-on database) + else if (srcDir.match(/scripts\/addons_extern/)) { + console.log(" '" + name + "' is meta-androcto's add-on database. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + // test add-on (Nutti's test or sample add-on) + else if (srcDir.match(/mirror-introduction/) + || srcDir.match(/Testing_Blender_Addon_By_Travis_CI/) + || srcDir.match(/Testing_Blender_Addon_With_Travis_CI/) + || srcDir.match(/gitbook-test/)) { + console.log( "'" + name + "' is Nutti's test or sample add-on. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + + // check if repository URL is linked down + console.log(" Check: Repository URL link"); + let repoURL = addon['url']; + let isDown = await isLinkDown(repoURL); + if (isDown) { + console.log(" '" + name + "' (Repository URL: " + repoURL + ") is link down. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } - let isDown = await isLinkDown(url); + // check if source URL is linked down + console.log(" Check: Source URL link"); + let srcURL = addon['src_url']; + isDown = await isLinkDown(srcURL); + if (isDown) { + console.log(" '" + name + "' (Source URL: " + srcURL + ") is link down. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + // check if bl_info is correct + console.log(" Check: Source Raw URL link"); + let srcRawURL = addon['src_raw_url']; + isDown = await isLinkDown(srcRawURL); if (isDown) { - console.log("'" + name + "' (" + url + ") is link down. Trying to delete from DB ..."); + console.log(" '" + name + "' (Source Raw URL: " + srcRawURL + ") is link down. Trying to delete from DB ..."); + let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; + } + console.log(" Check: bl_info"); + let valid = await blamDB.isBlInfoValid(srcRawURL); + if (!valid) { + console.log(" '" + name + "' has an invalid bl_info. Trying to delete from DB ..."); let ret = await dbWriter.remove({'key': key}); + ++deleted; + continue; } + + ++clean; } - console.log("Finished cleaning up."); + console.log("Finished cleanup (total: " + total + ", target: " + target + ", clean: " + clean + ", deleted: " + deleted + ")"); dbWriter.close(); } -cleanupAddons(); +let start = parseInt(process.argv[2], 10) || 1; +let numProc = parseInt(process.argv[3], 10) || 10000; +let end = start + numProc - 1; + +console.log("Cleanup target '" + start + "-" + end + "'"); +cleanupAddons(start, end); diff --git a/src/server/server.py b/src/server/server.py index 08ed805..5fd248a 100644 --- a/src/server/server.py +++ b/src/server/server.py @@ -9,9 +9,6 @@ app = Flask(__name__) api = Api(app) -SERVICES = ['github'] -API_VERSION = "0.1.2" - class JSONEncoder(json.JSONEncoder): def default(self, o): @@ -20,10 +17,12 @@ def default(self, o): return json.JSONEncoder.default(self, o) -class AddonList(Resource): +class LegacyAddonList(Resource): def get(self, service): + SERVICES = ["github"] if not service in SERVICES: - abort(404, message='%s does not exist' % (service)) + abort(404, message="Service {0} is not supported".format(service)) + db = BlAddonDB(service) db.connect() data = [] @@ -32,11 +31,19 @@ def get(self, service): de = json.JSONDecoder().decode(en) data.append(de) db.close() + + data = self.__format(data) + return jsonify(data) + def __format(self, raw): + return raw -class AddonTotal(Resource): + +class LegacyAddonTotal(Resource): def get(self): + SERVICES = ["github"] + data = {}; for service in SERVICES: db = BlAddonDB(service) @@ -45,23 +52,104 @@ def get(self): for d in db.get_all(): count = count + 1 data[service] = count + return jsonify(data) -class Version(Resource): +class LegacyVersion(Resource): def get(self): - return jsonify({"version": API_VERSION}) + return jsonify({"version": "0.1.2"}) -class Services(Resource): +class LegacyServices(Resource): def get(self): return jsonify(SERVICES) -api.add_resource(Services, '/api/bl-addon-db/services') -api.add_resource(Version, '/api/bl-addon-db/version') -api.add_resource(AddonList, '/api/bl-addon-db/addon-list/') -api.add_resource(AddonTotal, '/api/bl-addon-db/addon-total') +api.add_resource(LegacyServices, "/api/bl-addon-db/services") +api.add_resource(LegacyVersion, "/api/bl-addon-db/version") +api.add_resource(LegacyAddonList, "/api/bl-addon-db/addon-list/") +api.add_resource(LegacyAddonTotal, "/api/bl-addon-db/addon-total") + + +def available_versions(): + return ["1.0.0", "0.1.2"] + + +def available_services(version): + return ["github"] + + +def check_version(version): + return version in available_versions() + + +def check_service(version, service): + return service in available_services(version) + + +class Versions(Resource): + def get(self): + return jsonify({"version": available_versions()}) + + +class AddonList(Resource): + def get(self, version, service): + ok = check_version(version) + if not ok: + abort(404, message="API version {0} does not exist".format(version)) + + ok = check_service(version, service) + if not ok: + abort(404, message="Service {0} is not supported in API version {1}".format(service, version)) + + db = BlAddonDB(service) + db.connect() + data = [] + for d in db.get_all(): + en = JSONEncoder().encode(d) + de = json.JSONDecoder().decode(en) + data.append(de) + db.close() + + data = self.__format(data) + + return jsonify(data) + + def __format(self, raw): + return raw + + +class AddonTotal(Resource): + def get(self, version): + ok = check_version(version) + if not ok: + abort(404, message="API version {0} does not exist".format(version)) + + data = {}; + for service in available_services(version): + db = BlAddonDB(service) + db.connect() + count = 0; + for d in db.get_all(): + count = count + 1 + data[service] = count + return jsonify(data) + + +class Services(Resource): + def get(self, version): + ok = check_version(version) + if not ok: + abort(404, message="API version {0} does not exist".format(version)) + + return jsonify({"service": available_services(version)}) + + +api.add_resource(Versions, "/api/bl-addon-db/versions") +api.add_resource(Services, "/api/bl-addon-db/v/services") +api.add_resource(AddonList, "/api/bl-addon-db/v/addon-list/") +api.add_resource(AddonTotal, "/api/bl-addon-db/v/addon-total") class BlAddonDB(): @@ -73,12 +161,10 @@ def __init__(self, service): self.__service = service def connect(self): - self.__client = pymongo.MongoClient('localhost', 27017) - if self.__service == 'github': + self.__client = pymongo.MongoClient("localhost", 27017) + if self.__service == "github": self.__db = self.__client.blAddonMgr self.__collection = self.__db.blAddonGitHub - #else: - # print "Service %s is not supported" % (self.__service) def find_one(self, key): return self.__collection.find_one(key) @@ -93,5 +179,5 @@ def close(self): self.__client.close() -if __name__ == '__main__': - app.run(host='0.0.0.0', debug=True) +if __name__ == "__main__": + app.run(host="0.0.0.0", debug=True)