-
Notifications
You must be signed in to change notification settings - Fork 148
fix: 完善 Release 同步机制 (#119) #129
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 5 commits
147d44f
6e2494a
b17978e
80102e5
cf2c635
e1ca7e5
3213db3
e0b69a0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,8 @@ export const ReleaseTimeline: React.FC = () => { | |
| setReleaseSearchQuery, | ||
| toggleReleaseExpandedRepository, | ||
| setReleaseIsRefreshing, | ||
| includePreRelease, | ||
| setIncludePreRelease, | ||
| } = useAppStore(); | ||
|
|
||
| const { toast, confirm } = useDialog(); | ||
|
|
@@ -301,56 +303,54 @@ export const ReleaseTimeline: React.FC = () => { | |
| setReleaseIsRefreshing(true); | ||
| try { | ||
| const githubApi = new GitHubApiService(githubToken); | ||
| // Only fetch releases for repos that are subscribed to releases | ||
| const subscribedRepos = repositories.filter(repo => releaseSubscriptions.has(repo.id)); | ||
|
|
||
| if (subscribedRepos.length === 0) { | ||
| toast(language === 'zh' ? '没有订阅的仓库。' : 'No subscribed repositories.', 'error'); | ||
| return; | ||
| } | ||
|
|
||
| const allNewReleases: Release[] = []; | ||
|
|
||
| const latestReleaseTime = releases.length > 0 | ||
| ? releases.reduce((max, r) => Math.max(max, new Date(r.published_at).getTime()), 0) | ||
| : 0; | ||
| const sinceTimestamp = latestReleaseTime > 0 ? new Date(latestReleaseTime).toISOString() : undefined; | ||
| // Use the new getMultipleRepositoryReleases with options | ||
| const { releases: newReleases, failedRepos } = await githubApi.getMultipleRepositoryReleases( | ||
| subscribedRepos, | ||
| { includePreRelease } | ||
| ); | ||
|
|
||
| // Update repository sync metadata | ||
| const now = new Date().toISOString(); | ||
| for (const repo of subscribedRepos) { | ||
| const [owner, name] = repo.full_name.split('/'); | ||
|
|
||
| const hasExistingReleases = releases.some(r => r.repository.id === repo.id); | ||
|
|
||
| let repoReleases: Release[]; | ||
| if (!hasExistingReleases) { | ||
| repoReleases = await githubApi.getRepositoryReleases(owner, name, 1, 10); | ||
| } else { | ||
| repoReleases = await githubApi.getIncrementalRepositoryReleases(owner, name, sinceTimestamp, 10); | ||
| } | ||
|
|
||
| repoReleases.forEach(release => { | ||
| release.repository.id = repo.id; | ||
| updateRepository({ | ||
| ...repo, | ||
| has_fetched_releases: true, | ||
| last_release_fetch_time: now, | ||
| }); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do not advance sync markers for failed repositories.
Suggested fix // Update repository sync metadata
const now = new Date().toISOString();
+ const failedRepoIds = new Set(failedRepos.map(repo => repo.repoId));
for (const repo of subscribedRepos) {
+ if (failedRepoIds.has(repo.id)) {
+ continue;
+ }
updateRepository({
...repo,
has_fetched_releases: true,
last_release_fetch_time: now,
});Also applies to: 341-353 🤖 Prompt for AI Agents |
||
|
|
||
| allNewReleases.push(...repoReleases); | ||
|
|
||
| await new Promise(resolve => setTimeout(resolve, 200)); | ||
| } | ||
|
|
||
| // Filter out existing releases and add new ones | ||
| const existingIds = new Set(useAppStore.getState().releases.map(r => r.id)); | ||
| const actuallyNewCount = allNewReleases.filter(r => !existingIds.has(r.id)).length; | ||
| const actuallyNewReleases = newReleases.filter(r => !existingIds.has(r.id)); | ||
| const actuallyNewCount = actuallyNewReleases.length; | ||
|
|
||
| if (allNewReleases.length > 0) { | ||
| addReleases(allNewReleases); | ||
| if (actuallyNewReleases.length > 0) { | ||
| addReleases(actuallyNewReleases); | ||
| } | ||
|
|
||
| const now = new Date().toISOString(); | ||
| setLastRefreshTime(now); | ||
|
|
||
| const message = language === 'zh' | ||
| ? `刷新完成!发现 ${actuallyNewCount} 个新Release。` | ||
| : `Refresh completed! Found ${actuallyNewCount} new releases.`; | ||
| // Build success message with failed repos info | ||
| let message: string; | ||
| if (failedRepos.length > 0) { | ||
| message = language === 'zh' | ||
| ? `刷新完成!发现 ${actuallyNewCount} 个新Release,${failedRepos.length} 个仓库刷新失败。` | ||
| : `Refresh completed! Found ${actuallyNewCount} new releases, ${failedRepos.length} repos failed.`; | ||
| } else { | ||
| message = language === 'zh' | ||
| ? `刷新完成!发现 ${actuallyNewCount} 个新Release。` | ||
| : `Refresh completed! Found ${actuallyNewCount} new releases.`; | ||
| } | ||
|
|
||
| toast(message, 'success'); | ||
| toast(message, actuallyNewCount > 0 ? 'success' : 'info'); | ||
| } catch (error) { | ||
| console.error('Refresh failed:', error); | ||
| const errorMessage = language === 'zh' | ||
|
|
@@ -527,19 +527,35 @@ export const ReleaseTimeline: React.FC = () => { | |
| } | ||
| </p> | ||
|
|
||
| {/* 刷新按钮 - 在有订阅仓库时显示 */} | ||
| {/* Pre-release toggle + Refresh button */} | ||
| {subscribedRepoCount > 0 && ( | ||
| <div className="mb-6"> | ||
| <div className="mb-6 flex flex-col items-center gap-3"> | ||
| {/* Pre-release toggle */} | ||
| <label className="flex items-center gap-2 cursor-pointer select-none"> | ||
| <div | ||
| onClick={() => setIncludePreRelease(!includePreRelease)} | ||
| className={`relative inline-flex h-5 w-9 items-center rounded-full transition-colors ${includePreRelease ? 'bg-brand-indigo' : 'bg-gray-300 dark:bg-gray-600'}`} | ||
| > | ||
| <span | ||
| className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${includePreRelease ? 'translate-x-[18px]' : 'translate-x-[2px]'}`} | ||
| /> | ||
| </div> | ||
| <span className="text-sm text-gray-600 dark:text-text-secondary"> | ||
| {t('包含 Pre-release', 'Include Pre-release')} | ||
| </span> | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| </label> | ||
|
|
||
| {/* Refresh button */} | ||
| <button | ||
| onClick={handleRefresh} | ||
| disabled={releaseIsRefreshing} | ||
| className="flex items-center space-x-2 px-6 py-3 bg-brand-indigo text-white rounded-lg hover:bg-brand-hover transition-colors disabled:opacity-50 disabled:cursor-not-allowed mx-auto" | ||
| className="flex items-center space-x-2 px-6 py-3 bg-brand-indigo text-white rounded-lg hover:bg-brand-hover transition-colors disabled:opacity-50 disabled:cursor-not-allowed" | ||
| > | ||
| <RefreshCw className={`w-5 h-5 ${releaseIsRefreshing ? 'animate-spin' : ''}`} /> | ||
| <span>{releaseIsRefreshing ? t('刷新中...', 'Refreshing...') : t('刷新Release', 'Refresh Releases')}</span> | ||
| </button> | ||
| {lastRefreshTime && ( | ||
| <p className="text-sm text-gray-500 dark:text-text-tertiary mt-2"> | ||
| <p className="text-sm text-gray-500 dark:text-text-tertiary"> | ||
| {t('上次刷新:', 'Last refresh:')} {formatDistanceToNow(new Date(lastRefreshTime), { addSuffix: true })} | ||
| </p> | ||
| )} | ||
|
|
@@ -598,6 +614,21 @@ export const ReleaseTimeline: React.FC = () => { | |
| </span> | ||
| )} | ||
|
|
||
| {/* Pre-release toggle */} | ||
| <label className="flex items-center gap-1.5 cursor-pointer select-none"> | ||
| <div | ||
| onClick={() => setIncludePreRelease(!includePreRelease)} | ||
| className={`relative inline-flex h-5 w-9 items-center rounded-full transition-colors ${includePreRelease ? 'bg-brand-indigo' : 'bg-gray-300 dark:bg-gray-600'}`} | ||
| > | ||
| <span | ||
| className={`inline-block h-4 w-4 transform rounded-full bg-white shadow transition-transform ${includePreRelease ? 'translate-x-[18px]' : 'translate-x-[2px]'}`} | ||
| /> | ||
| </div> | ||
| <span className="text-xs text-gray-600 dark:text-text-secondary hidden sm:inline"> | ||
| {t('Pre', 'Pre')} | ||
| </span> | ||
| </label> | ||
|
|
||
| {/* Refresh Button */} | ||
| <button | ||
| onClick={handleRefresh} | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.