Prep for v3.1.4

ififfy · Jun 26, 2021 · 8bdd7d6 · 8bdd7d6
1 parent d17bc90
commit 8bdd7d6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 6 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,4 +1,16 @@
 # Changelog
+## 3.1.4 <small>(06/26/2021)</small>
+- Add Piwigo support (abrenoch)
+- Add <Unclipped> filter
+- Add option to toggle grid cell watermarks
+- Fix bug with saving data.json
+- Fix bug with auto clean algorithm
+- Fix bug with grid cells being cut-off
+- Fix bug with adding script to library
+- Fix tagging UI in Video Clipper
+- Fix bug with duplicate caption tracks appearing on videos
+- Fix bug with Scene Generator tutorial
+- Fix bug with menu settings not resetting when ending playback
 
 ## 3.1.3 <small>(05/21/2021)</small>
 - Scrape images in separate thread

diff --git a/docs/doc_icons/piwigo.svg b/docs/doc_icons/piwigo.svg
diff --git a/docs/doc_images/config.png b/docs/doc_images/config.png
diff --git a/docs/doc_images/flipflip_home.png b/docs/doc_images/flipflip_home.png
diff --git a/docs/sources.md b/docs/sources.md
@@ -109,6 +109,7 @@ local video/playlist file, add a `Local video/playlsit` and choose the video(s)
 * <img style="vertical-align: -2px; margin-right: 5px" src="doc_icons/gelbooru.png" alt="Gelbooru" width="15" height="15">Gelbooru Tag
 * <img style="vertical-align: -2px; margin-right: 5px" src="doc_icons/ehentai.png" alt="E-Hentai" width="15" height="15">E-Hentai Gallery
 * <img style="vertical-align: -2px; margin-right: 5px" src="doc_icons/hydrus.svg" alt="Hydrus" width="15" height="15">Hydrus Tag
+* <img style="vertical-align: -2px; margin-right: 5px" src="doc_icons/piwigo.svg" alt="Piwigo" width="15" height="15">Piwigo Album
 * <img style="vertical-align: -2px; margin-right: 5px" src="doc_icons/b.svg" alt="BDSMlr" width="15" height="15">BDSMlr Blog (Only works for blogs with images in RSS feed)
 * ~~<img style="vertical-align: -2px" src="doc_icons/sexcom.svg" alt="Sex.com" width="15" height="15"> Sex.com Gallery/User~~ _Currently broken_
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flipflip",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "main": "./dist/main.bundle.js",
   "author": "ififfy",
   "license": "MIT",

diff --git a/src/renderer/data/actions.ts b/src/renderer/data/actions.ts
@@ -377,24 +377,26 @@ export function cleanBackups(config: Config) {
       let lastMonth = convertFromEpoch(keepMonths[keepMonths.length - 1].url);
 
       if (moment(backupDate).isSame(lastDay, 'day')) {
-        if (backupDate < lastDay) {
-          keepDays[keepDays.length - 1]  = backup;
+        if (moment(backupDate).isSame(new Date(), 'day') && backupDate > lastDay) {
+          keepDays[keepDays.length - 1] = backup;
+        } else if (!moment(backupDate).isSame(new Date(), 'day') && backupDate < lastDay) {
+          keepDays[keepDays.length - 1] = backup;
         }
       } else if (keepDays.length < config.generalSettings.autoCleanBackupDays) {
         keepDays.push(backup);
       }
 
       if (moment(backupDate).isSame(lastWeek, 'week')) {
         if (backupDate < lastWeek) {
-          keepWeeks[keepWeeks.length - 1]  = backup;
+          keepWeeks[keepWeeks.length - 1] = backup;
         }
       } else if (keepWeeks.length < config.generalSettings.autoCleanBackupWeeks) {
         keepWeeks.push(backup);
       }
 
       if (moment(backupDate).isSame(lastMonth, 'month')) {
         if (backupDate < lastWeek) {
-          keepMonths[keepMonths.length - 1]  = backup;
+          keepMonths[keepMonths.length - 1] = backup;
         }
       } else if (keepMonths.length < config.generalSettings.autoCleanBackupMonths) {
         keepMonths.push(backup);

diff --git a/src/renderer/data/utils.ts b/src/renderer/data/utils.ts
@@ -73,7 +73,7 @@ export function getBackups(): Array<{url: string, size: number}> {
   const files = fs.readdirSync(saveDir);
   const backups = Array<any>();
   for (let file of files) {
-    if (file.startsWith("data.json.")) {
+    if (file.startsWith("data.json.") && file != "data.json.new") {
       const stats = fs.statSync(saveDir + "/" + file);
       backups.push({url: file, size: stats.size});
     }