Merge pull request #189 from openzim/issue_145

Migrate to new PG server + remove inline JS + remove JS deps from repo
openzim · Aug 17, 2023 · 1ea3cc1 · 1ea3cc1
2 parents 91e2744 + c2a7850
commit 1ea3cc1
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 17,463 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.1-bullseye
+FROM python:3.11.4-bookworm
 
 # Install necessary packages
 RUN apt-get update -y && \
@@ -7,13 +7,14 @@ RUN apt-get update -y && \
     rm -rf /var/lib/apt/lists/*
 
 # Install gutenberg (from source)
-RUN locale-gen "en_US.UTF-8"
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen "en_US.UTF-8"
 COPY requirements.pip /src/
 RUN python3 -m pip install -r /src/requirements.pip
 COPY LICENSE /src/
 COPY pypi-readme.rst /src/
 COPY MANIFEST.in /src/
 COPY setup.py /src/
+COPY get_js_deps.sh /src/
 COPY gutenberg2zim /src/
 COPY gutenbergtozim /src/gutenbergtozim
 WORKDIR /src/

diff --git a/get_js_deps.sh b/get_js_deps.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+###
+# download JS dependencies and place them in our templates/assets folder
+# then launch our ogv.js script to fix dynamic loading links
+###
+
+if ! command -v curl > /dev/null; then
+	echo "you need curl."
+	exit 1
+fi
+
+# Absolute path this script is in.
+SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
+ASSETS_PATH="${SCRIPT_PATH}/gutenbergtozim/templates"
+
+echo "About to download JS assets to ${ASSETS_PATH}"
+
+echo "getting datatables.min.js"
+curl -L -O https://cdn.datatables.net/v/dt/dt-1.13.6/r-2.5.0/datatables.min.js
+rm -rf $ASSETS_PATH/datatables/datatables.min.js
+mv datatables.min.js $ASSETS_PATH/datatables/datatables.min.js
+
+echo "getting datatables.min.css"
+curl -L -O https://cdn.datatables.net/v/dt/dt-1.13.6/r-2.5.0/datatables.min.css
+rm -rf $ASSETS_PATH/datatables/datatables.min.css
+mv datatables.min.css $ASSETS_PATH/datatables/datatables.min.css
diff --git a/gutenbergtozim/download.py b/gutenbergtozim/download.py
@@ -27,7 +27,7 @@
     get_etag_from_url,
 )
 
-IMAGE_BASE = "http://dante.pglaf.org/cache/epub/"
+IMAGE_BASE = "http://aleph.pglaf.org/cache/epub/"
 
 # for development
 # def resource_exists(url):

diff --git a/gutenbergtozim/templates/base.html b/gutenbergtozim/templates/base.html
@@ -4,6 +4,9 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title {% if show_books %} data-l10n-id="top-title"{% endif %}>{% block title %}Project Gutenberg Library{% endblock %}</title>
         <meta name="description" content="Project Gutenberg Ebooks." />
+        <meta name="show_books" content="{% if show_books %}true{% else %}false{% endif %}" />
+        <meta name="bookshelf_home" content="{% if bookshelf_home %}true{% else %}false{% endif %}" />
+        <meta name="bookshelf" content="{% if bookshelf is defined %}{{ bookshelf }}{% endif %}" />
         <link rel="shortcut icon" href="favicon.ico" />
         <link rel="stylesheet" href="css/pure-min.css" type="text/css" />
         <link rel="stylesheet" href="css/grids-responsive-min.css" type="text/css" />
@@ -17,7 +20,7 @@
         <script type="text/javascript" src="jquery/jquery.cookie.js"></script>
         <script type="text/javascript" src="jquery/jquery.persist.js"></script>
         <script src="jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-        <script type="text/javascript" charset="utf8" src="datatables/datatables.js"></script>
+        <script type="text/javascript" charset="utf8" src="datatables/datatables.min.js"></script>
         <script type="application/l10n">{{ l10n_strings }}</script>
         <script src="js/l10n.js" type="text/javascript"></script>
         <script src="js/tools.js" type="text/javascript"></script>
@@ -26,7 +29,7 @@
         <script src="other_languages.js" type="text/javascript"></script>
     </head>
 
-<body onload="init();  {% if show_books %} showBooks(); {% else %} populateFilters(); {% endif %} {%if bookshelf_home %} showBookshelfSearchResults(''); {%endif%} {%if bookshelf is defined%} showBookshelf(`{{ bookshelf }} `); {%endif%}" class="pure-skin-gutenberg {%if bookshelf_home%}bookshelf_home{%endif%}  {%if individual_book_shelf%}individual_book_shelf{%endif%}  {% if not show_books %}cover{% else %}home{% endif %}">
+<body class="pure-skin-gutenberg {%if bookshelf_home%}bookshelf_home{%endif%}  {%if individual_book_shelf%}individual_book_shelf{%endif%}  {% if not show_books %}cover{% else %}home{% endif %}">
     <div id="spinner" class="spinner" style="display:none;" >
         <img id="img-spinner" src="css/spinner.gif" alt="Loading" />
     </div>

diff --git a/gutenbergtozim/templates/cover_article.html b/gutenbergtozim/templates/cover_article.html
@@ -17,7 +17,7 @@ <h2>{{ book.subtitle }}</h2>
         {% endif %}
             <div class="cover-detail author">
                 <p class="label" data-l10n-id="author">Author</p>
-                <p class="label-value"{{ translate_author}}><a href='javascript:goToAuthor("{{ book.author.name() }}");'>{{ book.author.name() }}</a></p>
+                <p class="label-value author-btn"{{ translate_author}}><a class="author-btn" data-author-name="{{ book.author.name() }}">{{ book.author.name() }}</a></p>
             </div>
 
             <div class="cover-detail language">

diff --git a/gutenbergtozim/templates/datatables/.gitignore b/gutenbergtozim/templates/datatables/.gitignore
@@ -0,0 +1 @@
+*