File tree Expand file tree Collapse file tree 2 files changed +18
-18
lines changed
app/src/main/java/com/heyanle/easybangumi4 Expand file tree Collapse file tree 2 files changed +18
-18
lines changed Original file line number Diff line number Diff line change @@ -158,7 +158,7 @@ object Migrate {
158158
159159
160160
161- if (lastVersionCode < curVersionCode) {
161+ if (lastVersionCode < curVersionCode || BuildConfig . DEBUG ) {
162162
163163 scope.launch(Dispatchers .IO ) {
164164
@@ -456,11 +456,12 @@ object Migrate {
456456 )
457457 )
458458 }
459- Inject .get<JsonFileProvider >().extensionIndex.update {
459+ val helper = Inject .get<JsonFileProvider >().extensionIndex
460+ helper.initJob.join()
461+ helper.update {
460462 indexItem
461463 }
462464
463-
464465 }
465466 // 在这里添加新的迁移代码
466467
Original file line number Diff line number Diff line change @@ -43,26 +43,25 @@ class JsonlFileHelper <T : Any>(
4343
4444 private val tempFileName = " ${name} .temp"
4545
46- init {
47- scope.launch {
48- val jsonFile = folder.createFile(name)
49- if (jsonFile == null || ! jsonFile.canRead()){
50- _flow .update {
51- DataResult .error(" json file create failed or can't read" )
52- }
53- return @launch
54- }
55- var data = jsonFile.openInputStream().use {
56- it.bufferedReader().lineSequence().map {
57- it.jsonTo<T >(type)
58- }.filterNotNull().toList()
59- }
46+ val initJob = scope.launch {
47+ val jsonFile = folder.createFile(name)
48+ if (jsonFile == null || ! jsonFile.canRead()){
6049 _flow .update {
61- DataResult .ok(data )
50+ DataResult .error( " json file create failed or can't read " )
6251 }
52+ return @launch
53+ }
54+ var data = jsonFile.openInputStream().use {
55+ it.bufferedReader().lineSequence().map {
56+ it.jsonTo<T >(type)
57+ }.filterNotNull().toList()
58+ }
59+ _flow .update {
60+ DataResult .ok(data)
6361 }
6462 }
6563
64+
6665 fun trySave (){
6766 scope.launch {
6867 val data = flow.value.okOrNull() ? : return @launch
You can’t perform that action at this time.
0 commit comments