1.0.7: Add handler for failed ctypes find_library call

Author: rlaphoenix

HISTORY.md

@@ -4,6 +4,12 @@
 
 N/A
 
+## 1.0.7
+
+**Improvements**
+
+- Add handler for failed ctypes cdll call
+
 ## 1.0.6
 
 **Improvements**

README.md

@@ -114,14 +114,14 @@ _Note: with the second method you will need to handle updating yourself by re-cl
 - [x] Implement dvdcss_is_scrambled
 - [x] Implement `__enter__` and `__exit__` for proper disposing
 - [x] Add handlers for failed find_library calls
+- [X] Add handlers for failed cdll calls
 - [x] Add instructions for installing libdvdcss
 - [x] Add and test support for Windows
 - [x] Add and test support for Mac OS
 - [x] Add and test support for Linux
 - [x] Add function to set DVDCSS_VERBOSE
 - [x] Add function to set DVDCSS_METHOD
 - [ ] Implement dvdcss_readv, not sure how this would be used or implemented
-- [ ] Handle errors for failed cdll calls if any?
 
 <p>&nbsp;</p><p>&nbsp;</p>
 

pydvdcss/__init__.py

@@ -72,35 +72,12 @@ class PyDvdCss:
         if LIB:
             break
     if not LIB:
-        err = "PyDvdCss: Unable to locate libdvdcss library, please install it.\n"
-        if platform.system() == "Windows":
-            dll = f"https://github.com/allienx/libdvdcss-dll/raw/master/1.4.2/{platform.architecture()[0].replace('b', '-b')}/libdvdcss-2.dll"
-            err += "\n".join([
-                "On Windows, the installation process is a bit annoying, so I calculated it all for you:",
-                f"Download the following file: `{dll}``",
-                f"Place the file in: `C:/Windows/{'SysWOW64' if platform.machine().endswith('64') else 'System32'}``",
-                f"Done!"
-            ])
-        elif platform.system() == "Darwin":
-            err += "\n".join([
-                "On Mac, the installation process is easiest when using `brew`.",
-                "If you don't have brew installed, follow the instructions at `https://brew.sh`",
-                "Once installed, open terminal and type: `brew install libdvdcss`",
-                "Done!"
-            ])
-        elif platform.system() == "Linux":
-            err += "\n".join([
-                "On Linux, the installation process is very simple.",
-                "Just check your Package Distro for `libdvdcss` or possibly `libdvdcss-2` or the alike.",
-                "If it's not found, check it's User Repository or compile it yourself.",
-                "If you compile it yourself, make sure it's somewhere in PATH for pydvdcss to find it.",
-                "pydvdcss uses ctypes.util.find_library to search for the library.",
-                "It uses `/sbin/ldconfig`, `gcc`, `objdump` and `ld` to try find the library.",
-                "Good luck!"
-            ])
-        raise EnvironmentError(err)
-    LIB = ctypes.CDLL(LIB)
-    # todo ; it's assuming find_library and cdll were successful
+        _libdvdcss_installation()
+    try:
+        LIB = ctypes.CDLL(LIB)
+    except OSError:
+        _libdvdcss_installation()
+    
     _open = ctypes.CFUNCTYPE(ctypes.c_long, ctypes.c_char_p)(("dvdcss_open", LIB))
     _close = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_long)(("dvdcss_close", LIB))
     _seek = ctypes.CFUNCTYPE(ctypes.c_int, ctypes.c_long, ctypes.c_int, ctypes.c_int)(
@@ -133,6 +110,35 @@ def dispose(self):
         # reset verbosity and cracking mode environment variables
         self.set_verbosity(None)
         self.set_cracking_mode(None)
+    
+    def _libdvdcss_installation(self):
+        err = "PyDvdCss: Unable to locate libdvdcss library, please install it.\n"
+        if platform.system() == "Windows":
+            dll = f"https://github.com/allienx/libdvdcss-dll/raw/master/1.4.2/{platform.architecture()[0].replace('b', '-b')}/libdvdcss-2.dll"
+            err += "\n".join([
+                "On Windows, the installation process is a bit annoying, so I calculated it all for you:",
+                f"Download the following file: `{dll}``",
+                f"Place the file in: `C:/Windows/{'SysWOW64' if platform.machine().endswith('64') else 'System32'}``",
+                f"Done!"
+            ])
+        elif platform.system() == "Darwin":
+            err += "\n".join([
+                "On Mac, the installation process is easiest when using `brew`.",
+                "If you don't have brew installed, follow the instructions at `https://brew.sh`",
+                "Once installed, open terminal and type: `brew install libdvdcss`",
+                "Done!"
+            ])
+        elif platform.system() == "Linux":
+            err += "\n".join([
+                "On Linux, the installation process is very simple.",
+                "Just check your Package Distro for `libdvdcss` or possibly `libdvdcss-2` or the alike.",
+                "If it's not found, check it's User Repository or compile it yourself.",
+                "If you compile it yourself, make sure it's somewhere in PATH for pydvdcss to find it.",
+                "pydvdcss uses ctypes.util.find_library to search for the library.",
+                "It uses `/sbin/ldconfig`, `gcc`, `objdump` and `ld` to try find the library.",
+                "Good luck!"
+            ])
+        raise EnvironmentError(err)
 
     def open(self, psz_target):
         """

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="pydvdcss",
-    version="1.0.6",
+    version="1.0.7",
     author="PHOENiX",
     author_email="rlaphoenix@pm.me",
     description="Python wrapper for VideoLAN's libdvdcss.",