rogs/cleanmedia
rogs/cleanmedia
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: add support for sqlite3 and multiple databases #2

Open
cgroschupp wants to merge 8 commits from feature/sqlite3-and-multiple-db-support into master
pull from: feature/sqlite3-and-multiple-db-support
merge into: rogs:master
Conversation 27 Commits 8 Files Changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78fb13fb26 - Show all commits

6
cleanmedia.py
View File

@ -207,7 +207,7 @@ class MediaRepository:
"""Retrieve a single media file by ID."""
cur = self._execute(
"""SELECT media_id, creation_ts, base64hash, file_size_bytes
from mediaapi_media_repository WHERE media_id = %s;""",
from mediaapi_media_repository WHERE media_id = %s;""",
(mxid,),
)
row = cur.fetchone()
@ -224,7 +224,7 @@ class MediaRepository:
"""
cur = self._execute(
"""SELECT media_id, creation_ts, base64hash, file_size_bytes
FROM mediaapi_media_repository WHERE user_id = %s;""",
FROM mediaapi_media_repository WHERE user_id = %s;""",
(user_id,),
)
return [File(self, row[0], row[1] // 1000, row[2], row[3]) for row in cur.fetchall()]
@ -239,7 +239,7 @@ class MediaRepository:
List of File objects
"""
query = """SELECT media_id, creation_ts, base64hash, file_size_bytes
FROM mediaapi_media_repository"""
FROM mediaapi_media_repository"""
if not local:
query += " WHERE user_id = ''"
cur = self._execute(query)

4
tests/test_cleanmedia.py
View File

@ -144,7 +144,7 @@ def test_get_single_media(media_repo: MediaRepository, mock_db_conn: Tuple[Any,
assert file.base64hash == "abc123"
media_repo._execute.assert_called_with( # type: ignore
"SELECT media_id, creation_ts, base64hash, file_size_bytes from mediaapi_media_repository WHERE media_id = %s;",
"SELECT media_id, creation_ts, base64hash, file_size_bytes\nfrom mediaapi_media_repository WHERE media_id = %s;",
("mxid123",),
)
@ -279,7 +279,7 @@ def test_get_local_user_media(media_repo: MediaRepository, mock_db_conn: Tuple[A
assert files[1].media_id == "media2"
media_repo._execute.assert_called_with( # type: ignore
"SELECT media_id, creation_ts, base64hash, file_size_bytes FROM mediaapi_media_repository WHERE user_id = %s;",
"SELECT media_id, creation_ts, base64hash, file_size_bytes\nFROM mediaapi_media_repository WHERE user_id = %s;",
("@user:domain.com",),
)