fontastic 0.1.7 → 0.2.0

package/app/core/FontManager.ts

@@ -1,172 +1,136 @@
-import { app, dialog, BrowserWindow, shell } from 'electron';
-
-import SystemManager from './SystemManager';
-import ConfigManager from './ConfigManager';
-import ConnectionManager from './ConnectionManager';
-
-import FontCatalog from './FontCatalog';
-import FontFinder from './FontFinder';
-import FontInstaller from './FontInstaller';
-
-import { execute } from '../helpers/command';
-import { randNumber } from '../helpers/random';
-
-import { StorageType } from '../enums/StorageType';
-
-import * as path from 'path';
-
-const fetch = require('node-fetch');
-
-export default class FontManager {
-
-  systemManager: SystemManager;
-  configManager: ConfigManager;
-  connectionManager: ConnectionManager;
-
-  constructor(systemManager: SystemManager, configManager: ConfigManager, connectionManager: ConnectionManager) {
-    this.systemManager = systemManager;
-    this.configManager = configManager;
-    this.connectionManager = connectionManager;
-  }
-
-  async fetchLatestNews(args: any) {
-    const response = await fetch(args.endpoint);
-    return await response.json();
-  }
-
-  async systemAuthenticate(args: any) {
-    args.status = 'ok';
-    this.configManager.set(StorageType.User, args);
-    return this.configManager.get(StorageType.User);
-  }
-
-  async executeCommand(args: any) {
-    try {
-      return await execute(args.cmd, args.options);
-    } catch (err) {
-      return err;
-    }
-  }
-
-  scanFiles(files: string[], options: any) {
-    return new Promise((resolve, reject) => {
-      let finder = new FontFinder(this.connectionManager);
-      finder.scanFiles(files, options, (err: any) => {
-        if (err) { return reject(err); }
-        return resolve({});
-      });
-    });
-  }
-
-  scanFolders(dir: any, options: any) {
-    return new Promise((resolve, reject) => {
-      let finder = new FontFinder(this.connectionManager);
-      finder.scanFolders(dir, options, (err: any) => {
-        if (err) { return reject(err); }
-        return resolve({});
-      });
-    });
-  }
-
-  fontInstaller(options: any) {
-    let installer = new FontInstaller(this.systemManager, this.connectionManager);
-    return installer.activate(options);
-  }
-
-  /**
-   * @todo
-   */
-  folderInstaller(options: any) {
-    let installer = new FontInstaller(this.systemManager, this.connectionManager);
-    return installer.activate(options);
-  }
-
-  getMapFilePaths(files: string[], dest: string) {
-    return files.map((file: string) => dest + path.sep + path.basename(file));
-  }
-
-  getSourceFolder(sourceFolder: string) {
-    return path.normalize(sourceFolder);
-  }
-
-  getDestinationFolder() {
-    return path.normalize(this.systemManager.getCatalogPath() + path.sep + Date.now() + randNumber(7));
-  }
-
-  getSourceDestinationFolders(sourceFolder: string) {
-    const src = this.getSourceFolder(sourceFolder);
-    const dest = this.getDestinationFolder();
-    return { src, dest }
-  }
-
-  createCatalog(folder: string) {
-    const catalog = new FontCatalog(this.systemManager);
-    return catalog.createCatalog(folder);
-  }
-
-  async copyFiles(files: string[], dest: string) {
-    return new Promise((resolve, reject) => {
-      const catalog = new FontCatalog(this.systemManager);
-      catalog.copyFiles(files, dest, (err: any, stdout: any) => {
-        if (err) { return reject(err); }
-        return resolve({});
-      });
-    });
-  }
-
-  async copyFolders(src: string, dest: string) {
-    return new Promise((resolve, reject) => {
-      const catalog = new FontCatalog(this.systemManager);
-      catalog.copyFolders(src, dest, (err: any, stdout: any) => {
-        if (err) { return reject(err); }
-        return resolve({});
-      });
-    });
-  }
-
-  showMessageBox(options: any) {
-    return dialog.showMessageBox(null, options);
-  }
-
-  showOpenDialog(options: any) {
-    return dialog.showOpenDialog(options);
-  }
-
-  beep() {
-    return shell.beep()
-  }
-
-  openPath(path: string) {
-    shell.openPath(path)
-  }
-
-  openExternal(url: string) {
-    shell.openExternal(url)
-  }
-
-  showItemInFolder(fullPath: string) {
-    shell.showItemInFolder(fullPath);
-  }
-
-  reLaunch() {
-    app.relaunch();
-    app.quit();
-  }
-
-  exit() {
-    app.exit();
-  }
-
-  quit() {
-    app.quit();
-  }
-
-  reloadWindow() {
-    const windows = BrowserWindow.getAllWindows();
-    if (windows && windows.length) {
-      for (const win of windows) {
-        win.webContents.reloadIgnoringCache();
-      }
-    }
-  }
-}
+import { app, dialog, BrowserWindow, shell } from 'electron';
+
+import SystemManager from './SystemManager';
+import ConfigManager from './ConfigManager';
+import ConnectionManager from './ConnectionManager';
+
+import FontCatalog from './FontCatalog';
+import FontFinder from './FontFinder';
+import { execute } from '../helpers/command';
+
+import { StorageType } from '../enums/StorageType';
+
+import * as path from 'path';
+
+const fetch = require('node-fetch');
+
+export default class FontManager {
+  systemManager: SystemManager;
+  configManager: ConfigManager;
+  connectionManager: ConnectionManager;
+
+  constructor(systemManager: SystemManager, configManager: ConfigManager, connectionManager: ConnectionManager) {
+    this.systemManager = systemManager;
+    this.configManager = configManager;
+    this.connectionManager = connectionManager;
+  }
+
+  async fetchLatestNews(args: any) {
+    const response = await fetch(args.endpoint);
+    const data = await response.json();
+    if (data?.articles) {
+      this.configManager.set(StorageType.News, {
+        ...this.configManager.get(StorageType.News),
+        articles: data.articles,
+        ts: Date.now(),
+      });
+    }
+    return data;
+  }
+
+  async systemAuthenticate(args: any) {
+    args.status = 'ok';
+    this.configManager.set(StorageType.User, args);
+    return this.configManager.get(StorageType.User);
+  }
+
+  async executeCommand(args: any) {
+    try {
+      return await execute(args.cmd, args.options);
+    } catch (err) {
+      return err;
+    }
+  }
+
+  getDestinationFolder(collectionId: number) {
+    return path.join(this.systemManager.getCatalogPath(), String(collectionId));
+  }
+
+  async copyFiles(files: string[], collectionId: number): Promise<string[]> {
+    const dest = this.getDestinationFolder(collectionId);
+    console.log('[FontManager.copyFiles] dest:', dest, 'files:', files);
+    const catalog = new FontCatalog();
+    await catalog.copyFiles(files, dest);
+    const catalogFiles = files.map((file) => path.join(dest, path.basename(file)));
+    console.log('[FontManager.copyFiles] catalogFiles:', catalogFiles);
+    return catalogFiles;
+  }
+
+  async copyFolder(src: string, collectionId: number): Promise<string> {
+    const dest = this.getDestinationFolder(collectionId);
+    console.log('[FontManager.copyFolder] src:', src, 'dest:', dest);
+    const catalog = new FontCatalog();
+    await catalog.copyFolder(src, dest);
+    return dest;
+  }
+
+  async scanFiles(files: string[], options: any) {
+    console.log('[FontManager.scanFiles] files:', files, 'options:', options);
+    const finder = new FontFinder(this.connectionManager);
+    await finder.scanFiles(files, options);
+    console.log('[FontManager.scanFiles] done, processed:', finder.counter, 'errors:', finder.errors);
+  }
+
+  async scanFolder(dir: string, options: any) {
+    console.log('[FontManager.scanFolder] dir:', dir, 'options:', options);
+    const finder = new FontFinder(this.connectionManager);
+    await finder.scanFolder(dir, options);
+    console.log('[FontManager.scanFolder] done, processed:', finder.counter, 'errors:', finder.errors);
+  }
+
+  showMessageBox(options: any) {
+    return dialog.showMessageBox(null, options);
+  }
+
+  showOpenDialog(options: any) {
+    return dialog.showOpenDialog(options);
+  }
+
+  beep() {
+    return shell.beep();
+  }
+
+  openPath(path: string) {
+    shell.openPath(path);
+  }
+
+  openExternal(url: string) {
+    shell.openExternal(url);
+  }
+
+  showItemInFolder(fullPath: string) {
+    shell.showItemInFolder(fullPath);
+  }
+
+  reLaunch() {
+    app.relaunch();
+    app.quit();
+  }
+
+  exit() {
+    app.exit();
+  }
+
+  quit() {
+    app.quit();
+  }
+
+  reloadWindow() {
+    const windows = BrowserWindow.getAllWindows();
+    if (windows && windows.length) {
+      for (const win of windows) {
+        win.webContents.reloadIgnoringCache();
+      }
+    }
+  }
+}

