🔧 Search page refactoring
This commit is contained in:
Rishi Ghan
@@ -33,84 +33,84 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
|
|||||||
|
|
||||||
export const search =
|
export const search =
|
||||||
(data: SearchData, ADCPPSocket: any, credentials: any) =>
|
(data: SearchData, ADCPPSocket: any, credentials: any) =>
|
||||||
async (dispatch) => {
|
async (dispatch) => {
|
||||||
try {
|
try {
|
||||||
if (!ADCPPSocket.isConnected()) {
|
if (!ADCPPSocket.isConnected()) {
|
||||||
await ADCPPSocket.connect(
|
await ADCPPSocket.connect(
|
||||||
credentials.username,
|
credentials.username,
|
||||||
credentials.password,
|
credentials.password,
|
||||||
true,
|
true,
|
||||||
);
|
|
||||||
}
|
|
||||||
const instance: SearchInstance = await ADCPPSocket.post("search");
|
|
||||||
dispatch({
|
|
||||||
type: AIRDCPP_SEARCH_IN_PROGRESS,
|
|
||||||
});
|
|
||||||
|
|
||||||
// We want to get notified about every new result in order to make the user experience better
|
|
||||||
await ADCPPSocket.addListener(
|
|
||||||
`search`,
|
|
||||||
"search_result_added",
|
|
||||||
async (groupedResult) => {
|
|
||||||
// ...add the received result in the UI
|
|
||||||
// (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
|
|
||||||
|
|
||||||
dispatch({
|
|
||||||
type: AIRDCPP_SEARCH_RESULTS_ADDED,
|
|
||||||
groupedResult,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
instance.id,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
|
|
||||||
await ADCPPSocket.addListener(
|
|
||||||
`search`,
|
|
||||||
"search_result_updated",
|
|
||||||
async (groupedResult) => {
|
|
||||||
// ...update properties of the existing result in the UI
|
|
||||||
dispatch({
|
|
||||||
type: AIRDCPP_SEARCH_RESULTS_UPDATED,
|
|
||||||
groupedResult,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
instance.id,
|
|
||||||
);
|
|
||||||
|
|
||||||
// We need to show something to the user in case the search won't yield any results so that he won't be waiting forever)
|
|
||||||
// Wait for 5 seconds for any results to arrive after the searches were sent to the hubs
|
|
||||||
await ADCPPSocket.addListener(
|
|
||||||
`search`,
|
|
||||||
"search_hub_searches_sent",
|
|
||||||
async (searchInfo) => {
|
|
||||||
await sleep(5000);
|
|
||||||
|
|
||||||
// Check the number of received results (in real use cases we should know that even without calling the API)
|
|
||||||
const currentInstance = await ADCPPSocket.get(
|
|
||||||
`search/${instance.id}`,
|
|
||||||
);
|
|
||||||
if (currentInstance.result_count === 0) {
|
|
||||||
// ...nothing was received, show an informative message to the user
|
|
||||||
console.log("No more search results.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// The search can now be considered to be "complete"
|
|
||||||
// If there's an "in progress" indicator in the UI, that could also be disabled here
|
|
||||||
dispatch({
|
|
||||||
type: AIRDCPP_HUB_SEARCHES_SENT,
|
|
||||||
searchInfo,
|
|
||||||
instance,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
instance.id,
|
|
||||||
);
|
|
||||||
// Finally, perform the actual search
|
|
||||||
await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
};
|
const instance: SearchInstance = await ADCPPSocket.post("search");
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_SEARCH_IN_PROGRESS,
|
||||||
|
});
|
||||||
|
|
||||||
|
// We want to get notified about every new result in order to make the user experience better
|
||||||
|
await ADCPPSocket.addListener(
|
||||||
|
`search`,
|
||||||
|
"search_result_added",
|
||||||
|
async (groupedResult) => {
|
||||||
|
// ...add the received result in the UI
|
||||||
|
// (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
|
||||||
|
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_SEARCH_RESULTS_ADDED,
|
||||||
|
groupedResult,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
instance.id,
|
||||||
|
);
|
||||||
|
|
||||||
|
// We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
|
||||||
|
await ADCPPSocket.addListener(
|
||||||
|
`search`,
|
||||||
|
"search_result_updated",
|
||||||
|
async (groupedResult) => {
|
||||||
|
// ...update properties of the existing result in the UI
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_SEARCH_RESULTS_UPDATED,
|
||||||
|
groupedResult,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
instance.id,
|
||||||
|
);
|
||||||
|
|
||||||
|
// We need to show something to the user in case the search won't yield any results so that he won't be waiting forever)
|
||||||
|
// Wait for 5 seconds for any results to arrive after the searches were sent to the hubs
|
||||||
|
await ADCPPSocket.addListener(
|
||||||
|
`search`,
|
||||||
|
"search_hub_searches_sent",
|
||||||
|
async (searchInfo) => {
|
||||||
|
await sleep(5000);
|
||||||
|
|
||||||
|
// Check the number of received results (in real use cases we should know that even without calling the API)
|
||||||
|
const currentInstance = await ADCPPSocket.get(
|
||||||
|
`search/${instance.id}`,
|
||||||
|
);
|
||||||
|
if (currentInstance.result_count === 0) {
|
||||||
|
// ...nothing was received, show an informative message to the user
|
||||||
|
console.log("No more search results.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// The search can now be considered to be "complete"
|
||||||
|
// If there's an "in progress" indicator in the UI, that could also be disabled here
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_HUB_SEARCHES_SENT,
|
||||||
|
searchInfo,
|
||||||
|
instance,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
instance.id,
|
||||||
|
);
|
||||||
|
// Finally, perform the actual search
|
||||||
|
await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
export const downloadAirDCPPItem =
|
export const downloadAirDCPPItem =
|
||||||
(
|
(
|
||||||
@@ -120,133 +120,133 @@ export const downloadAirDCPPItem =
|
|||||||
ADCPPSocket: any,
|
ADCPPSocket: any,
|
||||||
credentials: any,
|
credentials: any,
|
||||||
): void =>
|
): void =>
|
||||||
async (dispatch) => {
|
async (dispatch) => {
|
||||||
try {
|
try {
|
||||||
if (!ADCPPSocket.isConnected()) {
|
if (!ADCPPSocket.isConnected()) {
|
||||||
await ADCPPSocket.connect(
|
await ADCPPSocket.connect(
|
||||||
`${credentials.username}`,
|
`${credentials.username}`,
|
||||||
`${credentials.password}`,
|
`${credentials.password}`,
|
||||||
true,
|
true,
|
||||||
);
|
|
||||||
}
|
|
||||||
let bundleDBImportResult = {};
|
|
||||||
const downloadResult = await ADCPPSocket.post(
|
|
||||||
`search/${instanceId}/results/${resultId}/download`,
|
|
||||||
);
|
);
|
||||||
let downloadStatus = undefined;
|
|
||||||
// download status check
|
|
||||||
await ADCPPSocket.addListener(`queue`, "queue_file_status", (status) => {
|
|
||||||
if (status.status.completed) {
|
|
||||||
downloadStatus = status;
|
|
||||||
|
|
||||||
dispatch({
|
|
||||||
type: LS_SINGLE_IMPORT,
|
|
||||||
meta: { remote: true },
|
|
||||||
data: { downloadStatus },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let bundleId;
|
|
||||||
let directoryIds;
|
|
||||||
if (!isNil(downloadResult.bundle_info)) {
|
|
||||||
bundleId = downloadResult.bundle_info.id;
|
|
||||||
}
|
|
||||||
if (!isNil(downloadResult.directory_download_ids)) {
|
|
||||||
directoryIds = downloadResult.directory_download_ids.map(
|
|
||||||
(item) => item.id,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isNil(downloadResult)) {
|
|
||||||
bundleDBImportResult = await axios({
|
|
||||||
method: "POST",
|
|
||||||
url: `${LIBRARY_SERVICE_BASE_URI}/applyAirDCPPDownloadMetadata`,
|
|
||||||
headers: {
|
|
||||||
"Content-Type": "application/json; charset=utf-8",
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
resultId,
|
|
||||||
comicObjectId,
|
|
||||||
searchInstanceId: instanceId,
|
|
||||||
bundleId,
|
|
||||||
directoryIds,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
dispatch({
|
|
||||||
type: AIRDCPP_RESULT_DOWNLOAD_INITIATED,
|
|
||||||
downloadResult: downloadResult,
|
|
||||||
bundleDBImportResult,
|
|
||||||
});
|
|
||||||
dispatch({
|
|
||||||
type: IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
|
|
||||||
comicBookDetail: bundleDBImportResult.data,
|
|
||||||
IMS_inProgress: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
};
|
let bundleDBImportResult = {};
|
||||||
|
const downloadResult = await ADCPPSocket.post(
|
||||||
|
`search/${instanceId}/results/${resultId}/download`,
|
||||||
|
);
|
||||||
|
let downloadStatus = undefined;
|
||||||
|
// download status check
|
||||||
|
await ADCPPSocket.addListener(`queue`, "queue_file_status", (status) => {
|
||||||
|
if (status.status.completed) {
|
||||||
|
downloadStatus = status;
|
||||||
|
|
||||||
export const getDownloadProgress =
|
dispatch({
|
||||||
(comicObjectId: string, ADCPPSocket: any, credentials: any): void =>
|
type: LS_SINGLE_IMPORT,
|
||||||
async (dispatch) => {
|
meta: { remote: true },
|
||||||
try {
|
data: { downloadStatus, comicObjectId },
|
||||||
if (!ADCPPSocket.isConnected()) {
|
});
|
||||||
await ADCPPSocket.connect(
|
|
||||||
`${credentials.username}`,
|
|
||||||
`${credentials.password}`,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
await ADCPPSocket.addListener(
|
});
|
||||||
`queue`,
|
|
||||||
"queue_bundle_tick",
|
let bundleId;
|
||||||
async (downloadProgressData) => {
|
let directoryIds;
|
||||||
dispatch({
|
if (!isNil(downloadResult.bundle_info)) {
|
||||||
type: AIRDCPP_DOWNLOAD_PROGRESS_TICK,
|
bundleId = downloadResult.bundle_info.id;
|
||||||
downloadProgressData,
|
}
|
||||||
});
|
if (!isNil(downloadResult.directory_download_ids)) {
|
||||||
},
|
directoryIds = downloadResult.directory_download_ids.map(
|
||||||
|
(item) => item.id,
|
||||||
);
|
);
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
export const getBundlesForComic =
|
if (!isNil(downloadResult)) {
|
||||||
(comicObjectId: string, ADCPPSocket: any, credentials: any) =>
|
bundleDBImportResult = await axios({
|
||||||
async (dispatch) => {
|
|
||||||
try {
|
|
||||||
if (!ADCPPSocket.isConnected()) {
|
|
||||||
await ADCPPSocket.connect(
|
|
||||||
`${credentials.username}`,
|
|
||||||
`${credentials.password}`,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const comicObject = await axios({
|
|
||||||
method: "POST",
|
method: "POST",
|
||||||
url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
|
url: `${LIBRARY_SERVICE_BASE_URI}/applyAirDCPPDownloadMetadata`,
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json; charset=utf-8",
|
"Content-Type": "application/json; charset=utf-8",
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
id: `${comicObjectId}`,
|
resultId,
|
||||||
|
comicObjectId,
|
||||||
|
searchInstanceId: instanceId,
|
||||||
|
bundleId,
|
||||||
|
directoryIds,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
// get only the bundles applicable for the comic
|
|
||||||
const filteredBundles = comicObject.data.acquisition.directconnect.map(
|
|
||||||
async ({ bundleId }) => {
|
|
||||||
return await ADCPPSocket.get(`queue/bundles/${bundleId}`);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
dispatch({
|
dispatch({
|
||||||
type: AIRDCPP_BUNDLES_FETCHED,
|
type: AIRDCPP_RESULT_DOWNLOAD_INITIATED,
|
||||||
bundles: await Promise.all(filteredBundles),
|
downloadResult: downloadResult,
|
||||||
|
bundleDBImportResult,
|
||||||
|
});
|
||||||
|
dispatch({
|
||||||
|
type: IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
|
||||||
|
comicBookDetail: bundleDBImportResult.data,
|
||||||
|
IMS_inProgress: false,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
|
||||||
throw error;
|
|
||||||
}
|
}
|
||||||
};
|
} catch (error) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getDownloadProgress =
|
||||||
|
(comicObjectId: string, ADCPPSocket: any, credentials: any): void =>
|
||||||
|
async (dispatch) => {
|
||||||
|
try {
|
||||||
|
if (!ADCPPSocket.isConnected()) {
|
||||||
|
await ADCPPSocket.connect(
|
||||||
|
`${credentials.username}`,
|
||||||
|
`${credentials.password}`,
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
await ADCPPSocket.addListener(
|
||||||
|
`queue`,
|
||||||
|
"queue_bundle_tick",
|
||||||
|
async (downloadProgressData) => {
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_DOWNLOAD_PROGRESS_TICK,
|
||||||
|
downloadProgressData,
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const getBundlesForComic =
|
||||||
|
(comicObjectId: string, ADCPPSocket: any, credentials: any) =>
|
||||||
|
async (dispatch) => {
|
||||||
|
try {
|
||||||
|
if (!ADCPPSocket.isConnected()) {
|
||||||
|
await ADCPPSocket.connect(
|
||||||
|
`${credentials.username}`,
|
||||||
|
`${credentials.password}`,
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const comicObject = await axios({
|
||||||
|
method: "POST",
|
||||||
|
url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json; charset=utf-8",
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
id: `${comicObjectId}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// get only the bundles applicable for the comic
|
||||||
|
const filteredBundles = comicObject.data.acquisition.directconnect.map(
|
||||||
|
async ({ bundleId }) => {
|
||||||
|
return await ADCPPSocket.get(`queue/bundles/${bundleId}`);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
dispatch({
|
||||||
|
type: AIRDCPP_BUNDLES_FETCHED,
|
||||||
|
bundles: await Promise.all(filteredBundles),
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import { searchIssue } from "../../actions/fileops.actions";
|
|||||||
export const SearchBar = (): ReactElement => {
|
export const SearchBar = (): ReactElement => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const handleSubmit = useCallback((e) => {
|
const handleSubmit = useCallback((e) => {
|
||||||
console.log(e);
|
|
||||||
dispatch(
|
dispatch(
|
||||||
searchIssue(
|
searchIssue(
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user