aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGertjan van den Burg <gertjanvandenburg@gmail.com>2019-10-25 20:25:33 +0100
committerGertjan van den Burg <gertjanvandenburg@gmail.com>2019-10-25 20:25:33 +0100
commit0f76c16645cb8ae5c041fbfe20ac36aafd5a34d9 (patch)
tree2ff056488463ef9f6db0679ada34bdb5c82894eb
parentMerge branch 'arxiv_bug' (diff)
downloadpaper2remarkable-0f76c16645cb8ae5c041fbfe20ac36aafd5a34d9.tar.gz
paper2remarkable-0f76c16645cb8ae5c041fbfe20ac36aafd5a34d9.zip
Fix follow_redirects for local file provider
-rw-r--r--paper2remarkable/providers/_base.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/paper2remarkable/providers/_base.py b/paper2remarkable/providers/_base.py
index 52e3b0e..d3b3482 100644
--- a/paper2remarkable/providers/_base.py
+++ b/paper2remarkable/providers/_base.py
@@ -15,7 +15,12 @@ import tempfile
from ._info import Informer
from ..pdf_ops import crop_pdf, center_pdf, blank_pdf, shrink_pdf
-from ..utils import assert_file_is_pdf, download_url, upload_to_remarkable, follow_redirects
+from ..utils import (
+ assert_file_is_pdf,
+ download_url,
+ upload_to_remarkable,
+ follow_redirects,
+)
from ..log import Logger
logger = Logger()
@@ -66,6 +71,10 @@ class Provider(metaclass=abc.ABCMeta):
def validate(src):
""" Validate whether ``src`` is appropriate for this provider """
+ @abc.abstractmethod
+ def get_abs_pdf_urls(self, src):
+ """ Get the url for the HTML page and the PDF file """
+
# Wrappers for pdf operations that have additional arguments
def crop_pdf(self, filepath):
return crop_pdf(filepath, pdfcrop_path=self.pdfcrop_path)
@@ -83,7 +92,7 @@ class Provider(metaclass=abc.ABCMeta):
def run(self, src, filename=None):
# needed with library use
- src = follow_redirects(src)
+ src = src if os.path.exists(src) else follow_redirects(src)
# extract page and pdf file urls
abs_url, pdf_url = self.get_abs_pdf_urls(src)