Commit 1c6c05f

authored

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

Check if newsletter was already claimed before processing

2 parents fa18463 + 30f861c commit 1c6c05fCopy full SHA for 1c6c05f

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+class AlreadyClaimedException(Exception):`
	`2`	`+ pass`

Lines changed: 0 additions & 2 deletions

This file was deleted.

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`from utils import make_soup, wait, download_file`
`5`	`5`	`from logs import *`
`6`	`6`	`from noBookException import NoBookException`
	`7`	`+from alreadyClaimedException import AlreadyClaimedException`
`7`	`8`
`8`	`9`	`class Packtpub(object):`
`9`	`10`	`"""`
`@@ -16,6 +17,9 @@ def __init__(self, config, dev):`
`16`	`17`	`self.__url_base = self.__config.get('url', 'url.base')`
`17`	`18`	`self.__headers = self.__init_headers()`
`18`	`19`	`self.__session = requests.Session()`
	`20`	`+ self.resetInfo()`
	`21`	`+`
	`22`	`+ def resetInfo(self):`
`19`	`23`	`self.info = {`
`20`	`24`	`'paths': []`
`21`	`25`	`}`
`@@ -122,6 +126,11 @@ def __GET_claim(self):`
`122`	`126`	`if div_target is None:`
`123`	`127`	`raise Exception('Could not access claim page. This is most likely caused by invalid credentials')`
`124`	`128`
	`129`	`+ errorMessage = soup.find(id='messages-container')`
	`130`	`+`
	`131`	`+ if errorMessage is not None and errorMessage.text.strip() == 'You have already claimed this promotion.':`
	`132`	`+ raise AlreadyClaimedException()`
	`133`	`+`
`125`	`134`	`# only last one just claimed`
`126`	`135`	`div_claimed_book = div_target.select('.product-line')[0]`
`127`	`136`	`self.info['book_id'] = div_claimed_book['nid']`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`from logs import *`
`12`	`12`	`from notify import Notify, SERVICE_GMAIL, SERVICE_IFTTT, SERVICE_JOIN`
`13`	`13`	`from noBookException import NoBookException`
	`14`	`+from alreadyClaimedException import AlreadyClaimedException`
`14`	`15`
`15`	`16`	`def parse_types(args):`
`16`	`17`	`if args.types is None:`
`@@ -120,12 +121,17 @@ def main():`
`120`	`121`	`elif lastNewsletterUrl != currentNewsletterUrl:`
`121`	`122`	`log_info('[*] getting free eBook from newsletter')`
`122`	`123`	`try:`
	`124`	`+ packtpub.resetInfo()`
`123`	`125`	`packtpub.runNewsletter(currentNewsletterUrl)`
`124`	`126`	`handleClaim(packtpub, args, config, dir_path)`
`125`	`127`
`126`	`128`	`with open(lastNewsletterUrlPath, 'w+') as f:`
`127`	`129`	`f.write(currentNewsletterUrl)`
`128`	`130`
	`131`	`+ except AlreadyClaimedException as a:`
	`132`	`+ log_info('[*] book was already claimed, skipping')`
	`133`	`+ with open(lastNewsletterUrlPath, 'w+') as f:`
	`134`	`+ f.write(currentNewsletterUrl)`
`129`	`135`	`except Exception as e:`
`130`	`136`	`log_debug(e)`
`131`	`137`	`if args.notify:`

Comments

(0)