- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/6] Store conflicts, provides and replaces in the DB
by Lukas Fleischer 26 Apr '14

26 Apr '14

Package conflicts, provides and replaces are now stored in the new PackageRelations table. The gendummydata script generates test entries for these relations. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 28 ++++++++++++++++++++++++++++ schema/aur-schema.sql | 26 ++++++++++++++++++++++++++ schema/gendummydata.py | 27 ++++++++++++++++----------- web/html/pkgsubmit.php | 18 ++++++++++++++++-- web/lib/pkgfuncs.inc.php | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 13 deletions(-) diff --git a/UPGRADING b/UPGRADING index 0a801cc..f523140 100644 --- a/UPGRADING +++ b/UPGRADING @@ -171,6 +171,34 @@ ALTER TABLE PackageDepends ALTER TABLE PackageDepends MODIFY DepName VARCHAR(255) NOT NULL; ---- +15. Create a new table to store package relation types: + +---- +CREATE TABLE RelationTypes ( + ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, + Name VARCHAR(32) NOT NULL DEFAULT '', + PRIMARY KEY (ID) +) ENGINE = InnoDB; +INSERT INTO RelationTypes VALUES (1, 'conflicts'); +INSERT INTO RelationTypes VALUES (2, 'provides'); +INSERT INTO RelationTypes VALUES (3, 'replaces'); +---- + +16. Create a new table to store package relations: + +---- +CREATE TABLE PackageRelations ( + PackageID INTEGER UNSIGNED NOT NULL, + RelTypeID TINYINT UNSIGNED NOT NULL, + RelName VARCHAR(255) NOT NULL, + RelCondition VARCHAR(20), + INDEX (PackageID), + INDEX (RelName), + FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, + FOREIGN KEY (RelTypeID) REFERENCES RelationTypes(ID) ON DELETE NO ACTION +) ENGINE = InnoDB; +---- + From 2.2.0 to 2.3.0 ------------------- diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index af03b69..c98ba77 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -160,6 +160,32 @@ CREATE TABLE PackageDepends ( ) ENGINE = InnoDB; +-- Define the package relation types +-- +CREATE TABLE RelationTypes ( + ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, + Name VARCHAR(32) NOT NULL DEFAULT '', + PRIMARY KEY (ID) +) ENGINE = InnoDB; +INSERT INTO RelationTypes VALUES (1, 'conflicts'); +INSERT INTO RelationTypes VALUES (2, 'provides'); +INSERT INTO RelationTypes VALUES (3, 'replaces'); + + +-- Track which conflicts, provides and replaces a package has +-- +CREATE TABLE PackageRelations ( + PackageID INTEGER UNSIGNED NOT NULL, + RelTypeID TINYINT UNSIGNED NOT NULL, + RelName VARCHAR(255) NOT NULL, + RelCondition VARCHAR(20), + INDEX (PackageID), + INDEX (RelName), + FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, + FOREIGN KEY (RelTypeID) REFERENCES RelationTypes(ID) ON DELETE NO ACTION +) ENGINE = InnoDB; + + -- Track which sources a package has -- CREATE TABLE PackageSources ( diff --git a/schema/gendummydata.py b/schema/gendummydata.py index 18852a2..bb622d1 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -29,6 +29,7 @@ MAX_DEVS = .1 # what percentage of MAX_USERS are Developers MAX_TUS = .2 # what percentage of MAX_USERS are Trusted Users MAX_PKGS = 900 # how many packages to load PKG_DEPS = (1, 15) # min/max depends a package has +PKG_RELS = (1, 5) # min/max relations a package has PKG_SRC = (1, 3) # min/max sources a package has PKG_CMNTS = (1, 5) # min/max number of comments a package has CATEGORIES_COUNT = 17 # the number of categories from aur-schema @@ -253,18 +254,22 @@ for p in list(track_votes.keys()): log.debug("Creating statements for package depends/sources.") for p in list(seen_pkgs.keys()): num_deps = random.randrange(PKG_DEPS[0], PKG_DEPS[1]) - this_deps = {} - i = 0 - while i != num_deps: + for i in range(0, num_deps): dep = random.choice([k for k in seen_pkgs]) - if dep not in this_deps: - deptype = random.randrange(1, 5) - if deptype == 4: - dep += ": for " + random.choice([k for k in seen_pkgs]) - s = "INSERT INTO PackageDepends VALUES (%d, %d, '%s', NULL);\n" - s = s % (seen_pkgs[p], deptype, dep) - out.write(s) - i += 1 + deptype = random.randrange(1, 5) + if deptype == 4: + dep += ": for " + random.choice([k for k in seen_pkgs]) + s = "INSERT INTO PackageDepends VALUES (%d, %d, '%s', NULL);\n" + s = s % (seen_pkgs[p], deptype, dep) + out.write(s) + + num_rels = random.randrange(PKG_RELS[0], PKG_RELS[1]) + for i in range(0, num_deps): + rel = random.choice([k for k in seen_pkgs]) + reltype = random.randrange(1, 4) + s = "INSERT INTO PackageRelations VALUES (%d, %d, '%s', NULL);\n" + s = s % (seen_pkgs[p], reltype, rel) + out.write(s) num_sources = random.randrange(PKG_SRC[0], PKG_SRC[1]) for i in range(num_sources): diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 11206e1..3df38d8 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -155,7 +155,10 @@ if ($uid): 'makedepends' => array(), 'checkdepends' => array(), 'optdepends' => array(), - 'source' => array() + 'source' => array(), + 'conflicts' => array(), + 'provides' => array(), + 'replaces' => array() ); /* Fall-through case. */ case 'epoch': @@ -171,6 +174,9 @@ if ($uid): case 'makedepends': case 'checkdepends': case 'optdepends': + case 'conflicts': + case 'provides': + case 'replaces': $section_info[$key][] = $value; break; } @@ -190,7 +196,7 @@ if ($uid): if (!isset($pkgbase_info['pkgbase'])) { $pkgbase_info['pkgbase'] = $pkgbase_info['pkgname']; } - foreach (array('source', 'depends', 'makedepends', 'checkdepends', 'optdepends') as $array_opt) { + foreach (array('source', 'depends', 'makedepends', 'checkdepends', 'optdepends', 'conflicts', 'provides', 'replaces') as $array_opt) { if (empty($pkgbase_info[$array_opt])) { $pkgbase_info[$array_opt] = array(); } else { @@ -359,6 +365,14 @@ if ($uid): } } + foreach (array('conflicts', 'provides', 'replaces') as $reltype) { + foreach ($pi[$reltype] as $rel) { + $relpkgname = preg_replace("/(<|=|>).*/", "", $rel); + $relcondition = str_replace($relpkgname, "", $rel); + pkg_add_rel($pkgid, $reltype, $relpkgname, $relcondition); + } + } + foreach ($pi['source'] as $src) { pkg_add_src($pkgid, $src); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 5c30a95..2eb0be4 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -148,6 +148,21 @@ function pkg_dependency_type_id_from_name($name) { } /** + * Get the ID of a relation type given its name + * + * @param string $name The name of the relation type + * + * @return int The ID of the relation type + */ +function pkg_relation_type_id_from_name($name) { + $dbh = DB::connect(); + $q = "SELECT ID FROM RelationTypes WHERE Name = "; + $q.= $dbh->quote($name); + $result = $dbh->query($q); + return $result->fetch(PDO::FETCH_COLUMN, 0); +} + +/** * Get the HTML code to display a package dependency link * * @param string $name The name of the dependency @@ -727,6 +742,27 @@ function pkg_add_dep($pkgid, $type, $depname, $depcondition) { } /** + * Add a relation for a specific package to the database + * + * @param int $pkgid The package ID to add the relation for + * @param string $type The type of relation to add + * @param string $relname The name of the relation to add + * @param string $relcondition The version requirement of the relation + * + * @return void + */ +function pkg_add_rel($pkgid, $type, $relname, $relcondition) { + $dbh = DB::connect(); + $q = sprintf("INSERT INTO PackageRelations (PackageID, RelTypeID, RelName, RelCondition) VALUES (%d, %d, %s, %s)", + $pkgid, + pkg_relation_type_id_from_name($type), + $dbh->quote($relname), + $dbh->quote($relcondition) + ); + $dbh->exec($q); +} + +/** * Add a source for a specific package to the database * * @param int $pkgid The package ID to add the source for -- 1.9.2

1 5

[aur-dev] [PATCH 1/3] Allow dependency names of up to 255 characters
by Lukas Fleischer 19 Apr '14

19 Apr '14

This field needs to be a bit larger now that optdepends (including descriptions) are stored there as well. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 6 ++++++ schema/aur-schema.sql | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/UPGRADING b/UPGRADING index 48737f2..0a801cc 100644 --- a/UPGRADING +++ b/UPGRADING @@ -165,6 +165,12 @@ ALTER TABLE PackageDepends ADD FOREIGN KEY (DepTypeID) REFERENCES DependencyTypes(ID) ON DELETE NO ACTION; ---- +14. Resize the package dependency name field: + +---- +ALTER TABLE PackageDepends MODIFY DepName VARCHAR(255) NOT NULL; +---- + From 2.2.0 to 2.3.0 ------------------- diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 327a792..af03b69 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -151,7 +151,7 @@ INSERT INTO DependencyTypes VALUES (4, 'optdepends'); CREATE TABLE PackageDepends ( PackageID INTEGER UNSIGNED NOT NULL, DepTypeID TINYINT UNSIGNED NOT NULL, - DepName VARCHAR(64) NOT NULL, + DepName VARCHAR(255) NOT NULL, DepCondition VARCHAR(20), INDEX (PackageID), INDEX (DepName), -- 1.9.2

1 2

[aur-dev] [PATCH 1/2] Store {make, check, opt}depends in the database
by Lukas Fleischer 17 Apr '14

17 Apr '14

In addition to parsing and storing dependencies of packages, store makedepends, checkdepends and optdepends. Every dependency (of any type) is displayed on the package details page. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 23 +++++++++++++++++++++++ schema/aur-schema.sql | 17 ++++++++++++++++- schema/gendummydata.py | 9 ++++++--- web/html/pkgsubmit.php | 36 ++++++++++++++++++++++-------------- web/lib/pkgfuncs.inc.php | 29 +++++++++++++++++++++++------ 5 files changed, 90 insertions(+), 24 deletions(-) diff --git a/UPGRADING b/UPGRADING index a33ea63..48737f2 100644 --- a/UPGRADING +++ b/UPGRADING @@ -142,6 +142,29 @@ CREATE UNIQUE INDEX VoteUsersIDPackageID ON PackageVotes (UsersID, PackageBaseID CREATE UNIQUE INDEX NotifyUserIDPkgID ON CommentNotify (UserID, PackageBaseID); ---- +12. Create a new table to store package dependency types: + +---- +CREATE TABLE DependencyTypes ( + ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, + Name VARCHAR(32) NOT NULL DEFAULT '', + PRIMARY KEY (ID) +) ENGINE = InnoDB; +INSERT INTO DependencyTypes VALUES (1, 'depends'); +INSERT INTO DependencyTypes VALUES (2, 'makedepends'); +INSERT INTO DependencyTypes VALUES (3, 'checkdepends'); +INSERT INTO DependencyTypes VALUES (4, 'optdepends'); +---- + +13. Add a field to store the dependency type to the PackageDepends table: + +---- +ALTER TABLE PackageDepends ADD COLUMN DepTypeID TINYINT UNSIGNED NOT NULL; +UPDATE PackageDepends SET DepTypeID = 1; +ALTER TABLE PackageDepends + ADD FOREIGN KEY (DepTypeID) REFERENCES DependencyTypes(ID) ON DELETE NO ACTION; +---- + From 2.2.0 to 2.3.0 ------------------- diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 9426a61..327a792 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -133,15 +133,30 @@ CREATE TABLE Packages ( ) ENGINE = InnoDB; +-- Define the package dependency types +-- +CREATE TABLE DependencyTypes ( + ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, + Name VARCHAR(32) NOT NULL DEFAULT '', + PRIMARY KEY (ID) +) ENGINE = InnoDB; +INSERT INTO DependencyTypes VALUES (1, 'depends'); +INSERT INTO DependencyTypes VALUES (2, 'makedepends'); +INSERT INTO DependencyTypes VALUES (3, 'checkdepends'); +INSERT INTO DependencyTypes VALUES (4, 'optdepends'); + + -- Track which dependencies a package has -- CREATE TABLE PackageDepends ( PackageID INTEGER UNSIGNED NOT NULL, + DepTypeID TINYINT UNSIGNED NOT NULL, DepName VARCHAR(64) NOT NULL, DepCondition VARCHAR(20), INDEX (PackageID), INDEX (DepName), - FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE + FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE, + FOREIGN KEY (DepTypeID) REFERENCES DependencyTypes(ID) ON DELETE NO ACTION ) ENGINE = InnoDB; diff --git a/schema/gendummydata.py b/schema/gendummydata.py index bc0ede8..18852a2 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -28,7 +28,7 @@ MAX_USERS = 300 # how many users to 'register' MAX_DEVS = .1 # what percentage of MAX_USERS are Developers MAX_TUS = .2 # what percentage of MAX_USERS are Trusted Users MAX_PKGS = 900 # how many packages to load -PKG_DEPS = (1, 5) # min/max depends a package has +PKG_DEPS = (1, 15) # min/max depends a package has PKG_SRC = (1, 3) # min/max sources a package has PKG_CMNTS = (1, 5) # min/max number of comments a package has CATEGORIES_COUNT = 17 # the number of categories from aur-schema @@ -258,8 +258,11 @@ for p in list(seen_pkgs.keys()): while i != num_deps: dep = random.choice([k for k in seen_pkgs]) if dep not in this_deps: - s = "INSERT INTO PackageDepends VALUES (%d, '%s', NULL);\n" - s = s % (seen_pkgs[p], dep) + deptype = random.randrange(1, 5) + if deptype == 4: + dep += ": for " + random.choice([k for k in seen_pkgs]) + s = "INSERT INTO PackageDepends VALUES (%d, %d, '%s', NULL);\n" + s = s % (seen_pkgs[p], deptype, dep) out.write(s) i += 1 diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 7db81a5..045b8f9 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -150,7 +150,13 @@ if ($uid): $pkginfo[] = array_merge($pkgbase_info, $section_info); } } - $section_info = array('depends' => array(), 'source' => array()); + $section_info = array( + 'depends' => array(), + 'makedepends' => array(), + 'checkdepends' => array(), + 'optdepends' => array(), + 'source' => array() + ); /* Fall-through case. */ case 'epoch': case 'pkgdesc': @@ -162,6 +168,9 @@ if ($uid): break; case 'source': case 'depends': + case 'makedepends': + case 'checkdepends': + case 'optdepends': $section_info[$key][] = $value; break; } @@ -181,15 +190,12 @@ if ($uid): if (!isset($pkgbase_info['pkgbase'])) { $pkgbase_info['pkgbase'] = $pkgbase_info['pkgname']; } - if (empty($pkgbase_info['depends'])) { - $pkgbase_info['depends'] = array(); - } else { - $pkgbase_info['depends'] = explode(" ", $pkgbase_info['depends']); - } - if (empty($pkgbase_info['source'])) { - $pkgbase_info['source'] = array(); - } else { - $pkgbase_info['source'] = explode(" ", $pkgbase_info['source']); + foreach (array('source', 'depends', 'makedepends', 'checkdepends', 'optdepends') as $array_opt) { + if (empty($pkgbase_info[$array_opt])) { + $pkgbase_info[$array_opt] = array(); + } else { + $pkgbase_info[$array_opt] = explode(" ", $pkgbase_info[$array_opt]); + } } $pkginfo[] = $pkgbase_info; } @@ -345,10 +351,12 @@ if ($uid): foreach ($pkginfo as $pi) { $pkgid = pkg_create($base_id, $pi['pkgname'], $pi['license'], $pi['full-version'], $pi['pkgdesc'], $pi['url']); - foreach ($pi['depends'] as $dep) { - $deppkgname = preg_replace("/(<|=|>).*/", "", $dep); - $depcondition = str_replace($deppkgname, "", $dep); - pkg_add_dep($pkgid, $deppkgname, $depcondition); + foreach (array('depends', 'makedepends', 'checkdepends', 'optdepends') as $deptype) { + foreach ($pi[$deptype] as $dep) { + $deppkgname = preg_replace("/(<|=|>).*/", "", $dep); + $depcondition = str_replace($deppkgname, "", $dep); + pkg_add_dep($pkgid, $deptype, $deppkgname, $depcondition); + } } foreach ($pi['source'] as $src) { diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c6b4a27..153e2a8 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -132,6 +132,21 @@ function pkg_dependencies($pkgid) { } /** + * Get the ID of a dependency type given its name + * + * @param string $name The name of the dependency type + * + * @return int The ID of the dependency type + */ +function pkg_dependency_type_id_from_name($name) { + $dbh = DB::connect(); + $q = "SELECT ID FROM DependencyTypes WHERE Name = "; + $q.= $dbh->quote($name); + $result = $dbh->query($q); + return $result->fetch(PDO::FETCH_COLUMN, 0); +} + +/** * Determine packages that depend on a package * * @param string $name The package name for the dependency search @@ -653,18 +668,20 @@ function pkg_create($base_id, $pkgname, $license, $pkgver, $pkgdesc, $pkgurl) { * Add a dependency for a specific package to the database * * @param int $pkgid The package ID to add the dependency for + * @param string $type The type of dependency to add * @param string $depname The name of the dependency to add * @param string $depcondition The type of dependency for the package * * @return void */ -function pkg_add_dep($pkgid, $depname, $depcondition) { +function pkg_add_dep($pkgid, $type, $depname, $depcondition) { $dbh = DB::connect(); - $q = sprintf("INSERT INTO PackageDepends (PackageID, DepName, DepCondition) VALUES (%d, %s, %s)", - $pkgid, - $dbh->quote($depname), - $dbh->quote($depcondition)); - + $q = sprintf("INSERT INTO PackageDepends (PackageID, DepTypeID, DepName, DepCondition) VALUES (%d, %d, %s, %s)", + $pkgid, + pkg_dependency_type_id_from_name($type), + $dbh->quote($depname), + $dbh->quote($depcondition) + ); $dbh->exec($q); } -- 1.9.2

2 4

[aur-dev] [PATCH 1/2] Fix pkgbase_user_voted()
by Lukas Fleischer 06 Apr '14

06 Apr '14

pkgbase_user_voted() should expect a package base ID, not a package ID. Change the SQL query accordingly. This fixes the vote status on package base pages. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgbasefuncs.inc.php | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index c55bd89..4e026f5 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -703,28 +703,24 @@ function pkgbase_votes_from_name($pkgname) { } /** - * Determine if a user has already voted for a specific package + * Determine if a user has already voted for a specific package base * * @param string $uid The user ID to check for an existing vote - * @param string $pkgid The package ID to check for an existing vote + * @param string $base_id The package base ID to check for an existing vote * * @return bool True if the user has already voted, otherwise false */ -function pkgbase_user_voted($uid, $pkgid) { +function pkgbase_user_voted($uid, $base_id) { $dbh = DB::connect(); - - $q = "SELECT * FROM PackageVotes, Packages WHERE "; - $q.= "PackageVotes.UsersID = ". $dbh->quote($uid) . " AND "; - $q.= "PackageVotes.PackageBaseID = Packages.PackageBaseID AND "; - $q.= "Packages.ID = " . $dbh->quote($pkgid); + $q = "SELECT COUNT(*) FROM PackageVotes WHERE "; + $q.= "UsersID = ". $dbh->quote($uid) . " AND "; + $q.= "PackageBaseID = " . $dbh->quote($base_id); $result = $dbh->query($q); - - if ($result->fetch(PDO::FETCH_NUM)) { - return true; - } - else { - return false; + if (!$result) { + return null; } + + return ($result->fetch(PDO::FETCH_COLUMN, 0) > 0); } /** -- 1.9.1

1 1

[aur-dev] [PATCH 1/3] Refactor pkgbase_categories()
by Lukas Fleischer 05 Apr '14

05 Apr '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgbasefuncs.inc.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 3bb07e5..91db229 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -9,17 +9,16 @@ include_once("config.inc.php"); * @return array All package categories */ function pkgbase_categories() { - $cats = array(); $dbh = DB::connect(); $q = "SELECT * FROM PackageCategories WHERE ID != 1 "; $q.= "ORDER BY Category ASC"; $result = $dbh->query($q); - if ($result) { - while ($row = $result->fetch(PDO::FETCH_NUM)) { - $cats[$row[0]] = $row[1]; - } + if (!$result) { + return null; } - return $cats; + + return array_combine($result->fetchAll(PDO::FETCH_COLUMN, 0), + $result->fetchAll(PDO::FETCH_COLUMN, 1)); } /** -- 1.9.1

1 3

[aur-dev] [PATCH 1/2] Fix searching by category
by Lukas Fleischer 05 Apr '14

05 Apr '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index f5eb11d..76fed89 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -422,7 +422,7 @@ function pkg_search_page($SID="") { * variable values more sensible. */ if (isset($_GET["C"]) && intval($_GET["C"])) { - $q_where .= "AND Packages.CategoryID = ".intval($_GET["C"])." "; + $q_where .= "AND PackageBases.CategoryID = ".intval($_GET["C"])." "; } if (isset($_GET['K'])) { -- 1.9.1

1 1

[aur-dev] [PATCH] pkg_search_results.php: Link to account when logged in
by Lukas Fleischer 05 Apr '14

05 Apr '14

Replace the maintainer package search links with links to the maintainer's account when browsing the search results as a logged-in user. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_search_results.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index c9da5f9..e47fcb2 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -73,7 +73,11 @@ if (!$result): ?> <td class="wrap"><?= htmlspecialchars($row['Description'], ENT_QUOTES); ?></td> <td> <?php if (isset($row["Maintainer"])): ?> + <?php if ($SID): ?> + <a href="<?= get_uri('/account/') . htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($row['Maintainer'])) ?>"><?= htmlspecialchars($row['Maintainer']) ?></a> + <?php else: ?> <a href="<?= get_uri('/packages/'); ?>?K=<?= htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>&SeB=m"><?= htmlspecialchars($row['Maintainer']) ?></a> + <?php endif; ?> <?php else: ?> <span><?= __("orphan") ?></span> <?php endif; ?> -- 1.9.1

1 0

[aur-dev] [PATCH 0/7] Split package support: Cleanups, fixes, improvements
by Lukas Fleischer 05 Apr '14

05 Apr '14

To be applied on top of the split package patch set. Lukas Fleischer (7): Use snake case for all package functions Prefix package functions with pkg_/pkgbase_ Split out package base functions pkgfuncs.inc.php: Remove several unused functions pkgbasefuncs.inc.php: Fix leftover bits Add full package list to the removal form Do not show package base page of non-split packages scripts/cleanup | 2 +- web/html/index.php | 2 +- web/html/packages.php | 10 +- web/html/pkgbase.php | 38 +- web/html/pkgdel.php | 9 +- web/html/pkgmerge.php | 10 +- web/html/pkgsubmit.php | 20 +- web/html/voters.php | 2 +- web/lib/pkgbasefuncs.inc.php | 968 ++++++++++++++++++++++++++++++++++ web/lib/pkgfuncs.inc.php | 1058 +------------------------------------- web/template/actions_form.php | 4 +- web/template/pkg_comments.php | 4 +- web/template/pkg_details.php | 12 +- web/template/pkg_search_form.php | 2 +- web/template/pkgbase_details.php | 6 +- 15 files changed, 1058 insertions(+), 1089 deletions(-) create mode 100644 web/lib/pkgbasefuncs.inc.php -- 1.9.1

1 6

[aur-dev] [PATCH 00/13] Split package support
by Lukas Fleischer 05 Apr '14

05 Apr '14

This patch series adds full .AURINFO support and split package support. Implementing this requires massive database layout changes and thus, a lot of patches in this series are quite invasive. Things that need to be done: * Testing, the patches are still experimental. * Fix and extend the RPC interface. Suggestions? * Do a lot of refactoring and code cleanup. Lukas Fleischer (13): Add provisional support for package bases Store comments on a per-package base basis routing.inc.php: Add get_pkgbase_uri() Make the delete function remove package bases Add full support for the new .AURINFO format Add package base detail pages pkg_details.php: Add link to package base details Do not allow for overwriting arbitrary packages Factor out PKGBUILD parsing Only parse PKGBUILD when required UPGRADING: Add migration instructions for 3.0.0 Allow for searching by package base name Move package actions to package bases UPGRADING | 124 +++++++++ schema/aur-schema.sql | 44 +-- schema/gendummydata.py | 18 +- web/html/index.php | 18 +- web/html/packages.php | 75 ----- web/html/pkgbase.php | 135 +++++++++ web/html/pkgdel.php | 10 +- web/html/pkgmerge.php | 10 +- web/html/pkgsubmit.php | 432 +++++++++++------------------ web/lib/aur.inc.php | 34 ++- web/lib/pkgbuild-parser.inc.php | 139 ++++++++++ web/lib/pkgfuncs.inc.php | 540 +++++++++++++++++++++++++----------- web/lib/routing.inc.php | 18 ++ web/lib/stats.inc.php | 21 +- web/template/pkg_comment_form.php | 4 +- web/template/pkg_comments.php | 10 +- web/template/pkg_details.php | 34 ++- web/template/pkg_search_form.php | 4 +- web/template/pkg_search_results.php | 4 +- web/template/pkgbase_details.php | 210 ++++++++++++++ 20 files changed, 1304 insertions(+), 580 deletions(-) create mode 100644 web/html/pkgbase.php create mode 100644 web/lib/pkgbuild-parser.inc.php create mode 100644 web/template/pkgbase_details.php -- 1.9.1

1 13

[aur-dev] [PATCH] Fix database schema
by Lukas Fleischer 03 Apr '14

03 Apr '14

Replace "ON SET NULL" with "ON DELETE SET NULL". Fixes a regression introduced in commit fb7bde3 (Add support for anonymous comments, 2014-02-04). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- schema/aur-schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 86f7563..932c1d3 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -167,7 +167,7 @@ CREATE TABLE PackageComments ( PRIMARY KEY (ID), INDEX (UsersID), INDEX (PackageID), - FOREIGN KEY (UsersID) REFERENCES Users(ID) ON SET NULL, + FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL, FOREIGN KEY (DelUsersID) REFERENCES Users(ID) ON DELETE CASCADE, FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE ) ENGINE = InnoDB; -- 1.9.1

1 0