Polish desc shards index format

huhu · Jun 22, 2024 · dd5edfe · dd5edfe
1 parent 9f1a746
commit dd5edfe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/extension/index-manager.js b/extension/index-manager.js
@@ -7,6 +7,7 @@ import rfcsIndex from "./index/rfcs.js";
 import rustcIndex from "./index/rustc.js";
 import targetsIndex from "./index/targets.js";
 import searchIndex from "./index/std-docs.js";
+import stdDescShards from "./index/desc-shards/std.js";
 import { mapping, crateIndex } from "./index/crates.js";
 import storage from "./core/storage.js";
 import IndexSetter from "./index-setter.js";
@@ -29,7 +30,12 @@ export default class IndexManager extends IndexSetter {
     }
 
     static async getDescShards(crate) {
-        return await storage.getItem(`desc-shards-${crate}`) || {};
+        let descShards = await storage.getItem(`desc-shards-${crate}`);
+        if (descShards) {
+            return new Map(descShards);
+        } else {
+            return stdDescShards;
+        }
     }
 
     static async getBookIndex() {

diff --git a/extension/index/desc-shards/std.js b/extension/index/desc-shards/std.js
diff --git a/extension/script/add-search-index.js b/extension/script/add-search-index.js
@@ -24,14 +24,15 @@
     async function loadDescShard(...crates) {
         if (!window.searchState.descShards) return null;
 
-        let crateDescsShard = {};
+        // Use [[crateName, shards]] array to construct a map.
+        let crateDescsShard = [];
         for (let crate of crates) {
             let shards = {};
             for (let descShard of window.searchState.descShards.get(crate)) {
                 shards[descShard.shard] = await loadDesc(descShard);
             }
 
-            crateDescsShard[crate] = shards;
+            crateDescsShard.push([crate, shards]);
         }
 
         console.log('load desc shard:', crateDescsShard);

diff --git a/extension/search/docs/desc-shard.js b/extension/search/docs/desc-shard.js
@@ -19,8 +19,7 @@ class DescShardManager {
     }
 
     async initDescShards() {
-        const stdDescShards = await IndexManager.getDescShards('std-stable');
-        this._descShards = new Map(Object.entries(stdDescShards));
+        this._descShards = await IndexManager.getDescShards('std-stable');
         for (const crate of Object.keys(await CrateDocManager.getCrates())) {
             const descShards = await DescShardManager.getDescShards(crate);
             this._descShards.set(crate, descShards);