From 5456d3eb1d0510d18035a72ed65961d104f080e6 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Fri, 10 Feb 2017 15:21:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9B=B4=E6=96=B0=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=BB=B6=E8=BF=87=E6=BB=A4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- .../controllers/settings-controller.js | 2 +- routes/api.js | 184 +++++++++--------- 3 files changed, 92 insertions(+), 97 deletions(-) diff --git a/package.json b/package.json index 15d95cd..70e2f10 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "mysql": "^2.11.1", "node-readability": "^2.2.0", "serve-favicon": "~2.3.0", - "supervisor": "^0.11.0", - "uploadify": "^1.0.7" + "supervisor": "^0.11.0" } } diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js index 9459ab1..1c2ad25 100644 --- a/public/scripts/controllers/settings-controller.js +++ b/public/scripts/controllers/settings-controller.js @@ -1,6 +1,6 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', 'bookmarkService', 'pubSubService', function($scope, $stateParams, $filter, $state, $window, bookmarkService, pubSubService) { console.log('Hello settingsCtr......'); - $scope.form = [true, false]; + $scope.form = [false, false, true]; $scope.passwordOrgin = ""; $scope.passwordNew1 = ""; $scope.passwordNew2 = ""; diff --git a/routes/api.js b/routes/api.js index 1d64432..5c898be 100644 --- a/routes/api.js +++ b/routes/api.js @@ -7,7 +7,7 @@ var multer = require('multer'); var storage = multer.diskStorage({ destination: function(req, file, cb) { - cb(null, './uploads') + cb(null, 'uploads/') }, filename: function(req, file, cb) { var now = new Date().format('yyyyMMddhhmmss') @@ -25,12 +25,7 @@ var upload = multer({ fileSize: 10 * 1024 * 2014, // 最大值接受10M }, fileFilter: function(req, file, cb) { - console.log("fileFilter file = ", file) - if (file.mimetype == "text/html'") { - return cb(null, true); - } else { - return cb(null, false); - } + cb(null, file.mimetype == "text/html"); }, }) @@ -477,94 +472,95 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) { } var file = req.file; - var bookmarks = [{ - "url": "https://www.163.com/", - "name": "Bookmarks", - "add_date": "1432116178", - "tags": [] - }, { - "url": "https://github.com/aponxi/npm-bookmark-parser", - "name": "aponxi/npm-bookmark-parser: Node plugin to parse Chrome bookmarks into usable JSON format, via javascript.", - "add_date": "1486615941", - "tags": ["测试栏目2", "测试栏目1"] - }, { - "url": "http://stackoverflow.com/questions/26673837/parsing-bookmark-html-in-node-js", - "name": "parsing bookmark.html in node.js - Stack Overflow", - "add_date": "1486614926", - "tags": ["测试栏目1"] - }, { - "url": "http://stackoverflow.com/", - "name": "dddddddddddddd", - "add_date": "1486614926", - "tags": ["测试栏目3"] - }]; + // var bookmarks = [{ + // "url": "https://www.163.com/", + // "name": "Bookmarks", + // "add_date": "1432116178", + // "tags": [] + // }, { + // "url": "https://github.com/aponxi/npm-bookmark-parser", + // "name": "aponxi/npm-bookmark-parser: Node plugin to parse Chrome bookmarks into usable JSON format, via javascript.", + // "add_date": "1486615941", + // "tags": ["测试栏目2", "测试栏目1"] + // }, { + // "url": "http://stackoverflow.com/questions/26673837/parsing-bookmark-html-in-node-js", + // "name": "parsing bookmark.html in node.js - Stack Overflow", + // "add_date": "1486614926", + // "tags": ["测试栏目1"] + // }, { + // "url": "http://stackoverflow.com/", + // "name": "dddddddddddddd", + // "add_date": "1486614926", + // "tags": ["测试栏目3"] + // }]; - var tagsName = ['测试栏目1', '测试栏目2', '测试栏目3']; - var userId = req.session.user.id; - var addTagNames = []; - - db.getTags(userId) - // 先插入分类 - .then((tags) => { - // 需要插入的书签是该用户在数据库不存在的书签 - addTagNames = tagsName.filter((name) => { - for (var i = 0; i < tags.length; i++) { - if (tags[i].name.toLowerCase() === name.toLowerCase()) { - return false; - } - } - return true; - }); - return Promise.resolve(addTagNames); - }) - .then((newTagNames) => { - if (newTagNames.length > 0) { - return db.addTags(userId, newTagNames) - } else { - return Promise.resolve(); - } - }) - .then(() => db.getTags(userId)) - .then((allTags) => { - bookmarks.forEach((item, index) => { - var count = 0; - - var bookmark = {}; - bookmark.title = item.name; - bookmark.description = ""; - bookmark.url = item.url; - bookmark.public = '1'; - if (item.tags.length == 0) { - item.tags.push("未分类") - } - - var tags = []; - item.tags.forEach((tag) => { - allTags.forEach((at) => { - if (at.name == tag) { - tags.push(at.id); - } - }) - }) - // 插入书签 - db.addBookmark(userId, bookmark) // 插入书签 - .then((bookmark_id) => { - db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 - return bookmark_id; - }) // 将之前所有的书签分类信息删掉 - .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 - .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 - .then(() => { - count++ - }) // 运气不错 - .catch((err) => console.log('uploadBookmarkFile addBookmark err', err)); // oops! - if ((index + 1) == bookmarks.length) { - // 通知前台 - } - }) - }) - .catch((err) => console.log('uploadBookmarkFile err', err)); - res.json(file); + // var tagsName = ['测试栏目1', '测试栏目2', '测试栏目3']; + // var userId = req.session.user.id; + // var addTagNames = []; + // + // db.getTags(userId) + // // 先插入分类 + // .then((tags) => { + // // 需要插入的书签是该用户在数据库不存在的书签 + // addTagNames = tagsName.filter((name) => { + // for (var i = 0; i < tags.length; i++) { + // if (tags[i].name.toLowerCase() === name.toLowerCase()) { + // return false; + // } + // } + // return true; + // }); + // return Promise.resolve(addTagNames); + // }) + // .then((newTagNames) => { + // if (newTagNames.length > 0) { + // return db.addTags(userId, newTagNames) + // } else { + // return Promise.resolve(); + // } + // }) + // .then(() => db.getTags(userId)) + // .then((allTags) => { + // bookmarks.forEach((item, index) => { + // var count = 0; + // + // var bookmark = {}; + // bookmark.title = item.name; + // bookmark.description = ""; + // bookmark.url = item.url; + // bookmark.public = '1'; + // if (item.tags.length == 0) { + // item.tags.push("未分类") + // } + // + // var tags = []; + // item.tags.forEach((tag) => { + // allTags.forEach((at) => { + // if (at.name == tag) { + // tags.push(at.id); + // } + // }) + // }) + // // 插入书签 + // db.addBookmark(userId, bookmark) // 插入书签 + // .then((bookmark_id) => { + // db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 + // return bookmark_id; + // }) // 将之前所有的书签分类信息删掉 + // .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 + // .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 + // .then(() => { + // count++ + // }) // 运气不错 + // .catch((err) => console.log('uploadBookmarkFile addBookmark err', err)); // oops! + // if ((index + 1) == bookmarks.length) { + // // 通知前台 + // } + // }) + // }) + // .catch((err) => console.log('uploadBookmarkFile err', err)); + console.log("file", file); + res.json({}); }); api.post('/addBookmark', function(req, res) {