Merge pull request #435 from GetPublii/0.33.5

0.33.5

README.md

@@ -9,7 +9,7 @@
 [Publii](https://getpublii.com/) is a desktop-based CMS for Windows, Mac and Linux that makes creating static websites fast
 and hassle-free, even for beginners.
 
-**Current version: 0.33.4 (build 11590)**
+**Current version: 0.34.0 (build 11726)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an

app/back-end/app.js

@@ -183,6 +183,12 @@ class App {
      * @returns {object}
      */
     switchSite(site) {
+        if (!site) {
+            return {
+                status: false
+            };
+        }
+
         const siteDir = path.join(this.sitesDir, site);
         const menuConfigPath = path.join(siteDir, 'input', 'config', 'menu.config.json');
         const themeConfigPath = path.join(siteDir, 'input', 'config', 'theme.config.json');
@@ -449,8 +455,8 @@ class App {
                 windowParams.y > electron.screen.getPrimaryDisplay().workAreaSize.height
             )
         ) {
-            windowParams.x = 50;
-            windowParams.y = 50;
+            windowParams.x = 0;
+            windowParams.y = 0;
         }
 
         if(!(/^win/).test(process.platform)) {

app/back-end/builddata.json

@@ -1 +1 @@
-{"version":"0.33.4","build":11590,"status":"Beta"}
+{"version":"0.34.0","build":11726,"status":"Beta"}

app/back-end/events/backup.js

@@ -129,11 +129,15 @@ class BackupEvents {
             tempDir: tempDir
         });
 
-        backupProcess.on('message', function(data) {
-            if(data.type === 'app-backup-restore-success') {
+        backupProcess.on('message', data => {
+            if (data.type === 'app-backup-restore-success') {
                 event.sender.send('app-backup-restored', {
                     status: true
                 });
+            } else if (data.type === 'app-backup-restore-close-db') {
+                if (this.app.db) {
+                    this.app.db.close();
+                }
             } else {
                 event.sender.send('app-backup-restored', {
                     status: false,

app/back-end/events/site.js

@@ -63,6 +63,10 @@ class SiteEvents {
                     !fs.existsSync(path.join(appInstance.sitesDir, config.settings.name)) &&
                     slug(config.settings.displayName) === config.settings.name
                 ) {
+                    if (appInstance.db) {
+                        appInstance.db.close();
+                    }
+
                     // If yes - rename the dir
                     delete appInstance.sites[siteName];
                     siteName = config.settings.name;
@@ -306,7 +310,8 @@ class SiteEvents {
                 newConfig: {
                     config: themeConfig.config,
                     customConfig: themeConfig.customConfig,
-                    postConfig: themeConfig.postConfig
+                    postConfig: themeConfig.postConfig,
+                    defaultTemplates: themeConfig.defaultTemplates
                 }
             });
         });
@@ -349,6 +354,14 @@ class SiteEvents {
             site.regenerateThumbnails(event.sender);
         });
 
+        /*
+         * Regenerate thumbnails stauts
+         */
+        ipcMain.on('app-site-regenerate-thumbnails-required', function(event, config) {
+            let site = new Site(appInstance, config, true);
+            site.regenerateThumbnailsIsRequired(event.sender);
+        });
+
         /*
          * Delete website
          */

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

@@ -286,7 +286,12 @@ class Backup {
                     return;
                 }
 
-                // Remove site dir contents
+                // Close DB connection and remove site dir contents
+                process.send({
+                    type: 'app-backup-restore-close-db',
+                    status: true
+                });
+
                 fs.emptyDirSync(destinationPath);
 
                 // Move files from the temp dir to the site dir