fixed funny bug

This commit is contained in:
Hellow
2023-03-24 15:58:21 +01:00
parent 5387301ed2
commit 267bf52847
12 changed files with 142 additions and 82 deletions

View File

@@ -1,19 +0,0 @@
from . import database
from .. import objects
MusicObject = objects.MusicObject
ID3Timestamp = objects.ID3Timestamp
SourceTypes = objects.SourceTypes
SourcePages = objects.SourcePages
Song = objects.Song
Source = objects.Source
Target = objects.Target
Lyrics = objects.Lyrics
Album = objects.Album
Artist = objects.Artist
FormattedText = objects.FormattedText
Database = database.Database
# cache = temp_database.TempDatabase()

View File

@@ -130,7 +130,7 @@ class Database:
print(model._meta.fields)
def push(self, database_object: objects.MusicObject):
def push(self, database_object: objects.DatabaseObject):
"""
Adds a new music object to the database using the corresponding method from the `write` session.
When possible, rather use the `push_many` function.
@@ -153,7 +153,7 @@ class Database:
if isinstance(database_object, objects.Artist):
return writing_session.add_artist(database_object)
def push_many(self, database_objects: List[objects.MusicObject]) -> None:
def push_many(self, database_objects: List[objects.DatabaseObject]) -> None:
"""
Adds a list of MusicObject instances to the database.
This function sends only needs one querry for each type of table added.

View File

@@ -2,7 +2,7 @@ from collections import defaultdict
from typing import Dict, List, Optional
import weakref
from src.music_kraken.objects import MusicObject
from src.music_kraken.objects import DatabaseObject
"""
This is a cache for the objects, that et pulled out of the database.
@@ -32,14 +32,14 @@ class ObjectCache:
:method extent: Add a list of MusicObjects to the cache.
:method remove: Remove a MusicObject from the cache by its id.
:method get: Retrieve a MusicObject from the cache by its id. """
object_to_id: Dict[str, MusicObject]
object_to_id: Dict[str, DatabaseObject]
weakref_map: Dict[weakref.ref, str]
def __init__(self) -> None:
self.object_to_id = dict()
self.weakref_map = defaultdict()
def exists(self, music_object: MusicObject) -> bool:
def exists(self, music_object: DatabaseObject) -> bool:
"""
Check if a MusicObject with the same id already exists in the cache.
@@ -60,7 +60,7 @@ class ObjectCache:
data_id = self.weakref_map.pop(weakref_)
self.object_to_id.pop(data_id)
def append(self, music_object: MusicObject) -> bool:
def append(self, music_object: DatabaseObject) -> bool:
"""
Add a MusicObject to the cache.
@@ -75,7 +75,7 @@ class ObjectCache:
return False
def extent(self, music_object_list: List[MusicObject]):
def extent(self, music_object_list: List[DatabaseObject]):
"""
adjacent to the extent method of list, this appends n Object
"""
@@ -93,7 +93,7 @@ class ObjectCache:
self.weakref_map.pop(weakref.ref(data))
self.object_to_id.pop(_id)
def __getitem__(self, item) -> Optional[MusicObject]:
def __getitem__(self, item) -> Optional[DatabaseObject]:
"""
this returns the data obj
:param item: the id of the music object
@@ -102,5 +102,5 @@ class ObjectCache:
return self.object_to_id.get(item)
def get(self, _id: str) -> Optional[MusicObject]:
def get(self, _id: str) -> Optional[DatabaseObject]:
return self.__getitem__(_id)