Clean up

Author: StanFromIreland

generate.py

@@ -15,7 +15,7 @@
 import subprocess
 from collections.abc import Iterator
 from dataclasses import dataclass, asdict
-from datetime import datetime, date, timedelta, timezone
+from datetime import datetime, timezone
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -32,43 +32,6 @@
 generation_time = datetime.now(timezone.utc)
 
 
-def get_cached_data() -> dict:
-    try:
-        with open('index.json') as f:
-            return json.load(f)
-    except FileNotFoundError:
-        return {'previous_completion': {}, 'last_sunday': None}
-
-
-def get_last_sunday() -> str:
-    today = date.today()
-    offset = today.weekday() + 1
-    last_sunday = today - timedelta(days=offset)
-    return last_sunday.isoformat()
-
-
-def update_previous_completion(cached_data: dict, completion_progress: list):
-    current_sunday = get_last_sunday()
-    if cached_data.get('last_sunday') != current_sunday:
-        cached_data['previous_completion'] = {
-            item.language.code: item.completion for item in completion_progress
-        }
-        cached_data['last_sunday'] = current_sunday
-
-
-def save_index_json(cached_data: dict, completion_progress: list):
-    with open('index.json', 'w') as f:
-        json.dump(
-            {
-                'last_sunday': cached_data['last_sunday'],
-                'previous_completion': cached_data['previous_completion'],
-                'languages': [asdict(item) for item in completion_progress],
-            },
-            f,
-            indent=2,
-        )
-
-
 def get_completion_progress() -> Iterator['LanguageProjectData']:
     with TemporaryDirectory() as clones_dir:
         Repo.clone_from(
@@ -144,19 +107,15 @@ class LanguageProjectData:
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
     logging.info(f'starting at {generation_time}')
-
-    cached_data = get_cached_data()
-    completion_progress = list(get_completion_progress())
-
-    update_previous_completion(cached_data, completion_progress)
-    save_index_json(cached_data, completion_progress)
-
     template = Template(Path('template.html.jinja').read_text())
+
     output = template.render(
-        completion_progress=completion_progress,
-        previous_completion=cached_data.get('previous_completion', {}),
+        completion_progress=(completion_progress := list(get_completion_progress())),
         generation_time=generation_time,
         duration=(datetime.now(timezone.utc) - generation_time).seconds,
     )
 
     Path('index.html').write_text(output)
+    Path('index.json').write_text(
+        json.dumps(completion_progress, indent=2, default=asdict)
+    )

template.html.jinja

@@ -51,11 +51,6 @@
     <div class="progress-bar" style="width: {{ project.completion }}%;">{{ "{:.2f}".format(project.completion) }}%</div>
     <div class="progress-bar-outer-label">{{ "{:.2f}".format(project.completion) }}%</div>
   </td>
-  <td data-label="difference">
-    {% set prev = previous_completion.get(project.language.code, project.completion) %}
-    {% set diff = prev - project.completion %}
-    {{ "{:+.2f}".format(diff) }}%
-  </td>
 </tr>
 {% endfor %}
 </tbody>