Skip to content

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

polish: optimizing the sidecar json writing implementation

Ilian Sapundshiev6eb6844912ac
diff --git a/app/services/utils-io.ts b/app/services/utils-io.ts
index 01bbc3838..61731a521 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -59,13 +59,13 @@ export interface FileSystemEntry {
}
export interface FileSystemEntryMeta {
- description: string;
- tags: Array<Tag>;
+ id?: string;
+ description?: string;
+ tags?: Array<Tag>;
color?: string;
perspective?: string;
- appVersionCreated: string;
appName: string;
- appVersionUpdated: string;
+ appVersion: string;
lastUpdated: string;
files?: Array<FileSystemEntry>;
dirs?: Array<FileSystemEntry>;
@@ -761,9 +761,8 @@ export async function loadMetaDataPromise(
description: metaData.description || '',
color: metaData.color || '',
tags: metaData.tags || [],
- appVersionCreated: metaData.appVersionCreated || '',
appName: metaData.appName || '',
- appVersionUpdated: metaData.appVersionUpdated || '',
+ appVersion: metaData.appVersion || '',
lastUpdated: metaData.lastUpdated || ''
};
} else {
@@ -786,9 +785,8 @@ export async function loadMetaDataPromise(
color: metaData.color || '',
perspective: metaData.perspective || '',
tags: metaData.tags || [],
- appVersionCreated: metaData.appVersionCreated || '',
appName: metaData.appName || '',
- appVersionUpdated: metaData.appVersionUpdated || '',
+ appVersion: metaData.appVersion || '',
lastUpdated: metaData.lastUpdated || '',
files: metaData.files || [],
dirs: metaData.dirs || []
@@ -797,14 +795,60 @@ export async function loadMetaDataPromise(
return metaDataObject;
}
+export function cleanMetaData(
+ metaData: FileSystemEntryMeta
+): FileSystemEntryMeta {
+ const cleanedMeta: any = {};
+ if (metaData.id) {
+ cleanedMeta.id = metaData.id;
+ }
+ if (metaData.perspective) {
+ cleanedMeta.perspective = metaData.perspective;
+ }
+ if (metaData.color) {
+ cleanedMeta.color = metaData.color;
+ }
+ if (metaData.description) {
+ cleanedMeta.description = metaData.description;
+ }
+ if (metaData.files && metaData.files.length > 0) {
+ cleanedMeta.files = metaData.files;
+ }
+ if (metaData.dirs && metaData.dirs.length > 0) {
+ cleanedMeta.dirs = metaData.dirs;
+ }
+ if (metaData.tags && metaData.tags.length > 0) {
+ cleanedMeta.tags = [];
+ metaData.tags.forEach(tag => {
+ const cleanedTag: Tag = {};
+ if (tag.title) {
+ cleanedTag.title = tag.title;
+ }
+ if (tag.type) {
+ cleanedTag.type = tag.type;
+ }
+ if (tag.color) {
+ cleanedTag.color = tag.color;
+ }
+ if (tag.textcolor) {
+ cleanedTag.textcolor = tag.textcolor;
+ }
+ if (cleanedTag.title) {
+ cleanedMeta.tags.push(cleanedTag);
+ }
+ });
+ }
+ return cleanedMeta;
+}
+
export async function saveMetaDataPromise(
path: string,
metaData: any
): Promise<any> {
const entryProperties = await PlatformIO.getPropertiesPromise(path);
+ const cleanedMetaData = cleanMetaData(metaData);
if (entryProperties) {
let metaFilePath;
- let newFsEntryMeta;
if (entryProperties.isFile) {
metaFilePath = getMetaFileLocationForFile(
path,
@@ -817,13 +861,6 @@ export async function saveMetaDataPromise(
PlatformIO.getDirSeparator()
)
);
-
- newFsEntryMeta = {
- ...metaData,
- appName: versionMeta.name,
- appVersionUpdated: versionMeta.version,
- lastUpdated: new Date().toJSON()
- };
} else {
// check and create meta folder if not exist
// todo not need to check if folder exist first createDirectoryPromise() recursively will skip creation of existing folders https://nodejs.org/api/fs.html#fs_fs_mkdir_path_options_callback
@@ -838,26 +875,20 @@ export async function saveMetaDataPromise(
await PlatformIO.createDirectoryPromise(metaDirectoryPath);
}
- let dirId;
- if (metaData && metaData.id && metaData.id.length > 1) {
- dirId = metaData.id;
- } else {
- dirId = uuidv1();
+ if (!cleanedMetaData.id) {
+ // add id for directories
+ cleanedMetaData.id = uuidv1();
}
metaFilePath = getMetaFileLocationForDir(
path,
PlatformIO.getDirSeparator()
);
- newFsEntryMeta = {
- ...metaData,
- id: dirId,
- appName: versionMeta.name,
- appVersionUpdated: versionMeta.version,
- lastUpdated: new Date().toJSON()
- };
}
- const content = JSON.stringify(newFsEntryMeta);
+ cleanedMetaData.appName = versionMeta.name;
+ cleanedMetaData.appVersion = versionMeta.version;
+ cleanedMetaData.lastUpdated = new Date().toJSON();
+ const content = JSON.stringify(cleanedMetaData);
return PlatformIO.saveTextFilePromise(metaFilePath, content, true);
}
return new Promise((resolve, reject) =>
diff --git a/app/utils/metaoperations.ts b/app/utils/metaoperations.ts
index 2da6b1892..1b36ce341 100644
--- a/app/utils/metaoperations.ts
+++ b/app/utils/metaoperations.ts
@@ -38,8 +38,7 @@ export function savePerspective(
.catch(() => {
const newFsEntryMeta: FileSystemEntryMeta = {
appName: '',
- appVersionCreated: '',
- appVersionUpdated: '',
+ appVersion: '',
description: '',
lastUpdated: '',
tags: undefined,