liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复小问题

This commit is contained in:
B05BEE13.卢郴群 2021-06-01 09:32:55 +08:00
parent 2448ce767b
commit cbe4ad4e91
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controller/api.js
View File

@ -456,11 +456,7 @@ module.exports = class extends Base {
type = "folder"; type = "folder";
let dl = node.children("dl").first(); let dl = node.children("dl").first();
let dts = dl.children(); let dts = dl.children();
let ls = dts.toArray().map(function (ele) { let ls = dts.toArray().map(function (ele) { return ele.name !== "dt" ? null : parseNode($(ele)); });
if (ele.name !== "dt")
return null;
return parseNode($(ele));
});
children = ls.filter(function (item) { return item !== null; }); children = ls.filter(function (item) { return item !== null; });
case "a": case "a":
// site // site
@ -521,8 +517,7 @@ module.exports = class extends Base {
let bookmarks = []; let bookmarks = [];
const file = this.file("file"); const file = this.file("file");
let now = new Date().getTime(); let fileName = 'uploadbookmark-' + this.ctx.state.user.username + '-' + think.datetime(new Date(), "YYYYMMDDHHmmss") + '.html';
let fileName = 'uploadbookmark-' + this.ctx.state.user.username + '-' + now + '.html';
if (file) { if (file) {
const filePath = path.join(think.ROOT_PATH, `runtime/upload/${fileName}`); const filePath = path.join(think.ROOT_PATH, `runtime/upload/${fileName}`);
await fs.ensureDir(path.dirname(filePath)); await fs.ensureDir(path.dirname(filePath));
@ -580,6 +575,7 @@ module.exports = class extends Base {
</DL><p>` </DL><p>`
let time = (date) => parseInt(new Date(date).getTime() / 1000); // 日期转时间 let time = (date) => parseInt(new Date(date).getTime() / 1000); // 日期转时间
let now = new Date();
let left = `<!DOCTYPE NETSCAPE-Bookmark-file-1> let left = `<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file. <!-- This is an automatically generated file.
It will be read and overwritten. It will be read and overwritten.
@ -588,7 +584,7 @@ module.exports = class extends Base {
<TITLE>Bookmarks</TITLE> <TITLE>Bookmarks</TITLE>
<H1>Bookmarks</H1> <H1>Bookmarks</H1>
<DL><p> <DL><p>
<DT><H3 ADD_DATE="1606958496" LAST_MODIFIED="1622450430" PERSONAL_TOOLBAR_FOLDER="true">书签栏</H3> <DT><H3 ADD_DATE="${time(now)}" LAST_MODIFIED="${time(now)}" PERSONAL_TOOLBAR_FOLDER="true">书签栏</H3>
<DL><p>\n`; <DL><p>\n`;
let middle = ''; let middle = '';
let right = ` </DL><p> let right = ` </DL><p>
@ -596,7 +592,7 @@ module.exports = class extends Base {
let tags = await this.model('tags').where({ userId: this.ctx.state.user.id }).order('sort ASC, lastUse DESC').select(); let tags = await this.model('tags').where({ userId: this.ctx.state.user.id }).order('sort ASC, lastUse DESC').select();
for (const tag of tags) { for (const tag of tags) {
let tagStr = ` <DT><H3 ADD_DATE="${tag.lastUse}" LAST_MODIFIED="${tag.lastUse}">${tag.name}</H3>\n <DL><p>\n`; let tagStr = ` <DT><H3 ADD_DATE="${time(tag.lastUse)}" LAST_MODIFIED="${time(tag.lastUse)}">${tag.name}</H3>\n <DL><p>\n`;
let bookmarks = await this.model('bookmarks').where({ tagId: tag.id }).select(); let bookmarks = await this.model('bookmarks').where({ tagId: tag.id }).select();
for (const bookmark of bookmarks) { for (const bookmark of bookmarks) {
tagStr += ` <DT><A HREF="${bookmark.url}" ADD_DATE="${time(bookmark.createdAt)}" LAST_CLICK="${time(bookmark.lastClick)}" CLICK_COUNT="${bookmark.clickCount}">${bookmark.title}</A>\n` tagStr += ` <DT><A HREF="${bookmark.url}" ADD_DATE="${time(bookmark.createdAt)}" LAST_CLICK="${time(bookmark.lastClick)}" CLICK_COUNT="${bookmark.clickCount}">${bookmark.title}</A>\n`
@ -604,8 +600,7 @@ module.exports = class extends Base {
tagStr += ` </DL><p>\n`; tagStr += ` </DL><p>\n`;
middle += bookmarks.length > 0 ? tagStr : ''; middle += bookmarks.length > 0 ? tagStr : '';
} }
let now = new Date().getTime() let fileName = 'exportbookmark-' + this.ctx.state.user.username + '-' + think.datetime(new Date(), "YYYYMMDDHHmmss") + '.html';
let fileName = 'exportbookmark-' + this.ctx.state.user.username + '-' + now + '.html';
let filePath = path.join(think.ROOT_PATH, 'runtime', 'backup', fileName); let filePath = path.join(think.ROOT_PATH, 'runtime', 'backup', fileName);
await fs.ensureFile(filePath); await fs.ensureFile(filePath);