aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2020-02-22 13:26:25 +0000
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2020-02-22 13:26:25 +0000
commit4501d3fb80199a4c0220372795b571e3e018ffca (patch)
treef28db2388a13874055534ccd8878ec15df9dec3a
parentSimply set the cropbox of the page (diff)
downloadpaper2remarkable-4501d3fb80199a4c0220372795b571e3e018ffca.tar.gz
paper2remarkable-4501d3fb80199a4c0220372795b571e3e018ffca.zip
Remove pdfcrop dependency
-rw-r--r--README.md2
-rw-r--r--paper2remarkable/crop.py4
-rw-r--r--paper2remarkable/pdf_ops.py6
-rw-r--r--paper2remarkable/providers/_base.py8
-rw-r--r--paper2remarkable/ui.py6
5 files changed, 5 insertions, 21 deletions
diff --git a/README.md b/README.md
index 7b5c9ad..4f3a93e 100644
--- a/README.md
+++ b/README.md
@@ -115,8 +115,6 @@ $ p2r -v https://arxiv.org/abs/1811.11242
The script requires the following external programs to be available:
- [pdftk](https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/)
-- [pdfcrop](https://ctan.org/pkg/pdfcrop?lang=en): usually included with a
- LaTeX installation.
- [GhostScript](https://www.ghostscript.com/)
- [rMAPI](https://github.com/juruen/rmapi)
diff --git a/paper2remarkable/crop.py b/paper2remarkable/crop.py
index b8b31c6..2b6e086 100644
--- a/paper2remarkable/crop.py
+++ b/paper2remarkable/crop.py
@@ -50,7 +50,6 @@ class Cropper(object):
self,
input_file=None,
output_file=None,
- pdfcrop_path="pdfcrop",
pdftoppm_path="pdftoppm",
):
if not input_file is None:
@@ -59,7 +58,6 @@ class Cropper(object):
if not output_file is None:
self.output_file = os.path.abspath(output_file)
- self.pdfcrop_path = pdfcrop_path
self.pdftoppm_path = pdftoppm_path
self.writer = PyPDF2.PdfFileWriter()
@@ -113,7 +111,7 @@ class Cropper(object):
def get_raw_bbox(self, filename, resolution=72):
"""Get the basic bounding box of a pdf file"""
- # We try to use pdftoppm, but if it's not available or fails, we
+ # We try to use pdftoppm, but if it's not available or fails, we
# default to pdfplumber.
try:
bbox = self.get_raw_bbox_pdftoppm(filename, resolution=resolution)
diff --git a/paper2remarkable/pdf_ops.py b/paper2remarkable/pdf_ops.py
index fae9581..4c695c6 100644
--- a/paper2remarkable/pdf_ops.py
+++ b/paper2remarkable/pdf_ops.py
@@ -19,7 +19,7 @@ from .log import Logger
logger = Logger()
-def crop_pdf(filepath, pdfcrop_path="pdfcrop", pdftoppm_path="pdftoppm"):
+def crop_pdf(filepath, pdftoppm_path="pdftoppm"):
"""Crop the pdf file using Cropper
"""
logger.info("Cropping pdf file")
@@ -28,7 +28,6 @@ def crop_pdf(filepath, pdfcrop_path="pdfcrop", pdftoppm_path="pdftoppm"):
cropper = Cropper(
filepath,
cropped_file,
- pdfcrop_path=pdfcrop_path,
pdftoppm_path=pdftoppm_path,
)
status = cropper.crop(margins=15)
@@ -44,7 +43,7 @@ def crop_pdf(filepath, pdfcrop_path="pdfcrop", pdftoppm_path="pdftoppm"):
return cropped_file
-def center_pdf(filepath, pdfcrop_path="pdfcrop", pdftoppm_path="pdftoppm"):
+def center_pdf(filepath, pdftoppm_path="pdftoppm"):
"""Center the pdf file on the reMarkable
"""
logger.info("Centering pdf file")
@@ -53,7 +52,6 @@ def center_pdf(filepath, pdfcrop_path="pdfcrop", pdftoppm_path="pdftoppm"):
cropper = Cropper(
filepath,
centered_file,
- pdfcrop_path=pdfcrop_path,
pdftoppm_path=pdftoppm_path,
)
status = cropper.center()
diff --git a/paper2remarkable/providers/_base.py b/paper2remarkable/providers/_base.py
index 4191d35..bf8cdf5 100644
--- a/paper2remarkable/providers/_base.py
+++ b/paper2remarkable/providers/_base.py
@@ -39,7 +39,6 @@ class Provider(metaclass=abc.ABCMeta):
blank=False,
remarkable_dir="/",
rmapi_path="rmapi",
- pdfcrop_path="pdfcrop",
pdftoppm_path="pdftoppm",
pdftk_path="pdftk",
gs_path="gs",
@@ -49,7 +48,6 @@ class Provider(metaclass=abc.ABCMeta):
self.debug = debug
self.remarkable_dir = remarkable_dir
self.rmapi_path = rmapi_path
- self.pdfcrop_path = pdfcrop_path
self.pdftoppm_path = pdftoppm_path
self.pdftk_path = pdftk_path
self.gs_path = gs_path
@@ -85,12 +83,10 @@ class Provider(metaclass=abc.ABCMeta):
# Wrappers for pdf operations that have additional arguments
def crop_pdf(self, filepath):
- return crop_pdf(filepath, pdfcrop_path=self.pdfcrop_path,
- pdftoppm_path=self.pdftoppm_path)
+ return crop_pdf(filepath, pdftoppm_path=self.pdftoppm_path)
def center_pdf(self, filepath):
- return center_pdf(filepath, pdfcrop_path=self.pdfcrop_path,
- pdftoppm_path=self.pdftoppm_path)
+ return center_pdf(filepath, pdftoppm_path=self.pdftoppm_path)
def shrink_pdf(self, filepath):
return shrink_pdf(filepath, gs_path=self.gs_path)
diff --git a/paper2remarkable/ui.py b/paper2remarkable/ui.py
index 6b25aaf..2303603 100644
--- a/paper2remarkable/ui.py
+++ b/paper2remarkable/ui.py
@@ -71,11 +71,6 @@ def parse_args():
"--gs", help="path to gs executable (default: gs)", default="gs"
)
parser.add_argument(
- "--pdfcrop",
- help="path to pdfcrop executable (default: pdfcrop)",
- default="pdfcrop",
- )
- parser.add_argument(
"--pdftoppm",
help="path to pdftoppm executable (default: pdftoppm)",
default="pdftoppm",
@@ -138,7 +133,6 @@ def main():
blank=args.blank,
remarkable_dir=args.remarkable_dir,
rmapi_path=args.rmapi,
- pdfcrop_path=args.pdfcrop,
pdftoppm_path=args.pdftoppm,
pdftk_path=args.pdftk,
gs_path=args.gs,