tools v3.8

version 2 - a minor change to one script.

diff --git a/Calibre_Plugins/k4mobidedrm_plugin.zip b/Calibre_Plugins/k4mobidedrm_plugin.zip
index 83afae4f5764668b5b47961cf68b99f6298e02e7..295d06fe0e6b1c587d9e886e9f5547353815a156 100644 (file)
Binary files a/Calibre_Plugins/k4mobidedrm_plugin.zip and b/Calibre_Plugins/k4mobidedrm_plugin.zip differ

diff --git a/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py b/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
index 3ae1afaa488b4cd81ba90b0184f880db756811c6..64a998acad315aae4dbe14ace4c90fdb273326e7 100644 (file)
--- a/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
+++ b/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+       k4 = False
+       kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ if not __name__ == "__main__" and inCalibre:
             import mobidedrm
 
             k4 = True
+           if sys.platform.startswith('linux'):
+               k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ if not __name__ == "__main__" and inCalibre:
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
\ No newline at end of file

diff --git a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
index 3ae1afaa488b4cd81ba90b0184f880db756811c6..64a998acad315aae4dbe14ace4c90fdb273326e7 100644 (file)
--- a/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
+++ b/DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+       k4 = False
+       kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ if not __name__ == "__main__" and inCalibre:
             import mobidedrm
 
             k4 = True
+           if sys.platform.startswith('linux'):
+               k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ if not __name__ == "__main__" and inCalibre:
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
\ No newline at end of file

diff --git a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py
index 3ae1afaa488b4cd81ba90b0184f880db756811c6..64a998acad315aae4dbe14ace4c90fdb273326e7 100644 (file)
--- a/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py
+++ b/DeDRM_Windows_Application/DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+       k4 = False
+       kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ if not __name__ == "__main__" and inCalibre:
             import mobidedrm
 
             k4 = True
+           if sys.platform.startswith('linux'):
+               k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ if not __name__ == "__main__" and inCalibre:
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
\ No newline at end of file

diff --git a/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py b/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py
index 3ae1afaa488b4cd81ba90b0184f880db756811c6..64a998acad315aae4dbe14ace4c90fdb273326e7 100644 (file)
--- a/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py
+++ b/KindleBooks_Tools/KindleBooks/lib/k4mobidedrm.py
@@ -231,6 +231,9 @@ def main(argv=sys.argv):
 
     # try with built in Kindle Info files
     k4 = True
+    if sys.platform.startswith('linux'):
+       k4 = False
+       kInfoFiles = None
     infile = args[0]
     outdir = args[1]
 
@@ -267,6 +270,8 @@ if not __name__ == "__main__" and inCalibre:
             import mobidedrm
 
             k4 = True
+           if sys.platform.startswith('linux'):
+               k4 = False
             pids = []
             serials = []
             kInfoFiles = []
@@ -366,4 +371,4 @@ if not __name__ == "__main__" and inCalibre:
             return of.name
 
         def customization_help(self, gui=False):
-            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
+            return 'Enter 10 character PIDs and/or Kindle serial numbers, separated by commas.'
\ No newline at end of file