From: Max Value Date: Fri, 21 Mar 2025 21:53:54 +0000 (+0000) Subject: Added MOBI preperation system X-Git-Url: https://git.ozva.co.uk/?a=commitdiff_plain;h=012b99c91a40b4f4c4fe9f9a4757ee8a3befac67;p=shopping-channel Added MOBI preperation system + switch to docs.html to remove all incompatible components (links, details) ~ database check and docgen happens on first request This may not work with mutliprocesses or threads ~ added manual docgen endpoint @ /api/generate - EPUB leftovers - generate_docs.py --- diff --git a/docs/epub/META-INF/container.xml b/docs/epub/META-INF/container.xml deleted file mode 100644 index b640723..0000000 --- a/docs/epub/META-INF/container.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/docs/epub/info_page.html b/docs/epub/info_page.html deleted file mode 100644 index 3784551..0000000 --- a/docs/epub/info_page.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - Information - - -

Infomation

-

Call Sheet

- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameRoleContact
William GreenwoodProducer - W.Greenwood@edu.salford.ac.uk -
- +44 7594 768180 -
Test crewRole - Email -
- Phone -
Test crewRole - Email -
- Phone -
Test crewRole - Email -
- Phone -
- -

Lighting cue information

-

Lighting scenes

-

Full cue setups, only one can be opperating at once.

- -

Lighting triggers

-

Individual lighting triggers, for things such as the clock. Any number can be activated at once

- - - diff --git a/docs/epub/mimetype b/docs/epub/mimetype deleted file mode 100644 index 403c4f0..0000000 --- a/docs/epub/mimetype +++ /dev/null @@ -1 +0,0 @@ -application/epub+zip diff --git a/docs/epub/stylesheet.css b/docs/epub/stylesheet.css deleted file mode 100644 index 1d70e71..0000000 --- a/docs/epub/stylesheet.css +++ /dev/null @@ -1,9 +0,0 @@ -@page { - margin-bottom: 5pt; - margin-top: 5pt; -} - -table, th, td { - border: 1px solid black; - border-collapse: collapse; -} diff --git a/docs/epub/title_page.html b/docs/epub/title_page.html deleted file mode 100644 index 75d96ea..0000000 --- a/docs/epub/title_page.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - Title Page - - -

XMDV Teleshopping

-

Item manifest

-

Info on all items contained within the GFX system.


-

HIDDEN INFORMATION. NOT TO BE SHARED WITH THE ANCHOR.

- - diff --git a/generate_docs.py b/generate_docs.py deleted file mode 100755 index 35ff0fe..0000000 --- a/generate_docs.py +++ /dev/null @@ -1,162 +0,0 @@ -#!.venv/bin/python - -from pylatex import Command, Document, Section, Tabular, NewPage, NewLine -from pylatex.utils import NoEscape, bold -import json -import os - -# clean up working-directory -for filename in os.listdir("../docs/epub"): - if filename[:4] == "item": os.remove("../docs/epub/" + filename) - -# generate item pages -with open("../items.json", "r") as f: - items = json.loads(f.read()) - -for (i, item) in enumerate(items): - with open(f"../docs/epub/item{i}.html", "w") as f: - f.write(f""" - - - - {item['code']} - - -

{item['code']}

-

{item['subtext']}

-

Description

-

{item['description']}

- - - - - - - - - - - - - -
Rating{item['rating']}
Starting price{item['origionalPrice']}
In stock{item['stockCount']}
-

Anchor notes:

-

{item['notes']}

-

Crew notes:

-

{item['crew_notes']}

