Merge branch 'v.0.46.5'

Author: dziudek

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

app/back-end/author.js

@@ -31,6 +31,10 @@ class Author extends Model {
             this.additionalData = authorData.additionalData;
         }
 
+        if (authorData.imageConfigFields) {
+            this.imageConfigFields = authorData.imageConfigFields;
+        }
+
         if(authorData.name || authorData.name === '') {
             this.name = authorData.name;
             this.username = authorData.username;
@@ -89,11 +93,11 @@ class Author extends Model {
         }
 
         if (this.id !== 0) {
+            this.checkAndCleanImages();
             return this.updateAuthor();
         }
 
         this.checkAndCleanImages();
-
         return this.addAuthor();
     }
 
@@ -291,23 +295,26 @@ class Author extends Model {
      */
     cleanImages(images, imagesDir, cancelEvent) {
         let authorDir = this.id;
-        let featuredImage = false;
-
+        let featuredImage = '';
+        let viewConfig = {};
+        
         if (this.additionalData && this.additionalData.featuredImage) {
             featuredImage = path.parse(this.additionalData.featuredImage).base;
         }
 
+        if (this.additionalData && this.additionalData.viewConfig) {
+            viewConfig = this.additionalData.viewConfig;
+        }
+
         // If author is cancelled - get the previous featured image
         if (cancelEvent && this.id !== 0) {
-            let featuredImageSqlQuery = `SELECT additional_data FROM authors WHERE id = @id`;
-
-            let featuredImageResult = this.db.prepare(featuredImageSqlQuery).all({ 
-                id: this.id 
-            });
+            let additionalDataQuery = `SELECT additional_data FROM authors WHERE id = @id`;
+            let additionalDataResult = this.db.prepare(additionalDataQuery).all({ id: this.id });
 
-            if (featuredImageResult && featuredImageResult[0]) {
+            if (additionalDataResult) {
                 try {
-                    featuredImage = JSON.parse(featuredImageResult[0].additional_data).featuredImage;
+                    featuredImage = JSON.parse(additionalDataResult[0].additional_data).featuredImage;
+                    viewConfig = JSON.parse(additionalDataResult[0].additional_data).viewConfig;
                 } catch (e) {
                     console.log('(!) An issue occurred during parsing author additional data', this.id);
                 }
@@ -318,11 +325,13 @@ class Author extends Model {
             authorDir = 'temp';
         }
 
-        let imagesInAuthorViewSettings = [];
+        let imagesInViewSettings = [];
 
-        if (this.additionalData && this.additionalData.viewConfig) {
-            imagesInAuthorViewSettings = Object.values(this.additionalData.viewConfig).filter(item => item.type === "image").map(item => item.value);
-        }
+        imagesInViewSettings = Object.keys(viewConfig).filter((fieldName) => {
+            return this.imageConfigFields.indexOf(fieldName) !== -1 && viewConfig[fieldName] !== '';
+        }).map((fieldName) => {
+            return viewConfig[fieldName];
+        });
 
         // Iterate through images
         for (let i in images) {
@@ -335,10 +344,10 @@ class Author extends Model {
             }
 
             // Remove files which does not exist as featured image and authorViewSettings
-            if(
+            if (
                 (cancelEvent && authorDir === 'temp') ||
                 (
-                    imagesInAuthorViewSettings.indexOf(imagePath) === -1 &&
+                    imagesInViewSettings.indexOf(imagePath) === -1 &&
                     featuredImage !== imagePath
                 )
             ) {

app/back-end/builddata.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.46.4",
-  "build": 17048
+  "version": "0.46.5",
+  "build": 17089
 }

app/back-end/image.js

@@ -10,7 +10,7 @@ const normalizePath = require('normalize-path');
 const Themes = require('./themes.js');
 const Utils = require('./helpers/utils.js');
 const slug = require('./helpers/slug');
-const Jimp = require('./vendor/jimp.custom.js');
+const Jimp = require('jimp');
 // Default config
 const defaultAstCurrentSiteConfig = require('./../config/AST.currentSite.config');
 let sharp = require('sharp');

app/back-end/modules/deploy/gitlab-pages.js

@@ -193,7 +193,13 @@ class GitlabPages {
             this.projectID = projects[0].id;
 
             this.client.RepositoryFiles.showRaw(this.projectID, 'publii-files.json', this.branch).then(response => {
-                let remoteListToCheck = fs.readFileSync(path.join(this.deployment.configDir, 'files-remote.json'), 'utf-8');
+                let remoteListToCheck = '';
+
+                if (typeof response === 'Buffer') {
+                    remoteListToCheck = response.toString();
+                } else {
+                    remoteListToCheck = response;
+                }
 
                 try {
                     if (remoteListToCheck.length) {

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

@@ -305,13 +305,22 @@ class S3 {
 
         try {
             await this.connection.send(new DeleteObjectCommand(params));
-            console.log(`[${new Date().toUTCString()}] DEL ${input}`);
             this.deployment.currentOperationNumber++;
             console.log(`[${ new Date().toUTCString() }] DEL ${input}`);
             this.deployment.progressOfDeleting += this.deployment.progressPerFile;
             this.sendProgress(8 + Math.floor(this.deployment.progressOfDeleting));
             await this.removeFile();
         } catch (err) {
+            // Handle case when specific file no longer exists in the bucket - don't block sync
+            if (err.name === 'NoSuchKey') {
+                this.deployment.currentOperationNumber++;
+                console.log(`[${ new Date().toUTCString() }] DEL ${input} - NoSuchKey`);
+                this.deployment.progressOfDeleting += this.deployment.progressPerFile;
+                this.sendProgress(8 + Math.floor(this.deployment.progressOfDeleting));
+                await this.removeFile();
+                return;
+            }
+
             console.error(`[${new Date().toUTCString()}] Error deleting ${input}`, err);
             this.onError(err, true);
         }

app/back-end/modules/import/wxr-parser.js

@@ -581,7 +581,7 @@ class WxrParser {
                 });
 
                 let featuredPageID = newPage.db.prepare('SELECT last_insert_rowid() AS id').get().id;
-                let featuredPageIdUpdate = newPage.db.prepare(`UPDATE posts SET featured_image_id = @featuredPostID WHERE id = @newPageID`);
+                let featuredPageIdUpdate = newPage.db.prepare(`UPDATE posts SET featured_image_id = @featuredPageID WHERE id = @newPageID`);
 
                 featuredPageIdUpdate.run({
                     featuredPageID,
@@ -819,7 +819,7 @@ class WxrParser {
         text = text.replace(/\[\/caption\]/g, '');
 
         // Replace <!-- more --> with Publii separator
-        text = text.replace(/<!--more-->/g, '<hr id="read-more" />');
+        text = text.replace(/<!--more-->/g, '<hr id="read-more">');
 
         if(this.autop) {
             console.log('(i) Used automatic paragraphs for the post content');

app/back-end/modules/plugins/plugins-helpers.js

@@ -45,15 +45,15 @@ class PluginsHelpers {
         }
 
         if (pluginConfig.assets && pluginConfig.assets.front) {
-            pluginConfig.assets.front = pluginConfig.assets.front.map(fileName => fileName.replace(/[^a-zA-Z0-9\-\_\.\*\@\+]/gmi, ''));
+            pluginConfig.assets.front = pluginConfig.assets.front.map(fileName => fileName.split('/'));
             return pluginConfig.assets.front.map(fileName => ({
-                input: path.join(pluginsDir, pluginName, 'front-assets', fileName),
-                output: fileName
+                input: path.join(pluginsDir, pluginName, 'front-assets', ...fileName),
+                output: fileName.join('/')
             }));
         }
 
         return [];
     }
 }
 
-module.exports = PluginsHelpers;
+module.exports = PluginsHelpers;

app/back-end/modules/render-html/handlebars/helpers/feed-link.js

@@ -31,12 +31,12 @@ function feedLink() {
 
         if (this.siteConfig.advanced.feed.enableRss) {
             let rssUrl = Handlebars.Utils.escapeExpression(this.siteConfig.domain + '/feed.xml');
-            output += '<link rel="alternate" type="application/atom+xml" href="' + rssUrl + '" ' + rssFeedTitle + ' />' + "\n";
+            output += '<link rel="alternate" type="application/atom+xml" href="' + rssUrl + '" ' + rssFeedTitle + '>' + "\n";
         }
 
         if (this.siteConfig.advanced.feed.enableJson) {
             let jsonUrl = Handlebars.Utils.escapeExpression(this.siteConfig.domain + '/feed.json');
-            output += '<link rel="alternate" type="application/json" href="' + jsonUrl + '" ' + jsonFeedTitle + ' />' + "\n";
+            output += '<link rel="alternate" type="application/json" href="' + jsonUrl + '" ' + jsonFeedTitle + '>' + "\n";
         }
     }
 

app/back-end/modules/render-html/handlebars/helpers/meta-description.js

@@ -13,7 +13,7 @@ function metaDescription(options) {
             return '';
         }
 
-        let output = '<meta name="description" content="' + options.data.root.metaDescriptionRaw.replace(/"/g, "'") + '" />';
+        let output = '<meta name="description" content="' + options.data.root.metaDescriptionRaw.replace(/"/g, "'") + '">';
         return new Handlebars.SafeString(output);
     }