wood/obsidian-publish-to-discourse
1
0
Fork 0
mirror of https://github.com/woodchen-ink/obsidian-publish-to-discourse.git synced 2025-07-17 13:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 新增分类冲突处理功能，用户在本地分类与远程分类不同时可选择使用哪一分类。更新样式以支持分类冲突确认对话框，并在国际化文件中添加相关文本。更新 GitHub Actions 工作流以生成发布说明。

Browse Source
This commit is contained in:
wood chen 2025-06-20 21:23:19 +08:00
parent 069ce44978
commit b24bf09efc
7 changed files with 343 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
.github/workflows/release.yml vendored
View File

@ -25,11 +25,56 @@ jobs:
npm install
npm run build
- name: Generate release notes
id: release_notes
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tag="${GITHUB_REF#refs/tags/}"
# 获取上一个标签
previous_tag=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
# 生成发布说明
# 获取上一个标签
if [ -n "$previous_tag" ]; then
echo "## 🚀 更新内容 / What's Changed" > release_notes.md
echo "" >> release_notes.md
# 分析提交类型并分类显示
echo "### ✨ 新增功能 / New Features:" >> release_notes.md
git log --pretty=format:"%s" "$previous_tag"..HEAD | grep -i "^feat\|^add\|^新增\|^功能" | sed 's/^/- /' >> release_notes.md || echo "- 暂无" >> release_notes.md
echo "" >> release_notes.md
echo "### 🐛 问题修复 / Bug Fixes:" >> release_notes.md
git log --pretty=format:"%s" "$previous_tag"..HEAD | grep -i "^fix\|^bug\|^修复\|^修正" | sed 's/^/- /' >> release_notes.md || echo "- 暂无" >> release_notes.md
echo "" >> release_notes.md
echo "### 🔧 改进优化 / Improvements:" >> release_notes.md
git log --pretty=format:"%s" "$previous_tag"..HEAD | grep -i "^improve\|^update\|^优化\|^改进\|^更新" | sed 's/^/- /' >> release_notes.md || echo "- 暂无" >> release_notes.md
echo "" >> release_notes.md
echo "### 📝 所有提交 / All Commits:" >> release_notes.md
git log --pretty=format:"- %s ([%h](https://github.com/${{ github.repository }}/commit/%H))" "$previous_tag"..HEAD >> release_notes.md
echo "" >> release_notes.md
echo "### 📂 变更文件 / Changed Files:" >> release_notes.md
git diff --name-only "$previous_tag"..HEAD | sed 's/^/- `/' | sed 's/$/`/' >> release_notes.md
echo "" >> release_notes.md
echo "---" >> release_notes.md
echo "**完整变更日志**: https://github.com/${{ github.repository }}/compare/$previous_tag...$tag" >> release_notes.md
else
# 首次发布时使用 GitHub 自动生成的发布说明
echo "" > release_notes.md
fi
- name: Create release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
tag="${GITHUB_REF#refs/tags/}"
previous_tag=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
files=()
for file in main.js manifest.json styles.css; do
@ -41,7 +86,16 @@ jobs:
fi
done
gh release create "$tag" \
--title="$tag" \
--draft \
"${files[@]}"
if [ -n "$previous_tag" ]; then
# 有上一个标签，使用自定义发布说明
gh release create "$tag" \
--title="Release $tag" \
--notes-file release_notes.md \
"${files[@]}"
else
# 首次发布，使用 GitHub 自动生成的发布说明
gh release create "$tag" \
--title="Release $tag" \
--generate-notes \
"${files[@]}"
fi

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ data.json
# Exclude macOS Finder (System Explorer) View States
.DS_Store
.cursor/rules/discourse.mdc

10
src/i18n/en.ts
View File

@ -45,5 +45,13 @@ export default {
// Open in Discourse
'OPEN_IN_DISCOURSE': 'Open in Discourse',
'NO_ACTIVE_FILE': 'No active file',
'NO_TOPIC_ID': 'This note has not been published to Discourse yet'
'NO_TOPIC_ID': 'This note has not been published to Discourse yet',
// Category conflict
'CATEGORY_CONFLICT_TITLE': 'Category Conflict',
'CATEGORY_CONFLICT_DESC': 'The local category setting differs from the remote category on Discourse. Please choose which category to use:',
'LOCAL_CATEGORY': 'Local Category (set in frontmatter)',
'REMOTE_CATEGORY': 'Remote Category (from Discourse)',
'KEEP_LOCAL_CATEGORY': 'Keep Local Category',
'USE_REMOTE_CATEGORY': 'Use Remote Category'
}

10
src/i18n/zh-CN.ts
View File

