Changed to use Lua script provided by FlashAir IoT Hub.

Author: tks-abe

README.ja.md

@@ -35,14 +35,19 @@ FlashAir™の無線LAN機能を使い、FlashAir IoT Hubを経由する事で
 ## Usage
 
 1. 事前にFlashAir IoT Hubでアカウント登録し、FlashAirを登録する。詳細は[FlashAir IoT Hubのご利用の流れ](https://www.flashair-developers.com/ja/documents/tutorials/iot-hub/1/)を参照。
-2. [Luaスクリプト](https://github.com/FlashAirDevelopers/FlashAirFileManager/releases/download/v0.1.1/FlashAirFileManagerScript-0.1.1.zip)をダウンロード・解凍してFlashAirのルート上に置く。
-3. FlashAirのCONFIGに`LUA_RUN_SCRIPT=/fafm_boot.lua`を追記する。
+2. FlashAir IoT Hubにログインし、[Luaスクリプト](https://iot-hub.flashair-developers.com/ja/static/flashair-scripts.zip)をダウンロード・解凍してFlashAirのルート上に置く。
+3. FlashAirのCONFIGに`LUA_RUN_SCRIPT=/bootscript.lua`を追記する。
 4. FlashAirを抜き挿しするなどして、再起動する。
 5. FlashAirFileMangerを起動する。
-6. （初回起動の場合）FlashAir IoT Hub にログインし、アクセスの承認を行う。
+6. FlashAir IoT Hubへのアクセス承認を行う。
 7. 登録したFlashAirを選択すると、FlashAirのファイル一覧が画面左側に表示されます。
 8. FlashAirのファイルを選択して、画面中央のダウンロードボタンをクリックすると、ファイルが画面右側に表示されているフォルダーにダウンロードされます。
 
+注意：Version 0.2.0より[FlashAir IoT Hub](https://iot-hub.flashair-developers.com)のLuaスクリプトを使う様に変更されました。0.2.0より前のバージョンをお使いの方は次の手順を実行してください。
+
+- FlashAir IoT Hubにログインし、[Luaスクリプト](https://iot-hub.flashair-developers.com/ja/static/flashair-scripts.zip)をダウンロード・解凍してFlashAirのルート上に置く。
+- FlashAirのCONFIGを`LUA_RUN_SCRIPT=/fafm_boot.lua`から`LUA_RUN_SCRIPT=/bootscript.lua`に変更する。
+
 ## Build
 
 ### Windows

README.md

@@ -35,14 +35,19 @@ It is in [FlashAir Developers - FlashairFileManager](https://www.flashair-develo
 ## Usage
 
 1. Register your account in advance with FlashAir IoT Hub and register FlashAir. For details, please refer to [Flow of using FlashAir IoT Hub](https://www.flashair-developers.com/en/documents/tutorials/iot-hub/1/).
-2. Download [Lua script](https://github.com/FlashAirDevelopers/FlashAirFileManager/releases/download/v0.1.1/FlashAirFileManagerScript-0.1.1.zip), unzip it and place it on the root of FlashAir.
-3. Add `LUA_RUN_SCRIPT=/fafm_boot.lua` to FlashAir CONFIG.
+2. Login to FlashAir IoT Hub and download [Lua script](https://iot-hub.flashair-developers.com/en/static/flashair-scripts.zip), unzip it and place it on the root of FlashAir.
+3. Add `LUA_RUN_SCRIPT=/bootscript.lua` to FlashAir CONFIG.
 4. Disconnect and reconnect the FlashAir and restart.
 5. Start FlashAirFileManger.
-6. (First time startup) Login to FlashAir IoT Hub and approve access.
+6. Approve access to FlashAir IoT Hub.
 7. If you select the registered FlashAir, the file list of FlashAir is displayed on the left side of the screen.
 8. When you select a FlashAir file and click the download button in the center of the screen, the file will be downloaded to the folder displayed on the right side of the screen.
 
+Note: Since version 0.2.0, Lua scripts are using [FlashAir IoT Hub] (https://iot-hub.flashair-developers.com) instead. If you are using a version earlier than 0.2.0, please follow the steps below.
+
+- Login to FlashAir IoT Hub and download [Lua script](https://iot-hub.flashair-developers.com/en/static/flashair-scripts.zip), unzip it and place it on the root of FlashAir.
+- Change FlashAir CONFIG from `LUA_RUN_SCRIPT=/fafm_boot.lua` to` LUA_RUN_SCRIPT=/bootscript.lua`.
+
 ## Build
 
 ### Windows

electron-builder.json

@@ -2,6 +2,7 @@
   "appId": "com.flashair-developers",
   "productName": "FlashAirFileManger",
   "asar": true,
+  "electronVersion": "1.7.9",
   "files": [
     "static/**/*",
     "node_modules/**/*",

lua/fafm.lua

@@ -1,12 +1,13 @@
 {
   "name": "flashair-file-manager",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "The application to browse and download files on FlashAir™ via the network.",
   "homepage": "https://github.com/FlashAirDevelopers/FlashAirFileManager",
   "main": "./src/main/main.js",
   "scripts": {
     "dist:win": "npm config set msvs_version 2015 && npm config set scripts-prepend-node-path true && cross-env NODE_ENV=production npm run compile && electron-builder --win --x64",
     "pack:win": "npm config set msvs_version 2015 && npm config set scripts-prepend-node-path true && cross-env NODE_ENV=production npm run compile && electron-builder --win --x64 --dir",
+    "pack:win-dev": "npm config set msvs_version 2015 && npm config set scripts-prepend-node-path true && cross-env NODE_ENV=development npm run compile && electron-builder --win --x64 --dir",
     "compile": "webpack --config webpack.app.config.js",
     "lint": "eslint src/**/*.js",
     "fix": "eslint --fix",
@@ -21,52 +22,53 @@
     "javascript"
   ],
   "author": "FlashAir Developers",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "dependencies": {
-    "@openid/appauth": "^0.2.2",
+    "@openid/appauth": "^0.2.3",
     "about-window": "^1.8.0",
     "bootstrap": "^3.3.7",
     "bootstrap-notify": "^3.1.3",
     "bootstrap-select": "^1.12.4",
-    "electron-log": "^2.2.9",
+    "electron-log": "^2.2.11",
     "es6-promise": "^4.1.1",
-    "handlebars": "^4.0.10",
+    "handlebars": "^4.0.11",
     "isomorphic-fetch": "^2.2.1",
     "jquery": "^3.2.1",
     "js-base64": "^2.3.2",
     "jssha": "^2.3.1",
-    "keytar": "^4.0.4",
-    "source-map-support": "^0.4.18",
+    "keytar": "^4.0.5",
+    "source-map-support": "^0.5.0",
     "spin.js": "^2.3.2"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-eslint": "^7.2.3",
+    "babel-eslint": "^8.0.1",
     "babel-loader": "^7.1.2",
+    "babel-minify-webpack-plugin": "^0.2.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-runtime": "^6.26.0",
-    "clean-webpack-plugin": "^0.1.16",
-    "cross-env": "^5.0.5",
-    "css-hot-loader": "^1.3.1",
+    "clean-webpack-plugin": "^0.1.17",
+    "cross-env": "^5.1.1",
+    "css-hot-loader": "^1.3.2",
     "css-loader": "^0.28.7",
-    "electron": "^1.7.8",
-    "electron-builder": "^19.34.1",
-    "electron-webpack": "^1.6.1",
-    "eslint": "^4.6.1",
+    "electron": "^1.7.9",
+    "electron-builder": "^19.45.0",
+    "electron-webpack": "^1.11.0",
+    "eslint": "^4.10.0",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.1.1",
-    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-promise": "^3.6.0",
     "eslint-plugin-standard": "^3.0.1",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^0.11.2",
+    "extract-text-webpack-plugin": "^3.0.2",
+    "file-loader": "^1.1.5",
     "handlebars-loader": "^1.6.0",
     "node-gyp": "^3.6.2",
     "node-loader": "^0.6.0",
     "rcedit": "^0.9.0",
     "shebang-loader": "^0.0.1",
-    "style-loader": "^0.18.2",
-    "url-loader": "^0.5.9",
-    "webpack": "^3.6.0"
+    "style-loader": "^0.19.0",
+    "url-loader": "^0.6.2",
+    "webpack": "^3.8.1"
   }
 }

lua/fafm_boot.lua

@@ -43,6 +43,6 @@ export const IoTHubApi = {
     files: '/v1/flashairs/{flashair_id}/files',
 };
 export const FlashAIrScript = {
-    LIST: '/fafm_list.lua',
-    UPLOAD: '/fafm_upload.lua'
+    LIST: '/list_file.lua',
+    UPLOAD: '/upload_file.lua'
 };

lua/fafm_list.lua

@@ -49,3 +49,7 @@ export const dateFormat = {
     return result;
   },
 };
+export const basename = path => {
+  const base = path.substr(path.lastIndexOf('/') + 1);
+  return base.replace(new RegExp('$', 'g'), '');
+};