Skip to content

Commit 9e91d5a

Browse files
committed
feat(main: db): map old languages during migration
1 parent 34c340d commit 9e91d5a

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

src/main/services/db/index.ts

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import readline from 'readline'
44
import { nestedToFlat } from '../../utils'
55
import { nanoid } from 'nanoid'
66
import type { DB, Folder, Snippet, Tag } from '../../types/db'
7+
import { oldLanguageMap } from '../../../renderer/components/editor/languages'
78

89
const fileDb = store.preferences.get('storagePath') + '/db.json'
910

@@ -110,24 +111,27 @@ export const migrate = async (path: string) => {
110111

111112
folders.push(...DEFAULT_SYSTEM_FOLDERS)
112113

113-
masscodeJSONList.forEach(({ id, open, parentId, ...rest }) => {
114-
const newId = nanoid(8)
114+
masscodeJSONList.forEach(
115+
({ id, open, parentId, defaultLanguage, ...rest }) => {
116+
const newId = nanoid(8)
115117

116-
folders.push({
117-
id: newId,
118-
isOpen: open,
119-
...rest,
120-
parentId: parentId ?? null,
121-
createdAt: new Date().valueOf(),
122-
updatedAt: new Date().valueOf()
123-
})
118+
folders.push({
119+
id: newId,
120+
isOpen: open,
121+
parentId: parentId ?? null,
122+
defaultLanguage: oldLanguageMap[defaultLanguage] || defaultLanguage,
123+
...rest,
124+
createdAt: new Date().valueOf(),
125+
updatedAt: new Date().valueOf()
126+
})
124127

125-
folderIdsMap.push([id, newId])
126-
folderIdsMap.forEach(([oldId, newId]) => {
127-
const item = folders.find(i => i.parentId === oldId)
128-
if (item) item.parentId = newId
129-
})
130-
})
128+
folderIdsMap.push([id, newId])
129+
folderIdsMap.forEach(([oldId, newId]) => {
130+
const item = folders.find(i => i.parentId === oldId)
131+
if (item) item.parentId = newId
132+
})
133+
}
134+
)
131135

132136
tagsJSON.forEach(({ _id, ...rest }) => {
133137
const newId = nanoid(8)
@@ -152,6 +156,7 @@ export const migrate = async (path: string) => {
152156
tagsPopulated,
153157
createdAt,
154158
updatedAt,
159+
content,
155160
...rest
156161
}) => {
157162
const newId = nanoid(8)
@@ -164,10 +169,18 @@ export const migrate = async (path: string) => {
164169
if (newId) tagsIds.push(newId)
165170
})
166171

172+
content = content.map((i: any) => {
173+
return {
174+
...i,
175+
language: oldLanguageMap[i.language] || i.language
176+
}
177+
})
178+
167179
snippets.push({
168180
id: newId,
169181
folderId: newFolderId ?? null,
170182
tagsIds,
183+
content,
171184
...rest,
172185
createdAt: createdAt.$$date,
173186
updatedAt: updatedAt.$$date

src/main/services/ipc/context-menu.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,6 @@ export const subscribeToContextMenu = () => {
177177
async (event, payload) => {
178178
const { name, type, data } = payload
179179

180-
console.log(data.defaultLanguage)
181-
182180
return new Promise(resolve => {
183181
const createLanguageMenu = () => {
184182
return languages.map(i => {

src/renderer/components/editor/TheEditor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const cursorPosition = reactive({
6666
let editor: Ace.Editor
6767
6868
const localLang = computed({
69-
get: () => oldLanguageMap[props.lang] || props.lang,
69+
get: () => props.lang,
7070
set: v => emit('update:lang', v)
7171
})
7272

src/renderer/components/editor/languages.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ export const languages: LanguageOption[] = [
171171
{ name: 'Zeek', value: 'zeek' }
172172
]
173173

174-
// TODO: убрать в будущих релизах
175174
export const oldLanguageMap: Record<any, Language> = {
176175
azcli: 'plain_text',
177176
bat: 'sh',

0 commit comments

Comments
 (0)