From d5cc1f6318cc9027283141b8eae52f2c10494e2d Mon Sep 17 00:00:00 2001 From: Schemen Date: Wed, 6 Dec 2017 00:48:47 +0100 Subject: [PATCH 1/5] Add confirmation email to user email --- bin/_version.py | 2 +- bin/m2emSender.py | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/bin/_version.py b/bin/_version.py index 93e8096..1fe58fe 100644 --- a/bin/_version.py +++ b/bin/_version.py @@ -1 +1 @@ -__version__ = "v0.3.1" \ No newline at end of file +__version__ = "v0.3.2" \ No newline at end of file diff --git a/bin/m2emSender.py b/bin/m2emSender.py index 2c375d4..d0b24d3 100644 --- a/bin/m2emSender.py +++ b/bin/m2emSender.py @@ -75,6 +75,7 @@ def send_eb(self): for user in self.users: kindle_mail = user[3] shouldsend = user[4] + user_mail = user[2] # Check if user wants Mails if shouldsend == "True": @@ -126,15 +127,45 @@ def send_eb(self): #server.sendmail(emailadress, kindle_mail, msg.as_string()) server.sendmail(self.emailadress, kindle_mail, msg) server.close() - logging.debug("Sent email to %s "% kindle_mail) + logging.debug("Sent Ebook email to %s "% kindle_mail) + self.send_confirmation(user_mail) except smtplib.SMTPException as e: logging.debug("Could not send email! %s" % e) - # Set Email as Sent helper.setIsSent(self.mangaid,self.database) logging.info("Sent %s to all requested users."% self.mangatitle) - + def send_confirmation(self,usermail): + + # Compile Email + msg = MIMEMultipart() + msg['Subject'] = 'Ebook Delivery of %s' % self.mangatitle + msg['Date'] = formatdate(localtime=True) + msg['From'] = self.emailadress + msg['To'] = usermail + msg['Message-ID'] = make_msgid() + + text = '%s has been delivered to your Kindle Email!' % self.mangatitle + msg.attach(MIMEText(text)) + + # Convert message to string + sio = StringIO() + gen = Generator(sio, mangle_from_=False) + gen.flatten(msg) + msg = sio.getvalue() + + try: + server = smtplib.SMTP(self.smtpserver, self.serverport, ) + if self.starttls: + server.starttls() + server.ehlo() + server.login(self.emailadress, self.password) + server.sendmail(self.emailadress, usermail, msg) + server.close() + logging.debug("Sent confirmation email to %s " % usermail) + except smtplib.SMTPException as e: + logging.debug("Could not send email! %s" % e) + pass From 6f5b02e51f79f2b4e8bde691017637df7024ba53 Mon Sep 17 00:00:00 2001 From: Schemen Date: Sat, 9 Dec 2017 21:08:33 +0100 Subject: [PATCH 2/5] Fix Mangastream parser if there more than 100 oages --- bin/sourceparser/m2emMangastream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sourceparser/m2emMangastream.py b/bin/sourceparser/m2emMangastream.py index ad4861e..d36fe2f 100644 --- a/bin/sourceparser/m2emMangastream.py +++ b/bin/sourceparser/m2emMangastream.py @@ -40,7 +40,7 @@ def getPages(page): soup = BeautifulSoup(page.content, 'html.parser') #Get Manga Titel - var1 = soup.body.findAll(text=re.compile("Last Page \((..)\)")) + var1 = soup.body.findAll(text=re.compile("Last Page \((.*)\)")) pages = int(var1[0][11:-1]) return pages From 8442d70fd95ac4e90c242280fe342b34efd01993 Mon Sep 17 00:00:00 2001 From: Schemen Date: Sat, 9 Dec 2017 21:09:01 +0100 Subject: [PATCH 3/5] Add new Mangafox Domain --- bin/m2emDownloader.py | 4 ++-- bin/m2emHelper.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/m2emDownloader.py b/bin/m2emDownloader.py index 90c4508..a79ad94 100644 --- a/bin/m2emDownloader.py +++ b/bin/m2emDownloader.py @@ -75,7 +75,7 @@ def data_processor(self): # Mangafox Parser - elif self.origin == "mangafox.me": + elif self.origin == "mangafox.me" or self.origin == "mangafox.la": urllist = mxparser.getPagesUrl(self.mangastarturl,self.mangapages) @@ -121,7 +121,7 @@ def downloader(self): # https://github.com/aplanas/kmanga/blob/master/mobi/mobi.py#L416 # Thanks a lot to Alberto Planas for coming up with it! # - if self.origin == "mangafox.me": + if self.origin == "mangafox.me" or self.origin == "mangafox.la": logging.debug("Cleaning Mangafox Footer") img = Image.open(imagepath) _img = ImageOps.invert(img.convert(mode='L')) diff --git a/bin/m2emHelper.py b/bin/m2emHelper.py index 0d20c54..b00a4b6 100644 --- a/bin/m2emHelper.py +++ b/bin/m2emHelper.py @@ -777,7 +777,7 @@ def getMangaData(url,entry): mangadata = [manganame, pages, chapter, title, chapter_name, chapter_pubDate] # Mangafox Parser - elif origin == "mangafox.me": + elif origin == "mangafox.me" or origin == "mangafox.la": logging.debug("Getting Mangadata from Mangafox.me for %s" % url) # Easy Stuff From 336b24aca048c0da9599a83cf44b9b9a0a898383 Mon Sep 17 00:00:00 2001 From: Schemen Date: Sat, 9 Dec 2017 21:09:28 +0100 Subject: [PATCH 4/5] Up version --- bin/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/_version.py b/bin/_version.py index 1fe58fe..1bead0d 100644 --- a/bin/_version.py +++ b/bin/_version.py @@ -1 +1 @@ -__version__ = "v0.3.2" \ No newline at end of file +__version__ = "v0.3.3" \ No newline at end of file From d97ec6924704f98a3351cbb52654619c763fbf58 Mon Sep 17 00:00:00 2001 From: Schemen Date: Sat, 9 Dec 2017 21:15:30 +0100 Subject: [PATCH 5/5] Fix MangaFox parser, remove TLD requirement --- bin/sourceparser/m2emMangafox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sourceparser/m2emMangafox.py b/bin/sourceparser/m2emMangafox.py index b033d33..e029a0a 100644 --- a/bin/sourceparser/m2emMangafox.py +++ b/bin/sourceparser/m2emMangafox.py @@ -38,7 +38,7 @@ def getChapterName(page): soup = BeautifulSoup(page.content, 'html.parser') #Get Manga Titel - search = re.search(': (.*?) at MangaFox.me"', str(soup)) + search = re.search(': (.*?) at MangaFox', str(soup)) chaptername = search.group(1) return chaptername