From 0268a6902d704ade47bc9c88150a1b3c20ceb192 Mon Sep 17 00:00:00 2001 From: Gertjan van den Burg Date: Thu, 5 Nov 2020 22:10:42 +0000 Subject: Minor fixes to Taylor & Francis provider --- paper2remarkable/providers/tandfonline.py | 4 ++-- tests/test_providers.py | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/paper2remarkable/providers/tandfonline.py b/paper2remarkable/providers/tandfonline.py index d077211..a4b8d8e 100644 --- a/paper2remarkable/providers/tandfonline.py +++ b/paper2remarkable/providers/tandfonline.py @@ -32,8 +32,8 @@ class TandFOnlineInformer(Informer): class TandFOnline(Provider): - re_abs = "^https?://www.tandfonline.com/doi/(full|abs)/(?P\d+\.\d+/\d+\.\d+\.\d+)" - re_pdf = "^https?://www.tandfonline.com/doi/(full|pdf)/(?P\d+\.\d+/\d+\.\d+\.\d+)" + re_abs = "^https?://\w+.tandfonline.com/doi/(full|abs)/(?P\d+\.\d+/\d+\.\d+\.\d+)" + re_pdf = "^https?://\w+.tandfonline.com/doi/(full|pdf)/(?P\d+\.\d+/\d+\.\d+\.\d+)" def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/tests/test_providers.py b/tests/test_providers.py index b8582fe..27096ac 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -280,8 +280,17 @@ class TestProviders(unittest.TestCase): def test_tandfonline_2(self): prov = TandFOnline(upload=False, verbose=VERBOSE) - url = "https://www.tandfonline.com/doi/pdf/10.1080/03610918.2012.625790?scroll=top&needAccess=true" - exp = "Huskova_Marusiakova_-_M-Procedures_for_Detection_of_Changes_for_Dependent_Observations_2012.pdf" + url = "https://www.tandfonline.com/doi/pdf/10.1080/03610918.2017.1408826?needAccess=true" + exp = "Reschenhofer_-_Heteroscedasticity-Robust_Estimation_of_Autocorrelation_2018.pdf" + filename = prov.run(url) + self.assertEqual(exp, os.path.basename(filename)) + + def test_tandfonline_3(self): + prov = TandFOnline(upload=False, verbose=VERBOSE) + url = "https://amstat.tandfonline.com/doi/pdf/10.1080/01621459.2017.1385466?needAccess=true" + exp = "Fearnhead_Rigaill_-_Changepoint_Detection_in_the_Presence_of_Outliers_2018.pdf" + filename = prov.run(url) + self.assertEqual(exp, os.path.basename(filename)) def test_html_1(self): prov = HTML(upload=False, verbose=VERBOSE) -- cgit v1.2.3