From: Yuki Liu <yuki.liu@utexas.edu>
Date: Fri, 15 Apr 2022 16:02:18 +0000 (-0500)
Subject: fix the regular expression
X-Git-Url: http://git.xmof.duckdns.org/?a=commitdiff_plain;h=012ff533ab6ba6920813284a4eb7f46e4dc81831;p=DeDRM.git

fix the regular expression
---

diff --git a/DeDRM_plugin/k4mobidedrm.py b/DeDRM_plugin/k4mobidedrm.py
index e048a03..3ddb9e8 100644
--- a/DeDRM_plugin/k4mobidedrm.py
+++ b/DeDRM_plugin/k4mobidedrm.py
@@ -275,7 +275,7 @@ def decryptBook(infile, outdir, kDatabaseFiles, androidFiles, serials, pids):
     orig_fn_root = os.path.splitext(os.path.basename(infile))[0]
     if (
         re.match('^B[A-Z0-9]{9}(_EBOK|_EBSP|_sample)?$', orig_fn_root) or
-        re.match('^{0-9A-F-}{36}$', orig_fn_root)
+        re.match('^[0-9A-F-]{36}$', orig_fn_root)
     ):  # Kindle for PC / Mac / Android / Fire / iOS
         clean_title = cleanup_name(book.getBookTitle())
         outfilename = "{}_{}".format(orig_fn_root, clean_title)