Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: filename tags for dirs (#1529)

Stanimir3f7c97fc9527
diff --git a/app/perspectives/grid-perspective/components/CellContent.tsx b/app/perspectives/grid-perspective/components/CellContent.tsx
index c2e516006..a318dbbb3 100644
--- a/app/perspectives/grid-perspective/components/CellContent.tsx
+++ b/app/perspectives/grid-perspective/components/CellContent.tsx
@@ -116,11 +116,14 @@ const CellContent = (props: Props) => {
const fsEntryColor = findColorForEntry(fsEntry, supportedFileTypes);
const fsEntryBgColor = findBackgroundColorForFolder(fsEntry);
- const fileNameTags = extractTagsAsObjects(
- fsEntry.name,
- AppConfig.tagDelimiter,
- PlatformIO.getDirSeparator()
- );
+ let fileNameTags = [];
+ if (fsEntry.isFile) {
+ fileNameTags = extractTagsAsObjects(
+ fsEntry.name,
+ AppConfig.tagDelimiter,
+ PlatformIO.getDirSeparator()
+ );
+ }
const fsEntryTags = fsEntry.tags ? fsEntry.tags : [];
const sideCarTagsTitles = fsEntryTags.map(tag => tag.title);
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index 179bc66ed..456b16549 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -534,6 +534,7 @@ export default (state: any = initialState, action: any) => {
if (entry.path !== action.path) {
return entry;
}
+ const fileNameTags = entry.isFile ? extractedTags : []; // dirs dont have tags in filename
return {
...entry,
path: action.newPath,
@@ -545,7 +546,7 @@ export default (state: any = initialState, action: any) => {
),
tags: [
...entry.tags.filter(tag => tag.type === 'sidecar'), // add only sidecar tags
- ...extractedTags
+ ...fileNameTags
]
};
}),
@@ -553,12 +554,13 @@ export default (state: any = initialState, action: any) => {
if (entry.path !== action.path) {
return entry;
}
+ const fileNameTags = entry.isFile ? extractedTags : []; // dirs dont have tags in filename
return {
...entry,
path: action.newPath, // TODO handle change extension case
tags: [
...entry.tags.filter(tag => tag.type === 'sidecar'), // add only sidecar tags
- ...extractedTags
+ ...fileNameTags
]
// shouldReload: true
};
diff --git a/app/reducers/tagging-actions.ts b/app/reducers/tagging-actions.ts
index 7821d1ae2..25178c334 100644
--- a/app/reducers/tagging-actions.ts
+++ b/app/reducers/tagging-actions.ts
@@ -536,7 +536,7 @@ const actions = {
const { settings } = getState();
const tagTitlesForRemoving = tags.map(tag => tag.title);
loadMetaDataPromise(path)
- .then(fsEntryMeta => {
+ .then((fsEntryMeta: TS.FileSystemEntryMeta) => {
const newTags = [];
fsEntryMeta.tags.map(sidecarTag => {
if (!tagTitlesForRemoving.includes(sidecarTag.title)) {
@@ -560,7 +560,9 @@ const actions = {
})
);
}
- removeTagsFromFilename();
+ if (fsEntryMeta.isFile) {
+ removeTagsFromFilename();
+ }
return true;
})
.catch(err => {
@@ -574,7 +576,9 @@ const actions = {
true
)
);
- removeTagsFromFilename();
+ if (fsEntryMeta.isFile) {
+ removeTagsFromFilename();
+ }
});
return true;
})
diff --git a/app/services/utils-io.ts b/app/services/utils-io.ts
index 19ec2c693..497050e15 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -201,25 +201,27 @@ export function enhanceOpenedEntry(
entry: OpenedEntry,
tagDelimiter
): OpenedEntry {
- const fineNameTags = extractTagsAsObjects(
- entry.path,
- tagDelimiter,
- PlatformIO.getDirSeparator()
- );
- if (fineNameTags.length > 0) {
- if (entry.tags && entry.tags.length > 0) {
- const uniqueTags = entry.tags.filter(
- tag => fineNameTags.findIndex(obj => obj.title === tag.title) === -1
- );
+ if (entry.isFile) {
+ const fineNameTags = extractTagsAsObjects(
+ entry.path,
+ tagDelimiter,
+ PlatformIO.getDirSeparator()
+ );
+ if (fineNameTags.length > 0) {
+ if (entry.tags && entry.tags.length > 0) {
+ const uniqueTags = entry.tags.filter(
+ tag => fineNameTags.findIndex(obj => obj.title === tag.title) === -1
+ );
+ return {
+ ...entry,
+ tags: [...uniqueTags, ...fineNameTags]
+ };
+ }
return {
...entry,
- tags: [...uniqueTags, ...fineNameTags]
+ tags: fineNameTags
};
}
- return {
- ...entry,
- tags: fineNameTags
- };
}
return entry;
}
@@ -882,6 +884,7 @@ export function loadMetaDataPromise(
);
return loadJSONFile(metaFilePath).then(metaData => ({
...metaData,
+ isFile: true,
description: metaData.description || '',
color: metaData.color || '',
tags: metaData.tags || [],
@@ -897,6 +900,7 @@ export function loadMetaDataPromise(
return loadJSONFile(metaFilePath).then(metaData => ({
...metaData,
id: metaData.id || uuidv1(),
+ isFile: false,
description: metaData.description || '',
color: metaData.color || '',
perspective: metaData.perspective || '',
diff --git a/app/tagspaces.namespace.d.ts b/app/tagspaces.namespace.d.ts
index 1e2461a20..9213bff6d 100644
--- a/app/tagspaces.namespace.d.ts
+++ b/app/tagspaces.namespace.d.ts
@@ -126,6 +126,7 @@ export namespace TS {
interface FileSystemEntryMeta {
id?: string;
description?: string;
+ isFile?: boolean;
tags?: Array<TS.Tag>;
tagGroups?: Array<TS.TagGroup>;
color?: string;