sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-21 05:20:36 +00:00
Code Issues Projects Releases Wiki Activity

Use pathlib where possible

Browse Source
This commit is contained in:
Patrick Jentsch
2024-03-07 15:49:04 +01:00
parent ec23bd94ee
commit 9da74c1c6f
21 changed files with 164 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/corpus_file.py
View File

@ -1,6 +1,6 @@
from flask import current_app, url_for
from flask_hashids import HashidMixin
import os
from pathlib import Path
from app import db
from .corpus import CorpusStatus
from .file_mixin import FileMixin
@ -45,8 +45,8 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
return f'{self.corpus.jsonpatch_path}/files/{self.hashid}'
@property
def path(self):
return os.path.join(self.corpus.path, 'files', str(self.id))
def path(self) -> Path:
return self.corpus.path / 'files' / f'{self.id}'
@property
def url(self):
@ -66,9 +66,10 @@ class CorpusFile(FileMixin, HashidMixin, db.Model):
def delete(self):
try:
os.remove(self.path)
self.path.unlink(missing_ok=True)
except OSError as e:
current_app.logger.error(e)
raise
db.session.delete(self)
self.corpus.status = CorpusStatus.UNPREPARED