fixed all examples to work with new new library. fixed handling empty charptr returns as strings. Need to finish double checking any other functions that return str and docstring all the wrapper functions

SageCreations · SageCreations · commit b4ba4b0dd69b · 2025-01-28T01:09:30.000-06:00
diff --git a/PyPI/Package/src/webui/webui.py b/PyPI/Package/src/webui/webui.py
@@ -76,7 +76,7 @@ def close_client(self):
         _raw.webui_close_client(byref(self._c_event()))
 
     # -- send_raw_client ----------------------------
-    def send_raw_client(self, function: str, raw: Optional[c_void_p], size: int) -> None:
+    def send_raw_client(self, function: str, raw: Optional[int], size: int) -> None:
         if raw is None:
             raise ValueError("Invalid Pointer: Cannot send a null pointer.")
         _raw.webui_send_raw_client(
@@ -146,11 +146,17 @@ def get_string_at(self, index: int) -> str:
         Returns:
             str: The UTF-8 decoded string corresponding to the specified index.
         """
-        return str(_raw.webui_get_string_at(byref(self._c_event()), c_size_t(index)).decode('utf-8'))
+        char_ptr = _raw.webui_get_string_at(byref(self._c_event()), c_size_t(index))
+        if char_ptr is None:
+            return ""
+        return str(char_ptr.decode("utf-8"))
 
     # -- get_string ---------------------------------
     def get_string(self) -> str:
-        return str(_raw.webui_get_string(byref(self._c_event())).decode('utf-8'))
+        char_ptr = _raw.webui_get_string(byref(self._c_event()))
+        if char_ptr is None:
+            return ""
+        return str(char_ptr.decode("utf-8"))
 
     # -- get_bool_at --------------------------------
     def get_bool_at(self, index: int) -> bool:
@@ -170,7 +176,7 @@ def get_size(self) -> int:
 
     # -- return_int ---------------------------------
     def return_int(self, n: int) -> None:
-        _raw.webui_return_int(byref(self._c_event()), c_size_t(n))
+        _raw.webui_return_int(byref(self._c_event()), c_longlong(n))
 
     # -- return_float -------------------------------
     def return_float(self, f: float) -> None:
diff --git a/PyPI/test_package.py b/PyPI/test_package.py
@@ -62,19 +62,19 @@
     </body></html>
 """
 
-def all_events(e : webui.event):
+def all_events(e : webui.Event):
 	print('Function: all_events()')
 	print('Element: ' + e.element)
 	print('Type: ' + str(e.event_type))
 	print(' ')
 
-def python_to_js(e : webui.event):
+def python_to_js(e : webui.Event):
 	print('Function: python_to_js()')
 	print('Element: ' + e.element)
 	print('Type: ' + str(e.event_type))
-	print('Data: ' + e.window.get_str(e))
+	print('Data: ' + e.get_string())
 	print(' ')
-	# Run JavaScript to get the password
+	# Run JavaScript to get the value
 	res = e.window.script("return document.getElementById('MyInput').value;")
 	# Check for any error
 	if res.error is True:
@@ -85,28 +85,29 @@ def python_to_js(e : webui.event):
 	# e.window.run("alert('Fast!')")
 	print(' ')
 
-def js_to_python(e : webui.event):
+def js_to_python(e : webui.Event):
 	print('Function: js_to_python()')
 	print('Element: ' + e.element)
 	print('Type: ' + str(e.event_type))
-	print('Data: ' + e.window.get_str(e, 0))
+	print('Data: ' + e.get_string_at(0))
 	print(' ')
-	v = int(e.window.get_str(e, 0))
+	v = e.get_int()
 	v = v * 2
-	return v
+	e.return_int(v)
 
-def exit(e : webui.event):
+
+def exit(e : webui.Event):
 	print('Function: exit()')
 	print('Element: ' + e.element)
 	print('Type: ' + str(e.event_type))
-	print('Data: ' + e.window.get_str(e, 0))
+	print('Data: ' + e.get_string_at(0))
 	print(' ')
 	webui.exit()
 
 def main():
 
 	# Create a window object
-	MyWindow = webui.window()
+	MyWindow = webui.Window()
 
 	# Bind am HTML element ID with a python function
 	MyWindow.bind('', all_events)
@@ -115,7 +116,7 @@ def main():
 	MyWindow.bind('Exit', exit)
 
 	# Show the window
-	MyWindow.show(html, webui.browser.any)
+	MyWindow.show_browser(html, webui.Browser.AnyBrowser)
 
 	# Wait until all windows are closed
 	webui.wait()
diff --git a/examples/andershell3000/andershell3000.py b/examples/andershell3000/andershell3000.py
@@ -1,7 +1,10 @@
+import sys
+sys.path.append('../../PyPI/Package/src/webui')
+import webui
+
 # Install WebUI
 # pip install --upgrade webui2
-
-from webui import webui
+# from webui import webui
 import subprocess
 import time
 
@@ -36,20 +39,20 @@ def close(self):
         self.shell.terminate()
         self.shell.wait()
 
-def run_command(e : webui.event):
-    cmd = e.window.get_str(e, 0)
+def run_command(e : webui.Event):
+    cmd = e.get_string_at(0)
     if cmd == "exit":
         webui.exit()
     try:
         command_result = executor.execute(cmd)
-        return command_result
+        e.return_string(command_result)
     except FileNotFoundError:
-        return "Command not found '{cmd}'"
+        print(f"Command not found '{cmd}'")
 
 executor = CommandExecutor()
-MyWindow = webui.window()
+MyWindow = webui.Window()
 MyWindow.bind("Run", run_command)
 MyWindow.set_root_folder("ui/")
-MyWindow.show('index.html')
+MyWindow.show_browser('index.html', webui.Browser.Chrome)
 webui.wait()
 executor.close()
diff --git a/examples/hello_world.py b/examples/hello_world.py
@@ -1,7 +1,10 @@
+import sys
+sys.path.append('../PyPI/Package/src/webui')
+import webui
+
 # Install WebUI
 # pip install --upgrade webui2
-
-from webui import webui
+# from webui import webui
 
 # CSS
 css = """
@@ -72,7 +75,7 @@
 """
 
 # This function get called every time the user click on "MyButton1"
-def check_the_password(e : webui.event):
+def check_the_password(e : webui.Event):
 
 	# Run JavaScript to get the password
 	res = e.window.script("return document.getElementById(\"MyInput\").value;")
@@ -90,20 +93,20 @@ def check_the_password(e : webui.event):
 		print("Wrong password: " + res.data)
 		e.window.script(" document.getElementById('err').innerHTML = '[ ! ] Wrong password'; ")
 
-def close_the_application(e : webui.event):
+def close_the_application(e : webui.Event):
 	webui.exit()
 
 def main():
 
 	# Create a window object
-	MyWindow = webui.window()
+	my_window = webui.Window()
 
 	# Bind am HTML element ID with a python function
-	MyWindow.bind('CheckPassword', check_the_password)
-	MyWindow.bind('Exit', close_the_application)
+	my_window.bind('CheckPassword', check_the_password)
+	my_window.bind('Exit', close_the_application)
 
 	# Show the window
-	MyWindow.show(login_html)
+	my_window.show_browser(login_html, webui.Browser.Chrome)
 
 	# Wait until all windows are closed
 	webui.wait()
diff --git a/examples/minimal.py b/examples/minimal.py
@@ -1,9 +1,13 @@
+import sys
+sys.path.append('../PyPI/Package/src/webui')
+import webui
+
 # Install WebUI
 # pip install --upgrade webui2
 
-from webui import webui
+# from webui import webui
 
-MyWindow = webui.window()
+MyWindow = webui.Window()
 MyWindow.show('<html><head><script src=\"webui.js\"></script></head> Hello World ! </html>')
 webui.wait()
 print('Thank you.')
diff --git a/examples/public_ui.py b/examples/public_ui.py
@@ -1,4 +1,8 @@
-from webui import webui # GUI
+import sys
+sys.path.append('../PyPI/Package/src/webui')
+import webui
+
+# from webui import webui # GUI
 import socket # To get local IP
 
 
@@ -16,13 +20,13 @@ def get_local_ip():
         s.close()
     return local_ip
 
-def all_events(e : webui.event):
-	if e.event_type == webui.eventType.CONNECTED:
+def all_events(e : webui.Event):
+	if e.event_type == webui.EventType.CONNECTED:
 		print('Connected.')
-	if e.event_type == webui.eventType.DISCONNECTED:
+	if e.event_type == webui.EventType.DISCONNECTED:
 		print('Disconnected.')
 
-def exit(e : webui.event):
+def exit(e : webui.Event):
 	webui.exit()
 
 def main():
@@ -36,23 +40,23 @@ def main():
         """
 
     # New window
-    MyWindow = webui.window()
+    my_window = webui.Window()
 
     # Make the window URL accessible from public networks
-    MyWindow.set_public(True)
+    my_window.set_public(True)
 
     # Wait forever (Otherwise WebUI will timeout after 30s)
     webui.set_timeout(0)
 	
     # Bind
-    MyWindow.bind('', all_events)
-    MyWindow.bind('Exit', exit)
+    my_window.bind('', all_events)
+    my_window.bind('Exit', exit)
 
     # Start the window without any browser
-    MyWindow.show(html, webui.browser.NoBrowser)
+    my_window.show_browser(html, webui.Browser.NoBrowser)
 
     # Get URL of the window
-    url = MyWindow.get_url()
+    url = my_window.get_url()
 	
     # Get local IP
     local_ip = get_local_ip()
diff --git a/examples/serve_folder/second.html b/examples/serve_folder/second.html
diff --git a/examples/serve_folder/serve_folder.html b/examples/serve_folder/serve_folder.html
diff --git a/examples/serve_folder/serve_folder.py b/examples/serve_folder/serve_folder.py
@@ -1,37 +1,38 @@
-
-
+import sys
+sys.path.append('../../PyPI/Package/src/webui')
+import webui
 
 # Install WebUI
 # pip install --upgrade webui2
+# from webui import webui
 
-from webui import webui
-
-def switch_to_second_page(e : webui.event):
+def switch_to_second_page(e : webui.Event):
 	# This function get called when the user
 	# click on "SwitchToSecondPage" button
 	e.window.show("second.html")
 
-def close_the_application(e : webui.event):
+def close_the_application(e : webui.Event):
 	webui.exit()
 
 def main():
 
 	# Create a window object
-	MyWindow = webui.window()
+	my_window = webui.Window()
 
 	# Bind am HTML element ID with a python function
-	MyWindow.bind('SwitchToSecondPage', switch_to_second_page)
-	MyWindow.bind('Exit', close_the_application)
+	my_window.bind('SwitchToSecondPage', switch_to_second_page)
+	my_window.bind('Exit', close_the_application)
 
 	# Note
 	# Add this script to all your .html files:
 	# <script src="webui.js"></script>
 
 	# Show a window using the local file
-	MyWindow.show("serve_folder.html", webui.browser.chrome)
+	my_window.show_browser("serve_folder.html", webui.Browser.Chrome)
 
 	# Wait until all windows are closed
 	webui.wait()
+	webui.clean()
 
 	print('Thank you.')
 
diff --git a/examples/text-editor/main.py b/examples/text-editor/main.py
@@ -1,13 +1,17 @@
-from webui import webui
+import sys
+sys.path.append('../../PyPI/Package/src/webui')
+import webui
 
-def close(e: webui.event):
+# from webui import webui
+
+def close(e: webui.Event):
     print("Exit.")
     # Close all opened windows
     webui.exit()
 
 def main():
     # Create new window
-    window = webui.window()
+    window = webui.Window()
 
     # Bind HTML element IDs with Python functions
     window.bind("__close-btn", close)
@@ -16,7 +20,7 @@ def main():
     window.set_root_folder("ui/")
 
     # Show the window
-    window.show("index.html")
+    window.show_browser("index.html", webui.Browser.Chrome)
 
     # Wait until all windows get closed
     webui.wait()
