- Aur-dev - lists.archlinux.org

[PATCH] Make the locale directory configurable
by Lukas Fleischer 22 Jul '18

22 Jul '18

Add a new configuration option to specify the locale directory to use. This allows the Python scripts to find the translations, even when not being run from the source code checkout. At the same time, multiple parallel aurweb setups can still use different sets of translations. Fixes FS#59278. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/l10n.py | 5 ++++- conf/config.defaults | 1 + web/lib/translator.inc.php | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/aurweb/l10n.py b/aurweb/l10n.py index 66e0f1c..a7c0103 100644 --- a/aurweb/l10n.py +++ b/aurweb/l10n.py @@ -1,8 +1,11 @@ import gettext +import aurweb.config + class Translator: def __init__(self): + self._localedir = aurweb.config.get('options', 'localedir') self._translator = {} def translate(self, s, lang): @@ -10,7 +13,7 @@ class Translator: return s if lang not in self._translator: self._translator[lang] = gettext.translation("aurweb", - "../../web/locale", + self._localedir, languages=[lang]) self._translator[lang].install() return _(s) diff --git a/conf/config.defaults b/conf/config.defaults index be37f43..c8bc3a7 100644 --- a/conf/config.defaults +++ b/conf/config.defaults @@ -35,6 +35,7 @@ snapshot_uri = /cgit/aur.git/snapshot/%s.tar.gz enable-maintenance = 1 maintenance-exceptions = 127.0.0.1 render-comment-cmd = /usr/local/bin/aurweb-rendercomment +localedir = /srv/http/aurweb/aur.git/web/locale/ # memcache or apc cache = none memcache_servers = 127.0.0.1:11211 diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index cd944c5..334d0e7 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -130,7 +130,8 @@ function set_lang() { setcookie("AURLANG", $LANG, $cookie_time, "/"); } - $streamer = new FileReader('../locale/' . $LANG . + $localedir = config_get('options', 'localedir'); + $streamer = new FileReader($localedir . '/' . $LANG . '/LC_MESSAGES/aurweb.mo'); $l10n = new gettext_reader($streamer, true); -- 2.18.0

1 0

[aur-dev][PATCH] Fix regression in translating anything at all.
by Eli Schwartz 08 Jul '18

08 Jul '18

In commit 840ee20f7b9327fd5e3445af2652b299fdd0ff7f the translations file was renamed but we never actually switched to using the renamed translations. As a result, every single push to the AUR contains the following traceback: remote: Traceback (most recent call last): remote: File "/usr/bin/aurweb-notify", line 11, in <module> remote: load_entry_point('aurweb==4.7.0', 'console_scripts', 'aurweb-notify')() remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 541, in main remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 69, in send remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 56, in get_body_fmt remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/scripts/notify.py", line 192, in get_body remote: File "/usr/lib/python3.6/site-packages/aurweb-4.7.0-py3.6.egg/aurweb/l10n.py", line 14, in translate remote: File "/usr/lib/python3.6/gettext.py", line 514, in translation remote: raise OSError(ENOENT, 'No translation file found for domain', domain) remote: FileNotFoundError: [Errno 2] No translation file found for domain: 'aur' Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- aurweb/l10n.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/l10n.py b/aurweb/l10n.py index e58e3fe..66e0f1c 100644 --- a/aurweb/l10n.py +++ b/aurweb/l10n.py @@ -9,7 +9,7 @@ class Translator: if lang == 'en': return s if lang not in self._translator: - self._translator[lang] = gettext.translation("aur", + self._translator[lang] = gettext.translation("aurweb", "../../web/locale", languages=[lang]) self._translator[lang].install() -- 2.18.0

2 3

[PATCH] Rename translation resources from aur to aurweb
by Lukas Fleischer 08 Jul '18

08 Jul '18

