PyWSGIRef 1.1.4__tar.gz → 1.1.6__tar.gz

{pywsgiref-1.1.4/src/PyWSGIRef.egg-info → pywsgiref-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.4
+Version: 1.1.6
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -154,7 +154,24 @@ html = pyhtml.decoded()
 ```
 , which is actually automatically done by PyWSGIRef.<br/>
 The <code><{{evalPyHTML}}></code> phrase at the beginning of the document includes a Doctype announcement,<br/>
-a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.
+a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.<br/><br/>
+PyWSGIRef also provides a simple way to end PyHTML files:<br/>
+just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and<br/>
+PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
+You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
+<code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.
+### Shutting down your server
+You can shut down your server by calling the <code>shutdown</code> method on the server object:
+```python
+from PyWSGIRef import *
+
+# ...
+# Create a WSGI server
+server = setUpServer(application, port=8000)
+
+# Shut down the server
+server.shutdown()
+```
 ### Others
 Use the following to get information about your release and the author of the module:
 ```python
@@ -171,4 +188,10 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML style and script blocks<br/>
+- PyHTML favicon support<br/>
+- PyHTML include static resource blocks<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/README.md

@@ -136,7 +136,24 @@ html = pyhtml.decoded()
 ```
 , which is actually automatically done by PyWSGIRef.<br/>
 The <code><{{evalPyHTML}}></code> phrase at the beginning of the document includes a Doctype announcement,<br/>
-a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.
+a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.<br/><br/>
+PyWSGIRef also provides a simple way to end PyHTML files:<br/>
+just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and<br/>
+PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
+You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
+<code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.
+### Shutting down your server
+You can shut down your server by calling the <code>shutdown</code> method on the server object:
+```python
+from PyWSGIRef import *
+
+# ...
+# Create a WSGI server
+server = setUpServer(application, port=8000)
+
+# Shut down the server
+server.shutdown()
+```
 ### Others
 Use the following to get information about your release and the author of the module:
 ```python
@@ -153,4 +170,10 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML style and script blocks<br/>
+- PyHTML favicon support<br/>
+- PyHTML include static resource blocks<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyWSGIRef"
-version = "1.1.4"
+version = "1.1.6"
 authors = [
   {name="Leander Kafemann", email="leander@kafemann.berlin" },
 ]

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/__init__.py

@@ -8,19 +8,19 @@ from cgi import FieldStorage
 from .exceptions import *
 from .pyhtml import PyHTML
 from .defaults import *
-from .templateDict import TemplateDict, OneWayBoolean
+from .templateDict import TemplateDict
 from .beta import BETA
 from .loadContent import *
+from .finished import finished
 
 def about():
     """
-    Returns information about your release and other projects by LK
+    Returns information about your release and other projects by Leander Kafemann
     """
-    return {"Version":(1, 1, 4), "Author":"Leander Kafemann", "date":"10.06.2025",\
+    return {"Version":(1, 1, 6), "Author":"Leander Kafemann", "date":"12.06.2025",\
             "recommend":("Büro by LK",  "pyimager by LK"), "feedbackTo": "leander@kafemann.berlin"}
 
 SCHABLONEN = TemplateDict()
-finished = OneWayBoolean()
 
 def addSchablone(name: str, content: str):
     """

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/beta.py

@@ -2,6 +2,8 @@
 BETA mode...
 """
 
+from .exceptions import BetaAlreadyEnabledError
+
 class beta:
     """
     BETA mode for PyWSGIRef.
@@ -18,7 +20,7 @@ class beta:
         Enables BETA mode.
         """
         if self._beta:
-            raise ValueError("BETA mode is already enabled.")
+            raise BetaAlreadyEnabledError()
         self._beta = True
 
 BETA = beta()

pywsgiref-1.1.6/src/PyWSGIRef/defaults.py

@@ -0,0 +1,42 @@
+HELLO_WORLD = """<!DOCTYPE html>
+<html lang"de">
+    <body>
+        <h1>Hallo Welt!</h1>
+    </body>
+<html>"""
+
+ERROR = """<!DOCTYPE html>
+<html lang"de">
+    <body>
+        <h1>Fehler!</h1>
+        <p>Es ist ein Fehler aufgetreten.</p>
+    </body>
+</html>"""
+
+MAIN_HTML = """<!DOCTYPE html>
+<html lang="de">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>PyWSGIRef Server</title>
+    </head>
+    <body>
+        <h1>Willkommen zum PyWSGIRef Server!</h1>
+        <p>Dies ist die Hauptseite des Servers.</p>
+        <p>Sie nutzen Version {} von PyWSGIRef.</p>
+    </body>
+</html>"""
+
+SHUTDOWN_HTML = """<!DOCTYPE html>
+<html lang="de">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Server Shutdown</title>
+    <body>
+        <h1>Server Shutdown</h1>
+        <p>
+            Der Server wird jetzt heruntergefahren.
+        </p>
+    </body>
+</html>"""

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/exceptions.py

@@ -44,5 +44,21 @@ class StaticResourceUsageOutsideHeadError(Exception):
     Raised when a static resource is tried to include outside the head term of a PyHTML file.
     """
     def __init__(self, message="Static resource usage out of <head> term detected."):
+        self.message = message
+        super().__init__(self.message)
+
+class BooleanAlreadyTrueError(Exception):
+    """
+    Raised when trying to set a boolean that is already True.
+    """
+    def __init__(self, message="Boolean value is already True."):
+        self.message = message
+        super().__init__(self.message)#
+
+class BetaAlreadyEnabledError(BooleanAlreadyTrueError):
+    """
+    Raised when trying to enable beta mode that is already enabled.
+    """
+    def __init__(self, message="Beta mode is already enabled."):
         self.message = message
         super().__init__(self.message)

pywsgiref-1.1.6/src/PyWSGIRef/finished.py

@@ -0,0 +1,24 @@
+"""
+Creates finished object to indicate if the server has been generated.
+"""
+
+from .exceptions import BooleanAlreadyTrueError
+
+class OneWayBoolean:
+	def __init__(self):
+		self._value = False
+
+	@property
+	def value(self) -> bool:
+		return self._value
+
+	def set_true(self):
+		"""
+		Setzt den Wert auf True, wenn er False ist.
+		"""
+		if not self._value:
+			self._value = True
+		else:
+			raise BooleanAlreadyTrueError()
+
+finished = OneWayBoolean()

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/loadContent.py

@@ -4,7 +4,7 @@ Content loading helper.
 import requests
 
 from .exceptions import *
-from PyWSGIRef import finished
+from .finished import finished
 
 def loadFromWeb(url: str, data: dict = {}) -> str:
     """

pywsgiref-1.1.6/src/PyWSGIRef/patterns.py

@@ -0,0 +1,9 @@
+EVAL_PYHTML = "<{{evalPyHTML}}>"
+
+MODERN_STYLING_PHRASE = "<{{evalPyHTML-modernStyling: true}}>"
+
+INCLUDE_PATTERN = r"<\{\{evalPyHTML-include: (.*?) :include-\}\}\>"
+
+SCRIPT_PATTERN = r"<\{\{evalPyHTML-script: (.*?) :script-\}\}\>"
+
+STYLE_PATTERN = r"<\{\{evalPyHTML-style: (.*?) :style-\}\}\>"

pywsgiref-1.1.6/src/PyWSGIRef/pyhtml.py

@@ -0,0 +1,98 @@
+import re
+from naturalsize import replStrPassage
+
+from .defaults import HELLO_WORLD as DEFAULT
+from .commons import *
+from .exceptions import InvalidIncludePhraseFiletypeError, StaticResourceUsageOutsideHeadError
+from .beta import BETA
+from .patterns import *
+
+class PyHTML:
+    def __init__(self, html: str = DEFAULT):
+        self.html = html
+
+    def _replace_eval_phrase(self):
+        """
+        Scans the HTML for the evalPyHTML phrase and replaces it with the appropriate start and end phrases.
+        """
+        if self.html.startswith(EVAL_PYHTML):
+            self.html = START_REPLACE + self.html[len(EVAL_PYHTML):]
+        if self.html.endswith(EVAL_PYHTML):
+            self.html = self.html[:-len(EVAL_PYHTML)] + END_REPLACE
+
+    def _replace_modern_styling(self):
+        """
+        Scans the HTML for the modern styling phrase and replaces it with the appropriate CSS.
+        """
+        idx = self.html.find(MODERN_STYLING_PHRASE)
+        if idx != -1:
+            head_idx = self.html.find("</head>")
+            if idx > head_idx:
+                raise StaticResourceUsageOutsideHeadError()
+            self.html = replStrPassage(idx, idx+len(MODERN_STYLING_PHRASE), self.html, MODERN_STYLING)
+
+    def _replace_includes(self):
+        """
+        Scans the HTML for include phrases and replaces them with the appropriate resources.
+        """
+        for match in re.finditer(INCLUDE_PATTERN, self.html):
+            idx, idxEnd = match.span()
+            head_idx = self.html.find("</head>")
+            if idx > head_idx:
+                raise StaticResourceUsageOutsideHeadError()
+            resources = match.group(1).split(",")
+            setIn = ""
+            for i in resources:
+                i = i.strip()
+                if i.endswith(".css"):
+                    setIn += f"\t\t<link rel='stylesheet' href='{i}'/>\n"
+                elif i.endswith(".js"):
+                    setIn += f"\t\t<script src='{i}'></script>\n"
+                elif i.endswith(".json"):
+                    setIn += f"\t\t<link rel='manifest' href='{i}'/>\n"
+                elif i.endswith("favicon.ico"):
+                    setIn += f"\t\t<link rel='icon' href='{i}'/>\n"
+                else:
+                    raise InvalidIncludePhraseFiletypeError()
+            self.html = self.html[:idx] + setIn + self.html[idxEnd:]
+
+    def _replace_script_blocks(self):
+        """
+        Sucht nach evalPyHTML-script Phrasen und ersetzt sie durch <script>-Bl�cke.
+        Nur im BETA-Modus aktiv.
+        """
+        for match in re.finditer(SCRIPT_PATTERN, self.html, re.DOTALL):
+            idx, idxEnd = match.span()
+            script_content = match.group(1).strip()
+            replacement = f"<script>{script_content}</script>"
+            self.html = self.html[:idx] + replacement + self.html[idxEnd:]
+
+    def _replace_style_blocks(self):
+        """
+        Sucht nach evalPyHTML-style Phrasen und ersetzt sie durch <style>-Bl�cke.
+        Nur im BETA-Modus aktiv.
+        """
+        for match in re.finditer(STYLE_PATTERN, self.html, re.DOTALL):
+            idx, idxEnd = match.span()
+            style_content = match.group(1).strip()
+            replacement = f"<style>{style_content}</style>"
+            self.html = self.html[:idx] + replacement + self.html[idxEnd:]
+
+    def decode(self):
+        """
+        Decodes the HTML content by replacing specific phrases and applying modern styling.
+        """
+        self.html = self.html.strip()
+        self._replace_eval_phrase()
+        self._replace_modern_styling()
+        if BETA.value:
+            self._replace_includes()
+            self._replace_script_blocks()
+            self._replace_style_blocks()
+
+    def decoded(self) -> str:
+        """
+        Returns the decoded HTML content.
+        """
+        self.decode()
+        return self.html

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/simpleServer.py

@@ -21,6 +21,9 @@ def main():
                 content = SCHABLONEN["main"].decoded().format(about()["Version"])
             case "/hello":
                 content = HELLO_WORLD
+            case "/shutdown":
+                content = SHUTDOWN_HTML
+                server.shutdown()
             case _:
                 content = ERROR
         return content

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef/templateDict.py

@@ -1,5 +1,6 @@
 from .exceptions import ServerAlreadyGeneratedError
 from .pyhtml import PyHTML
+from .finished import OneWayBoolean
 
 class TemplateDict:
 	def __init__(self):
@@ -31,21 +32,4 @@ class TemplateDict:
 		return list(self.dictionary.values())
 
 	def items(self) -> list:
-		return list(self.dictionary.items())
-
-class OneWayBoolean:
-	def __init__(self):
-		self._value = False
-
-	@property
-	def value(self) -> bool:
-		return self._value
-
-	def set_true(self):
-		"""
-		Setzt den Wert auf True, wenn er False ist.
-		"""
-		if not self._value:
-			self._value = True
-		else:
-			raise ValueError("Value is already True, cannot set again.")
+		return list(self.dictionary.items())

{pywsgiref-1.1.4 → pywsgiref-1.1.6/src/PyWSGIRef.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.4
+Version: 1.1.6
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -154,7 +154,24 @@ html = pyhtml.decoded()
 ```
 , which is actually automatically done by PyWSGIRef.<br/>
 The <code><{{evalPyHTML}}></code> phrase at the beginning of the document includes a Doctype announcement,<br/>
-a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.
+a html and head block and some common meta phrases as utf-8 encoding or device-width scaling.<br/><br/>
+PyWSGIRef also provides a simple way to end PyHTML files:<br/>
+just use the <code><{{evalPyHTML}}></code> phrase at the end of the document and<br/>
+PyWSGIRef will automatically add the closing html and body tags.<br/><br/>
+You can also add PyWSGIRef's own, featured modern stylesheet using:<br/>
+<code><{{evalPyHTML-modernStyling: true}}></code> inside the head block of your PyHTML file.
+### Shutting down your server
+You can shut down your server by calling the <code>shutdown</code> method on the server object:
+```python
+from PyWSGIRef import *
+
+# ...
+# Create a WSGI server
+server = setUpServer(application, port=8000)
+
+# Shut down the server
+server.shutdown()
+```
 ### Others
 Use the following to get information about your release and the author of the module:
 ```python
@@ -171,4 +188,10 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML style and script blocks<br/>
+- PyHTML favicon support<br/>
+- PyHTML include static resource blocks<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.4 → pywsgiref-1.1.6}/src/PyWSGIRef.egg-info/SOURCES.txt

@@ -7,7 +7,9 @@ src/PyWSGIRef/beta.py
 src/PyWSGIRef/commons.py
 src/PyWSGIRef/defaults.py
 src/PyWSGIRef/exceptions.py
+src/PyWSGIRef/finished.py
 src/PyWSGIRef/loadContent.py
+src/PyWSGIRef/patterns.py
 src/PyWSGIRef/pyhtml.py
 src/PyWSGIRef/simpleServer.py
 src/PyWSGIRef/templateDict.py

pywsgiref-1.1.4/src/PyWSGIRef/defaults.py

@@ -1,28 +0,0 @@
-HELLO_WORLD = """<!DOCTYPE html>
-<html lang"de">
-    <body>
-        <h1>Hallo Welt!</h1>
-    </body>
-<html>"""
-
-ERROR = """<!DOCTYPE html>
-<html lang"de">
-    <body>
-        <h1>Fehler!</h1>
-        <p>Es ist ein Fehler aufgetreten.</p>
-    </body>
-</html>"""
-
-MAIN_HTML = """<!DOCTYPE html>
-    <html lang="de">
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>PyWSGIRef Server</title>
-        </head>
-        <body>
-            <h1>Willkommen zum PyWSGIRef Server!</h1>
-            <p>Dies ist die Hauptseite des Servers.</p>
-            <p>Sie nutzen Version {} von PyWSGIRef.</p>
-        </body>
-    </html>"""

pywsgiref-1.1.4/src/PyWSGIRef/pyhtml.py

@@ -1,57 +0,0 @@
-from naturalsize import replStrPassage
-
-from .defaults import HELLO_WORLD as DEFAULT
-from .commons import *
-from .exceptions import InvalidIncludePhraseFiletypeError, StaticResourceUsageOutsideHeadError
-from .beta import BETA
-
-class PyHTML:
-    def __init__(self, html: str = DEFAULT):
-        self.html = html
-
-    def decode(self):
-        """
-        Decodes the HTML content.
-        """
-        self.html = self.html.strip()
-
-        # common html beginning phrase
-        if self.html.startswith("<{{evalPyHTML}}>"):
-            self.html = START_REPLACE + self.html[16:]
-
-        # common html ending phrase
-        if self.html.endswith("<{{evalPyHTML}}>"):
-            self.html = self.html[:-16] + END_REPLACE
-        
-        if BETA.value:
-            # static ressources
-            idx = self.html.find("<{{evalPyHTML-include: ")
-            if idx != -1:
-                idxEnd = self.html.find(" :include-}}>", idx)
-                if idxEnd > self.html.find("</head>"):
-                    raise StaticResourceUsageOutsideHeadError()
-                setIn = ""
-                for i in self.html[idx:idxEnd+12].split(":")[1].strip().split(","):
-                    if i.endswith(".css"):
-                        setIn += "\t\t<link rel='stylesheet' href='{}'/>\n".format(i)
-                    elif i.endswith(".js"):
-                        setIn += "\t\t<script src='{}'></script>\n".format(i)
-                    elif i.endswith(".json"):
-                        setIn += "\t\t<link rel='manifest' href='{}'/>\n".format(i)
-                    else:
-                        raise InvalidIncludePhraseFiletypeError()
-                self.html = replStrPassage(idx, idxEnd+12, self.html, setIn)
-
-            # PyWSGIRef's styling
-            idx = self.html.find("<{{evalPyHTML-modernStyling: true}}>")
-            if idx != -1:
-                if idx > self.html.find("</head>"):
-                    raise StaticResourceUsageOutsideHeadError()
-                self.html = replStrPassage(idx, idx+35, self.html, MODERN_STYLING)
-
-    def decoded(self) -> str:
-        """
-        Returns the decoded HTML content.
-        """
-        self.decode()
-        return self.html