Merge branch 'master' into feature/right_align

3 files changed, 27 insertions, 4 deletions

diff --git a/paper2remarkable/providers/_base.py b/paper2remarkable/providers/_base.py
index b47fbae..c68caab 100644
--- a/paper2remarkable/providers/_base.py
+++ b/paper2remarkable/providers/_base.py
@@ -38,6 +38,7 @@ class Provider(metaclass=abc.ABCMeta):
         center=False,
         right=False,
         blank=False,
+        no_crop=False,
         remarkable_dir="/",
         rmapi_path="rmapi",
         pdftoppm_path="pdftoppm",
@@ -63,11 +64,14 @@ class Provider(metaclass=abc.ABCMeta):
             logger.disable()
 
         # Define the operations to run on the pdf. Providers can add others.
-        self.operations = [("crop", self.crop_pdf)]
-        if center:
+        if no_crop:
+            self.operations = []
+        elif center:
             self.operations = [("center", self.center_pdf)]
-        if right:
+        elif right:
             self.operations = [("right", self.right_pdf)]
+        else:
+            self.operations = [("crop", self.crop_pdf)]
 
         if blank:
             self.operations.append(("blank", blank_pdf))
diff --git a/paper2remarkable/providers/jmlr.py b/paper2remarkable/providers/jmlr.py
index 3634b4f..8b121cb 100644
--- a/paper2remarkable/providers/jmlr.py
+++ b/paper2remarkable/providers/jmlr.py
@@ -67,4 +67,9 @@ class JMLR(Provider):
         return abs_url, pdf_url
 
     def validate(src):
-        return re.match(JMLR.re_abs, src) or re.match(JMLR.re_pdf, src)
+        return (
+            re.match(JMLR.re_abs_1, src)
+            or re.match(JMLR.re_abs_2, src)
+            or re.match(JMLR.re_pdf_1, src)
+            or re.match(JMLR.re_pdf_2, src)
+        )
diff --git a/paper2remarkable/ui.py b/paper2remarkable/ui.py
index 835f044..a8218ec 100644
--- a/paper2remarkable/ui.py
+++ b/paper2remarkable/ui.py
@@ -59,6 +59,13 @@ def parse_args():
         action="store_true",
     )
     parser.add_argument(
+            '-k',
+            '--no-crop',
+            help="Don't crop the pdf file",
+            action="store_true"
+            )
+
+    parser.add_argument(
         "-v", "--verbose", help="be verbose", action="store_true"
     )
     parser.add_argument(
@@ -117,6 +124,12 @@ def main():
     if args.center and args.right:
         exception("Can't center and right align at the same time!")
 
+    if args.center and args.no_crop:
+        exception("Can't center and not crop at the same time!")
+
+    if args.right_align and args.no_crop:
+        exception("Can't right align and not crop at the same time!")
+
     if LocalFile.validate(args.input):
         # input is a local file
         provider = LocalFile
@@ -141,6 +154,7 @@ def main():
         center=args.center,
         right=args.right,
         blank=args.blank,
+        no_crop=args.no_crop,
         remarkable_dir=args.remarkable_dir,
         rmapi_path=args.rmapi,
         pdftoppm_path=args.pdftoppm,