feat: support multiple scan modes for partial gallery generation

src/cli/options.js

@@ -29,6 +29,12 @@ const OPTIONS = {
  // ------------------------------------
  // Input options
  // ------------------------------------
+ 'scan-mode': {
+ group: 'Input options:',
+ description: 'How files are indexed',
+ choices: ['full', 'partial', 'incremental'],
+ 'default': 'full'
+ },
  'include-photos': {
  group: 'Input options:',
  description: 'Include photos in the gallery',

src/components/index/delta.js

@@ -1,28 +1,44 @@
 /* eslint-disable no-prototype-builtins */
 const _ = require('lodash')
+const GlobPattern = require('./pattern')
 
 /*
  Calculate the difference between files on disk and already indexed
  - databaseMap = hashmap of {path, timestamp}
  - diskMap = hashmap of {path, timestamp}
 */
-exports.calculate = (databaseMap, diskMap) => {
+exports.calculate = (databaseMap, diskMap, { scanMode = 'full', include, exclude }) => {
  const delta = {
  unchanged: [],
  added: [],
  modified: [],
- deleted: []
+ deleted: [],
+ skipped: []
  }
+ // TODO: the glob pattern should be passed in
+ // It should be identical to the one used by the Glob object that scans the disk
+ // For now, partial scans only uses the include/exclude filter
+ // If we pass it it, other filters would apply as well (e.g. photo/video/raw...)
+ const pattern = new GlobPattern({ include, exclude, extensions: [] })
  _.each(databaseMap, (dbTime, dbPath) => {
- if (diskMap.hasOwnProperty(dbPath)) {
- const modified = Math.abs(dbTime - diskMap[dbPath]) > 1000
- if (modified) {
- delta.modified.push(dbPath)
+ const shouldProcessDBEntry = (scanMode === 'full') ? true : pattern.match(dbPath)
+ if (shouldProcessDBEntry) {
+ if (diskMap.hasOwnProperty(dbPath)) {
+ const modified = Math.abs(dbTime - diskMap[dbPath]) > 1000
+ if (modified) {
+ delta.modified.push(dbPath)
+ } else {
+ delta.unchanged.push(dbPath)
+ }
  } else {
- delta.unchanged.push(dbPath)
+ if (scanMode === 'incremental') {
+ delta.skipped.push(dbPath)
+ } else {
+ delta.deleted.push(dbPath)
+ }
  }
  } else {
- delta.deleted.push(dbPath)
+ delta.skipped.push(dbPath)
  }
  })
  _.each(diskMap, (diskTime, diskPath) => {

src/components/index/index.js

@@ -57,12 +57,13 @@ class Index {
  if (err) return console.error('error', err)
 
  // calculate the difference: which files have been added, modified, etc
- const deltaFiles = delta.calculate(databaseMap, diskMap)
+ const deltaFiles = delta.calculate(databaseMap, diskMap, options)
  emitter.emit('stats', {
  unchanged: deltaFiles.unchanged.length,
  added: deltaFiles.added.length,
  modified: deltaFiles.modified.length,
  deleted: deltaFiles.deleted.length,
+ skipped: deltaFiles.skipped.length,
  total: Object.keys(diskMap).length
  })
 

src/components/index/pattern.js

@@ -4,10 +4,10 @@ const micromatch = require('micromatch')
 
 class GlobPattern {
  constructor ({ include, exclude, extensions }) {
- this.includeList = include
- this.excludeList = exclude
+ this.includeList = (include && include.length > 0) ? include : ['**/**']
+ this.excludeList = exclude || []
  this.includeFolders = _.uniq(_.flatMap(this.includeList, this.subFolders))
- this.directoryExcludeList = exclude.concat(['**/@eaDir/**', '#recycle/**'])
+ this.directoryExcludeList = this.excludeList.concat(['**/@eaDir/**', '#recycle/**'])
  this.extensions = extPattern(extensions)
  }
 
@@ -43,7 +43,9 @@ class GlobPattern {
 }
 
 function extPattern (extensions) {
- if (extensions.length === 1) {
+ if (extensions.length === 0) {
+ return '**/*'
+ } else if (extensions.length === 1) {
  return '**/*.' + extensions[0]
  } else {
  return '**/*.{' + extensions.join(',') + '}'