From 9f221727c7a23f177d3cdf1e56caf5760921288c Mon Sep 17 00:00:00 2001
From: frostime <frostime@foxmail.com>
Date: Fri, 13 Sep 2024 11:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20refactor:=20Dock=20=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E4=BD=BF=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A2=84=E7=BA=A6=EF=BC=9B=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20reservation=20=E5=AF=B9=E8=B1=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- dock 栏点击刷新没有查询到最新的 reservation close #193
- 重构 reservation #197
---
 package.json                       |  1 +
 pnpm-lock.yaml                     |  9 +++++++++
 src/components/dock-reserve.svelte | 30 +++++++++++++++++++++++++-----
 src/func/reserve/retrieve.ts       | 16 +++++++++++++---
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index e401920..c00661a 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "rollup-plugin-livereload": "^2.0.5",
     "sass": "^1.72.0",
     "siyuan": "1.0.2",
+    "siyuan-plugin-cli": "^1.2.0",
     "svelte": "^4.2.19",
     "sy-plugin-changelog": "^0.0.7",
     "ts-node": "^10.9.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ae9e32e..c0a03dc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,6 +45,9 @@ importers:
       siyuan:
         specifier: 1.0.2
         version: 1.0.2
+      siyuan-plugin-cli:
+        specifier: ^1.2.0
+        version: 1.2.0
       svelte:
         specifier: ^4.2.19
         version: 4.2.19
@@ -697,6 +700,10 @@ packages:
   setimmediate@1.0.5:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
 
+  siyuan-plugin-cli@1.2.0:
+    resolution: {integrity: sha512-8Xg42Jd0zvfnwkVsPUCNbcAEZnyllT1JGaKzNGXNMwM0R/qdClJuoBiPmSrj5M03EHVGwhSzEYRRO0qc1uMr4g==}
+    hasBin: true
+
   siyuan@1.0.2:
     resolution: {integrity: sha512-78qonqi/X+VC5HBtqmkm6HZho6GVcXTBYvdWfu3uB3WkWzYeu3PqKw2514PZn2uZpydljjZ4DP5aSV9w9IlBbA==}
 
@@ -1402,6 +1409,8 @@ snapshots:
 
   setimmediate@1.0.5: {}
 
+  siyuan-plugin-cli@1.2.0: {}
+
   siyuan@1.0.2: {}
 
   source-map-js@1.0.2: {}
diff --git a/src/components/dock-reserve.svelte b/src/components/dock-reserve.svelte
index d2e6be2..64cfb82 100644
--- a/src/components/dock-reserve.svelte
+++ b/src/components/dock-reserve.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
     import { onMount } from "svelte";
     import ListItem from "./list-item.svelte";
-    import { reservation } from "@/global-status";
     import * as api from "@/serverApi";
     import { i18n } from "@/utils";
+    import { retrieveResvFromBlocks } from "@/func";
 
     let expandStatus = [];
-    let allResvs = [];
+    let allResvs: { date: string; blocks: Block[] }[] = [];
     let _i18n = i18n.DockReserve;
 
     function allExpand() {
@@ -23,9 +23,28 @@
         }
     }
 
+    type DateString = string;
     async function updateWithReservations() {
         //[ [date, [blockIds]] ]
-        let entries = Object.entries(reservation.reservations.OnDate);
+
+        let reservations: {
+            id: BlockId;
+            content: string;
+            date: DateString;
+        }[] = await retrieveResvFromBlocks("datetime", "-2 day");
+
+        const resvDates: Record<DateString, BlockId[]> = reservations.reduce(
+            (acc, resv) => {
+                if (!acc[resv.date]) {
+                    acc[resv.date] = [];
+                }
+                acc[resv.date].push(resv.id);
+                return acc;
+            },
+            {} as Record<DateString, BlockId[]>,
+        );
+
+        let entries = Object.entries(resvDates);
         let dateCnt = entries.length;
         let allBlockIds = [];
         for (let i = 0; i < dateCnt; i++) {
@@ -68,7 +87,7 @@
             newResvs.push({
                 date: `${entry[0].slice(0, 4)}-${entry[0].slice(
                     4,
-                    6
+                    6,
                 )}-${entry[0].slice(6, 8)}`,
                 blocks: blocks,
             });
@@ -86,7 +105,8 @@
 <div class="fn__flex-1 fn__flex-column file-tree layout__tab">
     <div class="block__icons">
         <div class="block__logo">
-            <svg class="block__logoicon"><use xlink:href="#iconBookmark" /></svg>
+            <svg class="block__logoicon"><use xlink:href="#iconBookmark" /></svg
+            >
             {_i18n.title}
         </div>
         <span class="fn__flex-1" />
diff --git a/src/func/reserve/retrieve.ts b/src/func/reserve/retrieve.ts
index 456bd28..00f554c 100644
--- a/src/func/reserve/retrieve.ts
+++ b/src/func/reserve/retrieve.ts
@@ -3,7 +3,7 @@
  * @Author       : Yp Z
  * @Date         : 2023-06-17 13:55:54
  * @FilePath     : /src/func/reserve/retrieve.ts
- * @LastEditTime : 2024-04-06 18:02:54
+ * @LastEditTime : 2024-09-13 11:48:53
  * @Description  : 
  */
 import * as serverApi from '@/serverApi';
@@ -172,16 +172,26 @@ export function RetvFactory(type: RetvType, position: RetvPosition, resvBlockIds
 }
 
 
-export async function retrieveResvFromBlocks(time: 'today' | 'future'): Promise<Reservation[]> {
+/**
+ * 查询所有的预约块，并返回预约内容
+ * @param time 'today' | 'future' | TAfterDateTime
+ *  - 'today' 查询今天的预约
+ *  - 'future' 查询未来的预约
+ *  - 'datetime': 将 datetimeArgs 传入 `strftime` 函数的日期字符串，查询该日期之后的预约
+ *      `A.value > strftime('%Y%m%d', datetime('now', ...datetimeArgs))`;
+ * @returns Promise<Reservation[]>
+ */
+export async function retrieveResvFromBlocks(time: 'today' | 'future' | 'datetime', ...datetimeArgs: string[]): Promise<Reservation[]> {
     let cond = '';
     if (time === 'today') {
         cond = `A.value = strftime('%Y%m%d', datetime('now'))`;
     } else if (time === 'future') {
         cond = `A.value >= strftime('%Y%m%d', datetime('now'))`;
+    } else if (time === 'datetime') {
+        cond = `A.value >= strftime('%Y%m%d', datetime('now', ${datetimeArgs.map((arg) => `'${arg}'`).join(',')}))`;
     }
     let sql = `select B.id, B.content, A.value as date from blocks as B inner join attributes as A
         on(A.block_id = B.id and  A.name = 'custom-reservation' and ${cond}) order by A.value;`;
     let results: Reservation[] = await serverApi.sql(sql);
-    console.debug(results);
     return results;
 }