[Bf-docboard-svn] bf-manual: [7668] branches/blender-2.92-release/blender_docs: 404: Grab version info from context and not versions.json

[Aaron Carlisle]

Revision: 7668
          https://developer.blender.org/rBM7668
Author:   Blendify
Date:     2021-01-25 21:58:47 +0100 (Mon, 25 Jan 2021)
Log Message:
-----------
404: Grab version info from context and not versions.json

Modified Paths:
--------------
    branches/blender-2.92-release/blender_docs/exts/404.py
    branches/blender-2.92-release/blender_docs/resources/templates/404.html

Modified: branches/blender-2.92-release/blender_docs/exts/404.py
===================================================================
--- branches/blender-2.92-release/blender_docs/exts/404.py	2021-01-25 20:00:31 UTC (rev 7667)
+++ branches/blender-2.92-release/blender_docs/exts/404.py	2021-01-25 20:58:47 UTC (rev 7668)
@@ -15,41 +15,9 @@
     """Adds a version tag variable to the context which can be accessed by the template."""
 
     if templatename == "404.html":
-        version_nbr = context['version']
-        version_tag = version_nbr
+        gen_htaccess(app, context['language'], context['version'])
 
-        version_data = read_versions()
-        if version_data:
-            for tag, title in version_data.items():
-                m = re.match(r"\d\.\d[\w\d\.]*", title)
-                if m and m[0] == version_nbr:
-                     version_tag = tag.strip();
-                     break;
 
-        if "versiontag" not in context:
-            context['versiontag'] = version_tag
-        else:
-            logger = logging.getLogger(__name__)
-            logger.error('context override')
-
-        gen_htaccess(app, context['language'], version_tag)
-
-
-def read_versions():
-    current_dir = os.path.abspath(os.path.dirname(__file__))
-    version_fn = os.path.normpath(os.path.join(current_dir, "..", "resources", "versions.json"))
-
-    try:
-        with open(version_fn) as json_data:
-            data = json.load(json_data)
-        return data
-
-    except (IOError, OSError) as err:
-        logger = logging.getLogger(__name__)
-        logger.warning("{0}: cannot read: {1}".format(version_fn, err))
-        return None
-
-
 def gen_htaccess(app, lang, version):
     text = read_htaccess()
     if text:

Modified: branches/blender-2.92-release/blender_docs/resources/templates/404.html
===================================================================
--- branches/blender-2.92-release/blender_docs/resources/templates/404.html	2021-01-25 20:00:31 UTC (rev 7667)
+++ branches/blender-2.92-release/blender_docs/resources/templates/404.html	2021-01-25 20:58:47 UTC (rev 7668)
@@ -3,7 +3,7 @@
 {%- set ROOT = "https://docs.blender.org/manual/" %}
 {%- block htmltitle %}
 	{{ super() }}
-	<base href="{{ ROOT + language + '/' + versiontag + '/' }}" />
+	<base href="{{ ROOT + language + '/' + version + '/' }}" />
 {% endblock %}
 {%- block extrahead %}
 	<style>
@@ -27,7 +27,7 @@
 </div>
 
 <noscript>
-<a href="{{ ROOT + language + '/' + versiontag + '/index.html' }}" class="btn btn-neutral" title="{{ _('Return Home') }}">
+<a href="{{ ROOT + language + '/' + version + '/index.html' }}" class="btn btn-neutral" title="{{ _('Return Home') }}">
 <span class="fa fa-home"></span> {{ _('Return Home') }}</a>
 
 <span style="font-style: italic">The search functionality needs JavaScript activated in order to work.</span>