Skip to content

Commit 9bcf64c

Browse files
ShMcKShMcK
committed
refactor storage into editor
1 parent 89045a3 commit 9bcf64c

File tree

9 files changed

+88
-77
lines changed

9 files changed

+88
-77
lines changed

‎src/editor/commands/loadSolution.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as CR from 'typings'
2-
import * as storage from '../storage'
2+
import * as storage from '../../services/storage'
33
import { gitLoadCommits, gitClear } from '../../services/git'
44

55
export default async function loadSolution(): Promise<void> {

‎src/editor/commands/runTest.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getOutputChannel } from '../channel'
22
import { exec } from '../../services/node'
3-
import * as storage from '../storage'
3+
import * as storage from '../../services/storage'
44
import * as testResult from '../../services/testResult'
55

66
// ensure only latest run_test action is taken

‎src/editor/commands/tutorialLoad.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as CR from 'typings'
44
import api from '../../services/api'
55
import tutorialSetup from '../../services/tutorialSetup'
66
import { loadProgressPosition } from '../../services/position'
7-
import * as storage from '../storage'
7+
import * as storage from '../../services/storage'
88
import rootSetup from '../../services/rootSetup'
99
import { isEmptyWorkspace, openReadme } from '../workspace'
1010
import * as git from '../../services/git'

‎src/editor/storage.ts‎

Lines changed: 4 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -8,77 +8,11 @@ export function setStorage(workspaceState: vscode.Memento): void {
88
storage = workspaceState
99
}
1010

