Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,30 @@
"default": null,
"enum": [
null,
"title"
"title",
"created",
"updated"
],
"enumDescriptions": [
"ファイルパスの昇順で表示",
"タイトルの昇順で表示"
"ファイルパス",
"タイトル",
"作成日時",
"更新日時"
],
"markdownDescription": "記事の並び順を設定します。"
"markdownDescription": "記事をソートする基準を設定します。"
},
"zenn-preview.sortOrder": {
"type": "string",
"default": "asc",
"enum": [
"asc",
"desc"
],
"enumDescriptions": [
"昇順",
"降順"
],
"markdownDescription": "記事ソート時の `昇順/降順` を指定します。"
}
}
}
Expand Down Expand Up @@ -271,4 +288,4 @@
"zenn-markdown-html": "^0.1.155",
"zenn-model": "^0.1.155"
}
}
}
2 changes: 1 addition & 1 deletion src/treeview/article/articlesTreeViewProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class ArticlesTreeViewProvider implements TreeDataProvider {

this.treeItems = treeItems;

return PreviewTreeItem.sortTreeItems(treeItems);
return await PreviewTreeItem.sortTreeItems(treeItems);
} catch {
console.error("articlesフォルダ内にコンテンツが見つかりませんでした");
return [];
Expand Down
2 changes: 1 addition & 1 deletion src/treeview/book/bookTreeItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class BookTreeItem extends PreviewTreeItem {
.get<boolean>("sortByChapterNumber");
const sortedItems = isSortedByChapterNumber
? chapterTreeItems
: PreviewTreeItem.sortTreeItems(chapterTreeItems);
: await PreviewTreeItem.sortTreeItems(chapterTreeItems);

const treeItems = [
// 設定ファイルのTreeItem
Expand Down
2 changes: 1 addition & 1 deletion src/treeview/book/booksTreeViewProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class BooksTreeViewProvider implements TreeDataProvider {

this.treeItems = treeItems;

return PreviewTreeItem.sortTreeItems(treeItems);
return await PreviewTreeItem.sortTreeItems(treeItems);
} catch {
console.error("booksフォルダ内にコンテンツが見つかりませんでした");
return [];
Expand Down
60 changes: 51 additions & 9 deletions src/treeview/previewTreeItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,51 @@ export abstract class PreviewTreeItem extends vscode.TreeItem {
/**
* TreeItemをソートする
*/
static sortTreeItems(items: PreviewTreeItem[]): PreviewTreeItem[] {
static async sortTreeItems(
items: PreviewTreeItem[]
): Promise<PreviewTreeItem[]> {
// 設定からソート順を取得
const sortArticle = vscode.workspace
.getConfiguration("zenn-preview")
.get<string | null>("sortArticle");
const zennPreviewConfig = vscode.workspace.getConfiguration("zenn-preview");
const sortArticle = zennPreviewConfig.get<string | null>("sortArticle");
const sortOrder = zennPreviewConfig.get<string>("sortOrder");
const order = sortOrder === "asc" ? 1 : -1;

// 作成日時あるいは更新日時でソート
if (sortArticle === "created" || sortArticle === "updated") {
const statsPromises = items.map(async (item) => {
if (item.contentUri) {
try {
const stat = await vscode.workspace.fs.stat(item.contentUri);
return { path: item.path, stat };
} catch {
return { path: item.path, stat: null };
}
}
return { path: item.path, stat: null };
});
const statsArray = await Promise.all(statsPromises);
const statsMap = new Map(statsArray.map((s) => [s.path, s.stat]));

return items.sort((a, b) => {
// file stat取得
const aStat = statsMap.get(a.path);
const bStat = statsMap.get(b.path);

if (aStat && bStat) {
// created
if (sortArticle === "created") {
return (aStat.ctime - bStat.ctime) * order;
}
// updated
else {
return (aStat.mtime - bStat.mtime) * order;
}
}

// ファイルの作成・更新時刻が取れなかった場合はpathで比較
return a.path.localeCompare(b.path, "ja", { sensitivity: "base" }) * order;
});
}

return items.sort((a, b) => {
// 記事タイトルでソート
Expand All @@ -88,18 +128,20 @@ export abstract class PreviewTreeItem extends vscode.TreeItem {

if (aCleanLabel || bCleanLabel) {
// どちらかに絵文字除去後ラベルがあれば比較
return aCleanLabel.localeCompare(bCleanLabel, "ja", {
sensitivity: "base",
});
return (
aCleanLabel.localeCompare(bCleanLabel, "ja", {
sensitivity: "base",
}) * order
);
}

// 絵文字除去後ラベルが両方空の場合はpathで比較 (元々ラベルがなかった場合など)
return a.path.localeCompare(b.path, "ja", { sensitivity: "base" });
return a.path.localeCompare(b.path, "ja", { sensitivity: "base" }) * order;
}

// ファイルパスでソート
else {
return a.path.localeCompare(b.path, "ja", { sensitivity: "base" });
return a.path.localeCompare(b.path, "ja", { sensitivity: "base" }) * order;
}
});
}
Expand Down