Mono-manifest

resources/manifests/apps.ts

@@ -0,0 +1,22 @@
+export default [
+  {
+    "name": "Name That Tune!!1",
+    "description": "Heardle.app made for Spicetify",
+
+    // TODO: Get the image working (once there is a repo?)
+    "preview": "https://github.com/theRealPadster/name-that-tune/raw/main/docs/preview.png",
+    // TODO: Get the readme working (once there is a repo?)
+    "readme": "README.md",
+
+    "authors": [
+      {
+        "name": "theRealPadster",
+        "url": "https://github.com/theRealPadster",
+      },
+    ],
+    "tags": [
+      "game",
+      "beta",
+    ],
+  },
+];

src/components/Grid.tsx

@@ -8,8 +8,10 @@ import { LOCALSTORAGE_KEYS, ITEMS_PER_REQUEST, MARKETPLACE_VERSION, LATEST_RELEA
 import { openModal } from "../logic/LaunchModals";
 import {
   getTaggedRepos,
-  fetchExtensionManifest, fetchThemeManifest, fetchAppManifest,
-  fetchCssSnippets, getBlacklist,
+  fetchExtensionManifest,
+  fetchCssSnippets, fetchBlacklist,
+  getThemesMonoManifest, buildThemeCardData,
+  getAppsMonoManifest, buildAppCardData,
 } from "../logic/FetchRemotes";
 import LoadMoreIcon from "./Icons/LoadMoreIcon";
 import LoadingIcon from "./Icons/LoadingIcon";
@@ -241,70 +243,42 @@ export default class Grid extends React.Component<
       // Don't need to return a page number because
       // installed extension do them all in one go, since it's local
     } case "Themes": {
-      const pageOfRepos = await getTaggedRepos("spicetify-themes", this.requestPage, this.BLACKLIST, query);
-      for (const repo of pageOfRepos.items) {
+      const allThemes = await getThemesMonoManifest();
+      console.log(allThemes);
 
-        const themes = await fetchThemeManifest(
-          repo.contents_url,
-          repo.default_branch,
-          repo.stargazers_count,
-        );
+      for (const theme of allThemes) {
+        const cardData = await buildThemeCardData(theme);
+
+        // TODO: do we need this queue stuff any more?
         // I believe this stops the requests when switching tabs?
         if (this.requestQueue.length > 1 && queue !== this.requestQueue[0]) {
           // Stop this queue from continuing to fetch and append to cards list
           return -1;
         }
 
-        if (themes && themes.length) {
-          themes.forEach((theme) => {
-            Object.assign(theme, { lastUpdated: repo.pushed_at });
-            this.appendCard(theme, "theme");
-          });
-        }
+        if (cardData) this.appendCard(cardData, "theme");
       }
 
-      // First request is null, so coerces to 1
-      const currentPage = this.requestPage > -1 && this.requestPage ? this.requestPage : 1;
-      // -1 because the page number is 1-indexed
-      const soFarResults = ITEMS_PER_REQUEST * (currentPage - 1) + pageOfRepos.page_count;
-      const remainingResults = pageOfRepos.total_count - soFarResults;
-
-      console.log(`Parsed ${soFarResults}/${pageOfRepos.total_count} themes`);
-      if (remainingResults > 0) return currentPage + 1;
-      else console.log("No more theme results");
+      console.log("Parsed themes");
       break;
     } case "Apps": {
-      const pageOfRepos = await getTaggedRepos("spicetify-apps", this.requestPage, this.BLACKLIST, query);
-      for (const repo of pageOfRepos.items) {
+      const allApps = await getAppsMonoManifest();
+      console.log(allApps);
 
-        const apps = await fetchAppManifest(
-          repo.contents_url,
-          repo.default_branch,
-          repo.stargazers_count,
-        );
+      for (const app of allApps) {
+        const cardData = await buildAppCardData(app);
+
+        // TODO: do we need this queue stuff any more?
         // I believe this stops the requests when switching tabs?
         if (this.requestQueue.length > 1 && queue !== this.requestQueue[0]) {
           // Stop this queue from continuing to fetch and append to cards list
           return -1;
         }
 
-        if (apps && apps.length) {
-          apps.forEach((app) => {
-            Object.assign(app, { lastUpdated: repo.pushed_at });
-            this.appendCard(app, "app");
-          });
-        }
+        if (cardData) this.appendCard(cardData, "app");
       }
 
-      // First request is null, so coerces to 1
-      const currentPage = this.requestPage > -1 && this.requestPage ? this.requestPage : 1;
-      // -1 because the page number is 1-indexed
-      const soFarResults = ITEMS_PER_REQUEST * (currentPage - 1) + pageOfRepos.page_count;
-      const remainingResults = pageOfRepos.total_count - soFarResults;
-
-      console.log(`Parsed ${soFarResults}/${pageOfRepos.total_count} apps`);
-      if (remainingResults > 0) return currentPage + 1;
-      else console.log("No more app results");
+      console.log("Parsed apps");
       break;
     } case "Snippets": {
       const snippets = await fetchCssSnippets();
@@ -441,7 +415,7 @@ export default class Grid extends React.Component<
     }
 
     // Load blacklist
-    this.BLACKLIST = await getBlacklist();
+    this.BLACKLIST = await fetchBlacklist();
     this.newRequest(ITEMS_PER_REQUEST);
   }
 

src/components/Modals/Settings/index.tsx

@@ -46,6 +46,7 @@ const SettingsModal = ({ CONFIG, updateAppConfig } : Props) => {
       <ConfigRow name='Theme developer tools' storageKey='themeDevTools' modalConfig={modalConfig} updateConfig={updateConfig} />
       <ConfigRow name='Hide installed when browsing' storageKey='hideInstalled' modalConfig={modalConfig} updateConfig={updateConfig} />
       <ConfigRow name='Shift colors every minute' storageKey='colorShift' modalConfig={modalConfig} updateConfig={updateConfig} />
+      <ConfigRow name='Use Github topics to fetch cards' storageKey='githubTopics' modalConfig={modalConfig} updateConfig={updateConfig} />
       <h2>Tabs</h2>
       <div className="tabs-container">
         {modalConfig.tabs.map(({ name }, index) => {

src/constants.ts

@@ -13,6 +13,7 @@ export const LOCALSTORAGE_KEYS = {
   // Theme installed store the localsorage key of the theme (e.g. marketplace:installed:NYRI4/Comfy-spicetify/user.css)
   "themeInstalled": "marketplace:theme-installed",
   "colorShift": "marketplace:colorShift",
+  "githubTopics": "marketplace:githubTopics",
 };
 
 // Initalize topbar tabs
@@ -34,6 +35,8 @@ export const CUSTOM_APP_PATH = "/marketplace";
 // Used in Card.tsx
 export const MAX_TAGS = 4;
 
+export const THEMES_URL = "https://raw.githubusercontent.com/spicetify/spicetify-themes/generated-manifest/manifest.json";
+
 export const SNIPPETS_PAGE_URL = "https://github.com/spicetify/spicetify-marketplace/blob/main/resources/snippets.ts";
 
 export const BLACKLIST_URL = "https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/blacklist.json";

src/extensions/extension.tsx

@@ -18,10 +18,14 @@ import {
   sleep,
 } from "../logic/Utils";
 import {
-  getBlacklist,
-  fetchThemeManifest,
+  fetchBlacklist,
+  buildThemeCardData,
   fetchExtensionManifest,
 } from "../logic/FetchRemotes";
+import {
+  fetchThemeManifestFromTopic,
+  fetchExtensionManifestFromTopic
+} from "../logic/FetchTopicRemotes";
 
 (async () => {
   while (!(Spicetify?.LocalStorage && Spicetify?.showNotification)) {
@@ -171,6 +175,8 @@ async function queryRepos(type: RepoType, pageNum = 1) {
  */
 async function loadPageRecursive(type: RepoType, pageNum: number) {
   const pageOfRepos = await queryRepos(type, pageNum);
+  console.log(pageOfRepos);
+  // TODO: Once we migrate to the mono-manifest repo, implement the option for enabling topics search here
   appendInformationToLocalStorage(pageOfRepos, type);
 
   // Sets the amount of items that have thus been fetched
@@ -187,38 +193,36 @@ async function loadPageRecursive(type: RepoType, pageNum: number) {
 (async function initializePreload() {
   console.log("Preloading extensions and themes...");
   window.sessionStorage.clear();
-  const BLACKLIST = await getBlacklist();
+  const BLACKLIST = await fetchBlacklist();
   window.sessionStorage.setItem("marketplace:blacklist", JSON.stringify(BLACKLIST));
 
   // TODO: does this work?
   // The recursion isn't super clean...
 
-  // Begin by getting the themes and extensions from github
-  // const [extensionReposArray, themeReposArray] = await Promise.all([
-  await Promise.all([
-    loadPageRecursive("extension", 1),
-    loadPageRecursive("theme", 1),
-  ]);
-
-  // let extensionsNextPage = 1;
-  // let themesNextPage = 1;
-  // do {
-  //     extensionReposArray = await loadPage("extension", extensionsNextPage);
-  //     appendInformationToLocalStorage(extensionReposArray, "extension");
-  // } while (extensionsNextPage);
-
-  // do {
-  //     themeReposArray = await loadPage("theme", themesNextPage);
-  //     appendInformationToLocalStorage(themeReposArray, "theme");
-  // } while (themesNextPage);
+  // TODO: re-enable this once everything works with mono-manifest...
+   await Promise.all([
+  loadPageRecursive("extension", 1),
+  loadPageRecursive("theme", 1),
+   ]);
 })();
 
 async function appendInformationToLocalStorage(array, type: RepoType) {
   // This system should make it so themes and extensions are stored concurrently
   for (const repo of array.items) {
+    if(LOCALSTORAGE_KEYS.githubTopics){
+        for (const repo of array.items) {
     // console.log(repo);
     const data = (type === "theme")
-      ? await fetchThemeManifest(repo.contents_url, repo.default_branch, repo.stargazers_count)
+      ? await fetchThemeManifestFromTopic(repo.contents_url, repo.default_branch, repo.stargazers_count)
+      : await fetchExtensionManifestFromTopic(repo.contents_url, repo.default_branch, repo.stargazers_count);
+    if (data) {
+      addToSessionStorage(data);
+      await sleep(5000);
+    }
+  }
+    }
+    const data = (type === "theme")
+      ? await buildThemeCardData(repo.contents_url, repo.default_branch, repo.stargazers_count)
       : await fetchExtensionManifest(repo.contents_url, repo.default_branch, repo.stargazers_count);
     if (data) {
       addToSessionStorage(data);