fix: don't abort opml import when a single feed exists or can't be added

CHANGELOG.md

@@ -14,6 +14,7 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 - adding feed via web-ui always use auto-discover
 - show 403 forbidden errors when fetching feeds
 - prevent move feed dialog from being closed unexpectedly
+- don't abort `opml` import when a single feed exists or can't be added
 
 # Releases
 ## [25.1.1] - 2024-12-16

lib/Service/OpmlService.php

@@ -14,9 +14,13 @@
 
 namespace OCA\News\Service;
 
+use OCA\News\Service\Exceptions\ServiceConflictException;
+use OCA\News\Service\Exceptions\ServiceNotFoundException;
+use OCA\News\Service\Exceptions\ServiceValidationException;
 use OCA\News\Utility\OPMLExporter;
 use OCA\News\Utility\OPMLImporter;
 use OCA\News\Db\Folder;
+use Psr\Log\LoggerInterface;
 
 class OpmlService
 {
@@ -25,6 +29,7 @@ public function __construct(
         private FeedServiceV2 $feedService,
         private OPMLExporter $exporter,
         private OPMLImporter $importer,
+        private LoggerInterface $logger,
     ) {
         //NO-OP
     }
@@ -57,13 +62,14 @@ public function import(string $userId, string $data): bool
     {
         list($folders, $feeds) = $this->importer->import($userId, $data);
 
+        $error = 0;
         $folderEntities  = [];
         $dbFolders = $this->folderService->findAllForUser($userId);
         foreach ($folders as $folder) {
             $existing = array_filter($dbFolders, fn(Folder $dbFolder) => $dbFolder->getName() === $folder['name']);
 
             if (count($existing) > 0) {
-                $folderEntities[$folder['name']] = $existing[0];
+                $folderEntities[$folder['name']] = array_pop($existing);
                 continue;
             }
 
@@ -75,15 +81,27 @@ public function import(string $userId, string $data): bool
         }
 
         foreach ($feeds as $feed) {
+            if ($this->feedService->existsForUser($userId, $feed['url'])) {
+                continue;
+            }
             $parent = $folderEntities[$feed['folder']] ?? null;
-            $this->feedService->create(
-                $userId,
-                $feed['url'],
-                $parent?->getId(),
-                full_text: false,
-                title: $feed['title'],
-                full_discover: false,
-            );
+            try {
+                $this->feedService->create(
+                    $userId,
+                    $feed['url'],
+                    $parent?->getId(),
+                    full_text: false,
+                    title: $feed['title'],
+                    full_discover: false,
+                );
+            } catch (ServiceNotFoundException | ServiceConflictException $e) {
+                $error++;
+                $this->logger->warning('Could not import feed ' . $feed['url']);
+            }
+        }
+
+        if ($error > 0) {
+            throw new ServiceValidationException("Failed to import $error feeds. Please check the server log!");
         }
 
         return true;

tests/Unit/Service/OPMLServiceTest.php

@@ -23,6 +23,8 @@
 
 use OCA\News\Db\Feed;
 
+use Psr\Log\LoggerInterface;
+
 use PHPUnit\Framework\TestCase;
 
 class OPMLServiceTest extends TestCase
@@ -76,6 +78,9 @@ protected function setUp(): void
             ->getMockBuilder(FeedServiceV2::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->logger = $this
+            ->getMockBuilder(LoggerInterface::class)
+            ->getMock();
 
         $this->time = 333333;
 
@@ -84,6 +89,7 @@ protected function setUp(): void
             $this->feedService,
             $this->exporter,
             $this->importer,
+            $this->logger,
         );
         $this->uid = 'jack';
     }