- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] aurinfo: Allow lines starting with spaces
by Johannes Löthberg 04 Aug '15

04 Aug '15

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- git-interface/aurinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-interface/aurinfo.py b/git-interface/aurinfo.py index 201f864..dfee3c1 100644 --- a/git-interface/aurinfo.py +++ b/git-interface/aurinfo.py @@ -121,7 +121,7 @@ def ParseAurinfoFromIterable(iterable, ecatcher=None): current_package = None continue - if not line.startswith('\t'): + if not (line.startswith('\t') or line.startswith(' ')): # start of new package try: key, value = map(str.strip, line.split('=', 1)) -- 2.5.0

2 2

[aur-dev] .SRCINFO: handling of commits lacking an update and in general
by Peter Mattern 28 Jul '15

28 Jul '15

Hello. Considering the short time AUR 4 is in use the number of commits lacking an update of .SRCINFO seems to be rather high. The resulting problem is a cosmetic one only as the actual PKGBUILD functionality isn't affected but only the package's web page not updated accordingly. Yet I wonder whether it would be helpful to reject commits lacking the update of .SRCINFO if feasible. Actually I wonder as well whether it wouldn't even be better to not have .SRCINFO written by the packagers before uploading a commit but by aurweb when commits are received. This would ensure that problems like the one stated above can't happen and I for one couldn't figure a downside so far. Regards, Peter Mattern

6 10

[aur-dev] [PATCH 1/2] Move documentation to a subdirectory
by Lukas Fleischer 24 Jul '15

24 Jul '15

Create a new subdirectory doc/ that contains documentation. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- AUTHORS | 4 ++-- README | 5 ++++- HACKING => doc/CodingGuidelines | 10 ++++++---- TRANSLATING => doc/i18n.txt | 0 4 files changed, 12 insertions(+), 7 deletions(-) rename HACKING => doc/CodingGuidelines (96%) rename TRANSLATING => doc/i18n.txt (100%) diff --git a/AUTHORS b/AUTHORS index a21fef7..4462cab 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,8 +23,8 @@ Use `git shortlog -s` for a list of aurweb contributors. Translations ------------ -Our translations are currently maintained in Transifex; please read TRANSLATING -for more details. +Our translations are currently maintained in Transifex; please read +doc/i18n.txt for more details. Below is a list of past translators before we switched to Transifex; more can be found by looking in the Git history. diff --git a/README b/README index 228358a..71e8481 100644 --- a/README +++ b/README @@ -24,6 +24,9 @@ Functionality Directory Layout ---------------- +doc:: + aurweb documentation. + po:: Translation files for strings in the aurweb interface. @@ -40,7 +43,7 @@ Links ----- * The repository is hosted at git://projects.archlinux.org/aurweb.git -- see - HACKING for information on submitting patches. + doc/CodingGuidelines for information on submitting patches. * Discovered bugs can be submitted to the aurweb bug tracker: https://bugs.archlinux.org/index.php?project=2 diff --git a/HACKING b/doc/CodingGuidelines similarity index 96% rename from HACKING rename to doc/CodingGuidelines index 291da1f..46537bb 100644 --- a/HACKING +++ b/doc/CodingGuidelines @@ -1,11 +1,13 @@ -HACKING +Coding Guidelines +================= DISCLAIMER: We realise the code doesn't necessarily follow all the rules. This is an attempt to establish a standard coding style for future development. -Coding style guidelines ------------------------ +Coding style +------------ + Column width: 79 columns or less within reason. Indentation: tabs (standard eight column width) @@ -28,6 +30,7 @@ MySQL queries should generally go into functions. Submitting patches ------------------ + !!! PLEASE TEST YOUR PATCHES BEFORE SUBMITTING !!! Submit uncompressed git-formatted patches to aur-dev(a)archlinux.org. @@ -49,4 +52,3 @@ Glossary git-formatted patch: A patch that is produced via `git format-patch` and is sent via `git send-email` or as an inline attachment of an email. - diff --git a/TRANSLATING b/doc/i18n.txt similarity index 100% rename from TRANSLATING rename to doc/i18n.txt -- 2.4.6