@ -45,5 +45,13 @@ export default {
// Open in Discourse
'OPEN_IN_DISCOURSE': '在 Discourse 中打开',
'NO_ACTIVE_FILE': '没有打开的文件',
'NO_TOPIC_ID': '此笔记尚未发布到 Discourse'
'NO_TOPIC_ID': '此笔记尚未发布到 Discourse',
// 分类冲突
'CATEGORY_CONFLICT_TITLE': '分类冲突',
'CATEGORY_CONFLICT_DESC': '检测到本地设置的分类与 Discourse 上的分类不同，请选择要使用的分类：',
'LOCAL_CATEGORY': '本地分类（frontmatter中设置）',
'REMOTE_CATEGORY': '远程分类（Discourse上的分类）',
'KEEP_LOCAL_CATEGORY': '保持本地分类',
'USE_REMOTE_CATEGORY': '使用远程分类'
}

50
src/main.ts
View File

@ -5,7 +5,7 @@ import { t, setLocale } from './i18n';
import { expandEmbeds } from './expand-embeds';
import { DiscourseAPI } from './api';
import { EmbedHandler } from './embed-handler';
import { SelectCategoryModal } from './ui';
import { SelectCategoryModal, CategoryConflictModal } from './ui';
import { NotifyUser } from './notification';
import { getFrontMatter, removeFrontMatter } from './utils';
import { ActiveFile, PluginInterface } from './types';
@ -124,13 +124,49 @@ export default class PublishToDiscourse extends Plugin implements PluginInterfac
console.log(`Updated tags from Discourse: ${topicInfo.tags.join(', ')}`);
}
// 如果获取到了分类ID，更新设置中的分类
// 处理分类冲突
if (topicInfo.categoryId) {
// 查找分类名称
const category = categories.find(c => c.id === topicInfo.categoryId);
if (category) {
this.settings.category = category.id;
console.log(`Updated category from Discourse: ${category.name} (${category.id})`);
const localCategoryId = fm?.discourse_category_id;
const remoteCategoryId = topicInfo.categoryId;
// 如果本地有设置分类ID且与远程不同，询问用户
if (localCategoryId && localCategoryId !== remoteCategoryId) {
const localCategory = categories.find(c => c.id === localCategoryId);
const remoteCategory = categories.find(c => c.id === remoteCategoryId);
if (localCategory && remoteCategory) {
const conflictModal = new CategoryConflictModal(
this.app,
this,
localCategoryId,
localCategory.name,
remoteCategoryId,
remoteCategory.name
);
const useRemote = await conflictModal.showAndWait();
if (useRemote) {
this.settings.category = remoteCategoryId;
console.log(`User chose remote category: ${remoteCategory.name} (${remoteCategoryId})`);
} else {
this.settings.category = localCategoryId;
console.log(`User kept local category: ${localCategory.name} (${localCategoryId})`);
}
} else {
// 如果找不到分类信息，使用远程分类
this.settings.category = remoteCategoryId;
}
} else if (localCategoryId) {
// 如果本地有设置且与远程相同，使用本地设置
this.settings.category = localCategoryId;
console.log(`Using local category: ${localCategoryId}`);
} else {
// 如果本地没有设置，使用远程分类
const category = categories.find(c => c.id === remoteCategoryId);
if (category) {
this.settings.category = category.id;
console.log(`Using remote category: ${category.name} (${category.id})`);
}
}
}
} catch (error) {

98
src/ui.ts
View File

@ -290,4 +290,102 @@ export class SelectCategoryModal extends Modal {
const { contentEl } = this;
contentEl.empty();
}
}
// 分类冲突确认对话框
export class CategoryConflictModal extends Modal {
plugin: PluginInterface;
localCategoryId: number;
localCategoryName: string;
remoteCategoryId: number;
remoteCategoryName: string;
resolve: (useRemote: boolean) => void;
constructor(
app: App,
plugin: PluginInterface,
localCategoryId: number,
localCategoryName: string,
remoteCategoryId: number,
remoteCategoryName: string
) {
super(app);
this.plugin = plugin;
this.localCategoryId = localCategoryId;
this.localCategoryName = localCategoryName;
this.remoteCategoryId = remoteCategoryId;
this.remoteCategoryName = remoteCategoryName;
}
// 返回一个Promise，让调用者等待用户选择
showAndWait(): Promise<boolean> {
return new Promise((resolve) => {
this.resolve = resolve;
this.open();
});
}
onOpen() {
const { contentEl } = this;
contentEl.empty();
contentEl.addClass('discourse-category-conflict-modal');
// 标题
contentEl.createEl('h2', { text: t('CATEGORY_CONFLICT_TITLE') });
// 说明文字
const description = contentEl.createEl('div', { cls: 'conflict-description' });
description.createEl('p', { text: t('CATEGORY_CONFLICT_DESC') });
// 分类对比
const comparisonContainer = contentEl.createEl('div', { cls: 'category-comparison' });
// 本地分类
const localContainer = comparisonContainer.createEl('div', { cls: 'category-option local' });
localContainer.createEl('h3', { text: t('LOCAL_CATEGORY') });
localContainer.createEl('div', {
cls: 'category-name',
text: `${this.localCategoryName} (ID: ${this.localCategoryId})`
});
// 远程分类
const remoteContainer = comparisonContainer.createEl('div', { cls: 'category-option remote' });
remoteContainer.createEl('h3', { text: t('REMOTE_CATEGORY') });
remoteContainer.createEl('div', {
cls: 'category-name',
text: `${this.remoteCategoryName} (ID: ${this.remoteCategoryId})`
});
// 按钮区域
const buttonArea = contentEl.createEl('div', { cls: 'button-area' });
// 保持本地分类按钮
const keepLocalButton = buttonArea.createEl('button', {
cls: 'keep-local-button',
text: t('KEEP_LOCAL_CATEGORY')
});
keepLocalButton.onclick = () => {
this.resolve(false);
this.close();
};
// 使用远程分类按钮
const useRemoteButton = buttonArea.createEl('button', {
cls: 'use-remote-button',
text: t('USE_REMOTE_CATEGORY')
});
useRemoteButton.onclick = () => {
this.resolve(true);
this.close();
};
}
onClose() {
const { contentEl } = this;
contentEl.empty();
// 如果用户直接关闭对话框，默认保持本地设置
if (this.resolve) {
this.resolve(false);
}
}
}