package/app/core/FontObject.js

@@ -1,54 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const opentype = require("opentype.js");
-class FontObject {
-    constructor(fp) {
-        try {
-            this.setFont(opentype.loadSync(fp));
-        }
-        catch (err) {
-            this.setError(fp, err.message);
-        }
-    }
-    setFont(font) {
-        this.font = font;
-    }
-    getFont() {
-        return this.font;
-    }
-    setError(file, message) {
-        this.error = { file, message };
-    }
-    getError() {
-        return this.error;
-    }
-    hasError() {
-        return this.error ? true : false;
-    }
-    getNamesTable() {
-        const names = (this.font && this.font.names) ? this.font.names : false;
-        let item = {};
-        item.compatible_full_name = (names && names.compatibleFullName) ? names.compatibleFullName.en : "";
-        item.copyright = (names && names.copyright) ? names.copyright.en : "";
-        item.description = (names && names.description) ? names.description.en : "";
-        item.designer = (names && names.designer) ? names.designer.en : "";
-        item.designer_url = (names && names.designerURL) ? names.designerURL.en : "";
-        item.font_family = (names && names.fontFamily) ? names.fontFamily.en : "";
-        item.font_subfamily = (names && names.fontSubfamily) ? names.fontSubfamily.en : "";
-        item.full_name = (names && names.fullName) ? names.fullName.en : "";
-        item.license = (names && names.license) ? names.license.en : "";
-        item.license_url = (names && names.licenseURL) ? names.licenseURL.en : "";
-        item.manufacturer = (names && names.manufacturer) ? names.manufacturer.en : "";
-        item.manufacturer_url = (names && names.manufacturerURL) ? names.manufacturerURL.en : "";
-        item.post_script_name = (names && names.postScriptName) ? names.postScriptName.en : "";
-        item.preferred_family = (names && names.preferredFamily) ? names.preferredFamily.en : "";
-        item.preferred_sub_family = (names && names.preferredSubfamily) ? names.preferredSubfamily.en : "";
-        item.sample_text = (names && names.sampleText) ? names.sampleText.en : "";
-        item.trademark = (names && names.trademark) ? names.trademark.en : "";
-        item.unique_id = (names && names.uniqueID) ? names.uniqueID.en : "";
-        item.version = (names && names.version) ? names.version.en : "";
-        return item;
-    }
-}
-exports.default = FontObject;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fontkit = require("fontkit");
+class FontObject {
+    constructor(fp) {
+        try {
+            this.setFont(fontkit.openSync(fp));
+        }
+        catch (err) {
+            this.setError(fp, err.message);
+        }
+    }
+    setFont(font) {
+        this.font = font;
+    }
+    getFont() {
+        return this.font;
+    }
+    setError(file, message) {
+        this.error = { file, message };
+    }
+    getError() {
+        return this.error;
+    }
+    hasError() {
+        return this.error ? true : false;
+    }
+    getNamesTable() {
+        const names = (this.font && this.font.name && this.font.name.records) ? this.font.name.records : false;
+        let item = {};
+        item.compatible_full_name = (names && names.compatibleFullName) ? names.compatibleFullName.en : "";
+        item.copyright = (names && names.copyright) ? names.copyright.en : "";
+        item.description = (names && names.description) ? names.description.en : "";
+        item.designer = (names && names.designer) ? names.designer.en : "";
+        item.designer_url = (names && names.designerURL) ? names.designerURL.en : "";
+        item.font_family = (names && names.fontFamily) ? names.fontFamily.en : "";
+        item.font_subfamily = (names && names.fontSubfamily) ? names.fontSubfamily.en : "";
+        item.full_name = (names && names.fullName) ? names.fullName.en : "";
+        item.license = (names && names.license) ? names.license.en : "";
+        item.license_url = (names && names.licenseURL) ? names.licenseURL.en : "";
+        item.manufacturer = (names && names.manufacturer) ? names.manufacturer.en : "";
+        item.manufacturer_url = (names && names.manufacturerURL) ? names.manufacturerURL.en : "";
+        item.post_script_name = (names && names.postScriptName) ? names.postScriptName.en : "";
+        item.preferred_family = (names && names.preferredFamily) ? names.preferredFamily.en : "";
+        item.preferred_sub_family = (names && names.preferredSubfamily) ? names.preferredSubfamily.en : "";
+        item.sample_text = (names && names.sampleText) ? names.sampleText.en : "";
+        item.trademark = (names && names.trademark) ? names.trademark.en : "";
+        item.unique_id = (names && names.uniqueSubfamily) ? names.uniqueSubfamily.en : "";
+        item.version = (names && names.version) ? names.version.en : "";
+        return item;
+    }
+}
+exports.default = FontObject;
 //# sourceMappingURL=FontObject.js.map