* Rename the aur project to aurweb on Transifex. * Rename aur.pot to aurweb.pot. * Update documentation and Makefile. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- .tx/config | 5 ++--- doc/i18n.txt | 8 ++++---- po/Makefile | 16 ++++++++-------- po/{aur.pot => aurweb.pot} | 0 4 files changed, 14 insertions(+), 15 deletions(-) rename po/{aur.pot => aurweb.pot} (100%) diff --git a/.tx/config b/.tx/config index f6f728d..e986f81 100644 --- a/.tx/config +++ b/.tx/config @@ -1,8 +1,7 @@ [main] host = https://www.transifex.com -[aur.aurpot] +[aurweb.aurwebpot] file_filter = po/<lang>.po -source_file = po/aur.pot +source_file = po/aurweb.pot source_lang = en - diff --git a/doc/i18n.txt b/doc/i18n.txt index a1c21fe..8216c08 100644 --- a/doc/i18n.txt +++ b/doc/i18n.txt @@ -5,7 +5,7 @@ This document describes how to create and maintain aurweb translations. Creating an aurweb translation requires a Transifex (http://www.transifex.com/) account. You will need to register with a translation team on the aurweb -project page (http://www.transifex.com/projects/p/aur/) +project page (http://www.transifex.com/projects/p/aurweb/) Creating a New Translation @@ -26,11 +26,11 @@ $ git clone git://git.archlinux.org/aurweb.git aurweb-git 2. Go into the "po/" directory in the aurweb source and run msginit(1) to create a initial translation file from our translation catalog: -$ cd aur-git +$ cd aurweb-git $ git checkout master $ git pull $ cd po -$ msginit -l <locale> -o <locale>.po -i aur.pot +$ msginit -l <locale> -o <locale>.po -i aurweb.pot 3. Use some editor or a translation helper like poedit to add translations: @@ -58,4 +58,4 @@ $ poedit po/<locale>.po 3. Push the updated translation file back to Transifex. Using transifex-client, this works as follows: -$ tx push -r aur.aurpot -t -l <locale> +$ tx push -r aurweb.aurwebpot -t -l <locale> diff --git a/po/Makefile b/po/Makefile index 78073f8..57fa9f7 100644 --- a/po/Makefile +++ b/po/Makefile @@ -44,9 +44,9 @@ all: ${MOFILES} %.mo: %.po msgfmt --check -o $@ $< -%.po-update: %.po aur.pot +%.po-update: %.po aurweb.pot lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - msgmerge -U --no-location --lang="$$lang" $< aur.pot + msgmerge -U --no-location --lang="$$lang" $< aurweb.pot POTFILES-php: find ../web -type f -name '*.php' -printf '%P\n' | sort >POTFILES-php @@ -55,19 +55,19 @@ POTFILES-py: find ../aurweb -type f -name '*.py' -printf '%P\n' | sort >POTFILES-py update-pot: POTFILES-php POTFILES-py - pkgname=AUR; \ + pkgname=AURWEB; \ pkgver=`sed -n 's/.*"AURWEB_VERSION", "$.*$".*/\1/p' ../web/lib/version.inc.php`; \ - xgettext --default-domain=aur -L php --keyword=__ --keyword=_n:1,2 \ + xgettext --default-domain=aurweb -L php --keyword=__ --keyword=_n:1,2 \ --add-location=file --add-comments=TRANSLATORS: \ --package-name="$$pkgname" --package-version="$$pkgver" \ --msgid-bugs-address='${MSGID_BUGS_ADDRESS}' \ - --directory ../web --files-from POTFILES-php -o aur.pot; \ - xgettext --default-domain=aur -L python --join-existing \ + --directory ../web --files-from POTFILES-php -o aurweb.pot; \ + xgettext --default-domain=aurweb -L python --join-existing \ --keyword=translate \ --add-location=file --add-comments=TRANSLATORS: \ --package-name="$$pkgname" --package-version="$$pkgver" \ --msgid-bugs-address='${MSGID_BUGS_ADDRESS}' \ - --directory ../aurweb --files-from POTFILES-py -o aur.pot + --directory ../aurweb --files-from POTFILES-py -o aurweb.pot update-po: ${MAKE} ${UPDATEPOFILES} @@ -77,7 +77,7 @@ clean: install: all for l in ${LOCALES}; do mkdir -p ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done - for l in ${LOCALES}; do cp $$l.mo ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/aur.mo; done + for l in ${LOCALES}; do cp $$l.mo ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/aurweb.mo; done uninstall: for l in ${LOCALES}; do rm -rf ${DESTDIR}${PREFIX}/$$l/LC_MESSAGES/; done diff --git a/po/aur.pot b/po/aurweb.pot similarity index 100% rename from po/aur.pot rename to po/aurweb.pot -- 2.18.0

2 1

aurweb 4.7.0 released
by Lukas Fleischer 07 Jul '18

07 Jul '18

Dear aurweb contributors and users, We are pleased to announce that aurweb 4.7.0 has been released! New features are the possibility to search by depends as well as an API rate limit in the RPC interface. Moreover, co-maintainers can now remove themselves from the co-maintainer list. This release also includes several fixes and improvements to the comment and notification features, as well as other bug fixes. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.7.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[PATCH] Sync CSS with archweb
by Lukas Fleischer 07 Jul '18

