From 529dd3f160c33da1d46aea32b28dd064f785dd01 Mon Sep 17 00:00:00 2001 From: Apprentice Alf Date: Fri, 1 Apr 2011 17:54:18 +0100 Subject: [PATCH] tools v3.8 version 2 - a minor change to one script. --- Calibre_Plugins/k4mobidedrm_plugin.zip | Bin 44385 -> 44419 bytes .../k4mobidedrm_plugin/k4mobidedrm_plugin.py | 7 ++++++- .../Contents/Resources/k4mobidedrm.py | 7 ++++++- .../DeDRM_WinApp/DeDRM_lib/lib/k4mobidedrm.py | 7 ++++++- .../KindleBooks/lib/k4mobidedrm.py | 7 ++++++- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Calibre_Plugins/k4mobidedrm_plugin.zip b/Calibre_Plugins/k4mobidedrm_plugin.zip index 83afae4f5764668b5b47961cf68b99f6298e02e7..295d06fe0e6b1c587d9e886e9f5547353815a156 100644 GIT binary patch delta 4468 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 diff --git a/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py b/Calibre_Plugins/k4mobidedrm_plugin/k4mobidedrm_plugin.py index 3ae1afa..64a998a 100644 --- 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 3ae1afa..64a998a 100644 --- 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 3ae1afa..64a998a 100644 --- 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 3ae1afa..64a998a 100644 --- 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