From f1ddc389dc524661b18d4a8f74476ac1a1102673 Mon Sep 17 00:00:00 2001 From: Eugen Ciur Date: Thu, 4 Jun 2020 19:16:51 +0200 Subject: [PATCH] add one optional arg to default file storage .delete_pages --- mglib/storage.py | 21 +++++++++++---------- setup.py | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mglib/storage.py b/mglib/storage.py index b23f297..b7f9145 100644 --- a/mglib/storage.py +++ b/mglib/storage.py @@ -1,15 +1,13 @@ +import logging import os +import shutil from os import listdir from os.path import isdir, join -import logging -import shutil -from mglib.step import Steps -from mglib.utils import ( - safe_to_delete, - get_assigns_after_delete -) + from mglib import pdftk -from mglib.path import PagePath, DocumentPath +from mglib.path import DocumentPath, PagePath +from mglib.step import Steps +from mglib.utils import get_assigns_after_delete, safe_to_delete logger = logging.getLogger(__name__) @@ -246,7 +244,7 @@ class Storage: return doc_path.version + 1 - def delete_pages(self, doc_path, page_numbers): + def delete_pages(self, doc_path, page_numbers, total_page_count=None): """ Delets pages in the document pointed by doc_path. doc_path is an instance of mglib.path.DocumentPath @@ -272,7 +270,10 @@ class Storage: page_numbers ) - page_count = self.get_pagecount(doc_path) + if total_page_count: + page_count = total_page_count + else: + page_count = self.get_pagecount(doc_path) if len(page_numbers) > page_count: logger.error( f"deleted_pages({page_numbers}) > page_count({page_count})" diff --git a/setup.py b/setup.py index 77e2a79..982dc82 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup with open("README.md", "r") as fh: long_description = fh.read() @@ -6,7 +6,7 @@ with open("README.md", "r") as fh: setup( name="mglib", - version="1.0.1", + version="1.0.3", author="Eugen Ciur", author_email="eugen@papermerge.com", url="https://github.com/papermerge/mglib",