Commit2b17530

authored

prioritize session file path over local storage (coderoad#553)

* prioritize session file path over local storageSigned-off-by: shmck <shawn.j.mckay@gmail.com>* move local storage lookup laterSigned-off-by: shmck <shawn.j.mckay@gmail.com>

1 parent8522ec6 commit2b17530Copy full SHA for 2b17530

File tree

1 file changed

+12

-5

lines changed

src/services/storage
- index.ts

1 file changed

+12

-5

lines changed

`‎src/services/storage/index.ts‎`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,9 @@ class Storage<T> {`
`30`	`30`	`this.defaultValue=defaultValue`
`31`	`31`	`}`
`32`	`32`	`publicget=async():Promise<T>=>{`
`33`		`-constvalue:string\|undefined=awaitthis.storage.get(this.key)`
`34`		`-if(value){`
`35`		`-returnJSON.parse(value)`
`36`		`-}elseif(SESSION_STORAGE_PATH){`
	`33`	`+if(SESSION_STORAGE_PATH){`
`37`	`34`	`try{`
`38`		`-//optionally read from fileas a fallback tolocal storage`
	`35`	`+//1. read from fileinstead oflocal storage if specified`
`39`	`36`	constsessionFile=awaitreadFile(SESSION_STORAGE_PATH,`${this.filePath}.json`)
`40`	`37`	`if(!sessionFile){`
`41`	`38`	`thrownewError('No session file found')`
`@@ -53,6 +50,16 @@ class Storage<T> {`
`53`	`50`	console.warn(`Failed to read or parse session file:${SESSION_STORAGE_PATH}/${this.filePath}.json`)
`54`	`51`	`}`
`55`	`52`	`}`
	`53`	`+constvalue:string\|undefined=awaitthis.storage.get(this.key)`
	`54`	`+if(value){`
	`55`	`+// 2. read from local storage`
	`56`	`+try{`
	`57`	`+returnJSON.parse(value)`
	`58`	`+}catch(err){`
	`59`	+console.warn(`Failed to parse session state from local storage:${value}`)
	`60`	`+}`
	`61`	`+}`
	`62`	`+// 3. fallback to the default`
`56`	`63`	`returnthis.defaultValue`
`57`	`64`	`}`
`58`	`65`	`publicset=(value:T):void=>{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2b17530

File tree

1 file changed

1 file changed

`‎src/services/storage/index.ts‎`

0 commit comments