Skip to content

一分钟搭建影视站,支持Docker等部署方式

feat: enhance search functionality to support multi-select APIs and pagination

developerb8b287421360
diff --git a/js/app.js b/js/app.js
index 37887dd..292c424 100644
--- a/js/app.js
+++ b/js/app.js
@@ -561,7 +561,7 @@ function getCustomApiInfo(customApiIndex) {
return customAPIs[index];
}
-// 搜索功能 - 修改为支持多选API
+// 搜索功能 - 修改为支持多选API和多页结果
async function search() {
// 密码保护校验
if (window.isPasswordProtected && window.isPasswordVerified) {
@@ -592,7 +592,7 @@ async function search() {
let allResults = [];
const searchPromises = selectedAPIs.map(async (apiId) => {
try {
- let apiUrl, apiName;
+ let apiUrl, apiName, apiBaseUrl;
// 处理自定义API
if (apiId.startsWith('custom_')) {
@@ -600,12 +600,14 @@ async function search() {
const customApi = getCustomApiInfo(customIndex);
if (!customApi) return [];
- apiUrl = customApi.url + API_CONFIG.search.path + encodeURIComponent(query);
+ apiBaseUrl = customApi.url;
+ apiUrl = apiBaseUrl + API_CONFIG.search.path + encodeURIComponent(query);
apiName = customApi.name;
} else {
// 内置API
if (!API_SITES[apiId]) return [];
- apiUrl = API_SITES[apiId].api + API_CONFIG.search.path + encodeURIComponent(query);
+ apiBaseUrl = API_SITES[apiId].api;
+ apiUrl = apiBaseUrl + API_CONFIG.search.path + encodeURIComponent(query);
apiName = API_SITES[apiId].name;
}
@@ -630,7 +632,7 @@ async function search() {
return [];
}
- // 添加源信息到每个结果
+ // 处理第一页结果
const results = data.list.map(item => ({
...item,
source_name: apiName,
@@ -638,6 +640,67 @@ async function search() {
api_url: apiId.startsWith('custom_') ? getCustomApiInfo(apiId.replace('custom_', ''))?.url : undefined
}));
+ // 获取总页数
+ const pageCount = data.pagecount || 1;
+ // 确定需要获取的额外页数 (最多获取maxPages页)
+ const pagesToFetch = Math.min(pageCount - 1, API_CONFIG.search.maxPages - 1);
+
+ // 如果有额外页数,获取更多页的结果
+ if (pagesToFetch > 0) {
+ const additionalPagePromises = [];
+
+ for (let page = 2; page <= pagesToFetch + 1; page++) {
+ // 构建分页URL
+ const pageUrl = apiBaseUrl + API_CONFIG.search.pagePath
+ .replace('{query}', encodeURIComponent(query))
+ .replace('{page}', page);
+
+ // 创建获取额外页的Promise
+ const pagePromise = (async () => {
+ try {
+ const pageController = new AbortController();
+ const pageTimeoutId = setTimeout(() => pageController.abort(), 8000);
+
+ const pageResponse = await fetch(PROXY_URL + encodeURIComponent(pageUrl), {
+ headers: API_CONFIG.search.headers,
+ signal: pageController.signal
+ });
+
+ clearTimeout(pageTimeoutId);
+
+ if (!pageResponse.ok) return [];
+
+ const pageData = await pageResponse.json();
+
+ if (!pageData || !pageData.list || !Array.isArray(pageData.list)) return [];
+
+ // 处理当前页结果
+ return pageData.list.map(item => ({
+ ...item,
+ source_name: apiName,
+ source_code: apiId,
+ api_url: apiId.startsWith('custom_') ? getCustomApiInfo(apiId.replace('custom_', ''))?.url : undefined
+ }));
+ } catch (error) {
+ console.warn(`API ${apiId} 第${page}页搜索失败:`, error);
+ return [];
+ }
+ })();
+
+ additionalPagePromises.push(pagePromise);
+ }
+
+ // 等待所有额外页的结果
+ const additionalResults = await Promise.all(additionalPagePromises);
+
+ // 合并所有页的结果
+ additionalResults.forEach(pageResults => {
+ if (pageResults.length > 0) {
+ results.push(...pageResults);
+ }
+ });
+ }
+
return results;
} catch (error) {
console.warn(`API ${apiId} 搜索失败:`, error);
@@ -701,7 +764,7 @@ async function search() {
}
// 添加XSS保护,使用textContent和属性转义
- resultsDiv.innerHTML = allResults.map(item => {
+ const safeResults = allResults.map(item => {
const safeId = item.vod_id ? item.vod_id.toString().replace(/[^\w-]/g, '') : '';
const safeName = (item.vod_name || '').toString()
.replace(/</g, '&lt;')
@@ -768,6 +831,8 @@ async function search() {
</div>
`;
}).join('');
+
+ resultsDiv.innerHTML = safeResults;
} catch (error) {
console.error('搜索错误:', error);
if (error.name === 'AbortError') {
diff --git a/js/config.js b/js/config.js
index ad12b0f..43f0f9f 100644
--- a/js/config.js
+++ b/js/config.js
@@ -178,15 +178,17 @@ const AGGREGATED_SEARCH_CONFIG = {
// 抽象API请求配置
const API_CONFIG = {
search: {
- // 修改搜索接口为返回更多详细数据(包括视频封面、简介和播放列表)
+ // 修改搜索接口支持分页参数
path: '/api.php/provide/vod/?ac=videolist&wd=',
+ pagePath: '/api.php/provide/vod/?ac=videolist&wd={query}&pg={page}',
+ maxPages: 10, // 最大获取页数
headers: {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36',
'Accept': 'application/json'
}
},
detail: {
- // 修改详情接口也使用videolist接口,但是通过ID查询,减少请求次数
+ // 修改详情接口也使用videolist接口,但是通过ID查询,减少请求次数
path: '/api.php/provide/vod/?ac=videolist&ids=',
headers: {
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36',