markup: do xls generation on webdav pdf save

This commit is contained in:
2020-03-02 11:21:57 -08:00
parent a9db1b2c8c
commit 0076605084
2 changed files with 7 additions and 1 deletions

View File

@ -22,6 +22,8 @@ from django.conf import settings
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'procat2.settings') os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'procat2.settings')
django.setup() django.setup()
from django.contrib.auth.models import User
from .utils import clean_path, ensure_dir, set_file_perms, WORKDIR from .utils import clean_path, ensure_dir, set_file_perms, WORKDIR
from .email import reply, reply_missing, reply_no_matches, send_error_email from .email import reply, reply_missing, reply_no_matches, send_error_email
from .matching import find_marked_products from .matching import find_marked_products
@ -90,11 +92,13 @@ def process_attachment(from_address, subject, attachment):
@shared_task(on_failure=on_fail_handler) @shared_task(on_failure=on_fail_handler)
def process_markup_pdf(pdf_path, user): def process_markup_pdf(pdf_path, username):
if not Path(pdf_path).is_file(): if not Path(pdf_path).is_file():
print(f'No pdf - exiting ({pdf_path})') print(f'No pdf - exiting ({pdf_path})')
return return
user = User.objects.get(username=username)
pdf_stem = Path(pdf_path).stem pdf_stem = Path(pdf_path).stem
workdir = os.path.join(WORKDIR, clean_path(user.username), clean_path(pdf_stem)) workdir = os.path.join(WORKDIR, clean_path(user.username), clean_path(pdf_stem))
ensure_dir(workdir) ensure_dir(workdir)

View File

@ -28,6 +28,7 @@ from procat2.models import Catalog
from procat2.settings import ASSET_DIR from procat2.settings import ASSET_DIR
from .utils import clean_path, ensure_dir, set_file_perms, WORKDIR from .utils import clean_path, ensure_dir, set_file_perms, WORKDIR
from .tasks import process_markup_pdf
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -262,6 +263,7 @@ class MarkupResource(MarkupDavResource, DummyFSDAVResource):
def write(self, request, temp_file=None, range_start=None): def write(self, request, temp_file=None, range_start=None):
super().write(request, temp_file=temp_file, range_start=range_start) super().write(request, temp_file=temp_file, range_start=range_start)
process_markup_pdf.delay(self.get_abs_path(), self.user.username)
def get_acl(self): def get_acl(self):
return FullAcl() return FullAcl()