07 Jul '18

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/css/archweb.css | 43 ++++++---------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index d8c66aa..209561f 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -608,17 +608,6 @@ div.widget { margin-bottom: 1.5em; } -/* home: other stuff */ -#konami { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - text-align: center; - opacity: 0.6; -} - /* feeds page */ #rss-feeds .rss { padding-right: 20px; @@ -983,8 +972,13 @@ table td.country { width: auto; } -/* dev: dashboard: dashboard and stats area */ +/* tables rows: highlight on mouse-vover */ +#article-list tr:hover, +#clocks-table tr:hover, #dev-dashboard tr:hover, +#dev-todo-lists tr:hover, +#dev-todo-pkglist tr:hover, +#pkglist-results tr:hover, #stats-area tr:hover { background: #ffd; } @@ -1036,7 +1030,6 @@ ul.admin-actions { .todo-table .complete, .signoff-yes, #key-status .signed-yes, -#releng-result .success-yes, #release-list .available-yes { color: green; } @@ -1044,7 +1037,6 @@ ul.admin-actions { .todo-table .incomplete, .signoff-no, #key-status .signed-no, -#releng-result .success-no, #release-list .available-no { color: red; } @@ -1095,25 +1087,6 @@ ul.signoff-list { color: gray; } -/* iso testing feedback form */ -#releng-feedback label { - width: auto; - display: inline; - font-weight: normal; -} - -#releng-feedback ul { - padding-left: 1em; -} - -#releng-feedback li { - list-style: none; -} - -#releng-feedback ul+.helptext { - position: relative; top: -0.9em; -} - /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a, #archnavbar.anb-packages ul li#anb-packages a, @@ -1126,10 +1099,6 @@ ul.signoff-list { margin: 0.5em 0.33em; } - .visualize-buttons button.active { - depressed: true; - } - .visualize-chart { position: relative; height: 500px; -- 2.18.0

1 0

[PATCH 1/1] This patch implements FS#54906. Ability to query by pkgver via RPC or web request (url)
by nodivbyzero 11 Jun '18

11 Jun '18

