Mirrors
/
DeDRM_tools
mirror of https://github.com/noDRM/DeDRM_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update watermark code

This commit is contained in:
NoDRM 2021-12-27 10:39:41 +01:00
parent 586609bb2c
commit 23a454205a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DeDRM_plugin/__init__.py
View File

@ -232,7 +232,7 @@ class DeDRM(FileTypePlugin):
# Remove watermarks (Amazon or LemonInk) from the OPF file # Remove watermarks (Amazon or LemonInk) from the OPF file
path_to_ebook = watermark.removeOPFwatermarks(self, path_to_ebook) or path_to_ebook path_to_ebook = watermark.removeOPFwatermarks(self, path_to_ebook) or path_to_ebook
# Remove watermarks (Adobe or LemonInk) from all HTML and XHTML files # Remove watermarks (Adobe, Pocketbook or LemonInk) from all HTML and XHTML files
path_to_ebook = watermark.removeHTMLwatermarks(self, path_to_ebook) or path_to_ebook path_to_ebook = watermark.removeHTMLwatermarks(self, path_to_ebook) or path_to_ebook
@ -606,7 +606,9 @@ class DeDRM(FileTypePlugin):
return self.postProcessEPUB(inf.name) return self.postProcessEPUB(inf.name)
#raise DeDRMError("{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime)) #raise DeDRMError("{0} v{1}: Couldn't decrypt after {2:.1f} seconds. DRM free perhaps?".format(PLUGIN_NAME, PLUGIN_VERSION,time.time()-self.starttime))
def PDFDecrypt(self,path_to_ebook):
# No DRM?
return self.postProcessEPUB(inf.name)
import calibre_plugins.dedrm.prefs as prefs import calibre_plugins.dedrm.prefs as prefs
import calibre_plugins.dedrm.ineptpdf as ineptpdf import calibre_plugins.dedrm.ineptpdf as ineptpdf
import calibre_plugins.dedrm.lcpdedrm as lcpdedrm import calibre_plugins.dedrm.lcpdedrm as lcpdedrm

13
DeDRM_plugin/epubwatermark.py
View File

@ -30,7 +30,7 @@ def removeHTMLwatermarks(object, path_to_ebook):
modded_contents = [] modded_contents = []
count_adept = 0 count_adept = 0
count_pocketbook = 0
count_lemonink_invisible = 0 count_lemonink_invisible = 0
count_lemonink_visible = 0 count_lemonink_visible = 0
lemonink_trackingID = None lemonink_trackingID = None
@ -53,6 +53,14 @@ def removeHTMLwatermarks(object, path_to_ebook):
if (str_new != pre_remove): if (str_new != pre_remove):
count_adept += 1 count_adept += 1
# Remove Pocketbook watermarks
pre_remove = str_new
str_new = re.sub(r'\<div style\=\"padding\:0\;border\:0\;text\-indent\:0\;line\-height\:normal\;margin\:0 1cm 0.5cm 1cm\;[^\"]*opacity:0.0\;[^\"]*text\-decoration\:none\;[^\"]*background\:none\;[^\"]*\"\>(.*?)\<\/div\>', '', str_new)
if (str_new != pre_remove):
count_pocketbook += 1
# Remove eLibri / LemonInk watermark # Remove eLibri / LemonInk watermark
# Run this in a loop, as it is possible a file has been watermarked twice ... # Run this in a loop, as it is possible a file has been watermarked twice ...
while True: while True:
@ -144,6 +152,9 @@ def removeHTMLwatermarks(object, path_to_ebook):
print("Watermark: Successfully stripped {0} visible and {1} invisible LemonInk watermark(s) (\"{2}\") from ebook." print("Watermark: Successfully stripped {0} visible and {1} invisible LemonInk watermark(s) (\"{2}\") from ebook."
.format(count_lemonink_visible, count_lemonink_invisible, lemonink_trackingID)) .format(count_lemonink_visible, count_lemonink_invisible, lemonink_trackingID))
if (count_pocketbook > 0):
print("Watermark: Successfully stripped {0} Pocketbook watermark(s) from ebook.".format(count_pocketbook))
return output return output
except: except: