fix: clamp negative playtime (#6519)

* fix: clamp negative playtime

* fix: remove triggers use instant
This commit is contained in:
Calum H.
2026-06-26 17:50:03 +02:00
committed by GitHub
parent 5fe07de187
commit e4376c2b15
11 changed files with 135 additions and 70 deletions
@@ -3,7 +3,7 @@
use crate::state::instances::{
ContentSet, ContentSetStatus, ContentSourceKind, Instance,
InstanceLaunchContext, InstanceLaunchOverrides,
InstanceLaunchOverridesData, InstanceLink,
InstanceLaunchOverridesData, InstanceLink, playtime_to_storage,
};
use crate::state::{
InstanceInstallStage, LauncherFeatureVersion, ModLoader, ReleaseChannel,
@@ -831,8 +831,12 @@ pub(crate) async fn insert_instance(
let created = instance.created.timestamp();
let modified = instance.modified.timestamp();
let last_played = instance.last_played.map(|value| value.timestamp());
let submitted_time_played = instance.submitted_time_played as i64;
let recent_time_played = instance.recent_time_played as i64;
let submitted_time_played = playtime_to_storage(
instance.submitted_time_played,
"submitted_time_played",
)?;
let recent_time_played =
playtime_to_storage(instance.recent_time_played, "recent_time_played")?;
sqlx::query!(
"
@@ -887,8 +891,12 @@ pub(crate) async fn update_instance(
let icon_path = instance.icon_path.as_deref();
let modified = instance.modified.timestamp();
let last_played = instance.last_played.map(|value| value.timestamp());
let submitted_time_played = instance.submitted_time_played as i64;
let recent_time_played = instance.recent_time_played as i64;
let submitted_time_played = playtime_to_storage(
instance.submitted_time_played,
"submitted_time_played",
)?;
let recent_time_played =
playtime_to_storage(instance.recent_time_played, "recent_time_played")?;
sqlx::query!(
"
@@ -1,6 +1,6 @@
use crate::state::InstanceInstallStage;
use crate::state::instances::{
InstanceLaunchContext, adapters::sqlite::instance_rows,
InstanceLaunchContext, adapters::sqlite::instance_rows, playtime_to_storage,
};
use chrono::{DateTime, Utc};
use sqlx::SqlitePool;
@@ -120,16 +120,31 @@ pub(crate) async fn add_instance_recent_playtime(
seconds: u64,
pool: &SqlitePool,
) -> crate::Result<()> {
let seconds = seconds as i64;
if seconds == 0 {
return Ok(());
}
let seconds = playtime_to_storage(seconds, "recent_time_played")?;
let max_playtime = i64::MAX;
let max_playtime_before_increment = max_playtime - seconds;
let modified = Utc::now().timestamp();
sqlx::query!(
"
UPDATE instances
SET recent_time_played = recent_time_played + ?, modified = ?
SET
recent_time_played = CASE
WHEN recent_time_played < 0 THEN ?
WHEN recent_time_played > ? THEN ?
ELSE recent_time_played + ?
END,
modified = ?
WHERE id = ?
",
seconds,
max_playtime_before_increment,
max_playtime,
seconds,
modified,
instance_id,
)
@@ -144,19 +159,33 @@ pub(crate) async fn mark_instance_playtime_submitted(
recent_time_played: u64,
pool: &SqlitePool,
) -> crate::Result<()> {
let recent_time_played = recent_time_played as i64;
if recent_time_played == 0 {
return Ok(());
}
let recent_time_played =
playtime_to_storage(recent_time_played, "recent_time_played")?;
let max_playtime = i64::MAX;
let max_playtime_before_increment = max_playtime - recent_time_played;
let modified = Utc::now().timestamp();
sqlx::query!(
"
UPDATE instances
SET
submitted_time_played = submitted_time_played + ?,
submitted_time_played = CASE
WHEN submitted_time_played < 0 THEN ?
WHEN submitted_time_played > ? THEN ?
ELSE submitted_time_played + ?
END,
recent_time_played = 0,
modified = ?
WHERE id = ?
",
recent_time_played,
max_playtime_before_increment,
max_playtime,
recent_time_played,
modified,
instance_id,
)
@@ -20,3 +20,15 @@ pub struct Instance {
pub submitted_time_played: u64,
pub recent_time_played: u64,
}
pub(crate) fn playtime_to_storage(
value: u64,
column: &str,
) -> crate::Result<i64> {
i64::try_from(value).map_err(|_| {
crate::ErrorKind::InputError(format!(
"Expected {column} to fit in SQLite INTEGER"
))
.into()
})
}