jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-18 10:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from bcmi-labs/sketch-loader-bug-fix-win

Browse Source 
[win] Open sketch.
This commit is contained in:
Jan Bicker 2019-07-24 07:48:50 -07:00 committed by GitHub
commit 40eb74aeff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
View File

@ -357,11 +357,10 @@ export class ArduinoFrontendContribution implements TabBarToolbarContribution, C
async openSketchFiles(uri: string) { async openSketchFiles(uri: string) {
const fileStat = await this.fileSystem.getFileStat(uri); const fileStat = await this.fileSystem.getFileStat(uri);
if (fileStat) { if (fileStat) {
const sketchFiles = await this.sketches.getSketchFiles(fileStat); const uris = await this.sketches.getSketchFiles(fileStat);
sketchFiles.forEach(sketchFile => { for (const uri of uris) {
const uri = new URI(sketchFile.uri); this.editorManager.open(new URI(uri));
this.editorManager.open(uri); }
});
} }
} }

2
arduino-ide-extension/src/common/protocol/sketches-service.ts
View File

@ -4,7 +4,7 @@ export const SketchesServicePath = '/services/sketches-service';
export const SketchesService = Symbol('SketchesService'); export const SketchesService = Symbol('SketchesService');
export interface SketchesService { export interface SketchesService {
getSketches(fileStat?: FileStat): Promise<Sketch[]> getSketches(fileStat?: FileStat): Promise<Sketch[]>
getSketchFiles(fileStat: FileStat): Promise<FileStat[]> getSketchFiles(fileStat: FileStat): Promise<string[]>
} }
export interface Sketch { export interface Sketch {

20
arduino-ide-extension/src/electron-browser/electron-arduino-main-menu-factory.ts
View File

@ -1,20 +0,0 @@
import { injectable } from "inversify";
import * as electron from 'electron';
import { ElectronMainMenuFactory } from "@theia/core/lib/electron-browser/menu/electron-main-menu-factory";
import {
isOSX
} from '@theia/core/lib/common';
@injectable()
export class ElectronArduinoMainMenuFactory extends ElectronMainMenuFactory {
createMenuBar(): Electron.Menu {
const menuModel = this.menuProvider.getMenu();
const template = this.fillMenuTemplate([], menuModel);
if (isOSX) {
template.unshift(this.createOSXMenu());
}
const menu = electron.remote.Menu.buildFromTemplate(template);
this._menu = menu;
return menu;
}
}

5
arduino-ide-extension/src/electron-browser/electron-arduino-menu-module.ts
View File

@ -1,13 +1,8 @@
import { ContainerModule } from "inversify"; import { ContainerModule } from "inversify";
import { ElectronArduinoMainMenuFactory } from "./electron-arduino-main-menu-factory";
import { ElectronMainMenuFactory } from "@theia/core/lib/electron-browser/menu/electron-main-menu-factory";
import { ElectronMenuContribution } from "@theia/core/lib/electron-browser/menu/electron-menu-contribution" import { ElectronMenuContribution } from "@theia/core/lib/electron-browser/menu/electron-menu-contribution"
import { ElectronArduinoMenuContribution } from "./electron-arduino-menu-contribution"; import { ElectronArduinoMenuContribution } from "./electron-arduino-menu-contribution";
export default new ContainerModule((bind, unbind, isBound, rebind) => { export default new ContainerModule((bind, unbind, isBound, rebind) => {
bind(ElectronArduinoMainMenuFactory).toSelf().inSingletonScope();
rebind(ElectronMainMenuFactory).to(ElectronArduinoMainMenuFactory);
bind(ElectronArduinoMenuContribution).toSelf().inSingletonScope(); bind(ElectronArduinoMenuContribution).toSelf().inSingletonScope();
rebind(ElectronMenuContribution).to(ElectronArduinoMenuContribution); rebind(ElectronMenuContribution).to(ElectronArduinoMenuContribution);
}) })

42
arduino-ide-extension/src/node/sketches-service-impl.ts
View File

@ -4,6 +4,7 @@ import URI from "@theia/core/lib/common/uri";
import { FileStat, FileSystem } from "@theia/filesystem/lib/common"; import { FileStat, FileSystem } from "@theia/filesystem/lib/common";
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { FileUri } from "@theia/core/lib/node";
export const ALLOWED_FILE_EXTENSIONS = [".c", ".cpp", ".h", ".hh", ".hpp", ".s", ".pde", ".ino"]; export const ALLOWED_FILE_EXTENSIONS = [".c", ".cpp", ".h", ".hh", ".hpp", ".s", ".pde", ".ino"];
@ -19,16 +20,16 @@ export class SketchesServiceImpl implements SketchesService {
const uri = new URI(fileStat.uri); const uri = new URI(fileStat.uri);
const sketchFolderPath = await this.filesystem.getFsPath(uri.toString()); const sketchFolderPath = await this.filesystem.getFsPath(uri.toString());
if (sketchFolderPath) { if (sketchFolderPath) {
const files = fs.readdirSync(sketchFolderPath); const fileNames = fs.readdirSync(sketchFolderPath);
files.forEach(file => { for (const fileName of fileNames) {
const filePath = path.join(sketchFolderPath, file); const filePath = path.join(sketchFolderPath, fileName);
if (this.isSketchFolder(filePath, file)) { if (this.isSketchFolder(filePath, fileName)) {
sketches.push({ sketches.push({
name: file, name: fileName,
uri: filePath uri: FileUri.create(filePath).toString()
}); });
} }
}); }
} }
} }
return sketches; return sketches;
@ -38,25 +39,19 @@ export class SketchesServiceImpl implements SketchesService {
* Return all allowed files. * Return all allowed files.
* File extensions: "c", "cpp", "h", "hh", "hpp", "s", "pde", "ino" * File extensions: "c", "cpp", "h", "hh", "hpp", "s", "pde", "ino"
*/ */
async getSketchFiles(sketchFileStat: FileStat): Promise<FileStat[]> { async getSketchFiles(sketchFileStat: FileStat): Promise<string[]> {
const files: FileStat[] = []; const uris: string[] = [];
const sketchUri = new URI(sketchFileStat.uri); const sketchUri = new URI(sketchFileStat.uri);
const sketchPath = await this.filesystem.getFsPath(sketchUri.toString()); const sketchPath = await this.filesystem.getFsPath(sketchUri.toString());
if (sketchPath) { if (sketchPath) {
if (sketchFileStat.isDirectory && this.isSketchFolder(sketchPath, sketchUri.displayName)) { if (sketchFileStat.isDirectory && this.isSketchFolder(sketchPath, sketchUri.displayName)) {
const sketchDirContents = fs.readdirSync(sketchPath); const fileNames = fs.readdirSync(sketchPath);
for (const i in sketchDirContents) { for (const fileName of fileNames) {
const fileName = sketchDirContents[i];
const filePath = path.join(sketchPath, fileName); const filePath = path.join(sketchPath, fileName);
if (fs.existsSync(filePath) && if (ALLOWED_FILE_EXTENSIONS.indexOf(path.extname(filePath)) !== -1
fs.lstatSync(filePath).isFile() && && fs.existsSync(filePath)
ALLOWED_FILE_EXTENSIONS.indexOf(path.extname(filePath)) !== -1) { && fs.lstatSync(filePath).isFile()) {
const fileStat = await this.filesystem.getFileStat(filePath); uris.push(FileUri.create(filePath).toString())
if (fileStat) {
console.log("111111111111", fileStat);
files.push(fileStat);
console.log("222222222222222", files);
}
} }
} }
} else { } else {
@ -65,13 +60,12 @@ export class SketchesServiceImpl implements SketchesService {
const sketchFolderStat = await this.filesystem.getFileStat(sketchUri.path.dir.toString()); const sketchFolderStat = await this.filesystem.getFileStat(sketchUri.path.dir.toString());
if (sketchFolderStat) { if (sketchFolderStat) {
const sketchDirContents = await this.getSketchFiles(sketchFolderStat); const sketchDirContents = await this.getSketchFiles(sketchFolderStat);
files.push(...sketchDirContents); uris.push(...sketchDirContents);
} }
} }
} }
} }
console.log("###FILEPATH###", files); return uris;
return files;
} }
protected isSketchFolder(path: string, name: string): boolean { protected isSketchFolder(path: string, name: string): boolean {