openwrite 0.10.2__tar.gz → 0.10.3__tar.gz

{openwrite-0.10.2/openwrite.egg-info → openwrite-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.10.2
+Version: 0.10.3
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -687,7 +687,7 @@ Requires-Dist: gmcapsule
 Requires-Dist: user-agents
 Dynamic: license-file
 
-![logo](https://github.com/user-attachments/assets/5a0dc36c-1b62-40ba-b740-fe3b941b67fa)
+![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
 [![version](https://img.shields.io/badge/version-0.10.0-purple)](CHANGELOG.md)

{openwrite-0.10.2 → openwrite-0.10.3}/README.md

@@ -1,4 +1,4 @@
-![logo](https://github.com/user-attachments/assets/5a0dc36c-1b62-40ba-b740-fe3b941b67fa)
+![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
 [![version](https://img.shields.io/badge/version-0.10.0-purple)](CHANGELOG.md)

{openwrite-0.10.2 → openwrite-0.10.3}/openwrite/cli.py

@@ -16,7 +16,8 @@ import bcrypt
 
 load_dotenv()
 f_abs_path = os.path.abspath(__file__)
-cwd = "/".join(f_abs_path.split("/")[:-2])
+lib_cwd = "/".join(f_abs_path.split("/")[:-1])
+cwd = os.getcwd()
 env = f"{cwd}/.env"
 
 def print_banner():
@@ -85,11 +86,9 @@ def init():
         os.makedirs(f"{cwd}/gemini/.certs", exist_ok=True)
         subprocess.run(["openssl", "req", "-x509", "-newkey", "rsa:4096", "-keyout", f"{cwd}/gemini/.certs/key.pem", "-out", f"{cwd}/gemini/.certs/cert.pem", "-days", "365", "-nodes", "-subj", f"/CN={domain}"], check=True)
         if mode == 1:
-            os.rename(f"{cwd}/gemini_multi.py", f"{cwd}/gemini/mod/10_openwrite.py")
-            os.remove(f"{cwd}/gemini_single.py")
+            os.rename(f"{lib_cwd}/gemini_multi.py", f"{cwd}/gemini/mod/10_openwrite.py")
         elif mode == 2:
             os.rename(f"{cwd}/gemini_single.py", f"{cwd}/gemini/mod/10_openwrite.py")
-            os.remove(f"{cwd}/gemini_multi.py")
 
     logs_enabled = click.confirm("Enable logging?", default=True)
     if logs_enabled:

openwrite-0.10.3/openwrite/gemini_multi.py

@@ -0,0 +1,117 @@
+import os, subprocess
+from dotenv import load_dotenv
+from openwrite.utils.db import init_engine, SessionLocal
+from openwrite.utils.models import Blog, Post, User, View
+from openwrite.utils.helpers import anonymize
+from md2gemini import md2gemini
+from datetime import datetime, timezone
+session = None
+
+openwrite_logo = """
+                                                    
+                                     .-.    /       
+  .-._..-.   .-..  .-. `)    (  ).--.`-'---/---.-.  
+ (   ) /  )./.-'_)/   )/  .   )/    /     /  ./.-'_ 
+  `-' /`-' (__.''/   ((_.' `-'/  _.(__.  /   (__.'  
+     /                `-                            
+                            quiet space for loud thoughts
+"""
+
+def root(req):
+    global session
+    resp = f"```\n{openwrite_logo}\n```"
+    resp += "\nopenwrite.io is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise. To create your own blog, visit:\n"
+    resp += "=> https://openwrite.io openwrite.io\n"
+    resp += "In here you can read posts published.\n"
+    resp += "\n## 🗞️ Latest posts:\n"
+    try:
+        posts = (session.query(Post).filter_by(feed="1").order_by(Post.id.desc()).limit(10).all())
+        for p in posts:
+            blog = session.query(Blog).filter_by(id=p.blog).first()
+            resp += f"\n{p.date} - 📓 {blog.title}\n"
+            resp += f"=> /b/{blog.name}/{p.link} {p.title}\n"
+        return resp
+
+    finally:
+        session.close()
+
+def blog_index(req):                                                                           
+        global session
+        path = req.path
+        if len(path.split("/")) == 3:
+            blogname = path.split("/")[2]
+            try:
+                blog = session.query(Blog).filter_by(name=blogname).first()
+                if not blog:
+                    return "not found"
+                posts = (session.query(Post)
+                                .filter_by(blog=blog.id)
+                                .order_by(Post.id.desc())
+                                .all())
+                body = f"# 📓 {blog.title}\n\n"
+                body += md2gemini(blog.description_raw.replace("#", ""))
+                body += "\n--------------------------------------------------\n"
+                body += "### Posts:\n\n"
+                for post in posts:
+                    body += f"=> /b/{blogname}/{post.link} {post.title}\n"
+                return body
+            finally:
+                session.close()
+        elif len(path.split("/")) == 4:
+            
+            blogname = path.split("/")[2]
+            slug = path.split("/")[3]
+            try:
+                blog = session.query(Blog).filter_by(name=blogname).first()
+                if not blog:
+                    return "not found"
+
+                post = (session.query(Post)
+                              .filter_by(blog=blog.id, link=slug)
+                              .first())
+                if not post:
+                    return "not found"
+                user = session.query(User).filter_by(id=blog.owner).first()
+
+                now = datetime.now(timezone.utc)
+                ip = anonymize(req.remote_address[0])
+                v = session.query(View).filter(View.blog==blog.id, View.post==post.id, View.hash==ip).count()
+                if v < 1:
+                    new_view = View(blog=blog.id, post=post.id, hash=ip, date=now, agent="gemini")
+                    session.add(new_view)
+                    session.commit()
+
+                post.authorname = user.username
+                gemtext = f"=> /b/{blog.name} 📓 {blog.title}\n"
+                gemtext += f"# 🧾 {post.title}\n\n"
+                gemtext += f"{post.date} "
+                if post.author != "0":
+                    gemtext += f"by {post.authorname}"
+                gemtext += "\n--------------------------------------------------\n"
+                gemtext += f"\n\n{md2gemini(post.content_raw)}"
+                return gemtext
+              
+            finally:
+                session.close()
+            
+        else:
+            return "not found"
+
+def init(capsule):
+    global session
+    load_dotenv()
+    init_engine(os.getenv("DB_TYPE", "sqlite"),
+                    os.getenv("DB_PATH", "db.sqlite"))
+
+    from openwrite.utils.db import SessionLocal
+    session = SessionLocal
+
+    capsule.add("/",
+        root,
+        protocol='gemini')
+
+    capsule.add("/b/*",
+        blog_index,
+        protocol='gemini')
+
+

openwrite-0.10.3/openwrite/gemini_single.py

@@ -0,0 +1,84 @@
+import os, subprocess
+from dotenv import load_dotenv
+from openwrite.utils.db import init_engine, SessionLocal
+from openwrite.utils.models import Blog, Post, User, View
+from openwrite.utils.helpers import anonymize
+from md2gemini import md2gemini
+from datetime import datetime, timezone
+session = None
+
+def blog_index(req):
+    global session
+    try:
+        blog = session.query(Blog).filter_by(name="default").first()
+        posts = (session.query(Post)
+                        .filter_by(blog=blog.id)
+                        .order_by(Post.id.desc())
+                        .all())
+        body = f"# 📓 {blog.title}\n\n"
+        body += md2gemini(blog.description_raw.replace("#", ""))
+        body += "\n--------------------------------------------------\n"
+        body += "### Posts:\n\n"
+        for post in posts:
+            body += f"=> /p/{post.link} {post.title}\n"
+        return body
+    finally:
+        session.close()
+
+def blog_post(req):
+    global session
+    path = req.path
+    if len(path.split("/")) == 3:
+        
+        slug = path.split("/")[2]
+        try:
+            blog = session.query(Blog).filter_by(name="default").first()
+            post = (session.query(Post)
+                          .filter_by(blog=blog.id, link=slug)
+                          .first())
+            if not post:
+                return "not found"
+            user = session.query(User).filter_by(id=blog.owner).first()
+
+            now = datetime.now(timezone.utc)
+            ip = anonymize(req.remote_address[0])
+            v = session.query(View).filter(View.blog==blog.id, View.post==post.id, View.hash==ip).count()
+            if v < 1:
+                new_view = View(blog=blog.id, post=post.id, hash=ip, date=now, agent="gemini")
+                session.add(new_view)
+                session.commit()
+
+            post.authorname = user.username
+            gemtext = f"=> /b/{blog.name} 📓 {blog.title}\n"
+            gemtext += f"# 🧾 {post.title}\n\n"
+            gemtext += f"{post.date} "
+            if post.author != "0":
+                gemtext += f"by {post.authorname}"
+            gemtext += "\n--------------------------------------------------\n"
+            gemtext += f"\n\n{md2gemini(post.content_raw)}"
+            return gemtext
+          
+        finally:
+            session.close()
+            
+    else:
+        return "not found"
+
+def init(capsule):
+    global session
+    load_dotenv()
+    init_engine(os.getenv("DB_TYPE", "sqlite"),
+                    os.getenv("DB_PATH", "db.sqlite"))
+
+    from openwrite.utils.db import SessionLocal
+    session = SessionLocal
+
+    capsule.add("/",
+        blog_index,
+        protocol='gemini')
+
+    capsule.add("/p/*",
+        blog_post,
+        protocol='gemini')
+
+

{openwrite-0.10.2 → openwrite-0.10.3/openwrite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.10.2
+Version: 0.10.3
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -687,7 +687,7 @@ Requires-Dist: gmcapsule
 Requires-Dist: user-agents
 Dynamic: license-file
 
-![logo](https://github.com/user-attachments/assets/5a0dc36c-1b62-40ba-b740-fe3b941b67fa)
+![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
 [![version](https://img.shields.io/badge/version-0.10.0-purple)](CHANGELOG.md)

{openwrite-0.10.2 → openwrite-0.10.3}/openwrite.egg-info/SOURCES.txt

@@ -4,7 +4,8 @@ README.md
 pyproject.toml
 openwrite/__init__.py
 openwrite/cli.py
-openwrite/launch_gemini.py
+openwrite/gemini_multi.py
+openwrite/gemini_single.py
 openwrite.egg-info/PKG-INFO
 openwrite.egg-info/SOURCES.txt
 openwrite.egg-info/dependency_links.txt

{openwrite-0.10.2 → openwrite-0.10.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openwrite"
-version = "0.10.2"
+version = "0.10.3"
 license = { file = "LICENSE" }
 dependencies = [
     "flask",

openwrite-0.10.2/openwrite/launch_gemini.py

@@ -1,8 +0,0 @@
-from gemini import create_gemini
-import sys
-
-if __name__ == "__main__":
-    proxy = None
-    if len(sys.argv) > 1:
-        proxy = "proxy"
-    create_gemini(proxy)