Skip to content

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

chore: added function for find the file color in the utils

Ilian Sapundshiev0c9ab9615e03
diff --git a/src/renderer/AppConfig.ts b/src/renderer/AppConfig.ts
index 42689551b..ce530dcb8 100644
--- a/src/renderer/AppConfig.ts
+++ b/src/renderer/AppConfig.ts
@@ -33,7 +33,8 @@ AppConfig.editableFiles = [
AppConfig.autoSaveInterval = 40000;
AppConfig.maxCollectedTag = 500;
AppConfig.maxLoops = 2;
-AppConfig.defaultFolderColor = 'gray';
+AppConfig.defaultFolderColor = '#a466aa'; // 'gray';
+AppConfig.defaultFileColor = '#33b5be';
AppConfig.defaultCSSRadius = 10;
AppConfig.defaultSpaceBetweenButtons = 10;
AppConfig.aiFolder = 'ai';
diff --git a/src/renderer/components/TagContainer.tsx b/src/renderer/components/TagContainer.tsx
index 2224501cb..68b7a1ddd 100644
--- a/src/renderer/components/TagContainer.tsx
+++ b/src/renderer/components/TagContainer.tsx
@@ -16,21 +16,19 @@
*
*/
-import React, { useMemo } from 'react';
-import { useSelector } from 'react-redux';
-import TsButton from '-/components/TsButton';
-import PlaceIcon from '@mui/icons-material/Place';
-import DateIcon from '@mui/icons-material/DateRange';
-import Tooltip from '-/components/Tooltip';
-import { formatDateTime } from '@tagspaces/tagspaces-common/misc';
-import { getTagColor, getTagTextColor } from '-/reducers/settings';
-import { isGeoTag } from '-/utils/geo';
-import { isDateTimeTag, convertToTimestamp } from '-/utils/dates';
-import { TS } from '-/tagspaces.namespace';
-import { getTagColors } from '-/services/taglibrary-utils';
-import TagContainerMenu from '-/components/TagContainerMenu';
import Tag from '-/components/Tag';
+import TagContainerMenu from '-/components/TagContainerMenu';
import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
+import { getTagColor, getTagTextColor } from '-/reducers/settings';
+import { getTagColors } from '-/services/taglibrary-utils';
+import { TS } from '-/tagspaces.namespace';
+import { convertToTimestamp, isDateTimeTag } from '-/utils/dates';
+import { isGeoTag } from '-/utils/geo';
+import DateIcon from '@mui/icons-material/DateRange';
+import PlaceIcon from '@mui/icons-material/Place';
+import { formatDateTime } from '@tagspaces/tagspaces-common/misc';
+import React, { useMemo } from 'react';
+import { useSelector } from 'react-redux';
interface Props {
tag: TS.Tag;
diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.ts
index 1bb14a906..d3de47653 100644
--- a/src/renderer/services/utils-io.ts
+++ b/src/renderer/services/utils-io.ts
@@ -15,22 +15,22 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
-import { saveAs } from 'file-saver';
+import AppConfig from '-/AppConfig';
+import { supportedFileTypes } from '-/extension-config';
+import { TS } from '-/tagspaces.namespace';
+import { CommonLocation } from '-/utils/CommonLocation';
import { prepareTagForExport } from '@tagspaces/tagspaces-common/misc';
import {
baseName,
+ cleanFrontDirSeparator,
+ cleanTrailingDirSeparator,
extractFileName,
extractTagsAsObjects,
- cleanTrailingDirSeparator,
- cleanFrontDirSeparator,
} from '@tagspaces/tagspaces-common/paths';
-import AppConfig from '-/AppConfig';
-import versionMeta from '../version.json';
-import { TS } from '-/tagspaces.namespace';
-import { supportedFileTypes } from '-/extension-config';
+import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import { saveAs } from 'file-saver';
import removeMd from 'remove-markdown';
-import { CommonLocation } from '-/utils/CommonLocation';
+import versionMeta from '../version.json';
export const instanceId = getUuid();
@@ -468,15 +468,27 @@ export function findColorForEntry(
return AppConfig.defaultFolderColor;
}
if (fsEntry.extension !== undefined) {
- const fileType = supportedFileTypes.find(
- (type) => type.type.toLowerCase() === fsEntry.extension.toLowerCase(),
- );
+ return findColorForFileExt(fsEntry.extension, supportedFileTypes);
+ }
+ return AppConfig.defaultFileColor;
+}
+export function findColorForFileExt(
+ fileExt: string,
+ supportedFileTypes: Array<any>,
+): string {
+ if (fileExt) {
+ const fileType = supportedFileTypes?.find(
+ (type) => type.type.toLowerCase() === fileExt.toLowerCase(),
+ );
if (fileType && fileType.color) {
return fileType.color;
+ } else {
+ return AppConfig.defaultFileColor;
}
+ } else {
+ return AppConfig.defaultFileColor;
}
- return AppConfig.defaultFileColor;
}
export function loadFileContentPromise(