Base progress calculations on external file structure #11

Merged

mdk merged 1 commit from maciek/potodo:pot into main 2024-12-22 23:50:18 +01:00

Conversation 3 Commits 1 Files changed 2 +11 -1

maciek commented 2024-11-20 00:37:40 +01:00

Contributor

Copy link

Closes #4.

I am hesitant between using --base or --pot flag name (the latter suggested by Julien). For now I stick to the second one.

I skipped cache topic so far. I don't use it when scanning (cache argument always False). The cache written is in the temporary directory, so transient. For a case of external file structure the cache would be quite complicated, cause we'd need to check against external file structure timestamps or a directory tree hash 🤔

• TODO: unit tests
• Windows support?
• unit tests passing on CI

With regard to the merging method, I've considered three utilities:

• msgmerge: decided to use msgmerge as most straight-forward (though it's a operating system dependency);
• pomerge: it works only in one direction: PO files content is written to POTs and then I'd need to rename all files to make potodo read it, cause it has hardcoded filtering to *.po names
• sphinx-intl update: it requires a specific directories layout (locales/{lang}/LC_MESSAGES), and also it feels like a bit strange dependency for potodo, not sure if that would be an issue to potodo maintainers

Closes #4. I am hesitant between using `--base` or `--pot` flag name (the latter [suggested](https://git.afpy.org/AFPy/potodo/issues/7#issuecomment-4086) by Julien). For now I stick to the second one. I skipped cache topic so far. I don't use it when scanning (cache argument always `False`). The cache written is in the temporary directory, so transient. For a case of external file structure the cache would be quite complicated, cause we'd need to check against external file structure timestamps or a directory tree hash 🤔 * [x] TODO: unit tests * [x] Windows support? * [x] unit tests passing on CI With regard to the merging method, I've considered three utilities: * **msgmerge**: decided to use `msgmerge` as most straight-forward (though it's a operating system dependency); * **pomerge**: it works only in one direction: PO files content is written to POTs and then I'd need to rename all files to make potodo read it, cause it has hardcoded filtering to *.po names * **sphinx-intl update**: it requires a specific directories layout (`locales/{lang}/LC_MESSAGES`), and also it feels like a bit strange dependency for potodo, not sure if that would be an issue to potodo maintainers

🚀 1

maciek added 3 commits 2024-11-20 00:37:41 +01:00

Add pot flag with msgmerge, no filtering yet 5e9a9061ef

Support filtering in pot mode 9e5c17197d

Add help text to the script argument 1ad05a7326

maciek changed title from Base progress calculations on external file structure to WIP: Base progress calculations on external file structure 2024-11-20 00:40:39 +01:00

maciek added 1 commit 2024-11-20 00:52:12 +01:00

Debug log d55b98c869

maciek added 1 commit 2024-11-20 01:26:07 +01:00

Error handling for missing xgettext eddd3e3d03

maciek added 1 commit 2024-11-20 01:59:00 +01:00

Reformat 22e6d1c756

maciek added 1 commit 2024-11-20 02:01:15 +01:00

Drop superfluous code f78f514441

maciek added 1 commit 2024-11-20 02:02:40 +01:00

Refactor import 5dc198583f

maciek added 1 commit 2024-11-20 12:51:14 +01:00

Zero out the PO file on merge error 1bd001b4bb

maciek added 1 commit 2024-11-20 13:09:30 +01:00

Remove PO files without matching POTs to make them not affect the stats f5bb5e9d9c

maciek added 1 commit 2024-11-20 13:29:59 +01:00

Improve matching logic 1dd33de04b

maciek added 2 commits 2024-11-20 15:51:02 +01:00

Typing annotations a101e78148

Revert imports changes f134262635

maciek added 1 commit 2024-11-20 16:06:24 +01:00

Remove comments, replace prints with logging.debug cdc880874a

maciek added 3 commits 2024-11-21 12:35:06 +01:00

Make tmpdir an optional argument 001635d648

Fix call and typing a92439ee74

Support pot flag in the interactive mode 25ad949f9f

maciek added 1 commit 2024-11-22 11:23:04 +01:00

Handle OSError in msgmerge 98d40cfb3d

maciek force-pushed pot from 98d40cfb3d to f107bc558a 2024-11-25 01:25:30 +01:00 Compare

maciek added 2 commits 2024-11-25 09:03:20 +01:00

Move merge function to a separate module 0cf04b8c0a

Support Windows 087dd1b5f9

maciek added 2 commits 2024-11-27 22:36:17 +01:00

Rename third argument of merge_and_scan_path() 9f29fb1852

First test 33cf6d5627

maciek added 1 commit 2024-12-01 22:36:39 +01:00

Test of merging in a subdirectory e107f13c93

maciek added 1 commit 2024-12-01 22:44:10 +01:00

Add rest of merging tests 60c2bcb6e3

maciek added 1 commit 2024-12-01 22:51:49 +01:00

Skip tests if no GNU gettext df4ff35e29

maciek added 1 commit 2024-12-01 22:53:41 +01:00

Install GNU gettext in CI 94464cbd8b

maciek added 2 commits 2024-12-01 22:56:48 +01:00

Type get_msgmerge_command function 2427f20a9c

Get rid of sudo c9366a69a4

maciek added 1 commit 2024-12-01 22:58:02 +01:00

Add apt-get update to update indices 83483b66f6

maciek added 1 commit 2024-12-01 23:07:34 +01:00

Don't suppress a merge error, for debugging purposes in CI 0ea1328048

maciek added 1 commit 2024-12-01 23:18:17 +01:00

Write output files in msgmerge with -o option 3a23b56151

maciek commented 2024-12-01 23:41:51 +01:00

Author

Contributor

Copy link

The tests that complete successfully locally fail on CI. I wonder if it is connected somehow with transient filesystem in Docker. Will try to reproduce it in a Docker container, but some other day.

The tests that complete successfully locally fail on CI. I wonder if it is connected somehow with transient filesystem in Docker. Will try to reproduce it in a Docker container, but some other day.

maciek added 1 commit 2024-12-06 23:08:14 +01:00

Replace deprecated pipeline name with steps in .woodpecker.yml 0728f5d348

maciek added 1 commit 2024-12-06 23:12:16 +01:00

Add recommended triggers info to .woodpecker.yml 1f15d01ca7

maciek added 1 commit 2024-12-06 23:14:09 +01:00

Debug -- tmp dir existence check 20acd7e56a

maciek added 1 commit 2024-12-06 23:28:36 +01:00

revert trigger change in ci 7f06cf1e73

maciek added 1 commit 2024-12-06 23:37:50 +01:00

print tmpdir content 86d6727e27

maciek added 1 commit 2024-12-06 23:42:25 +01:00

pytest stdout, verbose 96ecbfd7a1

maciek added 1 commit 2024-12-06 23:48:02 +01:00

debug log in internal iteration ffa7a0581c

maciek added 1 commit 2024-12-06 23:52:28 +01:00

print subprocess.run out 2a48a0b344

maciek added 1 commit 2024-12-06 23:54:29 +01:00

raise logging level 0019c4443d

maciek added 1 commit 2024-12-06 23:57:02 +01:00

text true 12d41aa36f

maciek added 1 commit 2024-12-06 23:58:15 +01:00

dockerfile cbf3b5c115

maciek added 1 commit 2024-12-07 00:01:42 +01:00

version d5178819cd

maciek added 1 commit 2024-12-07 00:08:30 +01:00

logging to print 2509f6bbc7

maciek added 1 commit 2024-12-07 00:09:17 +01:00

shell true 1461c0dacc

maciek added 1 commit 2024-12-07 00:13:30 +01:00

shell true fix 24d2922096

maciek added 1 commit 2024-12-07 00:17:25 +01:00

sanity check subprocess 4d1b86273d

maciek added 1 commit 2024-12-07 00:21:49 +01:00

debug dirs 2011bc190f

maciek added 1 commit 2024-12-07 00:25:26 +01:00

add missing template files 8daf01240e

maciek force-pushed pot from 8daf01240e to 2dfb60803e 2024-12-07 00:28:55 +01:00 Compare

maciek added 1 commit 2024-12-07 00:32:20 +01:00

check skip faa6d0a866

maciek force-pushed pot from faa6d0a866 to 2dfb60803e 2024-12-07 00:34:52 +01:00 Compare

maciek force-pushed pot from 2dfb60803e to 46f89b763d 2024-12-07 00:41:13 +01:00 Compare

maciek commented 2024-12-07 00:42:14 +01:00

Author

Contributor

Copy link

The tests that complete successfully locally fail on CI. I wonder if it is connected somehow with transient filesystem in Docker. Will try to reproduce it in a Docker container, but some other day.

It was connected with pot files that were gitignored therefore not added to the repo.

> The tests that complete successfully locally fail on CI. I wonder if it is connected somehow with transient filesystem in Docker. Will try to reproduce it in a Docker container, but some other day. It was connected with pot files that were gitignored therefore not added to the repo.

maciek changed title from WIP: Base progress calculations on external file structure to Base progress calculations on external file structure 2024-12-07 00:42:19 +01:00

maciek added 1 commit 2024-12-07 00:52:36 +01:00

Bump version to 0.23.0, add changelog entries since 0.21.3 884771a7c9

mdk merged commit 884771a7c9 into main 2024-12-07 15:43:24 +01:00

mdk deleted branch pot 2024-12-07 15:43:25 +01:00

mdk commented 2024-12-07 15:44:18 +01:00

Owner

Copy link

Merged and released, thanks @maciek!

Merged and released, thanks @maciek!

maciek referenced this pull request 2025-01-18 02:10:10 +01:00

Fix CLI for --pot flag #16

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

AFPy/potodo!11

No description provided.