profitroll/PhotosAPI
profitroll/PhotosAPI
1
0
Fork 0
Code Issues 4 Pull Requests Releases 7 Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Profitroll 2023-06-23 12:31:10 +03:00
commit d688d766da
9 changed files with 110 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
extensions/albums.py
View File

@ -1,5 +1,6 @@
import re import re
from os import makedirs, path, rename from os import makedirs, rename
from pathlib import Path
from shutil import rmtree from shutil import rmtree
from typing import Union from typing import Union
@ -49,9 +50,7 @@ async def album_create(
if col_albums.find_one({"name": name}) is not None: if col_albums.find_one({"name": name}) is not None:
raise AlbumAlreadyExistsError(name) raise AlbumAlreadyExistsError(name)
makedirs( makedirs(Path(f"data/users/{current_user.user}/albums/{name}"), exist_ok=True)
path.join("data", "users", current_user.user, "albums", name), exist_ok=True
)
uploaded = col_albums.insert_one( uploaded = col_albums.insert_one(
{"user": current_user.user, "name": name, "title": title, "cover": None} {"user": current_user.user, "name": name, "title": title, "cover": None}
@ -123,8 +122,8 @@ async def album_patch(
if 2 > len(name) > 20: if 2 > len(name) > 20:
raise AlbumIncorrectError("name", "must be >2 and <20 characters.") raise AlbumIncorrectError("name", "must be >2 and <20 characters.")
rename( rename(
path.join("data", "users", current_user.user, "albums", album["name"]), Path(f"data/users/{current_user.user}/albums/{album['name']}"),
path.join("data", "users", current_user.user, "albums", name), Path(f"data/users/{current_user.user}/albums/{name}"),
) )
col_photos.update_many( col_photos.update_many(
{"user": current_user.user, "album": album["name"]}, {"user": current_user.user, "album": album["name"]},
@ -186,8 +185,8 @@ async def album_put(
cover = image["_id"].__str__() if image is not None else None # type: ignore cover = image["_id"].__str__() if image is not None else None # type: ignore
rename( rename(
path.join("data", "users", current_user.user, "albums", album["name"]), Path(f"data/users/{current_user.user}/albums/{album['name']}"),
path.join("data", "users", current_user.user, "albums", name), Path(f"data/users/{current_user.user}/albums/{name}"),
) )
col_photos.update_many( col_photos.update_many(
@ -222,6 +221,6 @@ async def album_delete(
col_photos.delete_many({"album": album["name"]}) col_photos.delete_many({"album": album["name"]})
rmtree(path.join("data", "users", current_user.user, "albums", album["name"])) rmtree(Path(f"data/users/{current_user.user}/albums/{album['name']}"))
return Response(status_code=HTTP_204_NO_CONTENT) return Response(status_code=HTTP_204_NO_CONTENT)

16
extensions/pages.py
View File

@ -1,4 +1,4 @@
from os import path from pathlib import Path
import aiofiles import aiofiles
from fastapi.responses import HTMLResponse, Response from fastapi.responses import HTMLResponse, Response
@ -8,27 +8,21 @@ from modules.app import app
@app.get("/pages/matter.css", include_in_schema=False) @app.get("/pages/matter.css", include_in_schema=False)
async def page_matter(): async def page_matter():
async with aiofiles.open( async with aiofiles.open(Path("pages/matter.css"), "r", encoding="utf-8") as f:
path.join("pages", "matter.css"), "r", encoding="utf-8"
) as f:
output = await f.read() output = await f.read()
return Response(content=output) return Response(content=output)
@app.get("/pages/{page}/{file}", include_in_schema=False) @app.get("/pages/{page}/{file}", include_in_schema=False)
async def page_assets(page: str, file: str): async def page_assets(page: str, file: str):
async with aiofiles.open( async with aiofiles.open(Path(f"pages/{page}/{file}"), "r", encoding="utf-8") as f:
path.join("pages", page, file), "r", encoding="utf-8"
) as f:
output = await f.read() output = await f.read()
return Response(content=output) return Response(content=output)
@app.get("/", include_in_schema=False) @app.get("/", include_in_schema=False)
async def page_home(): async def page_home():
async with aiofiles.open( async with aiofiles.open(Path("pages/home/index.html"), "r", encoding="utf-8") as f:
path.join("pages", "home", "index.html"), "r", encoding="utf-8"
) as f:
output = await f.read() output = await f.read()
return HTMLResponse(content=output) return HTMLResponse(content=output)
@ -36,7 +30,7 @@ async def page_home():
@app.get("/register", include_in_schema=False) @app.get("/register", include_in_schema=False)
async def page_register(): async def page_register():
async with aiofiles.open( async with aiofiles.open(
path.join("pages", "register", "index.html"), "r", encoding="utf-8" Path("pages/register/index.html"), "r", encoding="utf-8"
) as f: ) as f:
output = await f.read() output = await f.read()
return HTMLResponse(content=output) return HTMLResponse(content=output)

75
extensions/photos.py
View File

@ -1,6 +1,8 @@
import logging
import re import re
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from os import makedirs, path, remove, system from os import makedirs, path, remove, system
from pathlib import Path
from secrets import token_urlsafe from secrets import token_urlsafe
from shutil import move from shutil import move
from threading import Thread from threading import Thread
@ -42,14 +44,18 @@ from modules.security import (
get_current_active_user, get_current_active_user,
get_user, get_user,
) )
from modules.utils import configGet, logWrite from modules.utils import configGet
logger = logging.getLogger(__name__)
async def compress_image(image_path: str): async def compress_image(image_path: str):
image_type = Magic(mime=True).from_file(image_path) image_type = Magic(mime=True).from_file(image_path)
if image_type not in ["image/jpeg", "image/png"]: if image_type not in ["image/jpeg", "image/png"]:
logWrite(f"Not compressing {image_path} because its mime is '{image_type}'") logger.info(
"Not compressing %s because its mime is '%s'", image_path, image_type
)
return return
size_before = path.getsize(image_path) / 1024 size_before = path.getsize(image_path) / 1024
@ -65,12 +71,15 @@ async def compress_image(image_path: str):
return return
task.start() task.start()
logWrite(f"Compressing '{path.split(image_path)[-1]}'...") logger.info("Compressing '%s'...", Path(image_path).name)
task.join() task.join()
size_after = path.getsize(image_path) / 1024 size_after = path.getsize(image_path) / 1024
logWrite( logger.info(
f"Compressed '{path.split(image_path)[-1]}' from {size_before} Kb to {size_after} Kb" "Compressed '%s' from %s Kb to %s Kb",
Path(image_path).name,
size_before,
size_after,
) )
@ -109,15 +118,11 @@ async def photo_upload(
if col_albums.find_one({"user": current_user.user, "name": album}) is None: if col_albums.find_one({"user": current_user.user, "name": album}) is None:
raise AlbumNameNotFoundError(album) raise AlbumNameNotFoundError(album)
makedirs( makedirs(Path(f"data/users/{current_user.user}/albums/{album}"), exist_ok=True)
path.join("data", "users", current_user.user, "albums", album), exist_ok=True
)
filename = file.filename filename = file.filename
if path.exists( if Path(f"data/users/{current_user.user}/albums/{album}/{file.filename}").exists():
path.join("data", "users", current_user.user, "albums", album, file.filename)
):
base_name = file.filename.split(".")[:-1] base_name = file.filename.split(".")[:-1]
extension = file.filename.split(".")[-1] extension = file.filename.split(".")[-1]
filename = ( filename = (
@ -125,12 +130,12 @@ async def photo_upload(
) )
async with aiofiles.open( async with aiofiles.open(
path.join("data", "users", current_user.user, "albums", album, filename), "wb" Path(f"data/users/{current_user.user}/albums/{album}/{filename}"), "wb"
) as f: ) as f:
f.write(await file.read()) await f.write(await file.read())
file_hash = await get_phash( file_hash = await get_phash(
path.join("data", "users", current_user.user, "albums", album, filename) Path(f"data/users/{current_user.user}/albums/{album}/{filename}")
) )
duplicates = await get_duplicates(file_hash, album) duplicates = await get_duplicates(file_hash, album)
@ -168,7 +173,7 @@ async def photo_upload(
try: try:
coords = extract_location( coords = extract_location(
path.join("data", "users", current_user.user, "albums", album, filename) Path(f"data/users/{current_user.user}/albums/{album}/{filename}")
) )
except (UnpackError, ValueError): except (UnpackError, ValueError):
coords = {"lng": 0.0, "lat": 0.0, "alt": 0.0} coords = {"lng": 0.0, "lat": 0.0, "alt": 0.0}
@ -193,9 +198,7 @@ async def photo_upload(
compress_image, compress_image,
trigger="date", trigger="date",
run_date=datetime.now() + timedelta(seconds=1), run_date=datetime.now() + timedelta(seconds=1),
args=[ args=[Path(f"data/users/{current_user.user}/albums/{album}/{filename}")],
path.join("data", "users", current_user.user, "albums", album, filename)
],
) )
return UJSONResponse( return UJSONResponse(
@ -254,8 +257,8 @@ if configGet("media_token_access") is True:
except InvalidId: except InvalidId:
raise PhotoNotFoundError(id) raise PhotoNotFoundError(id)
image_path = path.join( image_path = Path(
"data", "users", user.user, "albums", image["album"], image["filename"] f"data/users/{user.user}/albums/{image['album']}/{image['filename']}"
) )
mime = Magic(mime=True).from_file(image_path) mime = Magic(mime=True).from_file(image_path)
@ -299,8 +302,8 @@ async def photo_get(
except InvalidId: except InvalidId:
raise PhotoNotFoundError(id) raise PhotoNotFoundError(id)
image_path = path.join( image_path = Path(
"data", "users", current_user.user, "albums", image["album"], image["filename"] f"data/users/{current_user.user}/albums/{image['album']}/{image['filename']}"
) )
mime = Magic(mime=True).from_file(image_path) mime = Magic(mime=True).from_file(image_path)
@ -335,11 +338,9 @@ async def photo_move(
if col_albums.find_one({"user": current_user.user, "name": album}) is None: if col_albums.find_one({"user": current_user.user, "name": album}) is None:
raise AlbumNameNotFoundError(album) raise AlbumNameNotFoundError(album)
if path.exists( if Path(
path.join( f"data/users/{current_user.user}/albums/{album}/{image['filename']}"
"data", "users", current_user.user, "albums", album, image["filename"] ).exists():
)
):
base_name = image["filename"].split(".")[:-1] base_name = image["filename"].split(".")[:-1]
extension = image["filename"].split(".")[-1] extension = image["filename"].split(".")[-1]
filename = ( filename = (
@ -360,15 +361,10 @@ async def photo_move(
) )
move( move(
path.join( Path(
"data", f"data/users/{current_user.user}/albums/{image['album']}/{image['filename']}"
"users",
current_user.user,
"albums",
image["album"],
image["filename"],
), ),
path.join("data", "users", current_user.user, "albums", album, filename), Path(f"data/users/{current_user.user}/albums/{album}/{filename}"),
) )
return UJSONResponse( return UJSONResponse(
@ -441,13 +437,8 @@ async def photo_delete(
col_albums.update_one({"name": image["album"]}, {"$set": {"cover": None}}) col_albums.update_one({"name": image["album"]}, {"$set": {"cover": None}})
remove( remove(
path.join( Path(
"data", f"data/users/{current_user.user}/albums/{image['album']}/{image['filename']}"
"users",
current_user.user,
"albums",
image["album"],
image["filename"],
) )
) )

11
extensions/users.py
View File

@ -1,3 +1,4 @@
import logging
from datetime import datetime, timedelta from datetime import datetime, timedelta
from uuid import uuid1 from uuid import uuid1
@ -21,7 +22,9 @@ from modules.security import (
get_user, get_user,
verify_password, verify_password,
) )
from modules.utils import configGet, logWrite from modules.utils import configGet
logger = logging.getLogger(__name__)
async def send_confirmation(user: str, email: str): async def send_confirmation(user: str, email: str):
@ -41,9 +44,11 @@ async def send_confirmation(user: str, email: str):
col_emails.insert_one( col_emails.insert_one(
{"user": user, "email": email, "used": False, "code": confirmation_code} {"user": user, "email": email, "used": False, "code": confirmation_code}
) )
logWrite(f"Sent confirmation email to '{email}' with code {confirmation_code}") logger.info(
"Sent confirmation email to '%s' with code %s", email, confirmation_code
)
except Exception as exp: except Exception as exp:
logWrite(f"Could not send confirmation email to '{email}' due to: {exp}") logger.error("Could not send confirmation email to '%s' due to: %s", email, exp)
@app.get("/users/me/", response_model=User) @app.get("/users/me/", response_model=User)

45
extensions/videos.py
View File

@ -1,6 +1,7 @@
import re import re
from datetime import datetime, timezone from datetime import datetime, timezone
from os import makedirs, path, remove from os import makedirs, remove
from pathlib import Path
from secrets import token_urlsafe from secrets import token_urlsafe
from shutil import move from shutil import move
from typing import Union from typing import Union
@ -45,15 +46,11 @@ async def video_upload(
if col_albums.find_one({"user": current_user.user, "name": album}) is None: if col_albums.find_one({"user": current_user.user, "name": album}) is None:
raise AlbumNameNotFoundError(album) raise AlbumNameNotFoundError(album)
makedirs( makedirs(Path(f"data/users/{current_user.user}/albums/{album}"), exist_ok=True)
path.join("data", "users", current_user.user, "albums", album), exist_ok=True
)
filename = file.filename filename = file.filename
if path.exists( if Path(f"data/users/{current_user.user}/albums/{album}/{file.filename}").exists():
path.join("data", "users", current_user.user, "albums", album, file.filename)
):
base_name = file.filename.split(".")[:-1] base_name = file.filename.split(".")[:-1]
extension = file.filename.split(".")[-1] extension = file.filename.split(".")[-1]
filename = ( filename = (
@ -61,7 +58,7 @@ async def video_upload(
) )
async with aiofiles.open( async with aiofiles.open(
path.join("data", "users", current_user.user, "albums", album, filename), "wb" Path(f"data/users/{current_user.user}/albums/{album}/{filename}"), "wb"
) as f: ) as f:
await f.write(await file.read()) await f.write(await file.read())
@ -125,8 +122,8 @@ async def video_get(
except InvalidId: except InvalidId:
raise VideoNotFoundError(id) raise VideoNotFoundError(id)
video_path = path.join( video_path = Path(
"data", "users", current_user.user, "albums", video["album"], video["filename"] f"data/users/{current_user.user}/albums/{video['album']}/{video['filename']}"
) )
mime = Magic(mime=True).from_file(video_path) mime = Magic(mime=True).from_file(video_path)
@ -161,11 +158,9 @@ async def video_move(
if col_albums.find_one({"user": current_user.user, "name": album}) is None: if col_albums.find_one({"user": current_user.user, "name": album}) is None:
raise AlbumNameNotFoundError(album) raise AlbumNameNotFoundError(album)
if path.exists( if Path(
path.join( f"data/users/{current_user.user}/albums/{album}/{video['filename']}"
"data", "users", current_user.user, "albums", album, video["filename"] ).exists():
)
):
base_name = video["filename"].split(".")[:-1] base_name = video["filename"].split(".")[:-1]
extension = video["filename"].split(".")[-1] extension = video["filename"].split(".")[-1]
filename = ( filename = (
@ -186,15 +181,10 @@ async def video_move(
) )
move( move(
path.join( Path(
"data", f"data/users/{current_user.user}/albums/{video['album']}/{video['filename']}"
"users",
current_user.user,
"albums",
video["album"],
video["filename"],
), ),
path.join("data", "users", current_user.user, "albums", album, filename), Path(f"data/users/{current_user.user}/albums/{album}/{filename}"),
) )
return UJSONResponse( return UJSONResponse(
@ -264,13 +254,8 @@ async def video_delete(
album = col_albums.find_one({"name": video["album"]}) album = col_albums.find_one({"name": video["album"]})
remove( remove(
path.join( Path(
"data", f"data/users/{current_user.user}/albums/{video['album']}/{video['filename']}"
"users",
current_user.user,
"albums",
video["album"],
video["filename"],
) )
) )

5
modules/extensions_loader.py
View File

@ -1,5 +1,6 @@
from importlib.util import module_from_spec, spec_from_file_location from importlib.util import module_from_spec, spec_from_file_location
from os import getcwd, path, walk from os import getcwd, path, walk
from pathlib import Path
# ================================================================================= # =================================================================================
@ -12,7 +13,7 @@ def get_py_files(src):
for root, dirs, files in walk(src): for root, dirs, files in walk(src):
for file in files: for file in files:
if file.endswith(".py"): if file.endswith(".py"):
py_files.append(path.join(cwd, root, file)) py_files.append(Path(f"{cwd}/{root}/{file}"))
return py_files return py_files
@ -36,7 +37,7 @@ def dynamic_import(module_name, py_path):
def dynamic_import_from_src(src, star_import=False): def dynamic_import_from_src(src, star_import=False):
my_py_files = get_py_files(src) my_py_files = get_py_files(src)
for py_file in my_py_files: for py_file in my_py_files:
module_name = path.split(py_file)[-1][:-3] module_name = Path(py_file).stem
print(f"Importing {module_name} extension...", flush=True) print(f"Importing {module_name} extension...", flush=True)
imported_module = dynamic_import(module_name, py_file) imported_module = dynamic_import(module_name, py_file)
if imported_module != None: if imported_module != None:

17
modules/mailer.py
View File

@ -1,8 +1,11 @@
import logging
from smtplib import SMTP, SMTP_SSL from smtplib import SMTP, SMTP_SSL
from ssl import create_default_context from ssl import create_default_context
from traceback import print_exc from traceback import print_exc
from modules.utils import configGet, logWrite from modules.utils import configGet
logger = logging.getLogger(__name__)
try: try:
if configGet("use_ssl", "mailer", "smtp") is True: if configGet("use_ssl", "mailer", "smtp") is True:
@ -10,7 +13,7 @@ try:
configGet("host", "mailer", "smtp"), configGet("host", "mailer", "smtp"),
configGet("port", "mailer", "smtp"), configGet("port", "mailer", "smtp"),
) )
logWrite(f"Initialized SMTP SSL connection") logger.info("Initialized SMTP SSL connection")
elif configGet("use_tls", "mailer", "smtp") is True: elif configGet("use_tls", "mailer", "smtp") is True:
mail_sender = SMTP( mail_sender = SMTP(
configGet("host", "mailer", "smtp"), configGet("host", "mailer", "smtp"),
@ -18,21 +21,21 @@ try:
) )
mail_sender.starttls(context=create_default_context()) mail_sender.starttls(context=create_default_context())
mail_sender.ehlo() mail_sender.ehlo()
logWrite(f"Initialized SMTP TLS connection") logger.info("Initialized SMTP TLS connection")
else: else:
mail_sender = SMTP( mail_sender = SMTP(
configGet("host", "mailer", "smtp"), configGet("port", "mailer", "smtp") configGet("host", "mailer", "smtp"), configGet("port", "mailer", "smtp")
) )
mail_sender.ehlo() mail_sender.ehlo()
logWrite(f"Initialized SMTP connection") logger.info("Initialized SMTP connection")
except Exception as exp: except Exception as exp:
logWrite(f"Could not initialize SMTP connection to: {exp}") logger.error("Could not initialize SMTP connection to: %s", exp)
print_exc() print_exc()
try: try:
mail_sender.login( mail_sender.login(
configGet("login", "mailer", "smtp"), configGet("password", "mailer", "smtp") configGet("login", "mailer", "smtp"), configGet("password", "mailer", "smtp")
) )
logWrite(f"Successfully initialized mailer") logger.info("Successfully initialized mailer")
except Exception as exp: except Exception as exp:
logWrite(f"Could not login into provided SMTP account due to: {exp}") logger.error("Could not login into provided SMTP account due to: %s", exp)

35
modules/utils.py
View File

@ -1,21 +1,18 @@
from traceback import print_exc import logging
from pathlib import Path
from traceback import format_exc
from typing import Any, Union from typing import Any, Union
from ujson import JSONDecodeError, dumps, loads from ujson import JSONDecodeError, dumps, loads
logger = logging.getLogger(__name__)
# Print to stdout and then to log
def logWrite(message: str, debug: bool = False) -> None:
# save to log file and rotation is to be done
# logAppend(f'{message}', debug=debug)
print(f"{message}", flush=True)
def jsonLoad(filepath: str) -> Any: def jsonLoad(filepath: Union[str, Path]) -> Any:
"""Load json file """Load json file
### Args: ### Args:
* filepath (`str`): Path to input file * filepath (`Union[str, Path]`): Path to input file
### Returns: ### Returns:
* `Any`: Some json deserializable * `Any`: Some json deserializable
@ -24,32 +21,36 @@ def jsonLoad(filepath: str) -> Any:
try: try:
output = loads(file.read()) output = loads(file.read())
except JSONDecodeError: except JSONDecodeError:
logWrite( logger.error(
f"Could not load json file {filepath}: file seems to be incorrect!\n{print_exc()}" "Could not load json file %s: file seems to be incorrect!\n%s",
filepath,
format_exc(),
) )
raise raise
except FileNotFoundError: except FileNotFoundError:
logWrite( logger.error(
f"Could not load json file {filepath}: file does not seem to exist!\n{print_exc()}" "Could not load json file %s: file does not seem to exist!\n%s",
filepath,
format_exc(),
) )
raise raise
file.close() file.close()
return output return output
def jsonSave(contents: Union[list, dict], filepath: str) -> None: def jsonSave(contents: Union[list, dict], filepath: Union[str, Path]) -> None:
"""Save contents into json file """Save contents into json file
### Args: ### Args:
* contents (`Union[list, dict]`): Some json serializable * contents (`Union[list, dict]`): Some json serializable
* filepath (`str`): Path to output file * filepath (`Union[str, Path]`): Path to output file
""" """
try: try:
with open(filepath, "w", encoding="utf8") as file: with open(filepath, "w", encoding="utf8") as file:
file.write(dumps(contents, ensure_ascii=False, indent=4)) file.write(dumps(contents, ensure_ascii=False, indent=4))
file.close() file.close()
except Exception as exp: except Exception as exp:
logWrite(f"Could not save json file {filepath}: {exp}\n{print_exc()}") logger.error("Could not save json file %s: %s\n%s", filepath, exp, format_exc())
return return
@ -63,7 +64,7 @@ def configGet(key: str, *args: str) -> Any:
### Returns: ### Returns:
* `Any`: Value of provided key * `Any`: Value of provided key
""" """
this_dict = jsonLoad("config.json") this_dict = jsonLoad(Path("config.json"))
this_key = this_dict this_key = this_dict
for dict_key in args: for dict_key in args:
this_key = this_key[dict_key] this_key = this_key[dict_key]

13
photos_api.py
View File

@ -1,13 +1,20 @@
from os import makedirs, path import logging
from os import makedirs
from pathlib import Path
from fastapi.responses import FileResponse from fastapi.responses import FileResponse
from modules.app import app from modules.app import app
from modules.extensions_loader import dynamic_import_from_src from modules.extensions_loader import dynamic_import_from_src
from modules.scheduler import scheduler from modules.scheduler import scheduler
from modules.utils import *
makedirs(path.join("data", "users"), exist_ok=True) makedirs(Path("data/users"), exist_ok=True)
logging.basicConfig(
level=logging.INFO,
format="%(name)s.%(funcName)s | %(levelname)s | %(message)s",
datefmt="[%X]",
)
@app.get("/favicon.ico", response_class=FileResponse, include_in_schema=False) @app.get("/favicon.ico", response_class=FileResponse, include_in_schema=False)