TagSpaces is an offline, open source, document manager with tagging support
introducing search by size
Ilian Sapundshiev33d48e21eebe
diff --git a/app/components/Search.js b/app/components/Search.jsindex c22adaad2..42991a650 100644--- a/app/components/Search.js+++ b/app/components/Search.js@@ -372,44 +372,41 @@ class Search extends React.Component<Props, State> {{i18n.t('core:anYearAgo')}</MenuItem></Select>- </FormControl>+ </FormControl> */ }<FormControlclassName={classes.formControl}disabled={indexing || !Pro}title={i18n.t('core:thisFunctionalityIsAvailableInPro')}>- <InputLabel htmlFor="file-size">{i18n.t('core:fileSize')}</InputLabel>+ <InputLabel htmlFor="file-size">{i18n.t('core:sizeAny')}</InputLabel><Selectvalue={this.state.fileSize}onChange={this.handleInputChange}input={<Input name="fileSize" id="file-size" />}><MenuItem value="">- {i18n.t('core:anySize')}- </MenuItem>- <MenuItem value="emptyOkb">- {i18n.t('core:emptyOkb')}+ {i18n.t('core:sizeAny')}</MenuItem>- <MenuItem value="tiny10kb">- {i18n.t('core:tiny10kb')}+ <MenuItem value="sizeEmpty">+ {i18n.t('core:sizeEmpty')}</MenuItem>- <MenuItem value="small100kb">- {i18n.t('core:small100kb')}+ <MenuItem value="sizeTiny">+ {i18n.t('core:sizeTiny')} (< 10KB)</MenuItem>- <MenuItem value="medium1mb">- {i18n.t('core:medium1mb')}+ <MenuItem value="sizeSmall">+ {i18n.t('core:sizeSmall')} (< 100KB)</MenuItem>- <MenuItem value="large30mb">- {i18n.t('core:large30mb')}+ <MenuItem value="sizeMedium">+ {i18n.t('core:sizeMedium')} (< 1MB)</MenuItem>- <MenuItem value="huge1000mb">- {i18n.t('core:huge1000mb')}+ <MenuItem value="sizeLarge">+ {i18n.t('core:sizeLarge')} (< 1GB)</MenuItem>- <MenuItem value="oneGBandBigger">- {i18n.t('core:oneGBandBigger')}+ <MenuItem value="sizeHuge">+ {i18n.t('core:sizeHuge')} (> 1GB)</MenuItem></Select>- </FormControl> */}+ </FormControl>{ /* <FormControlclassName={classes.formControl}disabled={true}diff --git a/app/locales/en/core.json b/app/locales/en/core.jsonindex 69c45cb2f..3e70b680b 100644--- a/app/locales/en/core.json+++ b/app/locales/en/core.json@@ -398,5 +398,12 @@"collectTagsFromLocation": "Collect Tags From Current Location","searchCurrentFolderWithSubFolders": "Search in folder with sub folders","dndDisabledReadOnlyMode": "Importing files is disabled because the location is in read-only mode.",+ "sizeAny": "Any size",+ "sizeEmpty": "Empty",+ "sizeTiny": "Tiny",+ "sizeSmall": "Small",+ "sizeMedium": "Medium",+ "sizeLarge": "Large",+ "sizeHuge": "Huge","-": "-"}diff --git a/app/services/search.js b/app/services/search.jsindex 5c564b3ca..97b22613b 100644--- a/app/services/search.js+++ b/app/services/search.js@@ -215,37 +215,41 @@ export default class Search {static searchLocationIndex = (locationContent: Array<Object>, searchQuery: SearchQuery): Promise<Array<Object> | []> => new Promise((resolve) => {console.time('searchtime');const jmespathQuery = constructjmespathQuery(searchQuery);- let jmespathResults;- let results;- let currentDirectoryEntries = transformTagsToLowercase(locationContent);+ let results = transformTagsToLowercase(locationContent);+ let searched = false;+ // Limiting the search to current folder only (with sub-folders)if (searchQuery.searchBoxing === 'folder') {- currentDirectoryEntries = currentDirectoryEntries.filter(entry => entry.path.startsWith(searchQuery.currentDirectory));+ results = results.filter(entry => entry.path.startsWith(searchQuery.currentDirectory));}if (jmespathQuery) {+ const resultCount = results.length;console.log('jmespath query: ' + jmespathQuery);console.time('jmespath');- jmespathResults = jmespath.search({ index: currentDirectoryEntries }, jmespathQuery);+ results = jmespath.search({ index: results }, jmespathQuery);console.timeEnd('jmespath');- console.log('jmespath results: ' + jmespathResults.length);+ console.log('jmespath results: ' + results.length);+ searched = searched || (results.length < resultCount);}- // if (Pro && Pro.Search.filterIndex) {- // results = Pro.Search.filterIndex(currentDirectoryEntries);- // }+ if (Pro && Pro.Search.filterIndex) {+ const resultCount = results.length;+ results = Pro.Search.filterIndex(results, searchQuery);+ searched = searched || (results.length < resultCount);+ }if (searchQuery.textQuery && searchQuery.textQuery.length > 1) {+ const resultCount = results.length;console.log('fuse query: ' + searchQuery.textQuery);console.time('fuse');- const fuse = new Fuse(jmespathResults || currentDirectoryEntries, fuseOptions);+ const fuse = new Fuse(results, fuseOptions);results = fuse.search(searchQuery.textQuery);console.timeEnd('fuse');- } else {- results = jmespathResults;+ searched = searched || (results.length < resultCount);}- if (results) {+ if (searched) {console.log('Results found: ' + results.length);if (searchQuery.maxSearchResults && results.length >= searchQuery.maxSearchResults) {results = results.slice(0, searchQuery.maxSearchResults);