Prep for v3.1.3

docs/changelog.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 3.1.3 <small>(05/21/2021)</small>
+- Scrape images in separate thread
+- Add top level error-page
+- Add ability to search for Scenes
+- Add new options for cleaning backups
+- Add ability to send to trash instead of delete
+- Add ability to disable scene-delete confirmation
+- Add ability to batch delete scenes
+- Prevent playing same image consecutively, if possible
+- Prevent re-downloading of cached images
+- Improve core data.json saving, prevent leaving empty file
+- Improve ImageFap scraping and add captcha display
+- When restarting, continue playing from offset image
+- Fix bug with Imgur, GfyCat, and RedGifs URL resolution
+- Fix bug with Default Scene config
+- Fix bug with deleted grids being left in overlays
+- Fix bug with default cache path
+- Fix bug with concurrent Hydrus metadata requests
+- Fix bug with gif options not working for Hydrus
+- Fix bug with extra Hydrus arguments not be respected
+- Fix bug with Hydrus Session/API key
+
 ## 3.1.2 <small>(04/29/2021)</small>
 - Allow Play Full video to advance even when seeking
 - Fix subtitle styling and add to video clipper

docs/config.md

@@ -26,6 +26,9 @@ These settings control various player options.
 * `Show Adv Easing Controls` - enables controls for advanced [easings](effects.md) in effects
 * `Show Audio Info` - when enabled, [audio information](audio_tagging#tagging-a-track) will appear during playback when a track changes.
   * _This only ever applies to the first playlist_
+---
+* `Confirm Scene Delete` - Disabling this will hide the confirmation dialog when deleting a Scene.
+* `Trash Instead of Delete` - If enabled, deleted files will be moved to the trash instead of immediately deleted.
 * `Portable Mode` - Portable Mode will save a copy of your data in the same directory as the FlipFlip executable, 
 as well as the default save path. This needs to be enabled on each machine.
   * `Disable Local Saves` - When this is on, FlipFlip will _only_ save its data to the folder with the FlipFlip 
@@ -123,6 +126,10 @@ Backup your FlipFlip data or restore from a previous backup.
 #### Auto Backup
 Turn this on to automatically create a backup every time the number of configured days passes.
 
+#### Auto Clean
+Turn this on to automatically clean backups according to the configured settings. Will keep 1 backups from each of the
+configured time-periods.
+
 #### Backup Data
 This creates a backup with all your current FlipFlip data (preferences, library, scenes, etc.)
 
@@ -131,7 +138,8 @@ A dialog will appear with a list the your FlipFlip backups (by date/time). Selec
 restore and click `Restore`
 
 #### Clean Backups
-Backups might build up over time. Click `Clean Backups` to delete all but the most recent backup.
+Backups might build up over time. Click `Clean Backups` to clean your backups. If you have Auto-Clean enabled, this will
+use your configured rules. If Auto-Clean is off, you can choose how many of the most recent backups you'd like to keep.
 
 ## Theme
 The FlipFlip UI allows you to customize the **Primary** and **Secondary** colors. You can also toggle Dark Mode on/off here

docs/effects.md

@@ -72,7 +72,7 @@ This section controls the strobe effect.  This effect restarts when the displaye
     </div>
 </div>
 
-## Fade In/Out BETA
+## Fade In/Out
 This section controls the fade in/out effect. This effect is continuous and will continue even if the displayed image 
 changes.
 * Choose fade in/out on/off. Control fade in/out time (ms).
@@ -89,10 +89,7 @@ changes.
     </div>
 </div>
 
-?> This is a BETA effect and may produce unexpected results when used with more complex timing functions or in 
-combination with other effects.
-
-## Panning BETA
+## Panning
 This section controls the panning effect. This effect is continuous and will continue even if the displayed image 
 changes.
 * Choose panning on/off.
@@ -111,7 +108,4 @@ changes.
         <div><img src="doc_images/panning_ex2.gif" alt="Panning Example" style="min-height:388px"></div>
         <div>Using the <b>Linear</b> easing for start and the <b>Bounce Out</b> easing for end</div>
     </div>
-</div>
-
-?> This is a BETA effect and may produce unexpected results when used with more complex timing functions or in 
-combination with other effects.
+</div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flipflip",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": "./dist/main.bundle.js",
   "author": "ififfy",
   "license": "MIT",

src/renderer/components/ScenePicker.tsx

@@ -422,11 +422,6 @@ class ScenePicker extends React.Component {
               v{this.props.version}
             </Typography>
             <div className={classes.fill}/>
-            <SceneSearch
-              displaySources={this.state.displayScenes}
-              filters={this.state.filters}
-              placeholder={"Search ..."}
-              onUpdateFilters={this.onUpdateFilters.bind(this)}/>
             {this.state.newVersion != "" && (
               <Tooltip title={`Download ${this.state.newVersion}`}>
                 <IconButton color="inherit" className={classes.updateIcon} onClick={this.openGitRelease.bind(this)}>
@@ -436,6 +431,11 @@ class ScenePicker extends React.Component {
                 </IconButton>
               </Tooltip>
             )}
+            <SceneSearch
+              displaySources={this.state.displayScenes}
+              filters={this.state.filters}
+              placeholder={"Search ..."}
+              onUpdateFilters={this.onUpdateFilters.bind(this)}/>
           </Toolbar>
         </AppBar>
 

src/renderer/components/configGroups/PlayerBoolCard.tsx

@@ -106,7 +106,7 @@ export default class PlayerBoolCard extends React.Component {
                 <Switch checked={this.props.generalSettings.enableTrash}
                         onChange={this.onGBoolInput.bind(this, 'enableTrash')}/>
               }
-              label="Trash instead of Delete"/>
+              label="Trash Instead of Delete"/>
           </Tooltip>
         </Grid>
         <Grid item xs={12}>

src/renderer/components/player/PlayerBars.tsx

@@ -896,7 +896,7 @@ class PlayerBars extends React.Component {
           if (process.platform === "win32") {
             remote.shell.openExternal(getCachePath(source, this.props.config));
           } else {
-            remote.shell.openExternal(urlToPath(getCachePath(source, this.props.config)));
+            remote.shell.openItem(getCachePath(source, this.props.config));
           }
         }
       }));

