2 Commits

Author SHA1 Message Date
394dd4f9f8 Version 1.4.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-11-09 21:01:55 +01:00
c358b1aaa0 Adding new games is easier 2023-11-09 21:01:01 +01:00
4 changed files with 7 additions and 27 deletions

View File

@ -44,7 +44,7 @@ def format_duration(
# timestamps where end is before start # timestamps where end is before start
if seconds_total < 0: if seconds_total < 0:
seconds_total = 0 seconds_total = 0
days = hours = hours_float = minutes = seconds = 0 days = hours = minutes = seconds = 0
remainder = seconds = seconds_total remainder = seconds = seconds_total
if "%d" in format_string: if "%d" in format_string:
days, remainder = divmod(seconds_total, day_seconds) days, remainder = divmod(seconds_total, day_seconds)
@ -55,7 +55,7 @@ def format_duration(
minutes, seconds = divmod(remainder, minute_seconds) minutes, seconds = divmod(remainder, minute_seconds)
literals = { literals = {
"d": str(days), "d": str(days),
"H": str(hours) if "m" not in format_string else str(hours_float), "H": str(hours),
"m": str(minutes), "m": str(minutes),
"s": str(seconds), "s": str(seconds),
"r": str(seconds_total), "r": str(seconds_total),

View File

@ -11,6 +11,7 @@ urlpatterns = [
name="list_sessions_recent", name="list_sessions_recent",
), ),
path("add-game/", views.add_game, name="add_game"), path("add-game/", views.add_game, name="add_game"),
path("add-game-unified/", views.add_game_unified, name="add_game_unified"),
path("add-platform/", views.add_platform, name="add_platform"), path("add-platform/", views.add_platform, name="add_platform"),
path("add-session/", views.add_session, name="add_session"), path("add-session/", views.add_session, name="add_session"),
path( path(

View File

@ -380,15 +380,9 @@ def stats(request, year: int = 0):
"spent_per_game": int( "spent_per_game": int(
safe_division(total_spent, this_year_purchases_without_refunded.count()) safe_division(total_spent, this_year_purchases_without_refunded.count())
), ),
"all_finished_this_year": purchases_finished_this_year.order_by( "all_finished_this_year": purchases_finished_this_year,
"date_finished" "this_year_finished_this_year": purchases_finished_this_year_released_this_year,
), "purchased_this_year_finished_this_year": purchased_this_year_finished_this_year,
"this_year_finished_this_year": purchases_finished_this_year_released_this_year.order_by(
"date_finished"
),
"purchased_this_year_finished_this_year": purchased_this_year_finished_this_year.order_by(
"date_finished"
),
"total_sessions": this_year_sessions.count(), "total_sessions": this_year_sessions.count(),
"unique_days": unique_days["dates"], "unique_days": unique_days["dates"],
"unique_days_percent": int(unique_days["dates"] / 365 * 100), "unique_days_percent": int(unique_days["dates"] / 365 * 100),
@ -483,12 +477,7 @@ def add_edition(request, game_id=None):
if game_id: if game_id:
game = Game.objects.get(id=game_id) game = Game.objects.get(id=game_id)
form = EditionForm( form = EditionForm(
initial={ initial={"game": game, "name": game.name, "sort_name": game.sort_name}
"game": game,
"name": game.name,
"sort_name": game.sort_name,
"year_released": game.year_released,
}
) )
else: else:
form = EditionForm() form = EditionForm()

View File

@ -83,16 +83,6 @@ class FormatDurationTest(unittest.TestCase):
result = format_duration(delta, "%r seconds") result = format_duration(delta, "%r seconds")
self.assertEqual(result, "0 seconds") self.assertEqual(result, "0 seconds")
def test_specific(self):
delta = timedelta(hours=2, minutes=40)
result = format_duration(delta, "%H:%m")
self.assertEqual(result, "2:40")
def test_specific_precise_if_unncessary(self):
delta = timedelta(hours=2, minutes=40)
result = format_duration(delta, "%02.0H:%02.0m")
self.assertEqual(result, "02:40")
def test_all_at_once(self): def test_all_at_once(self):
delta = timedelta(days=50, hours=10, minutes=34, seconds=24) delta = timedelta(days=50, hours=10, minutes=34, seconds=24)
result = format_duration( result = format_duration(