Makefile

@@ -2,49 +2,49 @@ all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
 
-HTMLFILES := $(shell find games/templates -type f)
+HTMLFILES := $(shell find src/timetracker/games/templates -type f)
 
 npm:
 	npm install
 
-css: input.css
+css: src/input.css
-	npx tailwindcss -i ./input.css -o  ./games/static/base.css
+	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css
 
 css-dev: css
-	npx tailwindcss -i ./input.css -o  ./games/static/base.css --watch
+	npx tailwindcss -i ./src/input.css -o  ./src/timetracker/games/static/base.css --watch
 
 makemigrations:
-	poetry run python manage.py makemigrations
+	poetry run python src/timetracker/manage.py makemigrations
 
 migrate: makemigrations
-	poetry run python manage.py migrate
+	poetry run python src/timetracker/manage.py migrate
 
 dev: migrate
-	poetry run python manage.py runserver
+	poetry run python src/timetracker/manage.py runserver
 
 caddy:
 	caddy run --watch
 
 dev-prod: migrate collectstatic
-	PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 timetracker.asgi:application -k uvicorn.workers.UvicornWorker
+	cd src/timetracker/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 root.asgi:application -k uvicorn.workers.UvicornWorker
 
 dumpgames:
-	poetry run python manage.py dumpdata --format yaml games --output tracker_fixture.yaml
+	poetry run python src/timetracker/manage.py dumpdata --format yaml games --output tracker_fixture.yaml
 
 loadplatforms:
-	poetry run python manage.py loaddata platforms.yaml
+	poetry run python src/timetracker/manage.py loaddata platforms.yaml
 
 loadsample:
-	poetry run python manage.py loaddata sample.yaml
+	poetry run python src/timetracker/manage.py loaddata sample.yaml
 
 createsuperuser:
-	poetry run python manage.py createsuperuser
+	poetry run python src/timetracker/manage.py createsuperuser
 
 shell:
-	poetry run python manage.py shell
+	poetry run python src/timetracker/manage.py shell
 
 collectstatic:
-	poetry run python manage.py collectstatic --clear --no-input
+	poetry run python src/timetracker/manage.py collectstatic --clear --no-input
 
 poetry.lock: pyproject.toml
 	poetry install
@@ -56,6 +56,6 @@ date:
 	poetry run python -c 'import datetime; from zoneinfo import ZoneInfo; print(datetime.datetime.isoformat(datetime.datetime.now(ZoneInfo("Europe/Prague")), timespec="minutes", sep=" "))'
 
 cleanstatic:
