October 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] aurjson: Rename the search_by parameter to "by"
by Lukas Fleischer 10 Oct '15

10 Oct '15

This parameter is only supported by the search command. We do not need to repeat ourselves. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- doc/rpc.txt | 13 ++++++++----- web/lib/aurjson.class.php | 14 +++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/rpc.txt b/doc/rpc.txt index ee1fa1e..f353ff0 100644 --- a/doc/rpc.txt +++ b/doc/rpc.txt @@ -5,11 +5,14 @@ Package Search -------------- Package searches can be performed by issuing HTTP GET requests of the form -+/rpc/?v=5&type=search&search_by=_by_&arg=_keywords_+ where _by_ is either -`name` (search by package name only), `name-desc` (search by package name and -description) or `maintainer` (search by package maintainer) and _keywords_ is -the search argument. The _search_by_ parameter can be skipped and defaults to -`name-desc`. ++/rpc/?v=5&type=search&by=_field_&arg=_keywords_+ where _keywords_ is the +search argument and _field_ is one of the following values: + +* `name` (search by package name only) +* `name-desc` (search by package name and description) +* `maintainer` (search by package maintainer) + +The _by_ parameter can be skipped and defaults to `name-desc`. If a maintainer search is performed and the search argument is left empty, a list of orphan packages is returned. diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 2bf2e7a..1548232 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -86,8 +86,12 @@ class AurJSON { if (!in_array($http_data['type'], self::$exposed_methods)) { return $this->json_error('Incorrect request type specified.'); } - if (isset($http_data['search_by']) && !in_array($http_data['search_by'], self::$exposed_fields)) { - return $this->json_error('Incorrect search_by field specified.'); + + if (isset($http_data['search_by']) && !isset($http_data['by'])) { + $http_data['by'] = $http_data['search_by']; + } + if (isset($http_data['by']) && !in_array($http_data['by'], self::$exposed_fields)) { + return $this->json_error('Incorrect by field specified.'); } $this->dbh = DB::connect(); @@ -362,8 +366,8 @@ class AurJSON { private function search($http_data) { $keyword_string = $http_data['arg']; - if (isset($http_data['search_by'])) { - $search_by = $http_data['search_by']; + if (isset($http_data['by'])) { + $search_by = $http_data['by']; } else { $search_by = 'name-desc'; } @@ -455,7 +459,7 @@ class AurJSON { * @return mixed Returns an array of value data containing the package data */ private function msearch($http_data) { - $http_data['search_by'] = 'maintainer'; + $http_data['by'] = 'maintainer'; return $this->search($http_data); } -- 2.6.1

1 0

[aur-dev] [PATCH 1/1] use square brackets for annotations in pkg dependencies
by Christian Hesse 10 Oct '15

10 Oct '15

From: Christian Hesse <mail(a)eworm.de> Currently a package depending on `markdown` will have a listed dependency that looks like this: markdown (discount) (make) Where `dicount` is a package that provides `markdown`, make is an annotation to express the type of dependency. Let's use square brackets for annotations in pkg dependencies, so this looks like: markdown (discount) [make] Signed-off-by: Christian Hesse <mail(a)eworm.de> --- web/lib/pkgfuncs.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 66bc249..b1a271b 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -253,7 +253,7 @@ function pkg_deplink_annotation($type, $arch, $desc=false) { return ''; } - $link = ' <em>('; + $link = ' <em>['; if ($type == 'makedepends') { $link .= 'make'; @@ -271,7 +271,7 @@ function pkg_deplink_annotation($type, $arch, $desc=false) { $link .= htmlspecialchars($arch); } - $link .= ')'; + $link .= ']'; if ($type == 'optdepends' && $desc) { $link .= ' – ' . htmlspecialchars($desc) . ' </em>'; } -- 2.6.1

2 1

[aur-dev] [PATCH 1/6] Add documentation of the RPC interface
by Lukas Fleischer 04 Oct '15

04 Oct '15

Convert the RPC interface documentation from web/html/rpc.php to AsciiDoc and add it to the documentation directory. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- doc/rpc.txt | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/rpc.txt diff --git a/doc/rpc.txt b/doc/rpc.txt new file mode 100644 index 0000000..b379515 --- /dev/null +++ b/doc/rpc.txt @@ -0,0 +1,33 @@ +aurweb RPC interface +==================== + +Allowed methods +--------------- + +* `search` +* `info` +* `multiinfo` +* `msearch` + +Each method requires the following HTTP GET syntax: ++type=_methodname_&arg=_data_+ + +Where _methodname_ is the name of an allowed method, and _data_ is the argument +to the call. + +If you need jsonp type callback specification, you can provide an additional +variable _callback_. + +Examples +-------- + +`search`:: + `http://aur-url/rpc.php?type=search&arg=foobar` +`info`:: + `http://aur-url/rpc.php?type=info&arg=foobar` +`multiinfo`:: + `http://aur-url/rpc.php?type=multiinfo&arg[]=foo&arg[]=bar` +`msearch`:: + `http://aur-url/rpc.php?type=msearch&arg=john` +Callback:: + `http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244621103` -- 2.6.0

1 5

[aur-dev] [PATCH] notify: Do not wrap references
by Lukas Fleischer 03 Oct '15

03 Oct '15

When sending notifications, do not wrap lines from the references section. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/notify.py | 60 ++++++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/scripts/notify.py b/scripts/notify.py index f6bf6ff..56c15d5 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -26,8 +26,9 @@ sender = config.get('notifications', 'sender') reply_to = config.get('notifications', 'reply-to') -def send_notification(to, subject, body, cc=None, reference=None): - body = str.join('\n', [textwrap.fill(line) for line in body.splitlines()]) +def send_notification(to, subject, body, refs, cc=None, reference=None): + body = '\n'.join([textwrap.fill(line) for line in body.splitlines()]) + body += '\n\n' + refs for recipient in to: msg = email.mime.text.MIMEText(body, 'plain', 'utf-8') @@ -91,10 +92,9 @@ def send_resetkey(cur, uid): 'associated with your email address. If you wish to reset your ' \ 'password follow the link [1] below, otherwise ignore this ' \ 'message and nothing will happen.' % (username) - body += '\n\n' - body += '[1] ' + aur_location + '/passreset/?resetkey=' + resetkey + refs = '[1] ' + aur_location + '/passreset/?resetkey=' + resetkey - send_notification([to], subject, body) + send_notification([to], subject, body, refs) def welcome(cur, uid): cur.execute('SELECT UserName, Email, ResetKey FROM Users WHERE ID = %s', @@ -106,10 +106,9 @@ def welcome(cur, uid): 'password for your new account, please click the link [1] below. ' \ 'If the link does not work, try copying and pasting it into your ' \ 'browser.' - body += '\n\n' - body += '[1] ' + aur_location + '/passreset/?resetkey=' + resetkey + body = '[1] ' + aur_location + '/passreset/?resetkey=' + resetkey - send_notification([to], subject, body) + send_notification([to], subject, body, refs) def comment(cur, uid, pkgbase_id): user = username_from_id(cur, uid) @@ -128,12 +127,11 @@ def comment(cur, uid, pkgbase_id): body += 'If you no longer wish to receive notifications about this ' \ 'package, please go to the package page [2] and select "%s".' % \ ('Disable notifications') - body += '\n\n' - body += '[1] ' + user_uri + '\n' - body += '[2] ' + pkgbase_uri + refs = '[1] ' + user_uri + '\n' + refs += '[2] ' + pkgbase_uri thread_id = '<pkg-notifications-' + pkgbase + '@aur.archlinux.org>' - send_notification(to, subject, body, reference=thread_id) + send_notification(to, subject, body, refs, reference=thread_id) def flag(cur, uid, pkgbase_id): user = username_from_id(cur, uid) @@ -170,19 +168,17 @@ def delete(cur, uid, old_pkgbase_id, new_pkgbase_id=None): 'If you no longer wish receive notifications about the new ' \ 'package, please go to [3] and click "%s".' %\ (user, old_pkgbase, new_pkgbase, 'Disable notifications') - body += '\n\n' - body += '[1] ' + user_uri + '\n' - body += '[2] ' + pkgbase_uri + '\n' - body += '[3] ' + new_pkgbase_uri + refs = '[1] ' + user_uri + '\n' + refs += '[2] ' + pkgbase_uri + '\n' + refs += '[3] ' + new_pkgbase_uri else: body = '%s [1] deleted %s [2].\n\n' \ 'You will no longer receive notifications about this ' \ 'package.' % (user, old_pkgbase) - body += '\n\n' - body += '[1] ' + user_uri + '\n' - body += '[2] ' + pkgbase_uri + refs = '[1] ' + user_uri + '\n' + refs += '[2] ' + pkgbase_uri - send_notification(to, subject, body) + send_notification(to, subject, body, refs) def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None): user = username_from_id(cur, uid) @@ -200,19 +196,19 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None): merge_into_uri = aur_location + '/pkgbase/' + merge_into + '/' body = '%s [1] filed a request to merge %s [2] into %s [3]:' % \ (user, pkgbase, merge_into) - body += '\n\n' + text + '\n\n' - body += '[1] ' + user_uri + '\n' - body += '[2] ' + pkgbase_uri + '\n' - body += '[3] ' + merge_into_uri + body += '\n\n' + text + refs = '[1] ' + user_uri + '\n' + refs += '[2] ' + pkgbase_uri + '\n' + refs += '[3] ' + merge_into_uri else: body = '%s [1] filed a %s request for %s [2]:' % \ (user, reqtype, pkgbase) - body += '\n\n' + text + '\n\n' - body += '[1] ' + user_uri + '\n' - body += '[2] ' + pkgbase_uri + '\n' + body += '\n\n' + text + refs = '[1] ' + user_uri + '\n' + refs += '[2] ' + pkgbase_uri + '\n' thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>' - send_notification(to, subject, body, cc, thread_id) + send_notification(to, subject, body, refs, cc, thread_id) def request_close(cur, uid, reqid, reason): user = username_from_id(cur, uid) @@ -226,13 +222,13 @@ def request_close(cur, uid, reqid, reason): subject = '[PRQ#%d] Request %s' % (int(reqid), reason.title()) body = 'Request #%d has been %s by %s [1]' % (int(reqid), reason, user) if text.strip() == '': - body += '.\n\n' + body += '.' else: - body += ':\n\n' + text + '\n\n' - body += '[1] ' + user_uri + body += ':\n\n' + text + refs = '[1] ' + user_uri thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>' - send_notification(to, subject, body, cc, thread_id) + send_notification(to, subject, body, refs, cc, thread_id) if __name__ == '__main__': -- 2.6.0

1 0

[aur-dev] aurweb 4.1.1 released
by Lukas Fleischer 03 Oct '15

03 Oct '15

Hello, We are pleased to announce that aurweb 4.1.1 has been released. The official aurweb setup [1] has already been updated. This is a maintenance release that includes several hotfixes, the most important one fixing the multiinfo command of the RPC interface. 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.1.1 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] Do not show ".SRCINFO unchanged" warning on restore
by Lukas Fleischer 03 Oct '15

03 Oct '15

Since 612300b (Show a warning if .SRCINFO is unchanged, 2015-09-29), the git-update script displays a warning when a ref update does not affect the content of the package base meta data. We also invoke git-update to rebuild the package base details in the aurweb database when a package base is restored via the SSH interface. In that case, fake information is passed to the update hook: Both the old and the new object IDs refer to the current HEAD. Check for such "Everything up-to-date" updates and not display the ".SRCINFO unchanged" in these cases. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index b418525..6e09517 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -286,7 +286,7 @@ for commit in walker: die_commit('missing source file: {:s}'.format(fname), str(commit.id)) # Display a warning if .SRCINFO is unchanged. -if sha1_old != "0000000000000000000000000000000000000000": +if sha1_old not in ("0000000000000000000000000000000000000000", sha1_new): srcinfo_id_old = repo[sha1_old].tree['.SRCINFO'].id srcinfo_id_new = repo[sha1_new].tree['.SRCINFO'].id if srcinfo_id_old == srcinfo_id_new: -- 2.6.0

1 0

[aur-dev] [PATCH] Do not redirect to details page after deletion
by Lukas Fleischer 03 Oct '15

03 Oct '15

When deleting a package base from the package base deletion form, do not try to redirect to the package base details page afterwards. Instead, jump to the package overview. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index a241c74..b98dc64 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -77,6 +77,7 @@ if (check_token()) { if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { list($ret, $output) = pkgbase_delete($ids, NULL, $via); unset($_GET['ID']); + unset($base_id); } else { $merge_base_id = pkgbase_from_name($_POST['merge_Into']); @@ -89,6 +90,7 @@ if (check_token()) { } else { list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); unset($_GET['ID']); + unset($base_id); } } } -- 2.6.0

1 0

[aur-dev] [PATCH] Redirect to details pages after performing actions
by Lukas Fleischer 03 Oct '15

03 Oct '15

After performing a package base action on a separate page, return to the corresponding package base details page. Partly fixes FS#46545. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgdel.php | 2 +- web/html/pkgdisown.php | 2 +- web/html/pkgflag.php | 2 +- web/html/pkgmerge.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php index eb20967..c522e25 100644 --- a/web/html/pkgdel.php +++ b/web/html/pkgdel.php @@ -26,7 +26,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?= __('Deletion of a package is permanent. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index 4842939..7ca6e6a 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -33,7 +33,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package.') ?> <?php endif; ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgflag.php b/web/html/pkgflag.php index bfe89e0..b1ca03b 100644 --- a/web/html/pkgflag.php +++ b/web/html/pkgflag.php @@ -27,7 +27,7 @@ if (has_credential(CRED_PKGBASE_FLAG)): ?> '<strong>', '</strong>'); ?> <?= __('Enter details on why the package is out-of-date below, preferably including links to the release announcement or the new release tarball.'); ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index f6e951b..3511390 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -28,7 +28,7 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?> <?= __('Enter the package name you wish to merge the package into. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> - <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> + <form action="<?= get_pkgbase_uri($pkgbase_name); ?>" method="post"> <fieldset> <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> <input type="hidden" name="ID" value="<?= $base_id ?>" /> -- 2.6.0

1 0

[aur-dev] [PATCH] Fix a PHP "Undefined index" notice
by Lukas Fleischer 03 Oct '15

03 Oct '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/packages.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/html/packages.php b/web/html/packages.php index 38a2e29..1b89278 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -21,7 +21,11 @@ if (!isset($pkgid) || !isset($pkgname)) { $details = array(); if (isset($pkgid)) { $details = pkg_get_details($pkgid); - $pkgname = $details['Name']; + if (isset($details['Name'])) { + $pkgname = $details['Name']; + } else { + $pkgname = null; + } } else { unset($pkgname); } -- 2.6.0

1 0

[aur-dev] [PATCH] Fix dependency sorting
by Lukas Fleischer 03 Oct '15

03 Oct '15

Fixes a regression introduced in 9d2d8f1 (Honor virtual provisions in package requirements, 2015-09-17). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkg_details.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b9fd51b..8b038b9 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -40,6 +40,8 @@ $out_of_date_time = ($row["OutOfDateTS"] == 0) ? $msg : gmdate("Y-m-d", intval($ $lics = pkg_licenses($row["ID"]); $grps = pkg_groups($row["ID"]); +$deps = pkg_dependencies($row["ID"]); + usort($deps, function($x, $y) { if ($x[1] != $y[1]) { if ($x[1] == "depends") { @@ -80,7 +82,6 @@ foreach ($rels as $rel) { } } -$deps = pkg_dependencies($row["ID"]); $requiredby = pkg_required($row["Name"], $rels_p); # $sources[0] = 'src'; -- 2.6.0

1 0