isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

LoopDBImporter: Improve performance; silence snackbar messages

Browse Source
This commit is contained in:
Alinson S. Xavier
2022-05-13 08:11:54 -05:00
parent 9609bee0f7
commit 53e7ef2918
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/LoopDBImporter.kt
View File

@@ -20,14 +20,13 @@ package org.isoron.uhabits.core.io
import org.isoron.uhabits.core.AppScope import org.isoron.uhabits.core.AppScope
import org.isoron.uhabits.core.DATABASE_VERSION import org.isoron.uhabits.core.DATABASE_VERSION
import org.isoron.uhabits.core.commands.Command
import org.isoron.uhabits.core.commands.CommandRunner import org.isoron.uhabits.core.commands.CommandRunner
import org.isoron.uhabits.core.commands.CreateHabitCommand import org.isoron.uhabits.core.commands.CreateHabitCommand
import org.isoron.uhabits.core.commands.CreateRepetitionCommand
import org.isoron.uhabits.core.commands.EditHabitCommand import org.isoron.uhabits.core.commands.EditHabitCommand
import org.isoron.uhabits.core.database.DatabaseOpener import org.isoron.uhabits.core.database.DatabaseOpener
import org.isoron.uhabits.core.database.MigrationHelper import org.isoron.uhabits.core.database.MigrationHelper
import org.isoron.uhabits.core.database.Repository import org.isoron.uhabits.core.database.Repository
import org.isoron.uhabits.core.models.Entry
import org.isoron.uhabits.core.models.HabitList import org.isoron.uhabits.core.models.HabitList
import org.isoron.uhabits.core.models.ModelFactory import org.isoron.uhabits.core.models.ModelFactory
import org.isoron.uhabits.core.models.Timestamp import org.isoron.uhabits.core.models.Timestamp
@@ -81,34 +80,33 @@ class LoopDBImporter
var habit = habitList.getByUUID(habitRecord.uuid) var habit = habitList.getByUUID(habitRecord.uuid)
val entryRecords = entryRepository.findAll("where habit = ?", habitRecord.id.toString()) val entryRecords = entryRepository.findAll("where habit = ?", habitRecord.id.toString())
var command: Command
if (habit == null) { if (habit == null) {
habit = modelFactory.buildHabit() habit = modelFactory.buildHabit()
habitRecord.id = null habitRecord.id = null
habitRecord.copyTo(habit) habitRecord.copyTo(habit)
command = CreateHabitCommand(modelFactory, habitList, habit) CreateHabitCommand(modelFactory, habitList, habit).run()
command.run()
} else { } else {
val modified = modelFactory.buildHabit() val modified = modelFactory.buildHabit()
habitRecord.id = habit.id habitRecord.id = habit.id
habitRecord.copyTo(modified) habitRecord.copyTo(modified)
command = EditHabitCommand(habitList, habit.id!!, modified) EditHabitCommand(habitList, habit.id!!, modified).run()
command.run()
} }
// Reload saved version of the habit // Reload saved version of the habit
habit = habitList.getByUUID(habitRecord.uuid) habit = habitList.getByUUID(habitRecord.uuid)!!
val entries = habit.originalEntries
// Import entries
for (r in entryRecords) { for (r in entryRecords) {
val t = Timestamp(r.timestamp!!) val t = Timestamp(r.timestamp!!)
val (_, value, notes) = habit!!.originalEntries.get(t) val (_, value, notes) = entries.get(t)
val oldNotes = r.notes ?: "" if (value != r.value || notes != r.notes) {
if (value != r.value || notes != oldNotes) CreateRepetitionCommand(habitList, habit, t, r.value!!, oldNotes).run() entries.add(Entry(t, r.value!!, r.notes ?: ""))
}
} }
habit.recompute()
runner.notifyListeners(command)
} }
habitList.resort()
db.close() db.close()
} }
} }