Merge pull request #50 from juzim/fix-error-on-already-claimed

Check if newsletter was already claimed before processing

Author: niqdev

script/alreadyClaimedException.py

@@ -0,0 +1,2 @@
+class AlreadyClaimedException(Exception):
+    pass

script/noBookException.py

@@ -4,6 +4,7 @@
 from utils import make_soup, wait, download_file
 from logs import *
 from noBookException import NoBookException
+from alreadyClaimedException import AlreadyClaimedException
 
 class Packtpub(object):
     """
@@ -16,6 +17,9 @@ def __init__(self, config, dev):
         self.__url_base = self.__config.get('url', 'url.base')
         self.__headers = self.__init_headers()
         self.__session = requests.Session()
+        self.resetInfo()
+
+    def resetInfo(self):
         self.info = {
             'paths': []
         }
@@ -122,6 +126,11 @@ def __GET_claim(self):
         if div_target is None:
             raise Exception('Could not access claim page. This is most likely caused by invalid credentials')
 
+        errorMessage = soup.find(id='messages-container')
+
+        if errorMessage is not None and errorMessage.text.strip() == 'You have already claimed this promotion.':
+            raise AlreadyClaimedException()
+
         # only last one just claimed
         div_claimed_book = div_target.select('.product-line')[0]
         self.info['book_id'] = div_claimed_book['nid']

script/packtpub.py

@@ -11,6 +11,7 @@
 from logs import *
 from notify import Notify, SERVICE_GMAIL, SERVICE_IFTTT, SERVICE_JOIN
 from noBookException import NoBookException
+from alreadyClaimedException import AlreadyClaimedException
 
 def parse_types(args):
     if args.types is None:
@@ -120,12 +121,17 @@ def main():
         elif lastNewsletterUrl != currentNewsletterUrl:
             log_info('[*] getting free eBook from newsletter')
             try:
+                packtpub.resetInfo()
                 packtpub.runNewsletter(currentNewsletterUrl)
                 handleClaim(packtpub, args, config, dir_path)
 
                 with open(lastNewsletterUrlPath, 'w+') as f:
                     f.write(currentNewsletterUrl)
 
+            except AlreadyClaimedException as a:
+                log_info('[*] book was already claimed, skipping')
+                with open(lastNewsletterUrlPath, 'w+') as f:
+                    f.write(currentNewsletterUrl)
             except Exception as e:
                 log_debug(e)
                 if args.notify: