Merge pull request #71 from juzim/manual-claim-on-error

niqdev · web-flow · commit bee57ae2c8f5 · 2017-06-02T11:54:32.000+01:00
Include book title and URL in error message
diff --git a/README.md b/README.md
@@ -224,7 +224,7 @@ python script/spider.py --config config/prod.cfg --notify ifttt
 Value mappings:
 * value1: title
 * value2: description
-* value3: image URL
+* value3: landing page URL
 
 ### Join notification
 
diff --git a/script/notification/gmail.py b/script/notification/gmail.py
@@ -72,9 +72,11 @@ def __prepare_error_message(self, exception, source):
           <head></head>
           <body>
             <div>{title}</div>
+            <div>Download manually: <a href="{url}">{url}</a></div>
             <div>{description}</div>
             """.format(title=text,
-                       description=repr(exception))
+                       description=repr(exception),
+                       url=self.__packpub_info['landingPageUrl'])
 
         html += """\
             <div>Powered by <a href="https://github.com/niqdev/packtpub-crawler">packtpub-crawler</a></div>
diff --git a/script/notification/ifttt.py b/script/notification/ifttt.py
@@ -22,6 +22,6 @@ def send(self):
 
     def sendError(self, exception, source):
         title = "packtpub-crawler [{source}]: Could not download ebook".format(source=source)
-        r = requests.post(self.__url, data = {'value1':title, 'value2':repr(exception)})
+        r = requests.post(self.__url, data = {'value1':title, 'value2':repr(exception), 'value3':self.__packpub_info['landingPageUrl']})
 
         log_success('[+] error notification sent to IFTTT')
diff --git a/script/notification/join.py b/script/notification/join.py
@@ -22,11 +22,12 @@ def send(self):
         log_success('[+] notification sent to Join')
 
     def sendError(self, exception, source):
-        url = "https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush?apikey={apiKey}&deviceId={deviceIds}&title={title}&text={description}".format(
+        url = "https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush?apikey={apiKey}&deviceId={deviceIds}&title={title}&text={description}&url={url}".format(
             apiKey=self.__config.get('join', 'join.api_key'),
             deviceIds=self.__config.get('join', 'join.device_ids'),
-            title='packtpub-crawler {source}: Could not download ebook'.format(source=source),
-            description=repr(exception)
+            title='packtpub-crawler {source}: Could not download ebook: {title}'.format(source=source, title=self.__packpub_info['title']),
+            description=repr(exception),
+            url=self.__packpub_info['landingPageUrl']
         )
 
         r = requests.post(url)
diff --git a/script/packtpub.py b/script/packtpub.py
@@ -148,6 +148,8 @@ def runDaily(self):
         else:
             loginUrl = self.__url_base + self.__config.get('url', 'url.login')
 
+        self.info['landingPageUrl'] = loginUrl
+
         soup = self.__GET_login(loginUrl)
         wait(self.__delay, self.__dev)
 
@@ -166,6 +168,8 @@ def runNewsletter(self, currentNewsletterUrl):
         """
 
         soup = self.__GET_login(currentNewsletterUrl)
+        self.info['landingPageUrl'] = currentNewsletterUrl
+
         self.__parseNewsletterBookInfo(soup)
         wait(self.__delay, self.__dev)
         self.__GET_claim()
diff --git a/script/spider.py b/script/spider.py
@@ -101,8 +101,7 @@ def main():
         except Exception as e:
             log_debug(e)
             if args.notify:
-                Notify(config, None, None, args.notify).sendError(e, 'daily')
-            return
+                Notify(config, packtpub.info, None, args.notify).sendError(e, 'daily')
 
         lastNewsletterUrlPath = dir_path + 'config/lastNewsletterUrl'
         lastNewsletterUrl = None
@@ -135,7 +134,7 @@ def main():
             except Exception as e:
                 log_debug(e)
                 if args.notify:
-                    Notify(config, None, None, args.notify).sendError(e, 'newsletter')
+                    Notify(config, packtpub.info, None, args.notify).sendError(e, 'newsletter')
         else:
             log_info('[*] already got latest ebook from newsletter, skipping')
 
