[web] - fix reading dao _index repo (#600)

gosh-sh · Oct 4, 2023 · 8a92dd2 · 8a92dd2
1 parent d3fb7ee
commit 8a92dd2
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 34 deletions.
diff --git a/web/src/v6.0.0/hooks/dao.hooks.ts b/web/src/v6.0.0/hooks/dao.hooks.ts
@@ -543,11 +543,23 @@ export function useDao(params: { initialize?: boolean; subscribe?: boolean } = {
         // TODO: /Remove/refactor this after git part refactored
 
         // TODO: Refactor this after git part refactored
+        const treeitems = ['description.txt', 'readme.md'].map((filename) => {
+            const treeitem = _tree.items.find(({ path, name }) => {
+                const treepath = `${path}/${name}`.toLowerCase()
+                const searchpath = `/${filename}`.toLowerCase()
+                return treepath === searchpath
+            })
+            return treeitem || null
+        })
         const [summary, description] = await Promise.all(
-            ['description.txt', 'README.md'].map(async (filename) => {
+            treeitems.map(async (treeitem) => {
+                if (!treeitem) {
+                    return ''
+                }
+
                 if (commit.version < '6.0.0') {
                     const snapshot = await repository.getSnapshot({
-                        data: { branch: 'main', filename, commitname: '' },
+                        data: { branch: 'main', filename: treeitem.name, commitname: '' },
                     })
 
                     if (await snapshot.isDeployed()) {
@@ -556,22 +568,17 @@ export function useDao(params: { initialize?: boolean; subscribe?: boolean } = {
                             return result.content
                         }
                     }
-                } else {
-                    const treeitem = _tree.items.find(
-                        ({ path, name }) => `${path}/${name}` === `/${filename}`,
+                } else if (treeitem.commit) {
+                    const snapshot = await repository.getSnapshot({
+                        data: { filename: treeitem.name, commitname: treeitem.commit },
+                    })
+                    const { current } = await _adapter.getCommitBlob(
+                        snapshot.address,
+                        treeitem.name,
+                        _commit.name,
                     )
-                    if (treeitem?.commit) {
-                        const snapshot = await repository.getSnapshot({
-                            data: { filename, commitname: treeitem.commit },
-                        })
-                        const { current } = await _adapter.getCommitBlob(
-                            snapshot.address,
-                            filename,
-                            _commit.name,
-                        )
-                        if (!Buffer.isBuffer(current)) {
-                            return current
-                        }
+                    if (!Buffer.isBuffer(current)) {
+                        return current
                     }
                 }
 

diff --git a/web/src/v6.1.0/hooks/dao.hooks.ts b/web/src/v6.1.0/hooks/dao.hooks.ts
@@ -638,11 +638,23 @@ export function useDao(params: { initialize?: boolean; subscribe?: boolean } = {
         // TODO: /Remove/refactor this after git part refactored
 
         // TODO: Refactor this after git part refactored
+        const treeitems = ['description.txt', 'readme.md'].map((filename) => {
+            const treeitem = _tree.items.find(({ path, name }) => {
+                const treepath = `${path}/${name}`.toLowerCase()
+                const searchpath = `/${filename}`.toLowerCase()
+                return treepath === searchpath
+            })
+            return treeitem || null
+        })
         const [summary, description] = await Promise.all(
-            ['description.txt', 'README.md'].map(async (filename) => {
+            treeitems.map(async (treeitem) => {
+                if (!treeitem) {
+                    return ''
+                }
+
                 if (commit.version < '6.0.0') {
                     const snapshot = await repository.getSnapshot({
-                        data: { branch: 'main', filename, commitname: '' },
+                        data: { branch: 'main', filename: treeitem.name, commitname: '' },
                     })
 
                     if (await snapshot.isDeployed()) {
@@ -651,22 +663,17 @@ export function useDao(params: { initialize?: boolean; subscribe?: boolean } = {
                             return result.content
                         }
                     }
-                } else {
-                    const treeitem = _tree.items.find(
-                        ({ path, name }) => `${path}/${name}` === `/${filename}`,
+                } else if (treeitem.commit) {
+                    const snapshot = await repository.getSnapshot({
+                        data: { filename: treeitem.name, commitname: treeitem.commit },
+                    })
+                    const { current } = await _adapter.getCommitBlob(
+                        snapshot.address,
+                        treeitem.name,
+                        _commit.name,
                     )
-                    if (treeitem?.commit) {
-                        const snapshot = await repository.getSnapshot({
-                            data: { filename, commitname: treeitem.commit },
-                        })
-                        const { current } = await _adapter.getCommitBlob(
-                            snapshot.address,
-                            filename,
-                            _commit.name,
-                        )
-                        if (!Buffer.isBuffer(current)) {
-                            return current
-                        }
+                    if (!Buffer.isBuffer(current)) {
+                        return current
                     }
                 }