From 5f94f66c45e7689690aad20294e86699d0e7c821 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 7 Apr 2023 17:23:37 +0100
Subject: Rename Popular to more generic name for reuse
---
gentoobrowse/src/mash.ice | 8 +++-----
gentoobrowse/src/packages.json | 2 +-
gentoobrowse/src/user.cpp | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/gentoobrowse/src/mash.ice b/gentoobrowse/src/mash.ice
index 40680fa..0ed9f76 100644
--- a/gentoobrowse/src/mash.ice
+++ b/gentoobrowse/src/mash.ice
@@ -46,13 +46,13 @@ module GentooBrowse {
};
["slicer:root:gentoo"]
- class Popular extends PageBase {
+ class CategoriesAndPackages extends PageBase {
Gentoo::Categories categories;
Gentoo::Packages packages;
};
["slicer:root:gentoo"]
- class UserTracked extends Popular {
+ class UserTracked extends CategoriesAndPackages {
Gentoo::Ebuilds versions;
};
@@ -95,10 +95,8 @@ module GentooBrowse {
};
["slicer:root:gentoo"]
- class Use extends PageBase {
- Gentoo::Categories categories;
+ class Use extends CategoriesAndPackages {
Gentoo::Uses usage;
- Gentoo::Packages packages;
Gentoo::Use use;
};
diff --git a/gentoobrowse/src/packages.json b/gentoobrowse/src/packages.json
index 1c1d12a..80be3e8 100644
--- a/gentoobrowse/src/packages.json
+++ b/gentoobrowse/src/packages.json
@@ -53,7 +53,7 @@
"operation": "Gentoo.Portage.getTopTrackedPackages"
}
},
- "type": "GentooBrowse.Popular",
+ "type": "GentooBrowse.CategoriesAndPackages",
"params": {
"n": {
"default": "50"
diff --git a/gentoobrowse/src/user.cpp b/gentoobrowse/src/user.cpp
index b7b06a1..e4452f5 100644
--- a/gentoobrowse/src/user.cpp
+++ b/gentoobrowse/src/user.cpp
@@ -215,7 +215,7 @@ namespace GentooBrowse {
void
execute(IceSpider::IHttpRequest * request) const
{
- PopularPtr u = std::make_shared<Popular>();
+ auto u = std::make_shared<CategoriesAndPackages>();
auto _ar_c = prx2->getAllCategoriesAsync(request->getContext());
addUser(request, u);
auto _ar_p = prx2->getUserTrackedPackagesAsync(u->user->userid, request->getContext());
--
cgit v1.2.3