diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-11-06 10:10:03 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2020-11-06 10:10:03 +0000 |
| commit | 8f434a6ac9defdd336de57a2a0a6731e8bf2cf5f (patch) | |
| tree | 35cc1ef54df964b96826fb673e7d0c4c2bd61d36 | |
| parent | Fixes for new NeurIPS site (diff) | |
| parent | Merge branch 'bugfix/tandfonline' (diff) | |
| download | paper2remarkable-8f434a6ac9defdd336de57a2a0a6731e8bf2cf5f.tar.gz paper2remarkable-8f434a6ac9defdd336de57a2a0a6731e8bf2cf5f.zip | |
Merge branch 'master' into bugfix/neurips
| -rw-r--r-- | paper2remarkable/providers/tandfonline.py | 4 | ||||
| -rw-r--r-- | tests/test_providers.py | 11 |
2 files changed, 11 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<doi>\d+\.\d+/\d+\.\d+\.\d+)" - re_pdf = "^https?://www.tandfonline.com/doi/(full|pdf)/(?P<doi>\d+\.\d+/\d+\.\d+\.\d+)" + re_abs = "^https?://\w+.tandfonline.com/doi/(full|abs)/(?P<doi>\d+\.\d+/\d+\.\d+\.\d+)" + re_pdf = "^https?://\w+.tandfonline.com/doi/(full|pdf)/(?P<doi>\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 d6a2408..9b2f24d 100644 --- a/tests/test_providers.py +++ b/tests/test_providers.py @@ -280,8 +280,15 @@ 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)) |