- - - """) - -# update manifest -manifest_items = " ".join([ - f"" - for i in range(len(items)) - ]) -toc_items = " ".join([ - f"" - for i in range(len(items)) - ]) - -with open("../docs/epub/content.opf", "w") as f: - f.write(f""" - - - - - - - XMDV Teleshopping item manifest - en - - http://data.ozva.co.uk/shopping/docs/item_manifest.epub - - Teleshopping, Manifest - Describing all items to be sold during the XMDV Teleshopping performance - William Greenwood - Goodnight Publishing - 2024-12-28 - Creative Commons BY-SA 3.0 License. - - - - - - - - {manifest_items} - - - - - - {toc_items} - - - -""") - -toc_items = " ".join([ - f""" - - - {i+1}: {item["code"]} - - - - """ - for (i, item) in enumerate(items) - ]) - -with open("../docs/epub/toc.ncx", "w") as f: - f.write(f""" - - - - - - - - - - - - - - XMDV Teleshopping item manifest - - - - - - Title Page - - - - - - Information - - - - {toc_items} - - - -""") - -os.system(""" - zip -X0 ../docs/item_manifest.epub ../docs/epub/mimetype && - zip -Xur9D ../docs/item_manifest.epub ../docs/epub/* && - ebook-convert ../docs/item_manifest.epub ../docs/item_manifest.mobi - """) diff --git a/static/cover.jpg b/static/cover.jpg new file mode 100644 index 0000000..be15dcf Binary files /dev/null and b/static/cover.jpg differ diff --git a/teleshopping.py b/teleshopping.py index 7627b6b..270d1ce 100755 --- a/teleshopping.py +++ b/teleshopping.py @@ -71,7 +71,7 @@ def gfx_page(page): @app.route("/docs") @auth.login_required def web_docs(): - return Response(render_template("docs.html", data=static_data, info=static_info), mimetype="text/html") + return Response(render_template("docs.html", data=static_data, info=static_info, book=False), mimetype="text/html") @app.route("/docs/") @auth.login_required @@ -189,30 +189,10 @@ def api_clock(): else: return "", 404 -@app.route("/api/regenerate") +@app.route("/api/generate") @auth.login_required -def check_generate(): - # sanity check the db - with open(path.join(app.root_path, "schema"), "r", encoding="utf-8") as f: - schema, load = f.read().split("\n\n") - - with sqlite3.connect(path.join(app.root_path, "data.db")) as connection: - cursor = connection.cursor() - try: - cursor.execute(load) - except sqlite3.IntegrityError: - print("Database is setup correctly") - pass - except sqlite3.OperationalError: - print("Table missing or corrupt...") - try: cursor.execute("DROP TABLE state;") # catch if there is no table "state" - except: pass - cursor.execute(schema) - cursor.execute(load) - connection.commit() - - # generate docs - print("Generating static documentation...") +def generate_docs(): + # setup the jinja enviroment for use in latex latex_enviroment = Environment( loader=FileSystemLoader(path.join(app.root_path, "templates")), block_start_string = "|%", @@ -225,9 +205,10 @@ def check_generate(): lstrip_blocks = True ) + # render each latex document + docs_path = path.join(app.root_path, "docs") for document in ["call-sheet.tex", "manifest-unsafe.tex", "manifest-safe.tex", "gfx-text.tex"]: template = latex_enviroment.get_template(document) - docs_path = path.join(app.root_path, "docs") with open(path.join(docs_path, document), "w", encoding="utf-8") as f: f.write(template.render(data=static_data, info=static_info)) @@ -237,7 +218,47 @@ def check_generate(): print(f" - Generated {document}") + with open(path.join(docs_path, "documentation.html"), "w", encoding="utf-8") as f: + f.write(render_template("docs.html", data=static_data, info=static_info, book=True)) + + system(f"ebook-convert '{path.join(docs_path, 'documentation.html')}' '{path.join(docs_path, 'documentation.mobi')}' --title='XMDV Teleshopping Documentation' --authors='William Greenwood' --comments='Valid for {static_info['shoot']['date']}' --language=en --change-justification=left --cover='{path.join(app.root_path, 'static', 'cover.jpg')}'") + return "", 200 + + + +# if this is the first incoming request do a sanity check on the db +# this might happen a few times because of threading, but it doesnt slow requests that much +first_request = True +@app.before_request +def check_database(): + global first_request + if first_request: + with open(path.join(app.root_path, "schema"), "r", encoding="utf-8") as f: + schema, load = f.read().split("\n\n") + + with sqlite3.connect(path.join(app.root_path, "data.db")) as connection: + cursor = connection.cursor() + try: + cursor.execute(load) + except sqlite3.IntegrityError: + print("Database is setup correctly") + pass + except sqlite3.OperationalError: + print("Table missing or corrupt...") + try: cursor.execute("DROP TABLE state;") # catch if there is no table "state" + except: pass + cursor.execute(schema) + cursor.execute(load) + connection.commit() + + generate_docs() # This might be a bad idea + + first_request = False + + + + if __name__ == "__main__": - app.run(host='192.168.0.144', port=8000, debug=True) + app.run(host='127.0.0.1', port=8000, debug=True) diff --git a/templates/docs.html b/templates/docs.html index 11757b1..8d6a63d 100644 --- a/templates/docs.html +++ b/templates/docs.html @@ -140,10 +140,14 @@ details { Forbidden -
- Reveal + {% if book %} {{item.crew_notes}} -
+ {% else %} +
+ Reveal + {{item.crew_notes}} +
+ {% endif %} {% endfor %} @@ -178,11 +182,15 @@ details { -

PDF Documents

- + {% if book %} +

For print document links, see web version of this document.

+ {% else %} +

PDF Documents

+ + {% endif %}