Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix accidentaly messed up return type default_location getter #848

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Fix accidentaly messed up return type default_location getter #848

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c5e8b
Fix accidentaly messed up return type default_location getter
rdbende Jan 19, 2024
af9ec9f
Update cozy/model/settings.py
rdbende Jan 20, 2024
26fb5bb
Merge branch 'master' into ich-hab-scheiße-gebaut
rdbende Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions cozy/model/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import logging
from typing import NoReturn

import peewee

import cozy.ext.inject as inject
from peewee import SqliteDatabase

import cozy.ext.inject as inject
from cozy.db.book import Book
from cozy.db.settings import Settings as SettingsModel
from cozy.db.storage import Storage as StorageModel
from cozy.model.storage import Storage, InvalidPath
from cozy.model.storage import InvalidPath, Storage
from cozy.report import reporter

log = logging.getLogger("model.storage_location")
Expand Down Expand Up @@ -51,8 +51,11 @@ def last_played_book(self, new_value) -> None:
self._db_object.save(only=self._db_object.dirty_fields)

@property
def default_location(self) -> Storage:
return next(location for location in self.storage_locations if location.default)
def default_location(self) -> Storage | NoReturn:
for location in self.storage_locations:
if location.default:
return location
raise AssertionError("This should never happen")

@property
def storage_locations(self) -> list[Storage]:
Expand Down
Loading