Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions completion.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
import json
from dataclasses import dataclass
from functools import cache
from pathlib import Path
from tempfile import TemporaryDirectory
from typing import Literal

import git
from potodo import potodo

import translators


@cache
def branches_from_devguide(devguide_dir: Path) -> list[str]:
Expand All @@ -22,9 +18,7 @@ def branches_from_devguide(devguide_dir: Path) -> list[str]:
]


def get_completion(
clones_dir: str, repo: str
) -> tuple[float, 'TranslatorsData', str, float]:
def get_completion(clones_dir: str, repo: str) -> tuple[float, str, float]:
clone_path = Path(clones_dir, 'translations', repo)
for branch in branches_from_devguide(Path(clones_dir, 'devguide')) + [
'master',
Expand All @@ -36,13 +30,9 @@ def get_completion(
)
except git.GitCommandError:
print(f'failed to clone {repo} {branch}')
translators_data = TranslatorsData(0, False)
branch = ''
continue
else:
translators_number = translators.get_number(clone_path)
translators_link = translators.get_link(clone_path, repo, branch)
translators_data = TranslatorsData(translators_number, translators_link)
break
path_for_merge = Path(clones_dir, 'rebased_translations', repo)
completion = potodo.merge_and_scan_path(
Expand Down Expand Up @@ -77,10 +67,4 @@ def get_completion(

change = completion - month_ago_completion

return completion, translators_data, branch, change


@dataclass(frozen=True)
class TranslatorsData:
number: int
link: str | Literal[False]
return completion, branch, change
7 changes: 2 additions & 5 deletions generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import build_status
import contribute
from completion import branches_from_devguide, get_completion, TranslatorsData
from completion import branches_from_devguide, get_completion
from repositories import Language, get_languages_and_repos

generation_time = datetime.now(timezone.utc)
Expand Down Expand Up @@ -59,10 +59,9 @@ def get_project_data(
) -> 'LanguageProjectData':
built = language.code in languages_built
if repo:
completion, translators_data, branch, change = get_completion(clones_dir, repo)
completion, branch, change = get_completion(clones_dir, repo)
else:
completion = 0.0
translators_data = TranslatorsData(0, False)
change = 0.0
branch = ''

Expand All @@ -72,7 +71,6 @@ def get_project_data(
branch,
completion,
change,
translators_data,
built,
translated_name=languages_built.get(language.code, ''),
uses_platform=language.code in contribute.pulling_from_transifex,
Expand All @@ -87,7 +85,6 @@ class LanguageProjectData:
branch: str
completion: float
change: float
translators: TranslatorsData
built: bool
translated_name: str
uses_platform: bool
Expand Down
2 changes: 1 addition & 1 deletion templates/index.html.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block main %}
<div>
<div class="row">
{% for project in completion_progress | sort(attribute='completion,translators.number') | reverse %}
{% for project in completion_progress | sort(attribute='completion') | reverse %}
<div class="col-12 col-sm-6 col-md-4 d-flex">
<div class="card shadow mb-3 w-100">
<div class="card-body">
Expand Down
2 changes: 1 addition & 1 deletion templates/metadata.html.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</tr>
</thead>
<tbody>
{% for project, metadata in metadata | sort(attribute='0.completion,0.translators.number') | reverse %}
{% for project, metadata in metadata | sort(attribute='0.completion') | reverse %}
<tr>
<td data-label="language">{{ project.language.name }} ({{ project.language.code }})</td>
<td data-label="branch">{{ project.branch }}</td>
Expand Down
79 changes: 0 additions & 79 deletions translators.py

This file was deleted.

Loading