2 2

[aur-dev] [PATCH] aurjson.class.php: Add missing PHPDoc
by Lukas Fleischer 22 Jul '15

22 Jul '15

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 4e4d5dc..7d94dab 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -139,6 +139,7 @@ class AurJSON { * Returns a JSON formatted result data. * * @param $type The response method type. + * @param $count The number of results to return * @param $data The result data to return * @param $error An error message to include in the response * @@ -159,6 +160,13 @@ class AurJSON { return json_encode($json_array); } + /* + * Get extended package details (for info and multiinfo queries). + * + * @param $pkgid The ID of the package to retrieve details for. + * + * @return array An array containing package details. + */ private function get_extended_fields($pkgid) { $query = "SELECT DependencyTypes.Name AS Type, " . "PackageDepends.DepName AS Name, " . @@ -208,6 +216,15 @@ class AurJSON { return $data; } + /* + * Retrieve package information (used in info, multiinfo, search and + * msearch requests). + * + * @param $type The request type. + * @param $where_condition An SQL WHERE-condition to filter packages. + * + * @return mixed Returns an array of package matches. + */ private function process_query($type, $where_condition) { $max_results = config_get_int('options', 'max_rpc_results'); -- 2.4.6

1 0

[aur-dev] [PATCH] fixup! aurjson: Pass http_data array to all functions
by Marcel Korpel 22 Jul '15

22 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/lib/aurjson.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 944362b..d255d45 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -299,7 +299,7 @@ class AurJSON { * IDs and package names are valid; sort them into the relevant arrays and * escape/quote the names. * - * @param $args the arg string or array to parse. + * @param array $http_data Query parameters. * * @return mixed An array containing 'ids' and 'names'. */ @@ -328,7 +328,7 @@ class AurJSON { /* * Performs a fulltext mysql search of the package database. * - * @param $keyword_string A string of keywords to search with. + * @param array $http_data Query parameters. * * @return mixed Returns an array of package matches. */ @@ -359,7 +359,7 @@ class AurJSON { /* * Returns the info on a specific package. * - * @param $pqdata The ID or name of the package. Package Query Data. + * @param array $http_data Query parameters. * * @return mixed Returns an array of value data containing the package data */ @@ -377,7 +377,7 @@ class AurJSON { /* * Returns the info on multiple packages. * - * @param $pqdata A comma-separated list of IDs or names of the packages. + * @param array $http_data Query parameters. * * @return mixed Returns an array of results containing the package data */ @@ -414,7 +414,7 @@ class AurJSON { /* * Returns all the packages for a specific maintainer. * - * @param $maintainer The name of the maintainer. + * @param array $http_data Query parameters. * * @return mixed Returns an array of value data containing the package data */ @@ -430,7 +430,7 @@ class AurJSON { /* * Get all package names that start with $search. * - * @param string $search Search string. + * @param array $http_data Query parameters. * * @return string The JSON formatted response data. */ @@ -457,7 +457,7 @@ class AurJSON { /* * Get all package base names that start with $search. * - * @param string $search Search string. + * @param array $http_data Query parameters. * * @return string The JSON formatted response data. */ -- 2.4.6

2 1

[aur-dev] [PATCH v4 0/4] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (4): pkg_comments.php: Merge two DIVs with same ID Split pkg_comment_form.php so the outer box is not always included aurjson.class.php: Add method get_comment_form() pkg_comments.php: Add JavaScript function to edit comments web/html/commentedit.php | 2 +- web/html/css/aurweb.css | 6 +++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 +++ web/lib/aurjson.class.php | 51 +++++++++++++++++++++++++++++++++++++- web/lib/pkgbasefuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/pkg_comment_box.php | 4 +++ web/template/pkg_comment_form.php | 4 --- web/template/pkg_comments.php | 39 ++++++++++++++++++++++++++--- 10 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 web/html/images/ajax-loader.gif create mode 100644 web/template/pkg_comment_box.php -- 2.4.6

2 5

[aur-dev] [PATCH v3 0/4] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (4): pkg_comments.php: Merge two DIVs with same ID Split pkg_comment_form.php so the outer box is not always included aurjson.class.php: Add method load_comment pkg_comments.php: Add JavaScript function to edit comments web/html/commentedit.php | 2 +- web/html/css/aurweb.css | 6 ++++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 ++++ web/lib/aurjson.class.php | 43 +++++++++++++++++++++++++++++++++++++- web/lib/pkgbasefuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/pkg_comment_box.php | 4 ++++ web/template/pkg_comment_form.php | 4 ---- web/template/pkg_comments.php | 43 +++++++++++++++++++++++++++++++++----- 10 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 web/html/images/ajax-loader.gif create mode 100644 web/template/pkg_comment_box.php -- 2.4.6

2 6

[aur-dev] [PATCH v2 0/3] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (3): pkg_comment_form.php: Make printing of header conditional aurjson.class.php: Add method load_comment pkg_comments.php: Add JavaScript function to edit comments web/html/css/aurweb.css | 6 ++++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 ++++ web/lib/aurjson.class.php | 26 +++++++++++++++++++++++++- web/template/pkg_comment_form.php | 5 +++++ web/template/pkg_comments.php | 30 ++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 web/html/images/ajax-loader.gif -- 2.4.6

2 10

[aur-dev] [PATCH] Do not use the term "unsupported" for AUR packages
by Lukas Fleischer 21 Jul '15

21 Jul '15

We no longer use the term [unsupported] to refer to the "repository" of AUR packages. Fixes FS#45381. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/home.php | 2 +- web/template/cgit/footer.html | 2 +- web/template/footer.php | 2 +- web/template/stats/user_table.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 3252876..23f37fe 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -39,7 +39,7 @@ html_header( __("Home") ); </p> <p class="important"> <?= __('DISCLAIMER') ?>: - <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> + <?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.'); ?> </p> <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR"><?= __('Learn more...') ?></a></p> </div> diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index 80481d9..36e0f1b 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,6 +1,6 @@ <div id="footer"> <p> Copyright © 2004-2014 aurweb Development Team – - <strong>Unsupported packages are user produced content. Any use of the provided files is at your own risk.</strong> + <strong>AUR packages are user produced content. Any use of the provided files is at your own risk.</strong> </p> </div> diff --git a/web/template/footer.php b/web/template/footer.php index 068cc06..1b3c936 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -6,7 +6,7 @@ <p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> <?php endif; ?> <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> - <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> + <p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> </body> diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php index 284d5b9..62361a7 100644 --- a/web/template/stats/user_table.php +++ b/web/template/stats/user_table.php @@ -8,7 +8,7 @@ $username = username_from_sid($_COOKIE["AURSID"]); <tr> <td> <a href="<?= get_uri('/packages/'); ?>?SeB=m&K=<?= $username; ?>"> -<?= __("Packages in unsupported"); ?></a> +<?= __("Packages"); ?></a> </td> <td><?= $maintainer_unsupported_count; ?></td> </tr> -- 2.4.6

3 4

[aur-dev] [PATCH] pkg_comments.php: Merge two DIVs with same ID
by Marcel Korpel 21 Jul '15

21 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/pkg_comments.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 6f74349..d38c976 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -63,10 +63,8 @@ $count = pkgbase_comments_count($base_id, $include_deleted); </p> </div> <?php endwhile; ?> -</div> <?php if ($count > 10 && !isset($_GET['comments'])): ?> -<div id="news"> <h3> <a href="<?= htmlentities(get_pkgbase_uri($pkgbase_name), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?= __('View all comments') ?> (<?= $count ?>)"><?= __('All comments', $count) ?></a> </h3> -- 2.4.6

2 1