Skip to content

Commit 418226c

Browse files
authored
short descriptive message for every version bump
1 parent aa410fd commit 418226c

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

papermerge/core/models/document.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import logging
22
import os
3+
from typing import Optional
34
from os.path import getsize
45
from pikepdf import Pdf
56

@@ -346,7 +347,11 @@ def version_bump_from_pages(self, pages):
346347

347348
return document_version
348349

349-
def version_bump(self, page_count=None):
350+
def version_bump(
351+
self,
352+
page_count=None,
353+
short_description: Optional[str] = ''
354+
):
350355
"""
351356
Increment document's version.
352357
@@ -370,6 +375,7 @@ def version_bump(self, page_count=None):
370375
file_name=last_doc_version.file_name,
371376
size=0, # TODO: set to newly created file size
372377
page_count=new_page_count,
378+
short_description=short_description,
373379
lang=last_doc_version.lang
374380
)
375381
new_doc_version.save()

papermerge/core/views/documents.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ def _merge_documents(src_uuid, dst_uuid):
162162

163163
src_version = src.versions.last()
164164
dst_new_version = dst.version_bump(
165-
page_count=src_version.pages.count()
165+
page_count=src_version.pages.count(),
166+
short_description='document merge'
166167
)
167168
total_merge(
168169
src_old_version=src_version,

papermerge/core/views/pages.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -575,23 +575,27 @@ def merge_to_document(self, data):
575575
)
576576
src_old_version = pages.first().document_version
577577
doc = src_old_version.document
578+
pages_count = pages.count()
578579

579-
if src_old_version.pages.count() == pages.count():
580+
if src_old_version.pages.count() == pages_count:
580581
# destination new version will have same
581582
# number of pages as source document count
582583
dst_new_version = dst_document.version_bump(
583-
page_count=pages.count()
584+
page_count=pages_count,
585+
short_description=f'{pages_count} page(s) merged in'
584586
)
585587
total_merge(
586588
src_old_version=src_old_version,
587589
dst_new_version=dst_new_version
588590
)
589591
else:
590592
src_new_version = doc.version_bump(
591-
page_count=src_old_version.pages.count() - pages.count()
593+
page_count=src_old_version.pages.count() - pages_count,
594+
short_description=f'{pages_count} page(s) merged out'
592595
)
593596
dst_new_version = dst_document.version_bump(
594-
page_count=pages.count()
597+
page_count=pages_count,
598+
short_description=f'{pages_count} page(s) merged in'
595599
)
596600
partial_merge(
597601
src_old_version=src_old_version,
@@ -610,13 +614,16 @@ def move_to_document(self, data):
610614
)
611615
src_old_version = pages.first().document_version
612616
dst_old_version = dst_document.versions.last()
617+
pages_count = pages.count()
613618

614619
doc = src_old_version.document
615620
src_new_version = doc.version_bump(
616-
page_count=src_old_version.pages.count() - pages.count()
621+
page_count=src_old_version.pages.count() - pages_count,
622+
short_description=f'{pages_count} page(s) moved out'
617623
)
618624
dst_new_version = dst_document.version_bump(
619-
page_count=dst_old_version.pages.count() + pages.count()
625+
page_count=dst_old_version.pages.count() + pages_count,
626+
short_description=f'{pages_count} page(s) moved in'
620627
)
621628

622629
remove_pdf_pages(

0 commit comments

Comments
 (0)