Merge pull request #11 from AOSC-Dev/sorevdeps

feat: add so revdeps on revdeps page

Author: jiegec

src/sql.rs

@@ -775,3 +775,32 @@ WHERE
 ORDER BY
     package
 ";
+
+pub const SQL_GET_PACKAGE_SO_REVDEPS: &str = "
+SELECT
+    DISTINCT s.name, s.package
+FROM
+    pv_package_sodep s
+INNER JOIN (
+    SELECT
+        p.name, p.ver
+    FROM
+        pv_package_sodep p
+    INNER JOIN
+        v_packages_new n
+    ON
+        p.package = n.package
+        AND p.version = n.version
+    WHERE
+        p.package = $1
+        AND p.depends = 0
+        AND p.ver IS NOT NULL
+) n
+ON
+    s.name = n.name
+    AND s.ver = n.ver
+WHERE
+    s.depends = 1
+ORDER BY
+    s.name, s.package
+";

src/views/package.rs

@@ -453,6 +453,7 @@ pub async fn revdep(Revdep { name }: Revdep, q: Query, db: Ext) -> Result<impl I
         revdeps: &'a Vec<TemplateRevDep<'a>>,
         sobreaks: &'a Vec<Vec<String>>,
         sobreaks_circular: &'a Vec<String>,
+        sorevdeps: &'a HashMap<String, Vec<String>>,
     }
 
     #[derive(Debug, Template, Serialize)]
@@ -461,6 +462,7 @@ pub async fn revdep(Revdep { name }: Revdep, q: Query, db: Ext) -> Result<impl I
         revdeps: &'a Vec<TemplateRevDep<'a>>,
         sobreaks: &'a Vec<Vec<String>>,
         sobreaks_circular: &'a Vec<String>,
+        sorevdeps: &'a HashMap<String, Vec<String>>,
     }
 
     #[derive(Debug, FromRow)]
@@ -545,17 +547,29 @@ pub async fn revdep(Revdep { name }: Revdep, q: Query, db: Ext) -> Result<impl I
 
     let (ref sobreaks, ref sobreaks_circular) = toposort(sobreaks);
 
+    let sorevdeps: Vec<(String, String)> = query_as(SQL_GET_PACKAGE_SO_REVDEPS)
+        .bind(&name)
+        .fetch_all(&db.pv)
+        .await?;
+
+    let mut sorevdeps_grouped: HashMap<String, Vec<String>> = HashMap::new();
+    for (k, v) in sorevdeps {
+        sorevdeps_grouped.entry(k).or_insert_with(Vec::new).push(v);
+    }
+
     let ctx = Template {
         name: &name,
         revdeps,
         sobreaks,
         sobreaks_circular,
+        sorevdeps: &sorevdeps_grouped,
     };
 
     let ctx_tsv = TemplateTsv {
         revdeps,
         sobreaks,
         sobreaks_circular,
+        sorevdeps: &sorevdeps_grouped,
     };
 
     render(ctx, Some(ctx_tsv), &q)

templates/revdep.html

@@ -36,4 +36,16 @@
 </ul>
 {% endif %}
 
-{% endblock main %}
+{% if !sorevdeps.is_empty() -%}<p><b class="pkg-field">Reverse dependencies of
+    the libraries</b>:
+<ul>{% for library in sorevdeps.keys() -%}
+    <li>{{ library }}:
+        {% for package in sorevdeps.get(library.as_str()).unwrap() -%}
+        {% if loop.index != 1 %},{% endif %}
+        <span class="pkg-dep"><a href="{{ package }}">{{ package }}</a></span>
+        {%- endfor %}
+    </li>{%- endfor %}
+</ul>
+{% endif %}
+
+{% endblock main %}

templates/revdep.tsv

@@ -9,4 +9,7 @@ SOBREAK	{{ outer }}	{{ package }}
 {% endfor %}{% endfor %}{% if !sobreaks_circular.is_empty() -%}
 {% for package in sobreaks_circular -%}
 SOBREAK		{{ package }}	
-{% endfor %}{% endif %}{% endif %}
+{% endfor %}{% endif %}{% endif %}{% if !sorevdeps.is_empty() -%}
+{% for library in sorevdeps.keys() -%}{% for package in sorevdeps.get(library.as_str()).unwrap() -%}
+SOREVDEP	{{ library }}	{{ package }}	
+{% endfor %}{% endfor %}{% endif %}