From 1b656fa4bb12c0f6d29d16ef8bdeea86ed56f581 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 29 Jun 2024 12:52:20 +0200
Subject: [PATCH] functions.php,distroquery.php: change distroquery API base
 dir from distroquery-api to rpms

---
 distroquery.php | 19 ++++++++++++++++---
 functions.php   |  8 ++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/distroquery.php b/distroquery.php
index 55244c1..caaaad7 100644
--- a/distroquery.php
+++ b/distroquery.php
@@ -17,7 +17,7 @@ if ( !defined( 'ABSPATH' ) ) {
    exit;
 }
 
-$url_prefix = home_url() . "/distroquery-api/";
+$url_prefix = home_url() . "/rpms/";
 
 ?>
 <?php get_header(); ?>
@@ -100,7 +100,7 @@ $url_prefix = home_url() . "/distroquery-api/";
 <tr><td width="15%">Size:</td><td><?php echo $j["size"] ?></td></tr>
 <tr><td width="15%">URL:</td><td><a href="<?php echo $j["url"] ?>" target=_blank><?php echo $j["url"] ?></a></td></tr>
 <tr><td width="15%">Download:</td><td><a href="<?php echo $j["download_url"] ?>" target=_blank><?php echo basename($j["download_url"]) ?></a></td></tr>
-<tr><td width="15%">Sources:</td><td><a href="<?php echo $j["source_url"] ?>" target=_blank><?php echo $j["source_url"] ?></a></td></tr>
+<tr><td width="15%">Sources repository:</td><td><a href="<?php echo $j["source_url"] ?>" target=_blank><?php echo $j["source_url"] ?></a></td></tr>
 <tr><td width="15%">Build time:</td><td><?php echo iso8601_to_datetime($j["buildtime"]) ?></td></tr>
 <tr><td width="15%">Built RPMS:</td><td><?php
    foreach ($j["children"] as $child) {
@@ -152,7 +152,6 @@ $url_prefix = home_url() . "/distroquery-api/";
 <tr><td width="15%">Source RPM:</td><td><?php
    $sourcerpm_url = $url_prefix . $repo . "/" . $j["source"]["name"];
    echo "<a href=\"". $sourcerpm_url . "\">". $j["source"]["name"] . "</a> "; ?>
-<tr><td width="15%">Sources:</td><td><a href="<?php echo $j["source"]["source_url"] ?>" target=_blank><?php echo $j["source"]["source_url"] ?></a></td></tr>
 <tr><td width="15%">Brothers:</td><td><?php
    foreach ($j["brothers"] as $brother) {
       $brother_url = $url_prefix . $repo . "/" . $brother . "/" . $arch;
@@ -166,6 +165,20 @@ $url_prefix = home_url() . "/distroquery-api/";
       echo " ";
    } ?>
 </td></tr>
+<tr><td width="15%">Obsoletes:</td><td><?php
+   foreach ($j["obsoletes"] as $obsolete) {
+      echo $obsolete["name"];
+      if ($obsolete["flags"] != "") echo "[" . $obsolete["flags"] . $obsolete["version"] . "]";
+      echo " ";
+   } ?>
+</td></tr>
+<tr><td width="15%">Requires:</td><td><?php
+   foreach ($j["requires"] as $require) {
+      echo $require["name"];
+      if ($require["flags"] != "") echo "[" . $require["flags"] . $require["version"] . "]";
+      echo " ";
+   } ?>
+</td></tr>
 </table>
 
 <?php
diff --git a/functions.php b/functions.php
index 096b7de..885c492 100644
--- a/functions.php
+++ b/functions.php
@@ -493,13 +493,13 @@ add_filter( 'query_vars', function( $query_vars ) {
 } );
 
 function distroquery_api_rewrite_rules ( ) {
-  add_rewrite_rule ( '^distroquery-api/([^/]*)/([^/]*)/([^/]*)/?',
+  add_rewrite_rule ( '^rpms/([^/]*)/([^/]*)/([^/]*)/?',
      'index.php?distroquery=1&repo=$matches[1]&package=$matches[2]&arch=$matches[3]','top' );
-  add_rewrite_rule ( '^distroquery-api/([^/]*)/([^/]*)/?',
+  add_rewrite_rule ( '^rpms/([^/]*)/([^/]*)/?',
      'index.php?distroquery=1&repo=$matches[1]&package=$matches[2]','top' );
-  add_rewrite_rule ( '^distroquery-api/([^/]*)/?',
+  add_rewrite_rule ( '^rpms/([^/]*)/?',
      'index.php?distroquery=1&repo=$matches[1]','top' );
-  add_rewrite_rule ( '^distroquery-api/?',
+  add_rewrite_rule ( '^rpms/?',
      'index.php?distroquery=1','top' );
 }
 add_action ( 'init', 'distroquery_api_rewrite_rules', 10, 0 ) ;