src/renderer/data/AppStorage.tsx

@@ -1,4 +1,4 @@
-import { mkdirSync, existsSync, readFileSync, renameSync, writeFile } from 'fs';
+import { copyFileSync, mkdirSync, existsSync, readFileSync, renameSync, writeFile } from 'fs';
 
 import {getBackups, portablePath, removeDuplicatesBy, saveDir, savePath} from "./utils";
 import {cleanBackups} from "./actions";
@@ -63,7 +63,7 @@ export const defaultInitialState = {
  */
 function archiveFile(filePath: string): void {
   if (existsSync(filePath)) {
-    renameSync(filePath, (filePath + '.' + Date.now()));
+    copyFileSync(filePath, (filePath + '.' + Date.now()));
   }
 }
 

src/renderer/data/utils.ts

@@ -314,7 +314,7 @@ function cachePath(source: string, typeDir: string, config: Config) {
   } else {
     if (source) {
       if (source != ST.video && source != ST.playlist) {
-        return saveDir + path.sep + "ImageCache" + path.sep + typeDir + path.sep + getFileGroup(source);
+        return saveDir + path.sep + "ImageCache" + path.sep + typeDir + path.sep + getFileGroup(source) + path.sep;
       } else {
         return saveDir + path.sep + "ImageCache" + path.sep + typeDir + path.sep;
       }

webpack.prod.js

@@ -17,7 +17,7 @@ let mainConfig = {
     resolve: {
         extensions: ['.js', '.json', '.ts'],
     },
-    externals: { 'react-native-fs': 'reactNativeFs' },
+    externals: { 'react-native-fs': 'reactNativeFs', 'trash': 'commonjs trash'  },
     module: {
         rules: [
             {
@@ -61,7 +61,7 @@ let rendererConfig = {
     resolve: {
         extensions: ['.js', '.json', '.ts', '.tsx'],
     },
-    externals: { 'react-native-fs': 'reactNativeFs' },
+    externals: { 'react-native-fs': 'reactNativeFs', 'trash': 'commonjs trash'  },
     module: {
         rules: [
             {