Merge pull request #191 from cnblogs/refactor-paging

refactor: paging

Author: cnblogs-dudu

src/cmd/post-list/post-list-view.ts

@@ -1,5 +1,4 @@
 import { globalCtx } from '@/ctx/global-ctx'
-import { PostService } from '@/service/post/post'
 import { window } from 'vscode'
 import { postDataProvider } from '@/tree-view/provider/post-data-provider'
 import { Alert } from '@/infra/alert'
@@ -53,8 +52,6 @@ function updatePostListViewTitle() {
 }
 
 export namespace PostListView {
-    import calcPageCount = PageList.calcPageCount
-
     export async function refresh({ queue = false, pageIndex = 1 } = {}): Promise<boolean> {
         if (isRefreshing && !queue) {
             await refreshTask
@@ -67,13 +64,13 @@ export namespace PostListView {
         const fut = async () => {
             await setRefreshing(true)
             const page = await postDataProvider.loadPosts(pageIndex)
-            const postCount = await PostService.getCount()
-            const pageCount = calcPageCount(page.cap, postCount)
+            const pageSize = page?.size ?? 30
+            const pageCount = page?.count ?? 1
             const hasPrev = PageList.hasPrev(pageIndex)
             const hasNext = PageList.hasNext(pageIndex, pageCount)
 
             await setPostListContext(pageCount, hasPrev, hasNext)
-            await updatePostListState(pageIndex, page.cap, page.items.length, pageCount)
+            await updatePostListState(pageIndex, pageSize, pageCount, hasPrev, hasNext)
             updatePostListViewTitle()
             await postDataProvider.refreshSearch()
             await setRefreshing(false)

src/model/page.ts

@@ -1,6 +1,7 @@
 export type Page<T> = {
     index: number
-    cap: number
+    size: number
+    count: number
     items: T[]
 }
 

src/model/post-list-state.ts

@@ -1,7 +1,6 @@
 export type PostListState = {
     pageIndex: number
-    pageCap: number
-    pageItemCount: number
+    pageSize: number
     pageCount: number
     hasPrev: boolean
     hasNext: boolean

src/service/post/post-list-view.ts

@@ -1,6 +1,5 @@
 import { Post } from '@/model/post'
 import { extTreeViews } from '@/tree-view/tree-view-register'
-import { PageList } from '@/model/page'
 import { PostListState } from '@/model/post-list-state'
 import { LocalState } from '@/ctx/local-state'
 import { PostListRespItem } from '@/model/post-list-resp-item'
@@ -33,17 +32,14 @@ export function getListState() {
 
 export async function updatePostListState(
     pageIndex: number,
-    pageCap: number,
-    pageItemCount: number,
-    pageCount: number
-) {
-    const hasPrev = PageList.hasPrev(pageIndex)
-    const hasNext = PageList.hasNext(pageIndex, pageCount)
-
+    pageSize: number,
+    pageCount: number,
+    hasPrev: boolean,
+    hasNext: boolean
+): Promise<void> {
     const finalState = <PostListState>{
         pageIndex,
-        pageCap,
-        pageItemCount,
+        pageSize,
         pageCount,
         hasPrev,
         hasNext,

src/service/post/post.ts

@@ -37,7 +37,8 @@ export namespace PostService {
         const listModel = <PostListModel>JSON.parse(resp)
         const page = {
             index: listModel.pageIndex,
-            cap: listModel.pageSize,
+            size: listModel.pageSize,
+            count: PageList.calcPageCount(listModel.pageSize, listModel.postsCount),
             items: listModel.postList.map(x => Object.assign(new Post(), x)),
         } as Page<Post>
 
@@ -49,6 +50,19 @@ export namespace PostService {
         }
     }
 
+    export async function getPosts({ pageIndex = 1, pageSize = 30, categoryId = <'' | number>'', search = '' }) {
+        const para = consUrlPara(
+            ['t', '1'],
+            ['p', pageIndex.toString()],
+            ['s', pageSize.toString()],
+            ['search', search],
+            ['cid', categoryId.toString()]
+        )
+        const url = `${AppConst.ApiBase.BLOG_BACKEND}/posts/list?${para}`
+        const resp = await AuthedReq.get(url, consHeader())
+        return <PostListModel>JSON.parse(resp)
+    }
+
     export async function getList(pageIndex: number, pageCap: number) {
         const req = await getAuthedPostReq()
         try {

src/tree-view/provider/post-data-provider.ts

@@ -7,7 +7,7 @@ import { PostEntryMetadata, PostMetadata } from '@/tree-view/model/post-metadata
 import { PostSearchResultEntry } from '@/tree-view/model/post-search-result-entry'
 import { PostTreeItem } from '@/tree-view/model/post-tree-item'
 import { PostListCfg } from '@/ctx/cfg/post-list'
-import { Page } from '@/model/page'
+import { Page, PageList } from '@/model/page'
 import { PostListView } from '@/cmd/post-list/post-list-view'
 
 export type PostListTreeItem = Post | PostTreeItem | TreeItem | PostMetadata | PostSearchResultEntry
@@ -52,16 +52,17 @@ export class PostDataProvider implements TreeDataProvider<PostListTreeItem> {
         return toTreeItem(item)
     }
 
-    async loadPosts(pageIndex: number): Promise<Page<Post>> {
-        const pageSize = PostListCfg.getListPageSize()
+    async loadPosts(pageIndex: number): Promise<Page<Post> | null> {
+        const pageSize = PostListCfg.getListPageSize() ?? 30
 
         try {
-            const result = await PostService.getList(pageIndex, pageSize)
+            const result = await PostService.getPosts({ pageIndex, pageSize })
+
             this.page = {
-                index: pageIndex,
-                cap: pageSize,
-                // TODO: need better design
-                items: result.map(it => Object.assign(new Post(), it)),
+                index: result.pageIndex,
+                size: pageSize,
+                count: PageList.calcPageCount(pageSize, result.postsCount),
+                items: result.postList.map(x => Object.assign(new Post(), x)),
             }
 
             this.fireTreeDataChangedEvent()