--- web/lib/aurjson.class.php | 5 +++++ web/lib/pkgfuncs.inc.php | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index c51e9c2..30ce63f 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -486,6 +486,11 @@ class AurJSON { if ($search_by === 'name') { $where_condition = "(Packages.Name LIKE $keyword_string)"; + if (isset($http_data['pkgver'])) { + $pkgver = $http_data['pkgver']; + $pkgver_string = $this->dbh->quote($pkgver . "%"); + $where_condition .= " AND (Packages.Version LIKE $pkgver_string)"; + } } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; $where_condition .= "Description LIKE $keyword_string)"; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index ad25474..660e3f5 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -727,6 +727,10 @@ function pkg_search_page($params, $show_headers=true, $SID="") { /* Search by name. */ $K = "%" . addcslashes($params['K'], '%_') . "%"; $q_where .= "AND (Packages.Name LIKE " . $dbh->quote($K) . ") "; + if (isset($params["pkgver"])) { + $pkgver = $params["pkgver"]; + $q_where .= "AND (Packages.Version LIKE " . $dbh->quote($pkgver . "%") . ") "; + } } elseif (isset($params["SeB"]) && $params["SeB"] == "b") { /* Search by package base name. */ -- 2.17.0

3 3

[PATCH 1/1] Highlighting row on hover in the search results. FS#53612
by nodivbyzero 10 Jun '18

10 Jun '18

--- web/html/css/archweb.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css index d8c66aa..54779eb 100644 --- a/web/html/css/archweb.css +++ b/web/html/css/archweb.css @@ -708,12 +708,20 @@ table.results { padding: .3em 1em .3em 3px; } - .results tr.odd { + .results tr.odd:hover { background: #fff; } + .results tr.odd { + background: #f5f5f5; + } + + .results tr.even:hover { + background: #b3cfff; + } + .results tr.even { - background: #e4eeff; + background: #ccdfff; } .results .flagged { -- 2.17.0

3 2

[PATCH] Add package base name in request close notifications
by Lukas Fleischer 20 May '18

20 May '18

Mention both the package base name and the request type in the subject of request closure notification. Implements FS#41607. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- aurweb/scripts/notify.py | 16 ++++++++++++---- test/t1200-git-serve.sh | 2 +- test/t2500-notify.sh | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index beca8b4..44eec84 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -443,9 +443,14 @@ class RequestCloseNotification(Notification): 'WHERE PackageRequests.ID = ?', [reqid]) self._to = aurweb.config.get('options', 'aur_request_ml') self._cc = [row[0] for row in cur.fetchall()] - cur = conn.execute('SELECT ClosureComment FROM PackageRequests ' + - 'WHERE ID = ?', [reqid]) - self._text = cur.fetchone()[0] + cur = conn.execute('SELECT PackageRequests.ClosureComment, ' + + 'RequestTypes.Name, ' + + 'PackageRequests.PackageBaseName ' + + 'FROM PackageRequests ' + + 'INNER JOIN RequestTypes ' + + 'ON RequestTypes.ID = PackageRequests.ReqTypeID ' + + 'WHERE PackageRequests.ID = ?', [reqid]) + self._text, self._reqtype, self._pkgbase = cur.fetchone() self._reqid = int(reqid) self._reason = reason @@ -453,7 +458,10 @@ class RequestCloseNotification(Notification): return [(self._to, 'en')] def get_subject(self, lang): - return '[PRQ#%d] Request %s' % (self._reqid, self._reason.title()) + return '[PRQ#%d] %s Request for %s %s' % (self._reqid, + self._reqtype.title(), + self._pkgbase, + self._reason.title()) def get_body(self, lang): if self._user: diff --git a/test/t1200-git-serve.sh b/test/t1200-git-serve.sh index 94a5ff6..473065f 100755 --- a/test/t1200-git-serve.sh +++ b/test/t1200-git-serve.sh @@ -376,7 +376,7 @@ test_expect_success "Check whether package requests are closed when disowning." SSH_ORIGINAL_COMMAND="disown foobar" AUR_USER=user AUR_PRIVILEGED=0 \ "$GIT_SERVE" 2>&1 && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Orphan Request for foobar Accepted EOD grep "^Subject.*PRQ" sendmail.out >sendmail.parts && test_cmp sendmail.parts expected && diff --git a/test/t2500-notify.sh b/test/t2500-notify.sh index 46c2753..b2bad1c 100755 --- a/test/t2500-notify.sh +++ b/test/t2500-notify.sh @@ -304,7 +304,7 @@ test_expect_success 'Test subject and body of request close notifications.' ' "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -322,7 +322,7 @@ test_expect_success 'Test subject and body of request close notifications (auto- "$NOTIFY" request-close 0 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && @@ -342,7 +342,7 @@ test_expect_success 'Test subject and body of request close notifications with c "$NOTIFY" request-close 1 1 accepted && grep ^Subject: sendmail.out >actual && cat <<-EOD >expected && - Subject: [PRQ#1] Request Accepted + Subject: [PRQ#1] Deletion Request for foobar Accepted EOD test_cmp actual expected && sed -n "/^\$/,\$p" sendmail.out | base64 -d >actual && -- 2.17.0

1 0

[aur-dev][PATCH] git-update: accept any arch when discovering arch-dependent metadata
by Eli Schwartz 18 May '18

18 May '18

Currently we hardcode the architectures the official repos historically supported, which seems both inefficient because of hardcoding, and simply wrong, because many packages support various ARM platforms too. If we were to say "only officially supported arches will be supported in the AUR" we'd have to disable i686, which seems silly and arbitrarily restrictive. Also there's better places to implement such a blacklist (via die_commit in the main loop, via a config option to list supported arches, would make much more sense in terms of logic). As for the metadata extraction itself, there's no reason to hardcode the arches to check for at all. We can get this information too, from the .SRCINFO itself. Detecting this dynamically is not incompatible with a blacklist, should we ever decide to implement such a thing. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Just in case I wasn't obvious, I don't support adding a real blacklist any more than the currently existing accidental sort of kind of one... But currently we're really inconsistent in how we treat e.g. source_aarch64 which just quietly disappears and should really be shown in the web interface. This is extremely valid in -bin packages. It looks like we weren't hardcoding this anywhere but there anyway, the database/frontend don't seem to care what the value of arch is before displaying it. So, no database changes, and less bytes of code. This is a really long commit message and annotation for a two-word change... aurweb/git/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/git/update.py b/aurweb/git/update.py index da48eb3..0614e9e 100755 --- a/aurweb/git/update.py +++ b/aurweb/git/update.py @@ -39,7 +39,7 @@ def extract_arch_fields(pkginfo, field): for val in pkginfo[field]: values.append({"value": val, "arch": None}) - for arch in ['i686', 'x86_64']: + for arch in pkginfo['arch']: if field + '_' + arch in pkginfo: for val in pkginfo[field + '_' + arch]: values.append({"value": val, "arch": arch}) -- 2.17.0

2 1

[PATCH 0/6] Localize notification emails
by Lukas Fleischer 17 May '18

17 May '18

This patch series implements FS#31850. The preparatory work is quite invasive and includes a complete rewrite of the notification module. The last patch adds the new translatable strings to our message catalog. Comments welcome! Lukas Fleischer (6): notify.py: Do not add stray newlines t2500: Add test cases for all notifications Refactor the notification script Localize notification emails Use modern format strings in notification messages Update message catalog aurweb/l10n.py | 16 + aurweb/scripts/notify.py | 880 +++++++++++++++++++++------------------ po/Makefile | 21 +- po/aur.pot | 136 +++++- test/setup.sh | 18 +- test/t2500-notify.sh | 350 +++++++++++++++- 6 files changed, 1003 insertions(+), 418 deletions(-) create mode 100644 aurweb/l10n.py -- 2.17.0

1 6