package/app/core/FontObject.ts

@@ -1,62 +1,62 @@
-const opentype = require("opentype.js");
-
-export default class FontObject {
-
-  font: any;
-  error: any;
-
-  constructor(fp: string) {
-    try {
-      this.setFont(opentype.loadSync(fp));
-    } catch (err) {
-      this.setError(fp, err.message);
-    }
-  }
-
-  setFont(font: any) {
-    this.font = font;
-  }
-
-  getFont() {
-    return this.font;
-  }
-
-  setError(file: string, message: string) {
-    this.error = { file, message };
-  }
-
-  getError() {
-    return this.error;
-  }
-
-  hasError() {
-    return this.error ? true : false;
-  }
-
-  getNamesTable() {
-    const names = (this.font && this.font.names) ? this.font.names : false;
-
-    let item: any = {};
-    item.compatible_full_name = (names && names.compatibleFullName) ? names.compatibleFullName.en : "";
-    item.copyright = (names && names.copyright) ? names.copyright.en : "";
-    item.description = (names && names.description) ? names.description.en : "";
-    item.designer = (names && names.designer) ? names.designer.en : "";
-    item.designer_url = (names && names.designerURL) ? names.designerURL.en : "";
-    item.font_family = (names && names.fontFamily) ? names.fontFamily.en : "";
-    item.font_subfamily = (names && names.fontSubfamily) ? names.fontSubfamily.en : "";
-    item.full_name = (names && names.fullName) ? names.fullName.en : "";
-    item.license = (names && names.license) ? names.license.en : "";
-    item.license_url = (names && names.licenseURL) ? names.licenseURL.en : "";
-    item.manufacturer = (names && names.manufacturer) ? names.manufacturer.en : "";
-    item.manufacturer_url = (names && names.manufacturerURL) ? names.manufacturerURL.en : "";
-    item.post_script_name = (names && names.postScriptName) ? names.postScriptName.en : "";
-    item.preferred_family = (names && names.preferredFamily) ? names.preferredFamily.en : "";
-    item.preferred_sub_family = (names && names.preferredSubfamily) ? names.preferredSubfamily.en : "";
-    item.sample_text = (names && names.sampleText) ? names.sampleText.en : "";
-    item.trademark = (names && names.trademark) ? names.trademark.en : "";
-    item.unique_id = (names && names.uniqueID) ? names.uniqueID.en : "";
-    item.version = (names && names.version) ? names.version.en : "";
-
-    return item;
-  }
-}
+const fontkit = require("fontkit");
+
+export default class FontObject {
+
+  font: any;
+  error: any;
+
+  constructor(fp: string) {
+    try {
+      this.setFont(fontkit.openSync(fp));
+    } catch (err) {
+      this.setError(fp, err.message);
+    }
+  }
+
+  setFont(font: any) {
+    this.font = font;
+  }
+
+  getFont() {
+    return this.font;
+  }
+
+  setError(file: string, message: string) {
+    this.error = { file, message };
+  }
+
+  getError() {
+    return this.error;
+  }
+
+  hasError() {
+    return this.error ? true : false;
+  }
+
+  getNamesTable() {
+    const names = (this.font && this.font.name && this.font.name.records) ? this.font.name.records : false;
+
+    let item: any = {};
+    item.compatible_full_name = (names && names.compatibleFullName) ? names.compatibleFullName.en : "";
+    item.copyright = (names && names.copyright) ? names.copyright.en : "";
+    item.description = (names && names.description) ? names.description.en : "";
+    item.designer = (names && names.designer) ? names.designer.en : "";
+    item.designer_url = (names && names.designerURL) ? names.designerURL.en : "";
+    item.font_family = (names && names.fontFamily) ? names.fontFamily.en : "";
+    item.font_subfamily = (names && names.fontSubfamily) ? names.fontSubfamily.en : "";
+    item.full_name = (names && names.fullName) ? names.fullName.en : "";
+    item.license = (names && names.license) ? names.license.en : "";
+    item.license_url = (names && names.licenseURL) ? names.licenseURL.en : "";
+    item.manufacturer = (names && names.manufacturer) ? names.manufacturer.en : "";
+    item.manufacturer_url = (names && names.manufacturerURL) ? names.manufacturerURL.en : "";
+    item.post_script_name = (names && names.postScriptName) ? names.postScriptName.en : "";
+    item.preferred_family = (names && names.preferredFamily) ? names.preferredFamily.en : "";
+    item.preferred_sub_family = (names && names.preferredSubfamily) ? names.preferredSubfamily.en : "";
+    item.sample_text = (names && names.sampleText) ? names.sampleText.en : "";
+    item.trademark = (names && names.trademark) ? names.trademark.en : "";
+    item.unique_id = (names && names.uniqueSubfamily) ? names.uniqueSubfamily.en : "";
+    item.version = (names && names.version) ? names.version.en : "";
+
+    return item;
+  }
+}