Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/PhieF/CarnetElectron.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhie <phie@phie.ovh>2021-02-17 00:30:42 +0300
committerPhie <phie@phie.ovh>2021-02-17 00:30:42 +0300
commit67d33912a1cab9ca8210d4aa8ff6881adf40fa87 (patch)
treee87ee533b62cb7ca9b939505f8160167f5180556
parent8867b281043f77af8e6f0a10e918b6a811d2eb1b (diff)
fixing parse metadata paths
-rw-r--r--package.json11
-rw-r--r--server/server.js7
2 files changed, 10 insertions, 8 deletions
diff --git a/package.json b/package.json
index a68b67b..bbb74c8 100644
--- a/package.json
+++ b/package.json
@@ -74,8 +74,10 @@
"electron-store": "^1.3.0",
"ev-emitter": "^1.1.1",
"fizzy-ui-utils": "^2.0.5",
+ "fs-extra": "^8.1.0",
"get-size": "^2.0.2",
"imports-loader": "^0.7.1",
+ "into-stream": "^5.1.1",
"jimp": "^0.5.6",
"jquery": "^3.2.1",
"jquery-mobile": "^1.5.0-alpha.1",
@@ -83,17 +85,16 @@
"lockfile": "^1.0.3",
"masonry-layout": "^4.2.0",
"mkdirp": "^0.5.1",
+ "qs": "^6.9.6",
"rimraf": "^2.6.1",
"textversionjs": "^1.1.3",
- "webdav": "^1.6.1",
- "fs-extra": "^8.1.0",
- "into-stream": "^5.1.1"
+ "webdav": "^1.6.1"
},
"devDependencies": {
+ "@babel/cli": "^7.1.5",
"@babel/core": "^7.1.5",
"@babel/preset-env": "^7.1.5",
- "@babel/cli": "^7.1.5",
"electron": "3.1.9",
"electron-builder": "^21.2.0"
}
-} \ No newline at end of file
+}
diff --git a/server/server.js b/server/server.js
index 5e721b8..7745b00 100644
--- a/server/server.js
+++ b/server/server.js
@@ -21,9 +21,12 @@ var handle = function (method, path, data, callback) {
var splitPath = path.split("?")
var pathBeforeArgs = splitPath[0]
var args = {}
+ var qs = require('qs');
+ var argsParsed = qs.parse(path);
if (splitPath[1] != undefined) {
var argsStr = path.split("?")[1]
+ argsParsed = qs.parse(argsStr);
argsSplit = argsStr.split("&");
for (var arg of argsSplit) {
argSplit = arg.split("=");
@@ -132,10 +135,8 @@ var handle = function (method, path, data, callback) {
return;
}
if (path.startsWith("/metadata?")) {
- console.logDebug("get metadata")
-
- var params = path.split("?")[1].split("=")[1].split("%2C");
+ var params = argsParsed['paths'];
var handler = new ArrayHandler(params, function (step) {
step = decodeURIComponent(step);
if (step == "" || step == undefined || step.indexOf("../") >= 0) {