fix obsidian upload problem

MorvanZhou · Nov 29, 2023 · 6cd0d58 · 6cd0d58
1 parent 2e3d984
commit 6cd0d58
Show file tree

Hide file tree

Showing 22 changed files with 444 additions and 248 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,6 @@ sortedcontainers>=2.3,<3.0
 pymongo>=4.6.0
 motor>=3.3.2
 markdown>=3.4.4
-pypinyin>=0.49.0
 oauthlib>=3.2.2
 httpx>=0.25.0
 captcha>=0.5.0

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = rethink-note
-version = 0.1.16
+version = 0.1.17
 author = MorvanZhou
 author_email = morvanzhou@hotmail.com
 description = note taking app
@@ -35,7 +35,6 @@ install_requires =
     sortedcontainers>=2.3,<3.0
     pymongo>=4.6.0
     markdown>=3.4.4
-    pypinyin>=0.49.0
     oauthlib>=3.2.2
     httpx>=0.25.0
     captcha>=0.5.0

diff --git a/src/rethink/controllers/files/upload_files.py b/src/rethink/controllers/files/upload_files.py
@@ -61,7 +61,7 @@ async def get_upload_process(
             type="",
             startAt="",
             running=False,
-            problemFiles=[],
+            msg="",
         )
     doc = await models.files.get_upload_process(uid=td.uid)
     if doc is None:
@@ -73,7 +73,7 @@ async def get_upload_process(
             type="",
             startAt="",
             running=False,
-            problemFiles=[],
+            msg="",
         )
     code = const.INT_CODE_MAP[doc["code"]]
     return schemas.files.FileUploadProcessResponse(
@@ -84,7 +84,7 @@ async def get_upload_process(
         type=doc["type"],
         startAt=datetime2str(doc["startAt"]),
         running=doc["running"],
-        problemFiles=doc["problemFiles"],
+        msg=doc["msg"],
     )
 
 

diff --git a/src/rethink/controllers/schemas/files.py b/src/rethink/controllers/schemas/files.py
@@ -17,7 +17,7 @@ class FileUploadProcessResponse(BaseModel):
     type: str
     startAt: str
     running: bool
-    problemFiles: List[str]
+    msg: str
 
 
 class ImageVditorUploadResponse(BaseModel):

diff --git a/src/rethink/controllers/schemas/search.py b/src/rethink/controllers/schemas/search.py
@@ -18,6 +18,8 @@ class SearchUserNodesRequest(BaseModel):
 class CursorQueryRequest(BaseModel):
     nid: str
     textBeforeCursor: str
+    page: NonNegativeInt = 0
+    pageSize: NonNegativeInt = 0
     requestId: str = ""
 
 

diff --git a/src/rethink/controllers/search/node_search.py b/src/rethink/controllers/search/node_search.py
@@ -18,6 +18,8 @@ async def cursor_query(
         uid=td.uid,
         nid=req.nid,
         cursor_text=req.textBeforeCursor,
+        page=req.page,
+        page_size=req.pageSize,
     )
     code = const.Code.OK
     return schemas.node.NodesSearchResponse(

diff --git a/src/rethink/dist-local/css/app.45e8eb98.css → src/rethink/dist-local/css/app.09f0dec8.css b/src/rethink/dist-local/css/app.45e8eb98.css → src/rethink/dist-local/css/app.09f0dec8.css
@@ -3175,6 +3175,7 @@ img[data-v-4f42ee16] {
 .at-search-result[data-v-5527cb1e]:hover {
   background-color: #eeeeee;
 }
+
 .result-hl[data-v-5527cb1e] {
   font-size: 0.8em;
   color: #666;
@@ -3184,6 +3185,30 @@ img[data-v-4f42ee16] {
 }
 
 
+/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/components/WaitLoading.vue?vue&type=style&index=0&id=1bc9a6f2&scoped=true&lang=css ***!
+  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+
+.loading[data-v-1bc9a6f2] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  margin: 0 auto;
+}
+
+.circle-bg[data-v-1bc9a6f2] {
+  background: #FEFEFE;
+}
+
+.circle[data-v-1bc9a6f2] {
+  height: 50px;
+}
+
+.dots[data-v-1bc9a6f2] {
+  width: 60px;
+}
+
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/components/app/editor/cursorSearch/SearchResultsGroup.vue?vue&type=style&index=0&id=e789ed84&scoped=true&lang=css ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -3194,6 +3219,11 @@ img[data-v-4f42ee16] {
   max-height: 400px;
   overflow-y: auto;
 }
+
+.at-search-height-sm[data-v-e789ed84] {
+  max-height: 600px !important;
+}
+
 .at-search-result-group-label[data-v-e789ed84] {
   font-weight: 500;
   font-size: 0.9em;
@@ -3358,24 +3388,6 @@ img[data-v-4f42ee16] {
   overflow-wrap: break-word;
 }
 
-/*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/components/WaitLoading.vue?vue&type=style&index=0&id=1bc9a6f2&scoped=true&lang=css ***!
-  \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
-
-.loading[data-v-1bc9a6f2] {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  margin: 0 auto;
-}
-.circle[data-v-1bc9a6f2] {
-  height: 50px;
-}
-.dots[data-v-1bc9a6f2] {
-  width: 60px;
-}
-
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./src/components/app/editor/AppNodeEditPanel.vue?vue&type=style&index=0&id=220b40cb&scoped=true&lang=css ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/

diff --git a/src/rethink/dist-local/index.html b/src/rethink/dist-local/index.html
@@ -15,7 +15,7 @@
 
   <script defer src="/js/chunk-vendors.js"></script>
   <script defer src="/js/app.js"></script>
-  <link href="/css/app.45e8eb98.css" rel="stylesheet">
+  <link href="/css/app.09f0dec8.css" rel="stylesheet">
 </head>
 <body>
 <div id="app"></div>