11-
// TUTORIAL
12-
const STORE_TUTORIAL = 'coderoad:tutorial'
13-
14-
export async function getTutorial(): Promise<CR.Tutorial | undefined> {
15-
return storage.get(STORE_TUTORIAL)
16-
}
17-
18-
export async function setTutorial(tutorial: CR.Tutorial): Promise<void> {
19-
await storage.update(STORE_TUTORIAL, tutorial)
11+
export function get<T>(key: string): T | undefined {
12+
return storage.get(key)
2013
}
2114

22-
// POSITION
23-
const STORE_POSITION = 'coderoad:position'
24-
25-
const defaultPosition = { levelId: '', stageId: '', stepId: '' }
26-
27-
export async function getPosition(): Promise<CR.Position> {
28-
const position: CR.Position | undefined = storage.get(STORE_POSITION)
29-
return position || defaultPosition
15+
export function update<T>(key: string, value: string | Object): Thenable<void> {
16+
return storage.update(key, value)
3017
}
3118

32-
export async function setPosition(position: CR.Position): Promise<void> {
33-
await storage.update(STORE_POSITION, position)
34-
}
35-
36-
// PROGRESS
37-
const STORE_PROGRESS = 'coderoad:progress'
38-
39-
const defaultProgress = { levels: {}, stages: {}, steps: {}, hints: {}, complete: false }
40-
41-
export async function getProgress(): Promise<CR.Progress> {
42-
const progress: CR.Progress | undefined = await storage.get(STORE_PROGRESS)
43-
return progress || defaultProgress
44-
}
45-
46-
export async function resetProgress(): Promise<void> {
47-
await storage.update(STORE_PROGRESS, defaultProgress)
48-
}
49-
50-
interface ProgressUpdate {
51-
levels?: {
52-
[levelId: string]: boolean
53-
}
54-
stages?: {
55-
[stageid: string]: boolean
56-
}
57-
steps?: {
58-
[stepId: string]: boolean
59-
}
60-
}
61-
62-
export async function updateProgress(record: ProgressUpdate): Promise<void> {
63-
const progress = await getProgress()
64-
if (record.levels) {
65-
progress.levels = {
66-
...progress.levels,
67-
...record.levels,
68-
}
69-
}
70-
if (record.stages) {
71-
progress.stages = {
72-
...progress.stages,
73-
...record.stages,
74-
}
75-
}
76-
if (record.steps) {
77-
progress.steps = {
78-
...progress.steps,
79-
...record.steps,
80-
}
81-
}
82-
83-
await storage.update(STORE_PROGRESS, progress)
84-
}

‎src/services/position.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as CR from 'typings'
2-
import * as storage from '../editor/storage'
2+
import * as storage from './storage'
33

44
export async function getInitial(tutorial: CR.Tutorial): Promise<CR.Position> {
55
const { data } = tutorial

‎src/services/storage.ts‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import * as CR from 'typings'
2+
import * as storage from '../editor/storage'
3+
4+
// TUTORIAL
5+
const STORE_TUTORIAL = 'coderoad:tutorial'
6+
7+
export async function getTutorial(): Promise<CR.Tutorial | undefined> {
8+
return storage.get<CR.Tutorial>(STORE_TUTORIAL)
9+
}
10+
11+
export async function setTutorial(tutorial: CR.Tutorial): Promise<void> {
12+
await storage.update<CR.Tutorial>(STORE_TUTORIAL, tutorial)
13+
}
14+
15+
// POSITION
16+
const STORE_POSITION = 'coderoad:position'
17+
18+
const defaultPosition = { levelId: '', stageId: '', stepId: '' }
19+
20+
export async function getPosition(): Promise<CR.Position> {
21+
const position: CR.Position | undefined = storage.get<CR.Position>(STORE_POSITION)
22+
return position || defaultPosition
23+
}
24+
25+
export async function setPosition(position: CR.Position): Promise<void> {
26+
await storage.update<CR.Position>(STORE_POSITION, position)
27+
}
28+
29+
// PROGRESS
30+
const STORE_PROGRESS = 'coderoad:progress'
31+
32+
const defaultProgress = { levels: {}, stages: {}, steps: {}, hints: {}, complete: false }
33+
34+
export async function getProgress(): Promise<CR.Progress> {
35+
const progress: CR.Progress | undefined = await storage.get<CR.Progress>(STORE_PROGRESS)
36+
return progress || defaultProgress
37+
}
38+
39+
export async function resetProgress(): Promise<void> {
40+
await storage.update<CR.Progress>(STORE_PROGRESS, defaultProgress)
41+
}
42+
43+
interface ProgressUpdate {
44+
levels?: {
45+
[levelId: string]: boolean
46+
}
47+
stages?: {
48+
[stageid: string]: boolean
49+
}
50+
steps?: {
51+
[stepId: string]: boolean
52+
}
53+
}
54+
55+
export async function updateProgress(record: ProgressUpdate): Promise<void> {
56+
const progress = await getProgress()
57+
if (record.levels) {
58+
progress.levels = {
59+
...progress.levels,
60+
...record.levels,
61+
}
62+
}
63+
if (record.stages) {
64+
progress.stages = {
65+
...progress.stages,
66+
...record.stages,
67+
}
68+
}
69+
if (record.steps) {
70+
progress.steps = {
71+
...progress.steps,
72+
...record.steps,
73+
}
74+
}
75+
76+
await storage.update<CR.Progress>(STORE_PROGRESS, progress)
77+
}

‎src/services/testResult.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as CR from 'typings'
22
import * as vscode from 'vscode'
3-
import * as storage from '../editor/storage'
3+
import * as storage from './storage'
44

55

66
export async function onSuccess(position: CR.Position) {

‎src/services/tutorialSetup.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as CR from 'typings'
22
import * as position from '../services/position'
3-
import * as storage from '../editor/storage'
3+
import * as storage from '../services/storage'
44
import { isEmptyWorkspace } from '../editor/workspace'
55
import { gitLoadCommits, gitInitIfNotExists, gitSetupRemote } from '../services/git'
66

‎src/state/actions/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { assign, send } from 'xstate'
22
import * as CR from 'typings'
3-
import * as storage from '../../editor/storage'
3+
import * as storage from '../../services/storage'
44
import * as git from '../../services/git'
55

66
let initialTutorial: CR.Tutorial | undefined

0 commit comments

Comments
 (0)