Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed Oct 24, 2024
2 parents 1e164b7 + 1172c71 commit 916f8a3
Show file tree
Hide file tree
Showing 27 changed files with 1,824 additions and 868 deletions.
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ api:

desktop:
cd desktop && npm run electron:build

install:
sudo dpkg -i desktop/release/nebulosa_0.1.0_amd64.deb
endif

build: api desktop
9 changes: 7 additions & 2 deletions api/src/main/kotlin/nebulosa/api/atlas/SatelliteUpdateTask.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package nebulosa.api.atlas

import com.fasterxml.jackson.databind.JsonMappingException
import nebulosa.api.database.MainDatabaseMigrator
import nebulosa.api.database.SkyDatabaseMigrator
import nebulosa.api.message.MessageService
Expand Down Expand Up @@ -35,8 +36,12 @@ class SatelliteUpdateTask(
}

private fun isOutOfDate(): Boolean {
val updatedAt = preferenceService.getLong(UPDATED_AT_KEY) ?: 0L
return System.currentTimeMillis() - updatedAt >= UPDATE_INTERVAL
try {
val updatedAt = preferenceService.getLong(UPDATED_AT_KEY) ?: 0L
return System.currentTimeMillis() - updatedAt >= UPDATE_INTERVAL
} catch (e: JsonMappingException) {
return true
}
}

private fun checkIsOutOfDateAndUpdate() {
Expand Down
Binary file modified desktop/alignment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions desktop/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion desktop/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nebulosa",
"version": "0.1.0",
"version": "0.1.1",
"description": "The complete integrated solution for all of your astronomical imaging needs.",
"author": {
"name": "Tiago Melo",
Expand Down
Binary file modified desktop/auto-focus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/calculator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/camera.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/filter-wheel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/flat-wizard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/focuser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/framing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/indi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified desktop/mount.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 916f8a3

Please sign in to comment.