3344/hubproxy
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 12 Wiki Activity

修复用户镜像的问题

Browse Source
This commit is contained in:
NewName
2025-05-20 17:40:02 +08:00
parent a79adc66ba
commit a177d23bb4
2 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ghproxy/public/search.html
View File

@@ -670,7 +670,13 @@
card.addEventListener('click', () => {
currentRepo = result;
loadTags(result.is_official ? 'library' : (result.repo_owner || ''), name);
const namespace = result.namespace || (result.is_official ? 'library' : '');
const repoName = result.name || result.repo_name;
if (!namespace || !repoName) {
showToast('无效的仓库信息');
return;
}
loadTags(namespace, repoName);
});
resultsContainer.appendChild(card);
@@ -681,23 +687,18 @@
showLoading();
try {
console.log('加载标签:', namespace, name);
if (!name) {
showToast('镜像名称不能为空');
if (!namespace || !name) {
showToast('命名空间和镜像名称不能为空');
return;
}
// 处理官方镜像
if (currentRepo.is_official) {
namespace = 'library';
}
const response = await fetch(`/tags/${namespace}/${name}`);
const data = await response.json();
const response = await fetch(`/tags/${encodeURIComponent(namespace)}/${encodeURIComponent(name)}`);
if (!response.ok) {
throw new Error(data.error || '获取标签信息失败');
const errorText = await response.text();
throw new Error(errorText || '获取标签信息失败');
}
const data = await response.json();
console.log('标签数据:', data);
displayTags(data);
showTagList();
@@ -711,24 +712,28 @@
function displayTags(tags) {
const tagList = document.getElementById('tagList');
const repoName = currentRepo.repo_name;
const namespace = currentRepo.namespace || (currentRepo.is_official ? 'library' : '');
const repoName = currentRepo.name || currentRepo.repo_name;
const fullRepoName = namespace ? `${namespace}/${repoName}` : repoName;
let header = `
<div class="tag-header">
<div class="tag-info">
<div class="tag-title">
${repoName}
${fullRepoName}
${currentRepo.is_official ? '<span class="badge badge-official">官方</span>' : ''}
${currentRepo.affiliation ? `<span class="badge badge-organization">By ${currentRepo.affiliation}</span>` : ''}
${currentRepo.is_automated ? '<span class="badge badge-automated">自动构建</span>' : ''}
</div>
<div class="tag-description">${currentRepo.short_description || '暂无描述'}</div>
<div class="tag-meta">
${currentRepo.star_count > 0 ? `<span class="meta-item">⭐ ${formatNumber(currentRepo.star_count)}</span>` : ''}
${currentRepo.pull_count > 0 ? `<span class="meta-item">⬇️ ${formatNumber(currentRepo.pull_count)}</span>` : ''}
${currentRepo.last_updated ? `<span class="meta-item">更新于 ${formatTimeAgo(currentRepo.last_updated)}</span>` : ''}
</div>
<div class="tag-pull-command">
docker pull ${repoName}
<button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}')">复制</button>
docker pull ${fullRepoName}
<button class="copy-button" onclick="copyToClipboard('docker pull ${fullRepoName}')">复制</button>
</div>
</div>
</div>
@@ -758,8 +763,8 @@
${tag.full_size ? `<span>大小: ${formatSize(tag.full_size)}</span>` : ''}
</div>
<div class="tag-pull-command">
docker pull ${repoName}:${tag.name}
<button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}:${tag.name}')">复制</button>
docker pull ${fullRepoName}:${tag.name}
<button class="copy-button" onclick="copyToClipboard('docker pull ${fullRepoName}:${tag.name}')">复制</button>
</div>
${architectures ? `<div class="tag-architectures">${architectures}</div>` : ''}
</div>

30
ghproxy/search.go
View File

@@ -35,6 +35,7 @@ type Repository struct {
Status int `json:"status"`
Organization string `json:"affiliation"`
PullsLastWeek int `json:"pulls_last_week"`
Namespace string `json:"namespace"`
}
// TagInfo 标签信息
@@ -158,25 +159,40 @@ func searchDockerHub(ctx context.Context, query string, page, pageSize int) (*Se
i, repo.Name, repo.RepoOwner, repo.Description, repo.IsOfficial)
}
// 处理搜索结果
for i := range result.Results {
// 从 repo_name 中提取 namespace
if !result.Results[i].IsOfficial {
parts := strings.Split(result.Results[i].Name, "/")
if len(parts) > 1 {
result.Results[i].Namespace = parts[0]
result.Results[i].Name = parts[1]
} else {
result.Results[i].Namespace = result.Results[i].RepoOwner
}
} else {
result.Results[i].Name = strings.TrimPrefix(result.Results[i].Name, "library/")
result.Results[i].Namespace = "library"
}
}
setCacheResult(cacheKey, &result)
return &result, nil
}
// getRepositoryTags 获取仓库标签信息
func getRepositoryTags(ctx context.Context, namespace, name string) ([]TagInfo, error) {
if namespace == "" || name == "" {
return nil, fmt.Errorf("无效输入：命名空间和名称不能为空")
}
cacheKey := fmt.Sprintf("tags:%s:%s", namespace, name)
if cached, ok := getCachedResult(cacheKey); ok {
return cached.([]TagInfo), nil
}
// 构建API URL
var baseURL string
if namespace == "library" {
baseURL = fmt.Sprintf("https://registry.hub.docker.com/v2/repositories/library/%s/tags", name)
} else {
baseURL = fmt.Sprintf("https://registry.hub.docker.com/v2/repositories/%s/%s/tags", namespace, name)
}
baseURL := fmt.Sprintf("https://registry.hub.docker.com/v2/repositories/%s/%s/tags", namespace, name)
params := url.Values{}
params.Set("page_size", "100")
params.Set("ordering", "last_updated")