From cc24e6b801fb417904c22f9f70a209ff8641bf3b Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Thu, 22 Sep 2016 11:01:23 +0900 Subject: [PATCH] parse u2028 char properly --- browser/main/lib/dataApi/addStorage.js | 2 +- browser/main/lib/dataApi/createFolder.js | 2 +- browser/main/lib/dataApi/createNote.js | 2 +- browser/main/lib/dataApi/deleteFolder.js | 2 +- browser/main/lib/dataApi/init.js | 2 +- .../main/lib/dataApi/migrateFromV5Storage.js | 2 +- .../main/lib/dataApi/migrateFromV6Storage.js | 42 ++++++++++--------- browser/main/lib/dataApi/moveNote.js | 2 +- .../main/lib/dataApi/resolveStorageData.js | 2 +- .../main/lib/dataApi/resolveStorageNotes.js | 2 +- browser/main/lib/dataApi/updateFolder.js | 2 +- browser/main/lib/dataApi/updateNote.js | 14 ++----- browser/main/modals/InitModal.js | 2 +- package.json | 2 +- tests/dataApi/addStorage.js | 2 +- tests/dataApi/createFolder.js | 2 +- tests/dataApi/createNote.js | 2 +- tests/dataApi/deleteFolder.js | 2 +- tests/dataApi/deleteNote.js | 2 +- tests/dataApi/migrateFromV6Storage.js | 2 +- tests/dataApi/moveNote.js | 2 +- tests/dataApi/updateFolder.js | 2 +- tests/dataApi/updateNote.js | 2 +- tests/fixtures/TestDummy.js | 2 +- webpack-skeleton.js | 2 +- 25 files changed, 50 insertions(+), 52 deletions(-) diff --git a/browser/main/lib/dataApi/addStorage.js b/browser/main/lib/dataApi/addStorage.js index cca49782..630c0bd3 100644 --- a/browser/main/lib/dataApi/addStorage.js +++ b/browser/main/lib/dataApi/addStorage.js @@ -4,7 +4,7 @@ const resolveStorageData = require('./resolveStorageData') const resolveStorageNotes = require('./resolveStorageNotes') const consts = require('browser/lib/consts') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') /** * @param {Object} * name, path, type diff --git a/browser/main/lib/dataApi/createFolder.js b/browser/main/lib/dataApi/createFolder.js index 2fb21a73..f0b4ff28 100644 --- a/browser/main/lib/dataApi/createFolder.js +++ b/browser/main/lib/dataApi/createFolder.js @@ -2,7 +2,7 @@ const _ = require('lodash') const keygen = require('browser/lib/keygen') const path = require('path') const resolveStorageData = require('./resolveStorageData') -const CSON = require('season') +const CSON = require('@rokt33r/season') /** * @param {String} storageKey diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js index b98f6832..83ea85e4 100644 --- a/browser/main/lib/dataApi/createNote.js +++ b/browser/main/lib/dataApi/createNote.js @@ -3,7 +3,7 @@ const resolveStorageData = require('./resolveStorageData') const _ = require('lodash') const keygen = require('browser/lib/keygen') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') function validateInput (input) { if (!_.isArray(input.tags)) input.tags = [] diff --git a/browser/main/lib/dataApi/deleteFolder.js b/browser/main/lib/dataApi/deleteFolder.js index f001ab59..78e5747b 100644 --- a/browser/main/lib/dataApi/deleteFolder.js +++ b/browser/main/lib/dataApi/deleteFolder.js @@ -2,7 +2,7 @@ const _ = require('lodash') const path = require('path') const resolveStorageData = require('./resolveStorageData') const resolveStorageNotes = require('./resolveStorageNotes') -const CSON = require('season') +const CSON = require('@rokt33r/season') const sander = require('sander') /** diff --git a/browser/main/lib/dataApi/init.js b/browser/main/lib/dataApi/init.js index 965bbe7a..8805b659 100644 --- a/browser/main/lib/dataApi/init.js +++ b/browser/main/lib/dataApi/init.js @@ -4,7 +4,7 @@ const resolveStorageData = require('./resolveStorageData') const resolveStorageNotes = require('./resolveStorageNotes') const consts = require('browser/lib/consts') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') /** * @return {Object} all storages and notes * ``` diff --git a/browser/main/lib/dataApi/migrateFromV5Storage.js b/browser/main/lib/dataApi/migrateFromV5Storage.js index d13a5e28..be922731 100644 --- a/browser/main/lib/dataApi/migrateFromV5Storage.js +++ b/browser/main/lib/dataApi/migrateFromV5Storage.js @@ -2,7 +2,7 @@ const _ = require('lodash') const keygen = require('browser/lib/keygen') const resolveStorageData = require('./resolveStorageData') const consts = require('browser/lib/consts') -const CSON = require('season') +const CSON = require('@rokt33r/season') const path = require('path') const sander = require('sander') diff --git a/browser/main/lib/dataApi/migrateFromV6Storage.js b/browser/main/lib/dataApi/migrateFromV6Storage.js index 1af49cf5..af4d902f 100644 --- a/browser/main/lib/dataApi/migrateFromV6Storage.js +++ b/browser/main/lib/dataApi/migrateFromV6Storage.js @@ -2,7 +2,7 @@ const path = require('path') const sander = require('sander') const keygen = require('browser/lib/keygen') const _ = require('lodash') -const CSON = require('season') +const CSON = require('@rokt33r/season') function migrateFromV5Storage (storagePath) { var boostnoteJSONPath = path.join(storagePath, 'boostnote.json') @@ -45,10 +45,6 @@ function migrateFromV5Storage (storagePath) { console.warn('Failed to fetch notes from ', folderDataJSONPath, err) return [] }) - .then(function deleteFolderDir (data) { - sander.rimrafSync(path.join(storagePath, folder.key)) - return data - }) }) return Promise.all(fetchNotesFromEachFolder) @@ -58,22 +54,30 @@ function migrateFromV5Storage (storagePath) { return sum.concat(notes) }, []) }) - }) - .then(function saveNotes (notes) { - notes.forEach(function renewKey (note) { - var newKey = keygen() - while (notes.some((_note) => _note.key === newKey)) { - newKey = keygen() - } - note.key = newKey - }) + .then(function saveNotes (notes) { + notes.forEach(function renewKey (note) { + var newKey = keygen() + while (notes.some((_note) => _note.key === newKey)) { + newKey = keygen() + } + note.key = newKey + }) - const noteDirPath = path.join(storagePath, 'notes') - notes - .map(function saveNote (note) { - CSON.writeFileSync(path.join(noteDirPath, note.key) + '.cson', note) + const noteDirPath = path.join(storagePath, 'notes') + notes + .map(function saveNote (note) { + CSON.writeFileSync(path.join(noteDirPath, note.key) + '.cson', note) + }) + return true + }) + .then(function deleteFolderDir (check) { + if (check) { + boostnoteJSONData.folders.forEach((folder) => { + sander.rimrafSync(path.join(storagePath, folder.key)) + }) + } + return check }) - return true }) .catch(function handleError (err) { console.warn(err) diff --git a/browser/main/lib/dataApi/moveNote.js b/browser/main/lib/dataApi/moveNote.js index 1564d80c..c9e7592a 100644 --- a/browser/main/lib/dataApi/moveNote.js +++ b/browser/main/lib/dataApi/moveNote.js @@ -1,7 +1,7 @@ const resolveStorageData = require('./resolveStorageData') const _ = require('lodash') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') const keygen = require('browser/lib/keygen') const sander = require('sander') diff --git a/browser/main/lib/dataApi/resolveStorageData.js b/browser/main/lib/dataApi/resolveStorageData.js index 1cf409a1..20f37952 100644 --- a/browser/main/lib/dataApi/resolveStorageData.js +++ b/browser/main/lib/dataApi/resolveStorageData.js @@ -1,6 +1,6 @@ const _ = require('lodash') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') const migrateFromV6Storage = require('./migrateFromV6Storage') function resolveStorageData (storageCache) { diff --git a/browser/main/lib/dataApi/resolveStorageNotes.js b/browser/main/lib/dataApi/resolveStorageNotes.js index 3e0d3dfb..21cc0a45 100644 --- a/browser/main/lib/dataApi/resolveStorageNotes.js +++ b/browser/main/lib/dataApi/resolveStorageNotes.js @@ -1,6 +1,6 @@ const sander = require('sander') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') function resolveStorageNotes (storage) { const notesDirPath = path.join(storage.path, 'notes') diff --git a/browser/main/lib/dataApi/updateFolder.js b/browser/main/lib/dataApi/updateFolder.js index 44250b2e..e128a2d3 100644 --- a/browser/main/lib/dataApi/updateFolder.js +++ b/browser/main/lib/dataApi/updateFolder.js @@ -1,7 +1,7 @@ const _ = require('lodash') const path = require('path') const resolveStorageData = require('./resolveStorageData') -const CSON = require('season') +const CSON = require('@rokt33r/season') /** * @param {String} storageKey diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js index f9f0d755..7dc4c6c7 100644 --- a/browser/main/lib/dataApi/updateNote.js +++ b/browser/main/lib/dataApi/updateNote.js @@ -1,7 +1,7 @@ const resolveStorageData = require('./resolveStorageData') const _ = require('lodash') const path = require('path') -const CSON = require('season') +const CSON = require('@rokt33r/season') function validateInput (input) { let validatedInput = {} @@ -14,7 +14,7 @@ function validateInput (input) { if (input.title != null) { if (!_.isString(input.title)) validatedInput.title = '' - else validatedInput.title = input.title.replace(/[\u2028]+/g, '') + else validatedInput.title = input.title } if (input.isStarred != null) { @@ -26,13 +26,13 @@ function validateInput (input) { case 'MARKDOWN_NOTE': if (input.content != null) { if (!_.isString(input.content)) validatedInput.content = '' - else validatedInput.content = input.content.replace(/[\u2028]+/g, '') + else validatedInput.content = input.content } return validatedInput case 'SNIPPET_NOTE': if (input.description != null) { if (!_.isString(input.description)) validatedInput.description = '' - else validatedInput.description = input.description.replace(/[\u2028]+/g, '') + else validatedInput.description = input.description } if (input.snippets != null) { if (!_.isArray(input.snippets)) { @@ -51,12 +51,6 @@ function validateInput (input) { if (!_.isString(snippet.content)) return false return true }) - .map((snippet) => { - snippet.name = snippet.name.replace(/[\u2028]+/g, '') - snippet.mode = snippet.mode.replace(/[\u2028]+/g, '') - snippet.content = snippet.content.replace(/[\u2028]+/g, '') - return snippet - }) } return validatedInput default: diff --git a/browser/main/modals/InitModal.js b/browser/main/modals/InitModal.js index f22cb2fb..d405f880 100644 --- a/browser/main/modals/InitModal.js +++ b/browser/main/modals/InitModal.js @@ -7,7 +7,7 @@ import { hashHistory } from 'react-router' import _ from 'lodash' import keygen from 'browser/lib/keygen' -const CSON = require('season') +const CSON = require('@rokt33r/season') const path = require('path') const electron = require('electron') const { remote } = electron diff --git a/package.json b/package.json index 1d252638..933845fd 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "moment": "^2.10.3", "node-ipc": "^8.1.0", "sander": "^0.5.1", - "season": "^5.3.0", + "@rokt33r/season": "^5.3.0", "superagent": "^1.2.0", "superagent-promise": "^1.0.3" }, diff --git a/tests/dataApi/addStorage.js b/tests/dataApi/addStorage.js index 1ca10c54..d5bc2994 100644 --- a/tests/dataApi/addStorage.js +++ b/tests/dataApi/addStorage.js @@ -12,7 +12,7 @@ const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const _ = require('lodash') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const v1StoragePath = path.join(os.tmpdir(), 'test/addStorage-v1-storage') // const legacyStoragePath = path.join(os.tmpdir(), 'test/addStorage-legacy-storage') diff --git a/tests/dataApi/createFolder.js b/tests/dataApi/createFolder.js index 986123b0..7d9a65a7 100644 --- a/tests/dataApi/createFolder.js +++ b/tests/dataApi/createFolder.js @@ -12,7 +12,7 @@ const _ = require('lodash') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const storagePath = path.join(os.tmpdir(), 'test/create-folder') diff --git a/tests/dataApi/createNote.js b/tests/dataApi/createNote.js index 7a983fef..5c31574e 100644 --- a/tests/dataApi/createNote.js +++ b/tests/dataApi/createNote.js @@ -11,7 +11,7 @@ const path = require('path') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const faker = require('faker') const storagePath = path.join(os.tmpdir(), 'test/create-note') diff --git a/tests/dataApi/deleteFolder.js b/tests/dataApi/deleteFolder.js index f760c819..4adf38e1 100644 --- a/tests/dataApi/deleteFolder.js +++ b/tests/dataApi/deleteFolder.js @@ -12,7 +12,7 @@ const _ = require('lodash') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const storagePath = path.join(os.tmpdir(), 'test/delete-folder') diff --git a/tests/dataApi/deleteNote.js b/tests/dataApi/deleteNote.js index b22e5de2..611022de 100644 --- a/tests/dataApi/deleteNote.js +++ b/tests/dataApi/deleteNote.js @@ -12,7 +12,7 @@ const path = require('path') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const faker = require('faker') const storagePath = path.join(os.tmpdir(), 'test/delete-note') diff --git a/tests/dataApi/migrateFromV6Storage.js b/tests/dataApi/migrateFromV6Storage.js index f10e3ff6..220289c6 100644 --- a/tests/dataApi/migrateFromV6Storage.js +++ b/tests/dataApi/migrateFromV6Storage.js @@ -10,7 +10,7 @@ const localStorage = window.localStorage = global.localStorage = new Storage(nul const path = require('path') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') -const CSON = require('season') +const CSON = require('@rokt33r/season') const _ = require('lodash') const os = require('os') diff --git a/tests/dataApi/moveNote.js b/tests/dataApi/moveNote.js index 595b46ed..fe73653d 100644 --- a/tests/dataApi/moveNote.js +++ b/tests/dataApi/moveNote.js @@ -11,7 +11,7 @@ const path = require('path') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const faker = require('faker') const storagePath = path.join(os.tmpdir(), 'test/move-note') diff --git a/tests/dataApi/updateFolder.js b/tests/dataApi/updateFolder.js index 9ebbdc9f..ad486344 100644 --- a/tests/dataApi/updateFolder.js +++ b/tests/dataApi/updateFolder.js @@ -12,7 +12,7 @@ const _ = require('lodash') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const storagePath = path.join(os.tmpdir(), 'test/update-folder') diff --git a/tests/dataApi/updateNote.js b/tests/dataApi/updateNote.js index 63b74dbb..2c6aad9c 100644 --- a/tests/dataApi/updateNote.js +++ b/tests/dataApi/updateNote.js @@ -12,7 +12,7 @@ const path = require('path') const TestDummy = require('../fixtures/TestDummy') const sander = require('sander') const os = require('os') -const CSON = require('season') +const CSON = require('@rokt33r/season') const faker = require('faker') const storagePath = path.join(os.tmpdir(), 'test/update-note') diff --git a/tests/fixtures/TestDummy.js b/tests/fixtures/TestDummy.js index 19cfa9c5..39164731 100644 --- a/tests/fixtures/TestDummy.js +++ b/tests/fixtures/TestDummy.js @@ -2,7 +2,7 @@ const faker = require('faker') const keygen = require('browser/lib/keygen') const _ = require('lodash') const sander = require('sander') -const CSON = require('season') +const CSON = require('@rokt33r/season') const path = require('path') function dummyFolder (override = {}) { diff --git a/webpack-skeleton.js b/webpack-skeleton.js index f4f2115c..14bb5a95 100644 --- a/webpack-skeleton.js +++ b/webpack-skeleton.js @@ -40,9 +40,9 @@ var config = { 'fs-jetpack', '@rokt33r/markdown-it-math', 'markdown-it-checkbox', - 'season', 'devtron', 'mixpanel', + '@rokt33r/season', { react: 'var React', 'react-dom': 'var ReactDOM',