Skip to content

A free, self-hostable news aggregator…

Group export feeds by category (#9079)

Gerard Alvear Porrasdd2ef8ffa697
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index f39fc2722..59221f3f5 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -32,7 +32,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
* This action displays the main page for import / export system.
*/
public function indexAction(): void {
- $this->view->feeds = $this->feedDAO->listFeeds();
+ $this->view->categories = $this->categoryDAO->listCategories();
+ $this->view->feedCount = array_sum(array_map(static fn(FreshRSS_Category $category): int => count($category->feeds()), $this->view->categories));
FreshRSS_View::prependTitle(_t('sub.import_export.title') . ' · ');
$this->listSqliteArchives();
}
diff --git a/app/Models/View.php b/app/Models/View.php
index 69ffd04d9..61160b3c3 100644
--- a/app/Models/View.php
+++ b/app/Models/View.php
@@ -91,6 +91,7 @@ class FreshRSS_View extends Minz_View {
// Export / Import
public string $content;
+ public int $feedCount;
/** @var array<string,array<string>> */
public array $entryIdsTagNames = [];
public string $list_title;
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index 60acee31b..f0aa68b0b 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -35,7 +35,7 @@
</form>
<h2><?= _t('sub.import_export.export') ?></h2>
- <?php if (count($this->feeds) > 0) { ?>
+ <?php if ($this->feedCount > 0) { ?>
<form method="post" action="<?= _url('importExport', 'export') ?>" data-auto-leave-validation="1">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<div class="form-group">
@@ -58,14 +58,23 @@
<?php
$select_args = '';
if (extension_loaded('zip')) {
- $select_args = ' size="' . min(10, count($this->feeds)) . '" multiple="multiple"';
+ $select_args = ' size="' . min(10, count($this->categories) + $this->feedCount) . '" multiple="multiple"';
}
?>
<select name="export_feeds[]"<?= $select_args ?>>
<?= extension_loaded('zip') ? '' : '<option></option>' ?>
- <?php foreach ($this->feeds as $feed) { ?>
- <option value="<?= $feed->id() ?>"><?= $feed->name() ?></option>
- <?php } ?>
+ <?php foreach ($this->categories as $category):
+ $feeds = $category->feeds();
+ if (empty($feeds)) {
+ continue;
+ }
+ ?>
+ <optgroup label="<?= $category->name() ?>">
+ <?php foreach ($feeds as $feed) { ?>
+ <option value="<?= $feed->id() ?>"><?= $feed->name() ?></option>
+ <?php } ?>
+ </optgroup>
+ <?php endforeach; ?>
</select>
</div>
</div>