TagSpaces is an offline, open source, document manager with tagging support
Use comma instead of space by tags in filenames in the settings (#2363)
Stanimir9472cc07ed69
diff --git a/src/renderer/components/EntryContainerTitle.tsx b/src/renderer/components/EntryContainerTitle.tsxindex e0d16078e..765abd2bc 100644--- a/src/renderer/components/EntryContainerTitle.tsx+++ b/src/renderer/components/EntryContainerTitle.tsx@@ -34,7 +34,7 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useNotificationContext } from '-/hooks/useNotificationContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { Pro } from '-/pro';-import { getSupportedFileTypes } from '-/reducers/settings';+import { getSupportedFileTypes, getTagDelimiter } from '-/reducers/settings';import { dataTidFormat } from '-/services/test';import { findColorForEntry, getAllTags } from '-/services/utils-io';import { TS } from '-/tagspaces.namespace';@@ -87,6 +87,7 @@ function EntryContainerTitle(props: Props) {const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);const supportedFileTypes = useSelector(getSupportedFileTypes);+ const tagDelimiter: string = useSelector(getTagDelimiter);const fileSystemEntryColor = findColorForEntry(openedEntry,supportedFileTypes,@@ -287,7 +288,7 @@ function EntryContainerTitle(props: Props) {)}</TsIconButton></ProTooltip>- <TagsPreview tags={getAllTags(openedEntry)} />+ <TagsPreview tags={getAllTags(openedEntry, tagDelimiter)} />{openedEntry.isEncrypted && (<Tooltip title={t('core:encryptedTooltip')}><EncryptedIcondiff --git a/src/renderer/components/EntryProperties.tsx b/src/renderer/components/EntryProperties.tsxindex 7c0aaab4e..9d5e2c58c 100644--- a/src/renderer/components/EntryProperties.tsx+++ b/src/renderer/components/EntryProperties.tsx@@ -101,6 +101,8 @@ import {TileLayer,} from 'react-leaflet';import { Pro } from '../pro';+import { useSelector } from 'react-redux';+import { getTagDelimiter } from '-/reducers/settings';const ThumbnailTextField = styled(TsTextField)(({ theme }) => ({[`& .${inputBaseClasses.root}`]: {@@ -157,7 +159,6 @@ const defaultBackgrounds = [function EntryProperties(props: Props) {const { t } = useTranslation();const theme = useTheme();- //const desktopMode = useSelector(isDesktopMode);const { openedEntry, sharingLink, getOpenedDirProps, fileChanged } =useOpenedEntryContext();const { openMoveCopyFilesDialog } = useMenuContext();@@ -182,6 +183,7 @@ function EntryProperties(props: Props) {Pro.contextProviders.BgndDialogContext,): undefined;+ const tagDelimiter: string = useSelector(getTagDelimiter);const dirProps = useRef<TS.DirProp>(undefined);const fileNameRef = useRef<HTMLInputElement>(null);@@ -583,7 +585,7 @@ function EntryProperties(props: Props) {label={t('core:fileTags')}dataTid="PropertiesTagsSelectTID"placeholderText={t('core:dropHere')}- tags={getAllTags(openedEntry)}+ tags={getAllTags(openedEntry, tagDelimiter)}tagMode="default"handleChange={handleChange}selectedEntry={openedEntry}diff --git a/src/renderer/components/TagContainerDnd.tsx b/src/renderer/components/TagContainerDnd.tsxindex 64b83fb5a..28d4f0da9 100644--- a/src/renderer/components/TagContainerDnd.tsx+++ b/src/renderer/components/TagContainerDnd.tsx@@ -27,6 +27,8 @@ import TagContainer from './TagContainer';import { TS } from '-/tagspaces.namespace';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';+import { useSelector } from 'react-redux';+import { getTagDelimiter } from '-/reducers/settings';interface Props {tag: TS.Tag;@@ -76,9 +78,9 @@ const TagContainerDnd = (props: Props) => {} = props;const { addTags } = useTaggingActionsContext();- const { findLocation } = useCurrentLocationContext();+ const { currentLocation } = useCurrentLocationContext();const tagContainerRef = useRef<HTMLSpanElement>(null);- const currentLocation = findLocation();+ const tagDelimiter: string = useSelector(getTagDelimiter);const endDrag = (item, monitor) => {// const item = monitor.getItem();@@ -193,7 +195,7 @@ const TagContainerDnd = (props: Props) => {if (dragItem.tag.type === 'plain') {const extractedTags = extractTags(entry.path,- AppConfig.tagDelimiter,+ tagDelimiter,currentLocation?.getDirSeparator(),);if (diff --git a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx b/src/renderer/components/dialogs/components/SettingsAdvanced.tsxindex 8980ca844..307147df2 100644--- a/src/renderer/components/dialogs/components/SettingsAdvanced.tsx+++ b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx@@ -239,6 +239,37 @@ function SettingsAdvanced(props: Props) {checked={settings.warningOpeningFilesExternally}/></ListItem>+ {isDevMode && (+ <ListItem>+ <ListItemText primary={t('core:tagDelimiter')} />+ <TsSelect+ data-tid="tagDelimiterTID"+ fullWidth={false}+ title={t('core:tagDelimiter')}+ value={settings.tagDelimiter}+ onChange={(event) =>+ openConfirmDialog(+ t('core:confirm'),+ t('core:tagDelimiterChange'),+ (result) => {+ if (result) {+ dispatch(+ SettingsActions.setTagDelimiter(event.target.value),+ );+ }+ },+ 'cancelTagDelimiterChangeDialog',+ 'confirmTagDelimiterChangeDialog',+ 'confirmTagDelimiterChangeContent',+ )+ }+ >+ <MenuItem value=" ">{t('core:space')}</MenuItem>+ <MenuItem value=",">,</MenuItem>+ <MenuItem value="_">_</MenuItem>+ </TsSelect>+ </ListItem>+ )}<ListItem><ListItemText primary={t('core:prefixTagContainer')} /><TsTextFielddiff --git a/src/renderer/hooks/DirectoryContentContextProvider.tsx b/src/renderer/hooks/DirectoryContentContextProvider.tsxindex e4b904241..5f9043f31 100644--- a/src/renderer/hooks/DirectoryContentContextProvider.tsx+++ b/src/renderer/hooks/DirectoryContentContextProvider.tsx@@ -32,6 +32,7 @@ import {actions as SettingsActions,getDefaultPerspective,getShowUnixHiddenEntries,+ getTagDelimiter,} from '-/reducers/settings';import {cleanMetaData,@@ -244,6 +245,7 @@ export const DirectoryContentContextProvider = ({//const useGenerateThumbnails = useSelector(getUseGenerateThumbnails);const showUnixHiddenEntries = useSelector(getShowUnixHiddenEntries);const defaultPerspective = useSelector(getDefaultPerspective);+ const tagDelimiter: string = useSelector(getTagDelimiter);const currentDirectoryEntries = useRef<TS.FileSystemEntry[]>([]);const { signal, abort, cancelAbort } =@@ -1130,7 +1132,7 @@ export const DirectoryContentContextProvider = ({const enhancedEntry: TS.FileSystemEntry = enhanceEntry(entry,- AppConfig.tagDelimiter,+ tagDelimiter,location?.getDirSeparator(),);directoryContent.push({@@ -1273,7 +1275,7 @@ export const DirectoryContentContextProvider = ({// description: getDescriptionPreview(meta.description, 200),},},- AppConfig.tagDelimiter,+ tagDelimiter,location?.getDirSeparator(),);}@@ -1502,20 +1504,20 @@ export const DirectoryContentContextProvider = ({if (meta) {return enhanceEntry({ ...entry, meta: { ...meta, ...metaProps } },- AppConfig.tagDelimiter,+ tagDelimiter,location.getDirSeparator(),);}return enhanceEntry({ ...entry, meta: { ...metaProps } },- AppConfig.tagDelimiter,+ tagDelimiter,location.getDirSeparator(),);});} catch (e) {return enhanceEntry({ ...entry, meta: { ...metaProps } },- AppConfig.tagDelimiter,+ tagDelimiter,location.getDirSeparator(),);}diff --git a/src/renderer/hooks/EditedEntryContextProvider.tsx b/src/renderer/hooks/EditedEntryContextProvider.tsxindex 0610efb2d..4bcbc8758 100644--- a/src/renderer/hooks/EditedEntryContextProvider.tsx+++ b/src/renderer/hooks/EditedEntryContextProvider.tsx@@ -26,6 +26,8 @@ import React, {import { extractTagsAsObjects } from '@tagspaces/tagspaces-common/paths';import { TS } from '-/tagspaces.namespace';import AppConfig from '-/AppConfig';+import { useSelector } from 'react-redux';+import { getTagDelimiter } from '-/reducers/settings';type EditedEntryContextData = {actions: TS.EditAction[] | undefined;@@ -59,6 +61,7 @@ export type EditedEntryContextProviderProps = {export const EditedEntryContextProvider = ({children,}: EditedEntryContextProviderProps) => {+ const tagDelimiter: string = useSelector(getTagDelimiter);const [actions, setActions] = useState<TS.EditAction[] | undefined>(undefined,);@@ -134,7 +137,7 @@ export const EditedEntryContextProvider = ({skipSelection: boolean = false,) => {if (!entry.tags || entry.tags.length === 0) {- entry.tags = extractTagsAsObjects(entry.name, AppConfig.tagDelimiter);+ entry.tags = extractTagsAsObjects(entry.name, tagDelimiter);}const currentAction: TS.EditAction = {action: 'add',diff --git a/src/renderer/hooks/IOActionsContextProvider.tsx b/src/renderer/hooks/IOActionsContextProvider.tsxindex b1da8f5ab..ccd95e0fe 100644--- a/src/renderer/hooks/IOActionsContextProvider.tsx+++ b/src/renderer/hooks/IOActionsContextProvider.tsx@@ -67,6 +67,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';import {getFileNameTagPlace,getPrefixTagContainer,+ getTagDelimiter,getWarningOpeningFilesExternally,} from '-/reducers/settings';import { usePlatformFacadeContext } from '-/hooks/usePlatformFacadeContext';@@ -323,6 +324,7 @@ export const IOActionsContextProvider = ({);const prefixTagContainer = useSelector(getPrefixTagContainer);const filenameTagPlacedAtEnd = useSelector(getFileNameTagPlace);+ const tagDelimiter: string = useSelector(getTagDelimiter);//const firstRender = useFirstRender();const currentLocation = findLocation();@@ -1518,7 +1520,7 @@ export const IOActionsContextProvider = ({if (file.meta) {const enhancedEntry: TS.FileSystemEntry = enhanceEntry(file,- AppConfig.tagDelimiter,+ tagDelimiter,currentLocation?.getDirSeparator(),);return enhancedEntry;@@ -1718,7 +1720,7 @@ export const IOActionsContextProvider = ({const extractedTags = extractTags(selectedFilePath,- AppConfig.tagDelimiter,+ tagDelimiter,currentLocation?.getDirSeparator(),);extractedTags.push('copy');@@ -1730,7 +1732,7 @@ export const IOActionsContextProvider = ({generateFileName(fileName,extractedTags,- AppConfig.tagDelimiter,+ tagDelimiter,currentLocation?.getDirSeparator(),prefixTagContainer,filenameTagPlacedAtEnd,diff --git a/src/renderer/hooks/LocationIndexContextProvider.tsx b/src/renderer/hooks/LocationIndexContextProvider.tsxindex 3c17ec374..0748844fc 100644--- a/src/renderer/hooks/LocationIndexContextProvider.tsx+++ b/src/renderer/hooks/LocationIndexContextProvider.tsx@@ -23,7 +23,7 @@ import { useEditedEntryContext } from '-/hooks/useEditedEntryContext';import { useFSWatcherContext } from '-/hooks/useFSWatcherContext';import { useNotificationContext } from '-/hooks/useNotificationContext';import { Pro } from '-/pro';-import { getEnableWS } from '-/reducers/settings';+import { getEnableWS, getTagDelimiter } from '-/reducers/settings';import Search from '-/services/search';import {executePromisesInBatches,@@ -111,6 +111,7 @@ export const LocationIndexContextProvider = ({useNotificationContext();const enableWS = useSelector(getEnableWS);+ const tagDelimiter: string = useSelector(getTagDelimiter);//const allLocations = useSelector(getLocations);const isIndexing = useRef<string>(undefined);@@ -655,7 +656,7 @@ export const LocationIndexContextProvider = ({searchQuery: TS.SearchQuery,//isCloudLocation: boolean,): Promise<TS.FileSystemEntry[]> {- return Search.searchLocationIndex(searchIndex, searchQuery)+ return Search.searchLocationIndex(searchIndex, searchQuery, tagDelimiter).then((searchResults) => {//enhanceSearchEntries(searchResults);return searchResults;diff --git a/src/renderer/hooks/TaggingActionsContextProvider.tsx b/src/renderer/hooks/TaggingActionsContextProvider.tsxindex f1c680d66..46cd6ff5e 100644--- a/src/renderer/hooks/TaggingActionsContextProvider.tsx+++ b/src/renderer/hooks/TaggingActionsContextProvider.tsx@@ -1017,7 +1017,7 @@ export const TaggingActionsContextProvider = ({const defaultTagColor = tagBackgroundColor;const defaultTagTextColor = tagTextColor;locationIndex.map((entry) => {- const tags = getAllTags(entry);+ const tags = getAllTags(entry, tagDelimiter);if (tags && tags.length > 0) {tags.map((tag) => {if (diff --git a/src/renderer/locales/en/core.json b/src/renderer/locales/en/core.jsonindex dba83b560..5d6db7305 100644--- a/src/renderer/locales/en/core.json+++ b/src/renderer/locales/en/core.json@@ -986,5 +986,7 @@"imageDescriptionStructured": "Image Description Structured","textDescription": "Text Description","generateImageTags": "Generate Image Tags",+ "tagDelimiterChange": "Changing Tag Delimiter will hide current tags with the old delimiter",+ "space": "Space","-": "-"}diff --git a/src/renderer/perspectives/grid/components/GridCell.tsx b/src/renderer/perspectives/grid/components/GridCell.tsxindex 3b1ffd18e..12bc33186 100644--- a/src/renderer/perspectives/grid/components/GridCell.tsx+++ b/src/renderer/perspectives/grid/components/GridCell.tsx@@ -41,7 +41,11 @@ import { useEditedEntryMetaContext } from '-/hooks/useEditedEntryMetaContext';import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';-import { getSupportedFileTypes, isReorderTags } from '-/reducers/settings';+import {+ getSupportedFileTypes,+ getTagDelimiter,+ isReorderTags,+} from '-/reducers/settings';import i18n from '-/services/i18n';import { dataTidFormat } from '-/services/test';import {@@ -142,6 +146,7 @@ function GridCell(props: Props) {const { findLocation } = useCurrentLocationContext();const supportedFileTypes = useSelector(getSupportedFileTypes);const reorderTags: boolean = useSelector(isReorderTags);+ const tagDelimiter: string = useSelector(getTagDelimiter);const thumbPath = useRef<string>(undefined);const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);const firstRender = useFirstRender();@@ -296,7 +301,7 @@ function GridCell(props: Props) {if (fsEntry.isFile) {fileNameTags = extractTagsAsObjects(fsEntry.name,- AppConfig.tagDelimiter,+ tagDelimiter,gridCellLocation?.getDirSeparator(),);}diff --git a/src/renderer/perspectives/list/components/RowCell.tsx b/src/renderer/perspectives/list/components/RowCell.tsxindex 7db13c25c..8a0a45105 100644--- a/src/renderer/perspectives/list/components/RowCell.tsx+++ b/src/renderer/perspectives/list/components/RowCell.tsx@@ -32,7 +32,11 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';-import { getSupportedFileTypes, isReorderTags } from '-/reducers/settings';+import {+ getSupportedFileTypes,+ getTagDelimiter,+ isReorderTags,+} from '-/reducers/settings';import i18n from '-/services/i18n';import {findBackgroundColorForFolder,@@ -112,6 +116,7 @@ function RowCell(props: Props) {const { currentLocation } = useCurrentLocationContext();const supportedFileTypes = useSelector(getSupportedFileTypes);const reorderTags: boolean = useSelector(isReorderTags);+ const tagDelimiter: string = useSelector(getTagDelimiter);//const rowCellLocation = findLocation(fsEntry.locationID);// You can use the dispatch function to dispatch actions@@ -159,7 +164,7 @@ function RowCell(props: Props) {if (fsEntry.isFile) {fileNameTags = extractTagsAsObjects(fsEntry.name,- AppConfig.tagDelimiter,+ tagDelimiter,currentLocation?.getDirSeparator(),);}diff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.tsindex a57921627..9c07e16a0 100644--- a/src/renderer/reducers/settings-default.ts+++ b/src/renderer/reducers/settings-default.ts@@ -53,7 +53,7 @@ export default {isUpdateAvailable: false,enableWS: AppConfig.isElectron,warningOpeningFilesExternally: true,- tagDelimiter: ' ',+ tagDelimiter: AppConfig.tagDelimiter,maxSearchResult: 1000,desktopMode,devMode: window.ExtDevMode ? window.ExtDevMode : false,diff --git a/src/renderer/services/search.ts b/src/renderer/services/search.tsindex 2fd9d6369..0ceb52e1c 100644--- a/src/renderer/services/search.ts+++ b/src/renderer/services/search.ts@@ -228,6 +228,7 @@ function constructjmespathQuery(searchQuery: TS.SearchQuery): string {function prepareIndex(index: Array<TS.FileSystemEntry>,+ tagDelimiter,showUnixHiddenEntries: boolean,) {console.time('PreparingIndex');@@ -240,7 +241,7 @@ function prepareIndex();}const enhancedIndex = filteredIndex.map((entry: any) => {- const tags = getAllTags(entry);+ const tags = getAllTags(entry, tagDelimiter);let lat = null;let lon = null;let fromTime = null;@@ -313,6 +314,7 @@ export default class Search {static searchLocationIndex = (locationContent: Array<TS.FileSystemEntry>,searchQuery: TS.SearchQuery,+ tagDelimiter: string,): Promise<TS.FileSystemEntry[]> =>new Promise((resolve, reject) => {console.time('searchtime');@@ -322,6 +324,7 @@ export default class Search {const jmespathQuery = constructjmespathQuery(searchQuery);let results = prepareIndex(locationContent,+ tagDelimiter,searchQuery.showUnixHiddenEntries,);let searched = false;diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.tsindex c6ef8e3fe..e968410f8 100644--- a/src/renderer/services/utils-io.ts+++ b/src/renderer/services/utils-io.ts@@ -34,7 +34,10 @@ import versionMeta from '../version.json';export const instanceId = getUuid();-export function getAllTags(entry: TS.FileSystemEntry): Array<TS.Tag> {+export function getAllTags(+ entry: TS.FileSystemEntry,+ tagDelimiter: string,+): Array<TS.Tag> {const tags = [];if (entry.meta && entry.meta.tags && entry.meta.tags.length > 0) {tags.push(...entry.meta.tags);@@ -46,7 +49,7 @@ export function getAllTags(entry: TS.FileSystemEntry): Array<TS.Tag> {entry.path.indexOf(AppConfig.beginTagContainer) !== -1 &&entry.path.indexOf(AppConfig.endTagContainer) !== -1) {- fileNameTags = extractTagsAsObjects(entry.name, AppConfig.tagDelimiter);+ fileNameTags = extractTagsAsObjects(entry.name, tagDelimiter);}if (fileNameTags) {if (tags.length > 0) {diff --git a/src/renderer/utils/CommonLocation.ts b/src/renderer/utils/CommonLocation.tsindex c390706ab..bb8114696 100644--- a/src/renderer/utils/CommonLocation.ts+++ b/src/renderer/utils/CommonLocation.ts@@ -499,15 +499,18 @@ export class CommonLocation implements TS.Location {return url;};- toFsEntry = (path: string, isFile: boolean): TS.FileSystemEntry => {+ toFsEntry = (+ path: string,+ isFile: boolean,+ tagDelimiter?: string,+ ): TS.FileSystemEntry => {const name = isFile? extractFileName(path, this.getDirSeparator()): extractDirectoryName(path, this.getDirSeparator());- const tags = extractTagsAsObjects(- name,- AppConfig.tagDelimiter,- this.getDirSeparator(),- );+ let tags = [];+ if (tagDelimiter) {+ tags = extractTagsAsObjects(name, tagDelimiter, this.getDirSeparator());+ }let entryPath = path;if (!isFile && !path.endsWith(this.getDirSeparator())) {entryPath = path + this.getDirSeparator();