improved readability again

.env

@@ -1,2 +1,5 @@
 obsidian_vault=/home/venus/Documents/Personal-Wiki
+obsidian_vault_url=git.riverrooks.dev/Personal-Wiki
+OBSIDIAN_VAULT_URL=git.riverrooks.dev/Personal-Wiki
+obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
 

.gitignore

@@ -1 +1,2 @@
 app/__pychache__
+public-vault

Dockerfile

@@ -1,15 +1,29 @@
 FROM python:3.14-slim
 
-ARG DEBUG_MODE=0
+#install git
-ENV FLASK_DEBUG=$DEBUG_MODE
+RUN apt-get update && apt-get install -y \
-ENV FLASK_APP=app
+    git \
-
+    && rm -rf /var/lib/apt/lists/*
+#install dependencies
 RUN mkdir /app 
 COPY app/requirements.txt /app
 RUN pip3 install -r /app/requirements.txt
+
+#parse from .env file
+ARG DEBUG_MODE=0
+ARG obsidian_vault=/home/venus/Documents/Personal-Wiki
+ARG OBSIDIAN_VAULT_URL=git.riverrooks.dev/venus/Personal-Wiki
+ARG obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
+
+ENV FLASK_DEBUG=$DEBUG_MODE
+ENV FLASK_APP=app
+# ENV OBSIDIAN_VAULT=$obsidian_vault
+ENV OBSIDIAN_VAULT_URL=$OBSIDIAN_VAULT_URL
+ENV OBSIDIAN_VAULT_TOKEN=$obsidian_vault_token
+
 COPY app /app
 
 ENTRYPOINT ["flask"]
-CMD ["--app", "app", "run", "--host=0.0.0.0", "--port=80"]
+CMD ["run", "--host=0.0.0.0", "--port=80"]
 
 

app/__init__.py

@@ -1,35 +1,24 @@
 from flask import Flask
-import markdown
+from app import build
 from pathlib import Path
+import markdown
+import os
+from dotenv import load_dotenv
 
 app = Flask(__name__)
 
-CONTENT_DIR = Path(__file__).parent.parent / "content"
+PRIVATE_VAULT_DIR = Path("/vault")
+PUBLIC_VAULT_DIR = "/content"
 
-@app.route("/hello")
+build.obsidian_vault(PRIVATE_VAULT_DIR) # initialize the private obsidian repo
-def hello_world():
+# build.public_vault(PUBLIC_VAULT_DIR) # initialize the public notes from the private repo
-    return "<h1>Hello, World!</h1>"
 
 @app.route("/")
 def index():
-    # Write your markdown content
+    md_content = "# Welcome to my blog!\nThis is rendered from **Markdown**.\n##[test](http://localhost/test)"
-    md_content = "# Welcome to my blog!\nThis is rendered from **Markdown**."
-    # Convert it to HTML
     html_content = markdown.markdown(md_content)
     return html_content
 
-@app.route ("/post/<filename>")
+@app.route ("/<filename>") # renders a filename if not otherwise specified
-def render_markdown_file(filename):
+def render_post(filename):
-    filePath = CONTENT_DIR / f"{filename}.md"
+    return build.html_file(filename, PUBLIC_VAULT_DIR)
-    # 3. Protect against missing files
-    if not filePath.is_file():
-        return f"<h1>404</h1><p>Could not find {filename}.md in {filePath}</p>", 404
-    # else:
-    #     return f"<h1> found</h1> <p> found {filename} in {filePath}</p>"
-    # 4. Open, read, and convert the file
-    with open(filePath, "r", encoding="utf-8") as f:
-        textContent = f.read()
-        
-    htmlContent = markdown.markdown(textContent)
-    
-    return htmlContent

app/build.py

@@ -1,26 +1,61 @@
 from obsidian_parser import Vault
 import shutil
-from git import Repo
+import markdown
+from pathlib import Path
+import os
 
 
+def html_file(filename: str, contentPath: Path): #renders markwown from filename 
+    filePath = contentPath / f"{filename}.md"
+    # 3. Protect against missing files
+    if not filePath.is_file():
+        return f"<h1>404</h1><p>Could not find {filename}.md in {filePath}</p>", 404
+    # open the file for reading
+    with open(filePath, "r", encoding="utf-8") as f:
+        textContent = f.read()
+    # convert it to markdown
+    htmlContent = markdown.markdown(textContent)
+    return htmlContent
 
-def clone_secure_repo(url: str, token: str = "", dest: str): # clone a gittea repo using optional security token into dest dirand return a path to the directory
+
-    return dest
+def obsidian_vault(dest = "/vault"): # makes sure there is a vault in dest
+    from git import Repo
+    url = os.getenv("OBSIDIAN_VAULT_URL")
+    token = os.getenv("OBSIDIAN_VAULT_TOKEN")
+    if not(token):
+        print ("token not found, cant build vault")
+        raise NameError("tokenNotFound")
+        return 0
+
+    url = f"https://{token}@{url}"
+
+    if os.path.exists(os.path.join(dest, '.git')):
+        #TODO handle merge conflictsjjj
+        print (f"pulling vault from {url} in {dest}")
+        repo = Repo(dest)
+        origin = repo.remotes.origin
+        origin.fetch()
+        origin.pull(strategy_option='theirs')
+        print ("vault updated")
+        return 1
+
+    print (f"building vault from {url} in {dest}")
+    Repo.clone_from(url, dest)
+    print("cloned vault!")
+    return 1
 
 def public_notes(src: str): # return a list of notes tagged with public from an obsidian directory
-    # build vault from source
+    # build vault object from source
     vault = Vault(src)
-    if vault:
+    if not(vault):
-        print ("found vault")
-    else:
         print("could not find vault")
+        raise NameError("vaultNotFound")
         return []
-
+    # return a list of notes
-    # return a list ofnotes
     return vault.get_notes_with_tag("public")
 
 
-def buld_public_vault(src: str, dest: str): # build the public vault in dest from an obsidian repo in src
+def public_vault(dest: str, src: str = "/content"): # build the public vault in dest from an obsidian repo in src
     for note in public_notes(src):
         print(note.title)
         shutil.copy2(f"{note.path}", dest)

app/requirements.txt

@@ -2,3 +2,4 @@ flask
 markdown
 obsidianmd-parser
 GitPython
+python-dotenv

compose.yml

@@ -3,7 +3,11 @@ services:
     build: 
       args:
         - DEBUG_MODE=1
+        - obsidian_vault_url=https://git.riverrooks.dev/Personal-Wiki
+        - obsidian_vault_token=bd8cd9301ae2c1c5bacfb3340492acb5e862686a
+
     ports:
       - '80:80'
     volumes:
-      - ./content:/content
+      - ./content:/content #public
+      - ./public-vault:/vault #private

content/index.md

@@ -1,3 +0,0 @@
-# This is a test
-and this is p
-*italics*

readme.md

@@ -1,22 +0,0 @@
-# Architecture
-/app
-> containts all of the files to build and run the docker container.Docker containter runs the application
-/content
-> contains all of the publicly accessible files
-    templates
-    notes
-    index
-    ...
-compose # compose file to mount content to app
-build.sh #optional file to build the app
-.env # enviroment var files for location of existing public directory. will depricate
-
-
-# Dockerfile
-> builds the flask application and sets it to run.
- - runs the site
-
-# app
- - clones the public repo (from env var url)
- - finds public notes and moves to content vault
- - exposes webhook to update vault and public notes