tkinterweb-tkhtml 1.0__py3-none-linux_armv7l.whl → 1.1.0__py3-none-linux_armv7l.whl

tkinterweb_tkhtml/__init__.py

@@ -1,5 +1,5 @@
 """
-TkinterWeb-Tkhtml v1.0
+TkinterWeb-Tkhtml v1.1
 This package provides pre-built binaries of a modified version of the Tkhtml3 widget from http://tkhtml.tcl.tk/tkhtml.html, 
 which enables the display of styled HTML and CSS code in Tkinter applications.
 
@@ -19,26 +19,99 @@ __title__ = 'TkinterWeb-Tkhtml'
 __author__ = "Andereoo"
 __copyright__ = "Copyright (c) 2025 Andereoo"
 __license__ = "MIT"
-__version__ = '1.0'
+__version__ = '1.1.0'
 
+TKHTML_RELEASE = "3.0 (TkinterWeb standard)" # Backwards-compatibility. Not useful or even necessarily true anymore. Will be removed.
 
-TKHTML_RELEASE = "3.0 (TkinterWeb standard)" # For debugging; eventually this project might also bundle experimental binaries
-TKHTML_ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "tkhtml")
+TKHTML_ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
 
-tkhtml_loaded = False
 
 
+TKHTML_BINARIES =  [file for file in os.listdir(TKHTML_ROOT_DIR) if "libTkhtml" in file]
+
+# NOTE:
+# File names should be in the format libTkhtml[major].[minor].[so/dll/dylib]
+# Experimental file names should be in the format libTkhtml[major].[minor]exp.[so/dll/dylib]
+
+tkhtml_file = None
+
+help_message = f"To add a new Tkhtml version, drop your binary into the {TKHTML_ROOT_DIR} folder, named using the following conventions:\n\
+- For a standard release: libTkhtml[major_version.minor_version].[dll/dylib.so] (eg. libTkhtml3.0.dll)\n\
+- For an experimental release: libTkhtml[major_version.minor_version]exp.[dll/dylib.so] (eg. libTkhtml3.1exp.dll)"
+
 def get_tkhtml_folder():
-    "Get the location of the platform's Tkhtml binary"
-    
+    # Backwards-compatibility. Will be removed.
     return TKHTML_ROOT_DIR
 
+def get_loaded_tkhtml_version():
+    global tkhtml_file
+    if tkhtml_file:
+        version = os.path.basename(tkhtml_file).replace("libTkhtml", "")
+        return version[:version.rfind(".")]
+    else:
+        return None
+    
+def get_tkhtml_file(version=None, index=-1, experimental=False):
+    "Get the location of the platform's Tkhtml binary"
+    if isinstance(version, float):
+        version = str(version)
+    if version:
+        for file in TKHTML_BINARIES:
+            if version in file:
+                # Note: experimental can be "auto"
+                if "exp" in file:
+                    if not experimental:
+                        raise OSError(f"Tkhtml version {version} is an experimental release but experimental mode is disabled. {help_message}")
+                    experimental = True
+                else:
+                    if experimental == True:
+                        raise OSError(f"Tkhtml version {version} is not an experimental release but experimental mode is enabled. {help_message}")
+                    experimental = False
+                return os.path.join(TKHTML_ROOT_DIR, file), version, experimental
+        raise OSError(f"Tkhtml version {version} either does not exist or is unsupported on your system. {help_message}")
+    else:
+        # Get highest numbered avaliable file if a version is not provided
+        if experimental == True:
+            files = [k for k in TKHTML_BINARIES if 'exp' in k]
+            if not files:
+                raise OSError(f"No experimental Tkhtml versions could be found on your system. {help_message}")
+        elif not experimental:
+            files = [k for k in TKHTML_BINARIES if 'exp' not in k]
+        else:
+            files = TKHTML_BINARIES
+        file = sorted(files)[index]
+        if "exp" in file:
+            experimental = True
+        else:
+            experimental = False
+        version = file.replace("libTkhtml", "").replace("exp", "")
+        version = version[:version.rfind(".")]
+        return os.path.join(TKHTML_ROOT_DIR, file), version, experimental
+
+
+def load_tkhtml_file(master, file, force=False):
+    "Load Tkhtml into the current Tcl/Tk instance"
+    global tkhtml_file
+    if (not tkhtml_file) or force:
+        if TKHTML_ROOT_DIR not in os.environ["PATH"].split(os.pathsep):
+            os.environ["PATH"] = os.pathsep.join([
+                TKHTML_ROOT_DIR,
+                os.environ["PATH"]
+            ])
+        master.tk.call("load", file)
+        tkhtml_file = file
+
 
-def load_tkhtml(master, location=None, force=False):
+def load_tkhtml(master, force=False, use_prebuilt=False):
     "Load Tkhtml into the current Tcl/Tk instance"
-    global tkhtml_loaded
-    if (not tkhtml_loaded) or force:
-        if location:
-            master.tk.eval("set auto_path [linsert $auto_path 0 {" + location + "}]")
-        master.tk.eval("package require Tkhtml")
-        tkhtml_loaded = True
+    if use_prebuilt:
+        # Backwards-compatibility. Will likely be removed.
+        file, version, experimental = get_tkhtml_file(None, 0)
+        load_tkhtml_file(master, file, force)
+        return version
+    
+    global tkhtml_file
+    if (not tkhtml_file) or force:
+        master.tk.call("package", "require", "Tkhtml")
+        tkhtml_file = True
+        return master.tk.call("package", "present", "Tkhtml")

{tkinterweb_tkhtml-1.0.dist-info → tkinterweb_tkhtml-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb-tkhtml
-Version: 1.0
+Version: 1.1.0
 Summary: HTML/CSS viewer for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb-Tkhtml
 License: MIT

tkinterweb_tkhtml-1.1.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+tkinterweb_tkhtml/__init__.py,sha256=Usx8lOoxbR72hmRbNOt3WxJPIrPnveKBBhsdN8TTFOk,4613
+tkinterweb_tkhtml/tkhtml/COPYRIGHT,sha256=DTaLs2-wF2uscyoCSsLB1oOqXwhtLRVZW1EdLa77OMs,1622
+tkinterweb_tkhtml/tkhtml/libTkhtml3.0.so,sha256=7SLetf_4DXwz_iphlIRAvuuDnm6qYcfAdjVnnapfekc,310504
+tkinterweb_tkhtml-1.1.0.dist-info/LICENSE.md,sha256=A4A41a28mznzn27r63D6_15V0UfRNrfIbKrX3sabiX8,1064
+tkinterweb_tkhtml-1.1.0.dist-info/METADATA,sha256=sZa4OVDdqgNugzfA-oJHNvjj4Kv4hc2NtQKHL7ukMYg,1054
+tkinterweb_tkhtml-1.1.0.dist-info/WHEEL,sha256=SfWbrUo49UCeTn4ZCaOubJz9Wtdk5gtBke9gOM6rnWs,101
+tkinterweb_tkhtml-1.1.0.dist-info/top_level.txt,sha256=ZsOj9XY_g_0oGsUoDORlQhP0qdbT4X_Ts6yyFWG7i1A,18
+tkinterweb_tkhtml-1.1.0.dist-info/RECORD,,

tkinterweb_tkhtml/tkhtml/pkgIndex.tcl

@@ -1,4 +0,0 @@
-package ifneeded Tkhtml 3.0 [string map [list @ $dir] {
-	load [file join {@} libTkhtml3.0.so]
-	package provide Tkhtml 3.0
-}]

tkinterweb_tkhtml-1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-tkinterweb_tkhtml/__init__.py,sha256=yeb5XCI83xqZ8cxzmFprBl_FmkNmHwsucsFpLARbVR0,1338
-tkinterweb_tkhtml/tkhtml/COPYRIGHT,sha256=DTaLs2-wF2uscyoCSsLB1oOqXwhtLRVZW1EdLa77OMs,1622
-tkinterweb_tkhtml/tkhtml/libTkhtml3.0.so,sha256=7SLetf_4DXwz_iphlIRAvuuDnm6qYcfAdjVnnapfekc,310504
-tkinterweb_tkhtml/tkhtml/pkgIndex.tcl,sha256=TLh_fgiI_ZWYOP04WT5fRPex4Jp8wl_FRuHFBGETFuo,125
-tkinterweb_tkhtml-1.0.dist-info/LICENSE.md,sha256=A4A41a28mznzn27r63D6_15V0UfRNrfIbKrX3sabiX8,1064
-tkinterweb_tkhtml-1.0.dist-info/METADATA,sha256=M3yHjinRnsxQzRgXjeOnatEXZ9KvOS3Bs_7sijFRHeo,1052
-tkinterweb_tkhtml-1.0.dist-info/WHEEL,sha256=SfWbrUo49UCeTn4ZCaOubJz9Wtdk5gtBke9gOM6rnWs,101
-tkinterweb_tkhtml-1.0.dist-info/top_level.txt,sha256=ZsOj9XY_g_0oGsUoDORlQhP0qdbT4X_Ts6yyFWG7i1A,18
-tkinterweb_tkhtml-1.0.dist-info/RECORD,,