Fix bug: Search path for Library Manager is incomplete (#166)

* Fix bug: Search path for Library Manager is incomplete

* filter folders when parsing libraries

* Refactor libraryManager & boardManager code

Author: testforstephen

html/app/components/BoardItemView.tsx

@@ -52,6 +52,9 @@ export default class BoardView extends React.Component<IBoardProps, IBoardState>
     private buildBoardSectionHeader(p) {
         return (<div>
             <span className="listitem-header">{p.name}</span>
+            {
+                p.defaultPlatform && (<span> Built-In </span>)
+            }
             <span className="listitem-author"> by <span className="listitem-header">{p.package.maintainer}</span></span>
             {
                 p.installedVersion && (

html/app/components/LibraryItemView.tsx

@@ -127,9 +127,13 @@ export default class LibraryItemView extends React.Component<ILibraryProps, ILib
                 this.state.isUninstalling && (<div className="toolbar-mask theme-bgcolor">Removing</div>)
             }
             {
-                lib.version && (
+                lib.installed && (
                     <div className="right-side">
-                        <Button className="operation-btn" onClick={() => this.addLibPath(lib.srcPath)}>Add to Include Path</Button>
+                        {
+                            lib.supported && (
+                                <Button className="operation-btn" onClick={() => this.addLibPath(lib.srcPath)}>Add to Include Path</Button>
+                            )
+                        }
                         {
                             lib.versions && lib.versions.length && util.versionCompare(lib.versions[0], lib.version) > 0 && (
                                 <Button className="operation-btn" onClick={() => this.installLibrary(lib.name, lib.versions[0])}>Update</Button>

html/app/components/LibraryManager.tsx

@@ -4,7 +4,7 @@
  *-------------------------------------------------------------------------------------------*/
 
 import * as React from "react";
-import { Button, DropdownButton, MenuItem } from "react-bootstrap";
+import { Button, Checkbox, DropdownButton, MenuItem } from "react-bootstrap";
 import { connect } from "react-redux";
 import SearchInput, { createFilter } from "react-search-input";
 import * as actions from "../actions";
@@ -28,6 +28,7 @@ interface ILibraryManagerState extends React.Props<any> {
     searchTerm: string;
     type: string;
     topic: string;
+    checked: boolean;
 }
 
 const mapStateToProps = (store) => {
@@ -72,10 +73,12 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
             searchTerm: "",
             type: "All",
             topic: "All",
+            checked: false,
         };
         this.typeUpdate = this.typeUpdate.bind(this);
         this.topicUpdate = this.topicUpdate.bind(this);
         this.searchUpdate = this.searchUpdate.bind(this);
+        this.handleCheck = this.handleCheck.bind(this);
     }
 
     public componentWillMount() {
@@ -103,8 +106,8 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
             switch (topic) {
                 case "All":
                     return true;
-                case "Uncatogorized":
-                    return !element.category;
+                case "Uncategorized":
+                    return !element.category || element.category === topic;
                 default:
                     return element.category === topic;
             }
@@ -114,7 +117,8 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
         const filterSearch = createFilter(this.state.searchTerm, SEARCH_KEYS);
         let totalCount = 0;
         this.props.libraries.forEach((element) => {
-            if (filterType(element, this.state.type) && filterTopic(element, this.state.topic) && filterSearch(element)) {
+            const filterSupported = this.state.checked ? element.supported : true;
+            if (filterSupported && filterType(element, this.state.type) && filterTopic(element, this.state.topic) && filterSearch(element)) {
                 element.shouldBeDisplayed = true;
                 totalCount++;
             } else {
@@ -154,6 +158,7 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
                     })}
                 </DropdownButton>
                 <SearchInput className="search-input" placeholder="Filter your search..." onChange={this.searchUpdate} />
+                <Checkbox className="supported-checkbox" onChange={this.handleCheck}>Only show libraries supported by current board</Checkbox>
             </div>
             <div className="arduinomanager-container">
                 {
@@ -187,6 +192,12 @@ class LibraryManager extends React.Component<ILibraryManagerProps, ILibraryManag
             searchTerm: term,
         });
     }
+
+    private handleCheck() {
+        this.setState({
+            checked: !this.state.checked,
+        });
+    }
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(LibraryManager);

html/app/reducers/libraryManagerReducer.ts

@@ -30,9 +30,10 @@ export function libraryManagerReducer(state = initalState, action) {
                 return item.category || "Uncategorized";
             });
             // Sorting versions in descending order.
-            action.libraries.forEach((element) => {
+            // for loop is faster than forEach iterator.
+            for (let element of action.libraries) {
                 element.versions = element.versions ? element.versions.sort(util.versionCompare).reverse() : element.versions;
-            });
+            }
             return {
                 ...state,
                 libraries: action.libraries,

html/app/styles/board.scss

@@ -19,7 +19,7 @@
 }
 
 .arduinomanager-toolbar {
-    height: 60px;
+    min-height: 60px;
     padding: 15px 10px;
     position: fixed;
     width: 100%;
@@ -162,6 +162,20 @@ a {
 }
 
 .librarymanager {
+    .arduinomanager-toolbar {
+        min-height: 80px;
+    }
+
+    .supported-checkbox {
+        margin-top: -5px;
+        margin-bottom: 0px;
+        padding-left: 5px;
+    }
+
+    .arduinomanager-container {
+        padding-top: 80px;
+    }
+
     .search-input {
         margin-left: 380px;
         padding-top: 0px;

src/arduino/boardManager.ts

@@ -211,8 +211,8 @@ export class BoardManager {
             this.parsePackageIndex(JSON.parse(packageContent));
         }
 
-        this.loadInstalledPlatforms();
         this.loadDefaultPlatforms();
+        this.loadInstalledPlatforms();
 
         this.loadInstalledBoards();
         this.updateStatusBar();
@@ -280,18 +280,10 @@ export class BoardManager {
 
     private loadDefaultPlatforms() {
         // Default arduino package information:
-        const arduinoPath = this._settings.arduinoPath;
         const packageName = "arduino";
         const archName = "avr";
-        let defaultPlatformPath = path.join(arduinoPath, "hardware");
-        const platform = os.platform();
-        if (platform === "darwin") {
-            defaultPlatformPath = path.join(arduinoPath, "Arduino.app/Contents/Java/hardware");
-        } else if (platform === "linux") {
-            // TODO Check default platform path at linux.
-        }
         try {
-            let packageBundled = fs.readFileSync(path.join(defaultPlatformPath, "package_index_bundled.json"), "utf8");
+            let packageBundled = fs.readFileSync(path.join(this._settings.defaultPackagePath, "package_index_bundled.json"), "utf8");
             if (!packageBundled) {
                 return;
             }
@@ -315,7 +307,7 @@ export class BoardManager {
                             return;
                         } else {
                             filteredPlat.installedVersion = v;
-                            filteredPlat.rootBoardPath = path.join(defaultPlatformPath, "arduino/avr");
+                            filteredPlat.rootBoardPath = path.join(this._settings.defaultPackagePath, "arduino", "avr");
                             this.installedPlatforms.push(filteredPlat);
                         }
                     }
@@ -351,11 +343,11 @@ export class BoardManager {
 
     private loadInstalledPlatforms(): void {
         this._installedPlatforms = [];
-        let rootPacakgesPath = path.join(path.join(this._settings.packagePath, "packages"));
-        if (!util.directoryExistsSync(rootPacakgesPath)) {
+        let rootPackagePath = path.join(path.join(this._settings.packagePath, "packages"));
+        if (!util.directoryExistsSync(rootPackagePath)) {
             return;
         }
-        const dirs = util.filterJunk(fs.readdirSync(rootPacakgesPath)); // in Mac, filter .DS_Store file.
+        const dirs = util.filterJunk(util.readdirSync(rootPackagePath, true)); // in Mac, filter .DS_Store file.
         dirs.forEach((packageName) => {
             let archPath = path.join(this._settings.packagePath, "packages", packageName, "hardware");
             if (!util.directoryExistsSync(archPath)) {
@@ -369,6 +361,7 @@ export class BoardManager {
                 let allVersion = util.filterJunk(fs.readdirSync(path.join(archPath, architecture)));
                 let existingPlatform = this._platforms.find((_plat) => _plat.package.name === packageName && _plat.architecture === architecture);
                 if (existingPlatform && allVersion && allVersion.length) {
+                    existingPlatform.defaultPlatform = false;
                     existingPlatform.installedVersion = allVersion[0];
                     existingPlatform.rootBoardPath = path.join(archPath, architecture, allVersion[0]);
                     this._installedPlatforms.push(existingPlatform);
@@ -378,7 +371,6 @@ export class BoardManager {
     }
 
     private loadInstalledBoards(): void {
-        // let boards: Map<string, IBoard> = new Map<string, IBoard>();
         this._boards = new Map<string, IBoard>();
         this.installedPlatforms.forEach((plat) => {
             let dir = plat.rootBoardPath;