feat: Feed loader is enabled to load either provider_metadata.json or…

… json feed directly
csaf-poc · Oct 4, 2023 · 5c8a5fd · 5c8a5fd
1 parent bac8bb1
commit 5c8a5fd
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/src/lib/feedview/Loader.svelte b/src/lib/feedview/Loader.svelte
@@ -10,11 +10,15 @@
 
 <script lang="ts">
   import { appStore } from "$lib/store";
-  import { loadProviderMetaData } from "$lib/urlloader";
+  import { loadFeed, loadProviderMetaData } from "$lib/urlloader";
   let url = "";
   const load = () => {
-    loadProviderMetaData(url);
-    window.location.hash = `#/feed?q=${url}`;
+    if (/provider-metadata\.json/.test(url)) {
+      loadProviderMetaData(url);
+      window.location.hash = `#/feed?q=${url}`;
+    } else {
+      loadFeed(url);
+    }
   };
 
   const keydown = (e: KeyboardEvent) => {

diff --git a/src/lib/feedview/feed/distributions/Distribution.svelte b/src/lib/feedview/feed/distributions/Distribution.svelte
@@ -9,34 +9,8 @@
 -->
 
 <script lang="ts">
-  import { appStore } from "$lib/store";
-  import { tick } from "svelte";
+  import { loadFeed } from "$lib/urlloader";
   export let distribution: any;
-  async function loadFeed(feedURL: string, e: Event) {
-    appStore.setSingleErrorMsg("");
-    try {
-      const response = await fetch(`${feedURL}`);
-      if (response.ok) {
-        const feedJSON = await response.json();
-        appStore.setCurrentFeed(null);
-        await tick();
-        appStore.setCurrentFeed(feedJSON);
-        appStore.setFeedSectionOpen();
-        appStore.unshiftHistory((e.target as Element).id);
-        setTimeout(() => {
-          const el = document.getElementById(`${feedURL}`);
-          el?.scrollIntoView({ block: "start", behavior: "smooth" });
-        }, 100);
-      }
-      if (response.status === 404) {
-        appStore.setSingleErrorMsg("The resource you requested was not found on the server.");
-      }
-    } catch (error) {
-      appStore.setSingleErrorMsg(
-        "Failed to load from URL. The server may be unreachable or the resource cannot be accessed due to CORS restrictions."
-      );
-    }
-  }
   const openFeed = (e: Event) => {
     loadFeed((e.target as Element).getAttribute("href")!, e);
     e.preventDefault();

diff --git a/src/lib/urlloader.ts b/src/lib/urlloader.ts
@@ -39,4 +39,29 @@ async function loadProviderMetaData(url: string) {
   }
 }
 
-export { loadSingleCSAF, loadProviderMetaData };
+async function loadFeed(feedURL: string, e?: Event) {
+  appStore.setSingleErrorMsg("");
+  try {
+    const response = await fetch(`${feedURL}`);
+    if (response.ok) {
+      const feedJSON = await response.json();
+      appStore.setCurrentFeed(null);
+      appStore.setCurrentFeed(feedJSON);
+      appStore.setFeedSectionOpen();
+      if (e) appStore.unshiftHistory((e.target as Element).id);
+      setTimeout(() => {
+        const el = document.getElementById(`${feedURL}`);
+        el?.scrollIntoView({ block: "start", behavior: "smooth" });
+      }, 100);
+    }
+    if (response.status === 404) {
+      appStore.setSingleErrorMsg("The resource you requested was not found on the server.");
+    }
+  } catch (error) {
+    appStore.setSingleErrorMsg(
+      "Failed to load from URL. The server may be unreachable or the resource cannot be accessed due to CORS restrictions."
+    );
+  }
+}
+
+export { loadSingleCSAF, loadProviderMetaData, loadFeed };