125
styles.css
View File

@ -420,3 +420,128 @@ If your plugin does not need CSS, delete this file.
opacity: 0;
}
}
/* Category Conflict Modal Styles */
.discourse-category-conflict-modal {
padding: 24px;
max-width: 600px;
background-color: var(--background-primary);
border-radius: var(--radius-l);
}
.discourse-category-conflict-modal h2 {
margin: 0 0 16px 0;
font-size: 1.4em;
font-weight: 600;
color: var(--text-normal);
text-align: center;
}
.discourse-category-conflict-modal .conflict-description {
margin-bottom: 24px;
text-align: center;
}
.discourse-category-conflict-modal .conflict-description p {
margin: 0;
color: var(--text-muted);
line-height: 1.5;
}
.discourse-category-conflict-modal .category-comparison {
display: flex;
gap: 16px;
margin-bottom: 24px;
}
.discourse-category-conflict-modal .category-option {
flex: 1;
padding: 16px;
border: 2px solid var(--background-modifier-border);
border-radius: var(--radius-m);
text-align: center;
background-color: var(--background-secondary);
}
.discourse-category-conflict-modal .category-option.local {
border-color: var(--color-blue);
background-color: var(--color-blue-hover);
}
.discourse-category-conflict-modal .category-option.remote {
border-color: var(--color-orange);
background-color: var(--color-orange-hover);
}
.discourse-category-conflict-modal .category-option h3 {
margin: 0 0 8px 0;
font-size: 1.1em;
font-weight: 600;
color: var(--text-normal);
}
.discourse-category-conflict-modal .category-name {
font-size: 14px;
color: var(--text-muted);
word-break: break-all;
}
.discourse-category-conflict-modal .button-area {
display: flex;
gap: 12px;
justify-content: center;
}
.discourse-category-conflict-modal .keep-local-button,
.discourse-category-conflict-modal .use-remote-button {
flex: 1;
max-width: 180px;
padding: 10px 16px;
border-radius: var(--radius-m);
cursor: pointer;
font-weight: 500;
font-size: 14px;
transition: all 0.2s ease;
min-height: 42px;
box-shadow: var(--shadow-s);
}
.discourse-category-conflict-modal .keep-local-button {
background-color: var(--color-blue);
color: white;
border: 1px solid var(--color-blue);
}
.discourse-category-conflict-modal .keep-local-button:hover {
background-color: var(--color-blue-hover);
border-color: var(--color-blue-hover);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15);
}
.discourse-category-conflict-modal .use-remote-button {
background-color: var(--color-orange);
color: white;
border: 1px solid var(--color-orange);
}
.discourse-category-conflict-modal .use-remote-button:hover {
background-color: var(--color-orange-hover);
border-color: var(--color-orange-hover);
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15);
}
/* 响应式设计 */
@media (max-width: 600px) {
.discourse-category-conflict-modal .category-comparison {
flex-direction: column;
}
.discourse-category-conflict-modal .button-area {
flex-direction: column;
}
.discourse-category-conflict-modal .keep-local-button,
.discourse-category-conflict-modal .use-remote-button {
max-width: none;
}
}