Merge pull request #576 from GetPublii/v.0.35.2

V.0.35.2

Author: dziudek

.gitignore

@@ -6,7 +6,7 @@ npm-debug.log
 /node_modules/
 /app/node_modules/
 /coverage
-/dist/
+/dist
 /app/dist/
 /cache/
 /StaticBlog-darwin-x64/

app/back-end/app.js

@@ -12,6 +12,7 @@ const compare = require('node-version-compare');
 const normalizePath = require('normalize-path');
 // Electron classes
 const electron = require('electron');
+const Menu = electron.Menu;
 const BrowserWindow = electron.BrowserWindow;
 // Collection classes
 const Posts = require('./posts.js');
@@ -318,8 +319,12 @@ class App {
             let account = passwordData[1];
             let retrievedPassword = '';
 
-            if(passwordSafeStorage) {
-                retrievedPassword = await passwordSafeStorage.getPassword(service, account);
+            if (passwordSafeStorage) {
+                try {
+                    retrievedPassword = await passwordSafeStorage.getPassword(service, account);
+                } catch (e) {
+                    console.log('(!) Cannot retrieve password via keytar');
+                }
             }
 
             if (retrievedPassword === null || retrievedPassword === true || retrievedPassword === false) {
@@ -484,8 +489,10 @@ class App {
           windowParams.icon = path.join(__dirname, '..', 'src', 'assets', 'installation', '1024x1024.png');
         }
 
+        Menu.setApplicationMenu(null);
         this.mainWindow = new BrowserWindow(windowParams);
         this.mainWindow.setMenu(null);
+        this.mainWindow.removeMenu();
         this.mainWindow.loadURL('file://' + this.basedir + '/index.html');
 
         this.mainWindow.webContents.on('did-finish-load', function() {

app/back-end/builddata.json

@@ -1 +1 @@
-{"version":"0.35.1","build":11963,"status":"Beta"}
+{"version":"0.35.2","build":12011,"status":"Beta"}

app/back-end/events/_modules.js

@@ -8,13 +8,15 @@ module.exports = {
     PostEvents: require('./post.js'),
     SiteEvents: require('./site.js'),
     TagEvents: require('./tag.js'),
+    TagsEvents: require('./tags.js'),
     DeployEvents: require('./deploy.js'),
     SyncEvents: require('./sync.js'),
     MenuEvents: require('./menu.js'),
     PreviewEvents: require('./preview.js'),
     NotificationsEvents: require('./notifications.js'),
     BackupEvents: require('./backup.js'),
     AuthorEvents: require('./author.js'),
+    AuthorsEvents: require('./authors.js'),
     ImportEvents: require('./import.js'),
     FileManagerEvents: require('./file-manager.js')
 };

app/back-end/events/authors.js

@@ -0,0 +1,24 @@
+const ipcMain = require('electron').ipcMain;
+const Posts = require('../posts.js');
+const Authors = require('../authors.js');
+
+/*
+ * Events for the IPC communication regarding authors list
+ */
+
+class AuthorsEvents {
+    constructor(appInstance) {
+        // Load
+        ipcMain.on('app-tags-load', function (event, siteData) {
+            let postsData = new Posts(appInstance, siteData);
+            let authorsData = new Authors(appInstance, siteData);
+
+            event.sender.send('app-tags-loaded', {
+                authors: authorsData.load(),
+                postsAuthors: postsData.loadAuthorsXRef()
+            });
+        });
+    }
+}
+
+module.exports = AuthorsEvents;

app/back-end/events/backup.js

@@ -69,8 +69,8 @@ class BackupEvents {
         });
     }
 
-    removeBackups(siteName, backupsNames, event) {
-        let result = Backup.remove(siteName, backupsNames, this.app.appConfig.backupsLocation);
+    async removeBackups(siteName, backupsNames, event) {
+        let result = await Backup.remove(siteName, backupsNames, this.app.appConfig.backupsLocation);
 
         event.sender.send('app-backup-removed', {
             status: result.status,

app/back-end/events/tags.js

@@ -0,0 +1,24 @@
+const ipcMain = require('electron').ipcMain;
+const Posts = require('../posts.js');
+const Tags = require('../tags.js');
+
+/*
+ * Events for the IPC communication regarding tags list
+ */
+
+class TagsEvents {
+    constructor(appInstance) {
+        // Load
+        ipcMain.on('app-tags-load', function (event, siteData) {
+            let postsData = new Posts(appInstance, siteData);
+            let tagsData = new Tags(appInstance, siteData);
+
+            event.sender.send('app-tags-loaded', {
+                tags: tagsData.load(),
+                postsTags: postsData.loadTagsXRef()
+            });
+        });
+    }
+}
+
+module.exports = TagsEvents;

app/back-end/modules/backup/backup.js

@@ -3,11 +3,13 @@
  */
 
 const fs = require('fs-extra');
+const os = require('os');
 const path = require('path');
 const Utils = require('./../../helpers/utils.js');
 const moment = require('moment');
 const archiver = require('archiver');
 const tar = require('tar');
+const trash = require('trash');
 
 class Backup {
     /**
@@ -148,7 +150,7 @@ class Backup {
      * @param backupsDir
      * @returns {{status: boolean, backups: *}}
      */
-    static remove(siteName, backupsNames, backupsDir) {
+    static async remove(siteName, backupsNames, backupsDir) {
         for(let backupName of backupsNames) {
             let backupFilePath = path.join(backupsDir, siteName, backupName);
 
@@ -160,19 +162,31 @@ class Backup {
             }
 
             try {
-                fs.unlinkSync(backupFilePath);
+                if (
+                    os.platform() !== 'darwin' || 
+                    (
+                        os.platform() === 'darwin' &&
+                        parseInt(os.release().split('.')[0], 10) >= 16
+                    )
+                ) {
+                    await (async () => {
+                        await trash(backupFilePath);
+                    })();
+                } else {
+                    fs.unlinkSync(backupFilePath);
+                }
             } catch (e) {
-                return {
+                return Promise.resolve({
                     status: false,
                     backups: Backup.loadList(siteName, backupsDir)
-                };
+                });
             }
         }
 
-        return {
+        return Promise.resolve({
             status: true,
             backups: Backup.loadList(siteName, backupsDir)
-        };
+        });
     }
 
     /**

app/back-end/modules/deploy/ftp.js

@@ -4,7 +4,6 @@
 
 const fs = require('fs-extra');
 const path = require('path');
-const md5 = require('md5');
 const ftpClient = require('./../custom-changes/ftp');
 const passwordSafeStorage = require('keytar');
 const slug = require('./../../helpers/slug');
@@ -48,7 +47,8 @@ class FTP {
                 host: this.deployment.siteConfig.deployment.server,
                 port: this.deployment.siteConfig.deployment.port,
                 user: this.deployment.siteConfig.deployment.username,
-                password: ftpPassword
+                password: ftpPassword,
+                rejectUnauthorized: this.deployment.siteConfig.deployment.rejectUnauthorized
             },
             connTimeout: 15000,
             pasvTimeout: 15000,
@@ -122,7 +122,10 @@ class FTP {
 
                 process.send({
                     type: 'web-contents',
-                    message: 'app-connection-error'
+                    message: 'app-connection-error',
+                    value: {
+                        additionalMessage: err.message
+                    }
                 });
 
                 setTimeout(function () {
@@ -470,7 +473,8 @@ class FTP {
                 host: deploymentConfig.server,
                 port: deploymentConfig.port,
                 user: deploymentConfig.username,
-                password: ftpPassword
+                password: ftpPassword,
+                rejectUnauthorized: deploymentConfig.rejectUnauthorized
             },
             connTimeout: 10000,
             pasvTimeout: 10000
@@ -533,7 +537,7 @@ class FTP {
             if(waitForTimeout) {
                 waitForTimeout = false;
                 client.destroy();
-                app.mainWindow.webContents.send('app-deploy-test-error');
+                app.mainWindow.webContents.send('app-deploy-test-error', { message: err.message });
             }
         });
 

app/back-end/modules/render-html/handlebars/helpers/menu-item-classes.js

@@ -138,6 +138,10 @@ function hasActiveChild(items, context) {
 
         if(items[i].items.length) {
             result = hasActiveChild(items[i].items, context);
+
+            if (result) {
+                return true;
+            }
         }
     }