-	rm -r static/*
+	rm -r src/timetracker/static/*
 
 clean: cleanstatic

common/import_data.py

@@ -1,30 +0,0 @@
-import csv
-from typing import TypeAlias
-
-from games.models import Game
-
-DataList: TypeAlias = list[dict[str, str]] | None
-
-
-def read_csv(filename: str) -> DataList:
-    with open(filename, "r") as csvfile:
-        writer = csv.DictReader(csvfile)
-        return writer
-
-
-def import_data(data: DataList):
-    matching_names = {}
-    for line in data:
-        name = line["name"]
-        if name not in matching_names:
-            # try exact match first
-            try:
-                game_id = Game.objects.get(name__iexact=name)
-            except:
-                pass
-            matching_names[name] = game_id
-    print(f"Exact matched {len(matching_names)} games.")
-
-
-def import_from_file(filename: str):
-    import_data(read_csv(filename))

games/fixtures/ps-tracker.csv

@@ -1,225 +0,0 @@
-name,platform,start,end
-Nioh 2,PS5,2022-12-17 19:34,2022-12-17 22:53
-Nioh 2,PS5,2022-12-15 02:25,2022-12-15 03:57
-Nioh 2,PS5,2022-12-13 02:41,2022-12-13 04:34
-Nioh 2,PS5,2022-12-11 21:01,2022-12-11 23:21
-VALKYRIE ELYSIUM,PS5,2022-12-11 06:07,2022-12-11 06:20
-Metal: Hellsinger,PS5,2022-12-11 05:50,2022-12-11 06:07
-Nioh 2,PS5,2022-12-11 04:31,2022-12-11 05:50
-Nioh 2,PS5,2022-12-11 04:11,2022-12-11 04:26
-Forspoken,PS5,2022-12-10 22:29,2022-12-10 23:10
-Nioh 2,PS5,2022-12-10 19:44,2022-12-10 22:29
-Nioh 2,PS5,2022-12-09 02:14,2022-12-09 04:16
-Nioh 2,PS5,2022-12-08 01:03,2022-12-08 01:57
-Nioh 2,PS5,2022-12-07 00:43,2022-12-07 04:16
-Nioh 2,PS5,2022-12-04 20:48,2022-12-04 23:31
-Nioh 2,PS5,2022-12-04 04:26,2022-12-04 07:01
-Nioh 2,PS5,2022-12-04 04:20,2022-12-04 04:22
-Nioh 2,PS5,2022-11-26 19:18,2022-11-26 21:28
-Nioh 2,PS5,2022-11-26 19:16,2022-11-26 19:18
-Nioh 2,PS5,2022-11-26 02:46,2022-11-26 03:56
-Nioh 2,PS5,2022-11-26 02:01,2022-11-26 02:43
-God of War Ragnarök,PS5,2022-11-24 23:03,2022-11-25 01:32
-God of War Ragnarök,PS5,2022-11-23 00:41,2022-11-23 07:52
-God of War Ragnarök,PS5,2022-11-21 22:52,2022-11-22 04:51
-God of War Ragnarök,PS5,2022-11-21 02:11,2022-11-21 05:13
-God of War Ragnarök,PS5,2022-11-20 21:34,2022-11-20 22:50
-God of War Ragnarök,PS5,2022-11-20 03:46,2022-11-20 05:52
-God of War Ragnarök,PS5,2022-11-19 14:30,2022-11-19 16:14
-God of War Ragnarök,PS5,2022-11-18 23:15,2022-11-19 04:16
-God of War Ragnarök,PS5,2022-11-18 19:58,2022-11-18 20:40
-God of War Ragnarök,PS5,2022-11-18 03:50,2022-11-18 06:25
-God of War Ragnarök,PS5,2022-11-17 19:36,2022-11-18 00:26
-God of War Ragnarök,PS5,2022-11-17 13:16,2022-11-17 16:13
-God of War Ragnarök,PS5,2022-11-16 21:45,2022-11-16 22:38
-God of War Ragnarök,PS5,2022-11-16 00:14,2022-11-16 04:28
-God of War Ragnarök,PS5,2022-11-15 01:33,2022-11-15 05:06
-God of War Ragnarök,PS5,2022-11-14 00:37,2022-11-14 04:43
-God of War Ragnarök,PS5,2022-11-12 23:32,2022-11-13 03:45
-God of War Ragnarök,PS5,2022-11-12 03:17,2022-11-12 05:00
-Grand Theft Auto V (PlayStation®5),PS5,2022-10-03 02:01,2022-10-03 02:23
-Grand Theft Auto V (PlayStation®5),PS5,2022-10-02 13:59,2022-10-02 15:54
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-30 22:40,2022-10-01 02:50
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 22:38,2022-09-28 00:16
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-27 19:27,2022-09-27 21:09
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-26 20:58,2022-09-26 23:38
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 23:56,2022-09-26 02:36
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 14:57,2022-09-25 16:38
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-25 02:04,2022-09-25 02:12
-Grand Theft Auto V (PlayStation®5),PS5,2022-09-23 20:33,2022-09-23 23:38
-Wo Long: Fallen Dynasty,PS5,2022-09-18 15:26,2022-09-18 16:58
-Grand Theft Auto V (PlayStation®5),PS5,2022-08-31 00:42,2022-08-31 01:15
-Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 13:43,2022-08-18 15:12
-Grand Theft Auto V (PlayStation®5),PS5,2022-08-18 00:42,2022-08-18 01:58
-Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-18 00:40,2022-08-18 00:42
-Tony Hawk's™ Pro Skater™ 1 + 2,PS5,2022-08-14 15:46,2022-08-14 16:10
-FINAL FANTASY VII,PS5,2022-07-26 18:56,2022-07-26 20:22
-FINAL FANTASY VII REMAKE,PS5,2022-07-26 17:39,2022-07-26 18:53
-FINAL FANTASY VII REMAKE,PS5,2022-07-25 22:12,2022-07-26 04:37
-FINAL FANTASY VII REMAKE,PS5,2022-07-24 00:09,2022-07-24 05:33
-FINAL FANTASY VII REMAKE,PS5,2022-07-23 23:34,2022-07-23 23:48
-FINAL FANTASY VII REMAKE,PS5,2022-07-23 18:05,2022-07-23 19:44
-FINAL FANTASY VII REMAKE,PS5,2022-07-22 17:07,2022-07-23 01:48
-FINAL FANTASY VII REMAKE,PS5,2022-07-22 15:26,2022-07-22 15:59
-FINAL FANTASY VII REMAKE,PS5,2022-07-21 21:27,2022-07-21 22:43
-FINAL FANTASY VII REMAKE,PS5,2022-07-21 20:48,2022-07-21 20:58
-FINAL FANTASY VII REMAKE,PS5,2022-07-21 18:35,2022-07-21 18:36
-Stray,PS5,2022-07-21 01:24,2022-07-21 02:34
-Stray,PS5,2022-07-19 23:49,2022-07-20 03:24
-Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-04 03:26,2022-07-04 03:34
-Red Dead Redemption,PS3,2022-07-04 02:36,2022-07-04 03:14
-Ghost of Tsushima,PS5,2022-07-04 01:38,2022-07-04 02:34
-Dark Cloud™,PS4,2022-07-01 23:48,2022-07-02 00:04
-Atelier Ayesha ~The Alchemist of Dusk~,PS3,2022-07-01 23:20,2022-07-01 23:46
-Resident Evil Director’s Cut,PS5,2022-07-01 23:14,2022-07-01 23:20
-ELEX II,PS5,2022-07-01 22:48,2022-07-01 23:13
-OlliOlli World,PS5,2022-07-01 21:30,2022-07-01 22:30
-Deep Rock Galactic,PS5,2022-06-16 05:30,2022-06-16 06:14
-Curse of the Dead Gods,PS5,2022-06-16 05:00,2022-06-16 05:22
-Persona 5: Dancing in Starlight,PS5,2022-04-29 20:14,2022-04-29 20:15
-Persona 5: Dancing in Starlight,PS5,2022-04-29 00:18,2022-04-29 00:44
-Dying Light 2,PS5,2022-04-14 01:26,2022-04-14 01:27
-Grand Theft Auto V (PlayStation®5),PS5,2022-03-24 16:26,2022-03-24 16:27
-Grand Theft Auto V (PlayStation®5),PS5,2022-03-21 15:52,2022-03-21 15:59
-Horizon Forbidden West,PS5,2022-02-23 19:37,2022-02-24 00:24
-Horizon Forbidden West,PS5,2022-02-23 13:57,2022-02-23 17:44
-Horizon Forbidden West,PS5,2022-02-22 18:05,2022-02-23 05:26
-Horizon Forbidden West,PS5,2022-02-22 15:39,2022-02-22 17:02
-Horizon Forbidden West,PS5,2022-02-22 00:05,2022-02-22 04:08
-Horizon Forbidden West,PS5,2022-02-20 15:39,2022-02-20 23:08
-Horizon Forbidden West,PS5,2022-02-20 14:54,2022-02-20 15:09
-Horizon Forbidden West,PS5,2022-02-19 23:37,2022-02-20 04:45
-Horizon Forbidden West,PS5,2022-02-18 23:15,2022-02-19 03:27
-Assassin's Creed® Origins,PS5,2022-02-18 21:49,2022-02-18 23:15
-Assassin's Creed® Origins,PS5,2022-01-17 02:38,2022-01-17 02:50
-Deep Rock Galactic,PS5,2022-01-17 00:57,2022-01-17 02:35
-HITMAN 3,PS5,2021-11-17 00:35,2021-11-17 01:17
-HITMAN 3,PS5,2021-11-08 01:59,2021-11-08 06:17
-HITMAN 3,PS5,2021-11-07 03:10,2021-11-07 05:23
-HITMAN 3,PS5,2021-11-06 04:23,2021-11-06 08:49
-HITMAN 3,PS5,2021-11-06 02:17,2021-11-06 03:31
-HITMAN 3,PS5,2021-11-05 21:33,2021-11-05 23:24
-HITMAN 3,PS5,2021-11-05 03:09,2021-11-05 03:34
-HITMAN 3,PS5,2021-11-05 00:47,2021-11-05 02:26
-HITMAN 3,PS5,2021-11-04 20:27,2021-11-04 23:32
-HITMAN 3,PS5,2021-11-04 01:34,2021-11-04 05:33
-RESIDENT EVIL 3,PS5,2021-11-03 23:14,2021-11-03 23:56
-RESIDENT EVIL 3,PS5,2021-11-02 23:56,2021-11-03 05:10
-RESIDENT EVIL 3,PS5,2021-11-02 21:22,2021-11-02 23:23
-RESIDENT EVIL 3,PS5,2021-11-02 05:36,2021-11-02 06:56
-HITMAN 3,PS5,2021-11-02 03:00,2021-11-02 05:36
-HITMAN 3,PS5,2021-11-02 01:19,2021-11-02 01:25
-HITMAN™ 2,PS5,2021-11-02 01:09,2021-11-02 01:19
-HITMAN 3,PS5,2021-11-01 23:45,2021-11-02 01:09
-RESIDENT EVIL 3,PS5,2021-11-01 19:32,2021-11-01 19:47
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-17 01:06,2021-10-17 03:27
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-16 20:58,2021-10-16 22:00
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-05 02:30,2021-10-05 03:27
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 23:12,2021-10-04 01:21
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-03 03:02,2021-10-03 04:42
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 20:12,2021-10-02 21:10
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-02 01:40,2021-10-02 03:36
-Marvel's Spider-Man: Miles Morales,PS5,2021-10-01 04:34,2021-10-01 05:30
-DEATHLOOP,PS5,2021-10-01 01:12,2021-10-01 04:27
-DEATHLOOP,PS5,2021-09-30 03:04,2021-09-30 06:30
-DEATHLOOP,PS5,2021-09-29 00:28,2021-09-29 05:08
-Persona 5 Royal,PS5,2021-09-28 00:36,2021-09-28 03:08
-Persona 5 Royal,PS5,2021-09-27 02:16,2021-09-27 05:56
-Persona 5 Royal,PS5,2021-09-26 14:54,2021-09-26 16:32
-Persona 5 Royal,PS5,2021-09-25 18:43,2021-09-25 23:26
-Persona 5 Royal,PS5,2021-09-24 21:41,2021-09-25 03:40
-Persona 5 Royal,PS5,2021-09-23 00:18,2021-09-23 06:26
-Persona 5 Royal,PS5,2021-09-21 20:27,2021-09-22 05:43
-Persona 5 Royal,PS5,2021-09-21 01:07,2021-09-21 06:06
-Borderlands: The Handsome Collection,PS5,2021-09-20 23:59,2021-09-21 01:07
-Persona 5 Royal,PS5,2021-09-20 23:53,2021-09-20 23:59
-DEATHLOOP,PS5,2021-09-20 02:03,2021-09-20 06:29
-DEATHLOOP,PS5,2021-09-19 19:49,2021-09-20 01:16
-Borderlands: The Handsome Collection,PS5,2021-09-19 00:51,2021-09-19 03:41
-Borderlands: The Handsome Collection,PS5,2021-09-17 23:45,2021-09-18 01:48
-Borderlands: The Handsome Collection,PS5,2021-09-17 23:40,2021-09-17 23:41
-DEATHLOOP,PS5,2021-09-17 16:48,2021-09-17 18:56
-DEATHLOOP,PS5,2021-09-17 03:02,2021-09-17 04:39
-DEATHLOOP,PS5,2021-09-17 00:03,2021-09-17 02:53
-DEATHLOOP,PS5,2021-09-16 18:39,2021-09-16 21:12
-Persona 5 Royal,PS5,2021-09-16 18:29,2021-09-16 18:30
-Persona 5 Royal,PS5,2021-09-16 02:26,2021-09-16 06:13
-Persona 5 Royal,PS5,2021-09-16 02:20,2021-09-16 02:21
-Persona 5 Royal,PS5,2021-09-15 01:48,2021-09-15 06:07
-Persona 5 Royal,PS5,2021-09-14 22:21,2021-09-15 01:22
-Persona 5 Royal,PS5,2021-09-14 02:01,2021-09-14 05:48
-Persona 5 Royal,PS5,2021-09-14 00:24,2021-09-14 01:46
-Persona 5 Royal,PS5,2021-08-12 05:04,2021-08-12 07:05
-Persona 5 Royal,PS5,2021-08-11 05:02,2021-08-11 06:48
-Persona 5 Royal,PS5,2021-08-09 00:37,2021-08-09 06:15
-Persona 5 Royal,PS5,2021-08-08 00:31,2021-08-08 08:01
-Persona 5 Royal,PS5,2021-08-07 19:51,2021-08-07 22:50
-Persona 5 Royal,PS5,2021-08-06 23:51,2021-08-07 01:35
-Persona 5 Royal,PS5,2021-08-06 19:26,2021-08-06 22:26
-Persona 5 Royal,PS5,2021-08-06 02:42,2021-08-06 06:51
-Persona 5 Royal,PS5,2021-08-06 00:37,2021-08-06 01:54
-Far Cry® 5,PS5,2021-08-01 23:27,2021-08-02 02:09
-Far Cry® 5,PS5,2021-08-01 18:10,2021-08-01 19:40
-STAR WARS™: Squadrons,PS5,2021-08-01 18:02,2021-08-01 18:10
-STAR WARS™: Squadrons,PS5,2021-08-01 00:24,2021-08-01 00:30
-STEEP,PS5,2021-08-01 00:15,2021-08-01 00:24
-Red Dead Redemption 2,PS5,2021-07-31 23:48,2021-08-01 00:13
-Persona 5 Royal,PS5,2021-07-30 19:09,2021-07-30 19:10
-Persona 5 Royal,PS5,2021-07-29 03:41,2021-07-29 04:59
-Persona 5 Royal,PS5,2021-07-28 02:32,2021-07-28 03:07
-Demon's Souls,PS5,2021-07-28 00:12,2021-07-28 02:32
-Red Dead Redemption 2,PS5,2021-07-27 23:20,2021-07-27 23:23
-Red Dead Redemption 2,PS5,2021-07-26 00:42,2021-07-26 01:13
-Ghost of Tsushima,PS5,2021-07-25 19:03,2021-07-25 22:12
-Ghost of Tsushima,PS5,2021-07-25 18:52,2021-07-25 18:55
-Rez Infinite,PS5,2021-07-25 18:32,2021-07-25 18:52
-Returnal,PS5,2021-07-25 05:24,2021-07-25 05:26
-Tom Clancy's The Division® 2,PS5,2021-07-25 02:12,2021-07-25 05:24
-Returnal,PS5,2021-07-25 00:00,2021-07-25 02:12
-Returnal,PS5,2021-07-24 16:13,2021-07-24 17:39
-Returnal,PS5,2021-07-24 03:02,2021-07-24 07:02
-Returnal,PS5,2021-07-23 18:08,2021-07-23 20:39
-Returnal,PS5,2021-07-23 14:36,2021-07-23 15:38
-Titanfall™ 2,PS5,2021-07-22 02:42,2021-07-22 03:20
-Returnal,PS5,2021-07-20 02:12,2021-07-20 05:40
-Returnal,PS5,2021-07-19 03:37,2021-07-19 05:24
-Concrete Genie,PS5,2021-07-19 03:35,2021-07-19 03:37
-Concrete Genie,PS5,2021-07-18 05:04,2021-07-18 05:30
-Stranded Deep,PS5,2021-07-18 04:32,2021-07-18 04:58
-Sniper Elite 4,PS5,2021-07-18 04:16,2021-07-18 04:32
-Oddworld: Soulstorm,PS5,2021-07-18 04:00,2021-07-18 04:14
-Zombie Army 4: Dead War,PS5,2021-07-18 03:48,2021-07-18 03:58
-Sekiro™: Shadows Die Twice,PS5,2021-07-18 03:00,2021-07-18 03:48
-Returnal,PS5,2021-07-17 17:41,2021-07-17 23:32
-Returnal,PS5,2021-07-17 01:35,2021-07-17 06:07
-Returnal,PS5,2021-07-17 00:23,2021-07-17 01:21
-Another World - 20th Anniversary Edition,PS5,2021-07-15 22:09,2021-07-15 23:33
-Sekiro™: Shadows Die Twice,PS5,2021-07-15 21:52,2021-07-15 22:09
-Sekiro™: Shadows Die Twice,PS5,2021-07-15 19:07,2021-07-15 20:13
-Sekiro™: Shadows Die Twice,PS5,2021-07-15 01:50,2021-07-15 03:31
-Sekiro™: Shadows Die Twice,PS5,2021-07-15 00:12,2021-07-15 01:14
-Sekiro™: Shadows Die Twice,PS5,2021-07-14 03:19,2021-07-14 05:13
-Persona 5,PS5,2021-07-13 21:56,2021-07-13 21:58
-Persona 5,PS5,2021-07-13 01:32,2021-07-13 02:59
-Maquette,PS5,2021-07-13 01:30,2021-07-13 01:32
-Maquette,PS5,2021-07-12 23:59,2021-07-13 00:34
-ASTRO's PLAYROOM,PS5,2021-07-12 23:06,2021-07-12 23:59
-Crash Bandicoot N. Sane Trilogy,PS5,2021-07-12 23:01,2021-07-12 23:06
-Virtua Fighter 5 Ultimate Showdown,PS4,2021-07-02 19:46,2021-07-02 20:57
-Bloodborne™,PS4,2021-04-03 19:50,2021-04-03 23:52
-Tom Clancy's The Division® 2,PS4,2021-04-03 02:10,2021-04-03 05:22
-Bloodborne™,PS4,2021-04-02 21:34,2021-04-03 02:10
-Bloodborne™,PS4,2021-04-02 06:01,2021-04-02 08:11
-Tom Clancy's The Division® 2,PS4,2021-04-02 04:24,2021-04-02 06:01
-Tom Clancy's The Division® 2,PS4,2021-03-31 02:55,2021-03-31 05:50
-Tom Clancy's The Division® 2,PS4,2021-03-29 02:00,2021-03-29 02:02
-Tom Clancy's The Division® 2,PS4,2021-03-27 03:31,2021-03-27 06:29
-Tom Clancy's The Division® 2,PS4,2021-03-26 05:10,2021-03-26 06:03
-Remnant: From the Ashes,PS4,2021-03-23 03:20,2021-03-23 05:58
-DARK SOULS™ II: Scholar of the First Sin,PS4,2021-03-20 01:31,2021-03-20 01:34
-Remnant: From the Ashes,PS4,2021-03-12 01:29,2021-03-12 01:30
-Remnant: From the Ashes,PS4,2021-03-08 02:41,2021-03-08 05:38
-Remnant: From the Ashes,PS4,2021-03-07 03:21,2021-03-07 06:49
-13 Sentinels: Aegis Rim,PS4,2021-03-07 03:20,2021-03-07 03:21
-DARK SOULS™ II: Scholar of the First Sin,PS4,2020-10-24 23:43,2020-10-25 01:18
-Ghost of Tsushima,PS4,2020-10-24 23:14,2020-10-24 23:22

pyproject.toml

@@ -5,7 +5,7 @@ description = "A simple time tracker."
 authors = ["Lukáš Kucharczyk <lukas@kucharczyk.xyz>"]
 license = "GPL"
 readme = "README.md"
-packages = [{include = "timetracker"}]
+packages = [{include = "timetracker", from = "src"}]
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -30,5 +30,7 @@ isort = "^5.11.4"
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.poetry.scripts]
+[tool.pytest.ini_options]
-timetracker-import = "timetracker.common.import_data:import_from_file"
+pythonpath = [
+  "src"
+]

src/timetracker/games/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from games.models import Game, Platform, Purchase, Session
+from .models import Game, Platform, Purchase, Session
 
 # Register your models here.
 admin.site.register(Game)

src/timetracker/games/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from games.models import Game, Platform, Purchase, Session
+from .models import Game, Platform, Purchase, Session
 
 
 class SessionForm(forms.ModelForm):

src/timetracker/games/models.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from zoneinfo import ZoneInfo
 
-from common.time import format_duration
+from timetracker.common.util.time import format_duration
 from django.conf import settings
 from django.db import models
 from django.db.models import F, Manager, Sum

src/timetracker/games/urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 
-from games import views
+from . import views
 
 urlpatterns = [
     path("", views.index, name="index"),

src/timetracker/games/views.py

@@ -1,8 +1,8 @@
 from datetime import datetime
 from zoneinfo import ZoneInfo
 
-from common.plots import playtime_over_time_chart
+from common.util.plots import playtime_over_time_chart
-from common.time import now as now_with_tz
+from common.util.time import now as now_with_tz
 from django.conf import settings
 from django.shortcuts import redirect, render
 

src/timetracker/manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

src/timetracker/root/asgi.py

@@ -1,5 +1,5 @@
 """
-ASGI config for timetracker project.
+ASGI config for root project.
 
 It exposes the ASGI callable as a module-level variable named ``application``.
 
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
 
 application = get_asgi_application()

src/timetracker/root/settings.py

@@ -14,7 +14,7 @@ import os
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve()
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 
 # Quick-start development settings - unsuitable for production
@@ -54,7 +54,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "timetracker.urls"
+ROOT_URLCONF = "root.urls"
 
 TEMPLATES = [
     {
@@ -73,7 +73,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = "timetracker.wsgi.application"
+WSGI_APPLICATION = "root.wsgi.application"
 
 
 # Database

src/timetracker/root/wsgi.py

@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "timetracker.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "root.settings")
 
 application = get_wsgi_application()

tests/test_time.py

@@ -1,7 +1,7 @@
 import unittest
 from datetime import timedelta
 
-from common.time import format_duration
+from timetracker.common.util.time import format_duration
 
 
 class FormatDurationTest(unittest.TestCase):