Merge branch 'v.0.47.0'

Author: dziudek

.nvmrc

@@ -1 +1 @@
-v20.15.1
+v22.18.0

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.46.5 (build 17089)**
+**Current version: 0.47.0 (build 17290)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an

app/back-end/app-preload.js

@@ -1,4 +1,4 @@
-const { contextBridge, ipcRenderer } = require('electron');
+const { contextBridge, ipcRenderer, webUtils } = require('electron');
 
 contextBridge.exposeInMainWorld('mainProcessAPI', {
     shellShowItemInFolder: (url) => ipcRenderer.invoke('publii-shell-show-item-in-folder', url),
@@ -7,6 +7,7 @@ contextBridge.exposeInMainWorld('mainProcessAPI', {
     existsSync: (pathToCheck) => ipcRenderer.invoke('publii-native-exists-sync', pathToCheck),
     normalizePath: (pathToNormalize) => ipcRenderer.invoke('publii-native-normalize-path', pathToNormalize),
     createMD5: (value) => ipcRenderer.invoke('publii-native-md5', value),
+    getPathForFile: (value) => webUtils.getPathForFile(value),
     getEnv: () => ({
         name: process.env.NODE_ENV,
         nodeVersion: process.versions.node,
@@ -99,7 +100,9 @@ contextBridge.exposeInMainWorld('mainProcessAPI', {
             'app-site-get-plugin-config',
             'app-site-save-plugin-config',
             'app-close',
-            'app-set-ui-zoom-level'
+            'app-set-ui-zoom-level',
+            'app-set-notifications-center-state',
+            'app-get-notifications-file'
         ];
 
         if (validChannels.includes(channel)) {

app/back-end/app.js

@@ -24,6 +24,7 @@ const Plugins = require('./plugins.js');
 const DBUtils = require('./helpers/db.utils.js');
 const Site = require('./site.js');
 const Utils = require('./helpers/utils.js');
+const FileHelper = require('./helpers/file.js');
 // List of the Event classes
 const EventClasses = require('./events/_modules.js');
 // Migration classes
@@ -52,7 +53,8 @@ class App {
         this.initPath = path.join(this.appDir, 'config', 'window-config.json');
         this.appConfigPath = path.join(this.appDir, 'config', 'app-config.json');
         this.tinymceOverridedConfigPath = path.join(this.appDir, 'config', 'tinymce.override.json');
-        this.versionData = JSON.parse(fs.readFileSync(__dirname + '/builddata.json', 'utf8'));
+        this.versionData = JSON.parse(FileHelper.readFileSync(__dirname + '/builddata.json', 'utf8'));
+        this.versionData.os = os.platform() === 'darwin' ? 'mac' : os.platform() === 'linux' ? 'linux' : 'win';
         this.windowBounds = null;
         this.appConfig = null;
         this.tinymceOverridedConfig = {};
@@ -165,8 +167,8 @@ class App {
 
                 // Check if both config.json files exists
                 if (fs.existsSync(appThemeConfig) && fs.existsSync(userThemeConfig)) {
-                    let appThemeData = JSON.parse(fs.readFileSync(appThemeConfig, 'utf8'));
-                    let userThemeData = JSON.parse(fs.readFileSync(userThemeConfig, 'utf8'));
+                    let appThemeData = JSON.parse(FileHelper.readFileSync(appThemeConfig, 'utf8'));
+                    let userThemeData = JSON.parse(FileHelper.readFileSync(userThemeConfig, 'utf8'));
 
                     // If app theme is newer version than the existing one
                     if(compare(appThemeData.version, userThemeData.version) === 1) {
@@ -231,7 +233,7 @@ class App {
         let themeDir = path.join(siteDir, 'input', 'themes', themes.currentTheme(true));
         let themeOverridesDir = path.join(siteDir, 'input', 'themes', themes.currentTheme(true) + '-override');
         let themeConfig = Themes.loadThemeConfig(themeConfigPath, themeDir);
-        let menuStructure = fs.readFileSync(menuConfigPath, 'utf8');
+        let menuStructure = FileHelper.readFileSync(menuConfigPath, 'utf8');
         let parsedMenuStructure = {};
 
         try {
@@ -283,8 +285,14 @@ class App {
 
         // Load the config
         let defaultSiteConfig = JSON.parse(JSON.stringify(defaultAstCurrentSiteConfig));
-        let siteConfig = fs.readFileSync(configFilePath);
-        siteConfig = JSON.parse(siteConfig);
+        let siteConfig = FileHelper.readFileSync(configFilePath);
+
+        try {
+            siteConfig = JSON.parse(siteConfig);
+        } catch (e) {
+            dialog.showErrorBox('Publii cannot read site config', 'There is an issue with file: ' + configFilePath + "\n\nError details: " + e.message);
+            return;
+        }
 
         if (siteConfig.name !== siteName) {
             siteConfig.name = siteName;
@@ -437,7 +445,7 @@ class App {
     loadConfig () {
         // Try to get window bounds
         try {
-            this.windowBounds = JSON.parse(fs.readFileSync(this.initPath, 'utf8'));
+            this.windowBounds = JSON.parse(FileHelper.readFileSync(this.initPath, 'utf8'));
         } catch (e) {
             console.log('The window-config.json file will be created');
         }
@@ -490,7 +498,7 @@ class App {
 
         // Try to get application config
         try {
-            this.appConfig = JSON.parse(fs.readFileSync(this.appConfigPath, 'utf8'));
+            this.appConfig = JSON.parse(FileHelper.readFileSync(this.appConfigPath, 'utf8'));
             this.appConfig = Utils.mergeObjects(JSON.parse(JSON.stringify(defaultAstAppConfig)), this.appConfig);
         } catch (e) {
             if (this.hasPermissionsErrors(e)) {
@@ -518,7 +526,7 @@ class App {
     loadAdditionalConfig () {
         // Try to get TinyMCE overrided config
         try {
-            this.tinymceOverridedConfig = JSON.parse(fs.readFileSync(this.tinymceOverridedConfigPath, 'utf8'));
+            this.tinymceOverridedConfig = JSON.parse(FileHelper.readFileSync(this.tinymceOverridedConfigPath, 'utf8'));
         } catch (e) {}
 
         if (this.appConfig.sitesLocation) {

app/back-end/author.js

@@ -8,6 +8,7 @@ const slug = require('./helpers/slug');
 const ImageHelper = require('./helpers/image.helper.js');
 const Themes = require('./themes.js');
 const Utils = require('./helpers/utils.js');
+const FileHelper = require('./helpers/file.js');
 
 /**
  * Author Model - used for operations connected with author management
@@ -93,11 +94,9 @@ class Author extends Model {
         }
 
         if (this.id !== 0) {
-            this.checkAndCleanImages();
             return this.updateAuthor();
         }
 
-        this.checkAndCleanImages();
         return this.addAuthor();
     }
 
@@ -136,6 +135,8 @@ class Author extends Model {
             }
         }
 
+        this.checkAndCleanImages();
+
         return {
             status: true,
             message: 'author-added',
@@ -169,6 +170,8 @@ class Author extends Model {
             id: this.id
         });
 
+        this.checkAndCleanImages();
+
         return {
             status: true,
             message: 'author-updated',
@@ -366,7 +369,7 @@ class Author extends Model {
         let themeConfigPath = path.join(this.application.sitesDir, this.site, 'input', 'config', 'theme.config.json');
 
         if (fs.existsSync(themeConfigPath)) {
-            let themeConfigString = fs.readFileSync(themeConfigPath, 'utf8');
+            let themeConfigString = FileHelper.readFileSync(themeConfigPath, 'utf8');
             themesHelper.checkAndCleanImages(themeConfigString);
         }
     }

app/back-end/builddata.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.46.5",
-  "build": 17089
+  "version": "0.47.0",
+  "build": 17290
 }

app/back-end/events/_modules.js

@@ -15,7 +15,6 @@ module.exports = {
     MenuEvents: require('./menu.js'),
     PreviewEvents: require('./preview.js'),
     NotificationsEvents: require('./notifications.js'),
-    ThemeUpdatesEvents: require('./theme-updates.js'),
     BackupEvents: require('./backup.js'),
     AuthorEvents: require('./author.js'),
     AuthorsEvents: require('./authors.js'),

app/back-end/events/app.js

@@ -1,5 +1,6 @@
 const fs = require('fs-extra');
 const path = require('path');
+const FileHelper = require('../helpers/file.js');
 const ipcMain = require('electron').ipcMain;
 const Themes = require('../themes.js');
 const Languages = require('../languages.js');
@@ -97,7 +98,7 @@ class AppEvents {
          * Save app color theme config
          */
         ipcMain.on('app-save-color-theme', function (event, theme) {
-            let appConfig = fs.readFileSync(appInstance.appConfigPath, 'utf8');
+            let appConfig = FileHelper.readFileSync(appInstance.appConfigPath, 'utf8');
 
             try {
                 appConfig = JSON.parse(appConfig);
@@ -440,7 +441,7 @@ class AppEvents {
             }
 
             let filePath = path.join(appInstance.app.getPath('logs'), filename);
-            let fileContent = fs.readFileSync(filePath, 'utf8');
+            let fileContent = FileHelper.readFileSync(filePath, 'utf8');
 
             event.sender.send('app-log-file-loaded', {
                 fileContent: fileContent
@@ -458,7 +459,7 @@ class AppEvents {
                 return;
             }
 
-            let appConfig = fs.readFileSync(appInstance.appConfigPath, 'utf8');
+            let appConfig = FileHelper.readFileSync(appInstance.appConfigPath, 'utf8');
 
             try {
                 appConfig = JSON.parse(appConfig);
@@ -470,6 +471,21 @@ class AppEvents {
 
             appInstance.mainWindow.webContents.setZoomFactor(zoomLevel);
         });
+
+        /**
+         * Set notifications center state
+         */
+        ipcMain.on('app-set-notifications-center-state', function(event, state) {
+            let appConfig = fs.readFileSync(appInstance.appConfigPath, 'utf8');
+
+            try {
+                appConfig = JSON.parse(appConfig);
+                appConfig.notificationsStatus = state;
+                fs.writeFileSync(appInstance.appConfigPath, JSON.stringify(appConfig, null, 4));
+            } catch (e) {
+                console.log('(!) App was unable to save the notifications center state');
+            }
+        });
     }
 }
 

app/back-end/events/credits.js

@@ -1,6 +1,7 @@
 const fs = require('fs-extra');
 const path = require('path');
 const ipcMain = require('electron').ipcMain;
+const FileHelper = require('../helpers/file.js');
 
 /*
  * Events for the IPC communication regarding credits
@@ -18,7 +19,7 @@ class CreditsEvents {
             }
 
             if(fs.existsSync(filePath)) {
-                licenseText = fs.readFileSync(filePath, 'utf-8');
+                licenseText = FileHelper.readFileSync(filePath, 'utf-8');
             }
 
             event.sender.send('app-license-loaded', licenseText);

app/back-end/events/notifications.js

@@ -10,17 +10,38 @@ class NotificationsEvents {
     constructor(appInstance) {
         // Save
         ipcMain.on('app-notifications-retrieve', function(event, downloadNotifications) {
+            let platform;
+            
+            if (process.platform === 'darwin') {
+                platform = process.arch === 'arm64' ? 'mac-arm64' : 'mac-x86';
+            } else if (process.platform === 'win32') {
+                platform = 'win';
+            } else {
+                platform = 'linux';
+            }
+
             let updatesHelper = new UpdatesHelper({
                 event: event,
-                filePath: path.join(appInstance.app.getPath('logs'), 'notifications.json'),
-                namespace: 'notifications',
-                url: 'https://getpublii.com/notifications.json',
-                contentField: 'text',
+                filePath: path.join(appInstance.app.getPath('logs'), 'updates.json'),
+                url: 'https://notifications.getpublii.com/updates-' + platform + '.json',
                 forceDownload: downloadNotifications
             });
 
             updatesHelper.retrieve();
         });
+
+        // Get notifications file
+        ipcMain.handle('app-get-notifications-file', async (event, fileName) => {
+            let filePath = path.join(appInstance.app.getPath('logs'), fileName);
+
+            try {
+                let data = await appInstance.app.readFile(filePath, 'utf8');
+                return JSON.parse(data);
+            } catch (error) {
+                console.error(`Error reading notifications file: ${error.message}`);
+                return false;
+            }
+        });
     }
 }