From 03c3b139db94806ed85bd864b0be1b2c776461a9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 15 Dec 2016 08:53:56 +0530 Subject: [PATCH] Update Die Zeit (subscription) Fixes #1650014 [recipe for Die Zeit (subscription only) doesn't work after URL changes](https://bugs.launchpad.net/calibre/+bug/1650014) --- recipes/zeitde_sub.recipe | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/recipes/zeitde_sub.recipe b/recipes/zeitde_sub.recipe index bef166e08f..99396a6d8e 100644 --- a/recipes/zeitde_sub.recipe +++ b/recipes/zeitde_sub.recipe @@ -186,9 +186,18 @@ class ZeitEPUBAbo(BasicNewsRecipe): browser.form['email'] = self.username browser.form['password'] = self.password browser.submit() + # change into abo section + browser.open(url) + abolink = browser.find_link(text_regex=re.compile( + '.*Abo-Bereich.*')) + browser.follow_link(abolink) + # find page for latest issue + latestlink = browser.find_link(text_regex=re.compile( + '.*ZUR AKTUELLEN AUSGABE.*')) + browser.follow_link(latestlink) # now find the correct file, we will still use the ePub file epublink = browser.find_link(text_regex=re.compile( - '.*Download als Datei im ePub-Format für eReader.*')) + '.*EPUB FÜR E-READER LADEN.*')) response = browser.follow_link(epublink) self.report_progress(1, _('next step')) @@ -243,9 +252,18 @@ class ZeitEPUBAbo(BasicNewsRecipe): browser.form['email'] = self.username browser.form['password'] = self.password browser.submit() + # change into abo section + browser.open(url) + abolink = browser.find_link(text_regex=re.compile( + '.*Abo-Bereich.*')) + browser.follow_link(abolink) + # find page for latest issue + latestlink = browser.find_link(text_regex=re.compile( + '.*ZUR AKTUELLEN AUSGABE.*')) + browser.follow_link(latestlink) # actual cover search pdflink = browser.find_link(text_regex=re.compile( - '.*Download der gesamten Ausgabe als PDF Datei.*')) + '.*GESAMT-PDF LADEN.*')) cover_url = urlparse(pdflink.base_url)[0] + '://' + urlparse(pdflink.base_url)[1] + '' + ( urlparse(pdflink.url)[2]).replace('ePaper_', '').replace('.pdf', '_001.pdf') self.log.warning('PDF link found:')