-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement Po mode #4
Merged
+213
−48
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,53 @@ | ||
from collections.abc import Sequence | ||
from pathlib import Path | ||
from subprocess import CalledProcessError | ||
|
||
from git import Repo | ||
|
||
from .config import RepositoryConfig | ||
from .logging import LOGGER | ||
|
||
def repository_in_clean_state(path: Path, branch: str) -> Repo: | ||
|
||
def repository_in_clean_state( | ||
repo_config: RepositoryConfig, | ||
) -> Repo: | ||
LOGGER.info("Cleaning up and updating %s repository", repo_config.path) | ||
try: | ||
return _repository_in_clean_state( | ||
repo_config.path, | ||
repo_config.branch, | ||
) | ||
except Exception as e: | ||
LOGGER.error( | ||
"Error while cleaning up and updating %s repository", repo_config.path | ||
) | ||
LOGGER.exception(e) | ||
raise e | ||
|
||
|
||
def _repository_in_clean_state(path: Path, branch: str) -> Repo: | ||
repo = Repo(path) | ||
repo.git.reset("--hard") | ||
repo.remotes.origin.fetch() | ||
repo.git.checkout(branch) | ||
repo.git.reset("--hard", f"origin/{branch}") | ||
return repo | ||
|
||
|
||
def commit_and_push_files( | ||
repo: Repo, | ||
files_to_push_to_repo: Sequence[Path], | ||
) -> None: | ||
try: | ||
repo.index.add(files_to_push_to_repo) | ||
repo.index.commit("Updating files") | ||
repo.remotes.origin.push() | ||
except CalledProcessError as e: | ||
LOGGER.error( | ||
"Committing and pushing files for repository %s failed", repo.working_dir | ||
) | ||
LOGGER.exception(e) | ||
raise e | ||
LOGGER.info( | ||
"Committing and pushing files for repository %s succeeded", repo.working_dir | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
import re | ||
from dataclasses import dataclass | ||
from pathlib import Path | ||
from subprocess import CalledProcessError | ||
from subprocess import run as run_subprocess | ||
from typing import assert_never | ||
|
||
from git import Repo | ||
|
||
from .config import PoFilePair, PoModeConfig, RepositoryConfig | ||
from .git import commit_and_push_files, repository_in_clean_state | ||
from .logging import LOGGER | ||
|
||
|
||
@dataclass(frozen=True) | ||
class _Success: | ||
path: Path | ||
|
||
|
||
@dataclass(frozen=True) | ||
class _Failure: | ||
error_message: str | ||
path: Path | ||
|
||
|
||
def run(config: PoModeConfig) -> int: | ||
checkmk_repo = repository_in_clean_state(config.checkmk_repository) | ||
repository_in_clean_state(config.locale_repository) | ||
|
||
failures: list[_Failure] = [] | ||
successes: list[_Success] = [] | ||
|
||
for file_pair in config.po_file_pairs: | ||
match ( | ||
result := _process_po_file_pair( | ||
file_pair=file_pair, | ||
checkmk_repo=config.checkmk_repository, | ||
locale_repo=config.locale_repository, | ||
) | ||
): | ||
case _Success(): | ||
successes.append(result) | ||
case _Failure(): | ||
LOGGER.error( | ||
"We encountered an error while processing the .po file. " | ||
"See the logging output at the end for more information." | ||
) | ||
failures.append(result) | ||
case _: | ||
assert_never(result) | ||
LOGGER.info("Checking if any .po files changed in the checkmk repository") | ||
|
||
if _check_if_repo_is_dirty(checkmk_repo): | ||
LOGGER.info("Committing and pushing .po file to checkmk repository") | ||
commit_and_push_files( | ||
repo=checkmk_repo, | ||
files_to_push_to_repo=[success.path for success in successes], | ||
) | ||
else: | ||
LOGGER.info("No changes in checkmk repository.") | ||
|
||
if not failures: | ||
return 0 | ||
|
||
for failure in failures: | ||
LOGGER.error( | ||
"Encountered the following error while processing %s:\n%s", | ||
failure.path, | ||
failure.error_message, | ||
) | ||
return 1 | ||
|
||
|
||
def _process_po_file_pair( | ||
file_pair: PoFilePair, | ||
checkmk_repo: RepositoryConfig, | ||
locale_repo: RepositoryConfig, | ||
) -> _Success | _Failure: | ||
checkmk_po_file = checkmk_repo.path / file_pair.checkmk | ||
locale_po_file = locale_repo.path / file_pair.locale | ||
LOGGER.info("Checking formatting errors in %s", locale_po_file) | ||
try: | ||
run_subprocess( | ||
["msgfmt", "--check-format", "-o", "-", locale_po_file], | ||
check=True, | ||
capture_output=True, | ||
encoding="UTF-8", | ||
) | ||
except CalledProcessError as e: | ||
return _Failure( | ||
error_message=f"Found formatting errors: {e.stderr}", path=locale_po_file | ||
) | ||
except Exception as e: # pylint: disable=broad-except | ||
return _Failure(error_message=str(e), path=locale_po_file) | ||
|
||
LOGGER.info("Removing unwanted lines from %s", locale_po_file) | ||
if isinstance(po_file_content := _remove_unwanted_lines(locale_po_file), _Failure): | ||
return po_file_content | ||
|
||
LOGGER.info("Writing stripped .po file to checkmk repository: %s", checkmk_po_file) | ||
try: | ||
checkmk_po_file.write_text(po_file_content) | ||
except Exception as e: # pylint: disable=broad-except | ||
return _Failure( | ||
f"Encountered error while writing po file to checkmk repository: {str(e)}", | ||
checkmk_po_file, | ||
) | ||
return _Success(checkmk_po_file) | ||
|
||
|
||
def _check_if_repo_is_dirty(repo: Repo) -> bool: | ||
try: | ||
if not repo.is_dirty(untracked_files=True): | ||
LOGGER.info("No changes, exiting") | ||
return False | ||
except Exception as e: | ||
LOGGER.error( | ||
"Checking if any .po files changed in the checkmk repository failed" | ||
) | ||
LOGGER.exception(e) | ||
raise e | ||
return True | ||
|
||
|
||
def _remove_unwanted_lines(file_path: Path) -> str | _Failure: | ||
LOGGER.info("Reading %s", file_path) | ||
try: | ||
po_file_content = file_path.read_text() | ||
except Exception as e: # pylint: disable=broad-except | ||
return _Failure( | ||
error_message=f"Encountered error while reading file: {str(e)}", | ||
path=file_path, | ||
) | ||
LOGGER.info("Removing code comments from %s", file_path) | ||
po_file_content = re.sub(r"^#.+\d\n", "", po_file_content, flags=re.DOTALL) | ||
|
||
LOGGER.info("Removing last translator information from %s", file_path) | ||
po_file_content = re.sub( | ||
r"\"Last-Translator:.+?\n", "", po_file_content, flags=re.DOTALL | ||
) | ||
return po_file_content |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can move this to git.py and reuse it in pot.py