🔎 DC++ manual search scaffold

This commit is contained in:
2022-04-19 01:01:34 -07:00
parent 253c7357a0
commit d17f49baf4
4 changed files with 186 additions and 150 deletions

View File

@@ -1,8 +1,9 @@
import axios from "axios"; import axios from "axios";
import rateLimiter from "axios-rate-limit"; import rateLimiter from "axios-rate-limit";
import { AxiosCacheRequestConfig, createCacheAdapter } from 'axios-simple-cache-adapter'; import {
AxiosCacheRequestConfig,
createCacheAdapter,
} from "axios-simple-cache-adapter";
import qs from "qs"; import qs from "qs";
import { import {
CV_SEARCH_SUCCESS, CV_SEARCH_SUCCESS,
@@ -25,7 +26,6 @@ import {
LIBRARY_SERVICE_BASE_URI, LIBRARY_SERVICE_BASE_URI,
} from "../constants/endpoints"; } from "../constants/endpoints";
const axiosCacheAdapter = createCacheAdapter(); const axiosCacheAdapter = createCacheAdapter();
const http = rateLimiter(axios.create(), { const http = rateLimiter(axios.create(), {
maxRequests: 1, maxRequests: 1,
@@ -39,7 +39,6 @@ export const getWeeklyPullList = (options) => async (dispatch) => {
type: CV_WEEKLY_PULLLIST_CALL_IN_PROGRESS, type: CV_WEEKLY_PULLLIST_CALL_IN_PROGRESS,
}); });
await axios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, { await axios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
method: "get", method: "get",
params: options, params: options,
@@ -145,7 +144,7 @@ export const analyzeLibrary = (issues) => async (dispatch) => {
}); });
}; };
export const getLibraryStatistics = () => async dispatch => { export const getLibraryStatistics = () => async (dispatch) => {
dispatch({ dispatch({
type: LIBRARY_STATISTICS_CALL_IN_PROGRESS, type: LIBRARY_STATISTICS_CALL_IN_PROGRESS,
}); });

View File

@@ -52,15 +52,9 @@ export async function walkFolder(path: string): Promise<Array<IFolderData>> {
} }
/** /**
* Fetches comic book covers along with some metadata * Fetches comic book covers along with some metadata
* * @return the comic book metadata
* using {@link Renderer}.
*
* Used by external plugins
*
* @param {Object} options
* @return {Promise<string>} HTML of the page
*/ */
export const fetchComicBookMetadata = (options) => async (dispatch) => { export const fetchComicBookMetadata = () => async (dispatch) => {
const extractionOptions = { const extractionOptions = {
extractTarget: "cover", extractTarget: "cover",
targetExtractionFolder: "./userdata/covers", targetExtractionFolder: "./userdata/covers",
@@ -97,6 +91,11 @@ export const toggleImportQueueStatus = (options) => async (dispatch) => {
data: { manjhul: "jigyadam", action: options.action }, data: { manjhul: "jigyadam", action: options.action },
}); });
}; };
/**
* Fetches comic book metadata for various types
* @return metadata for the comic book object categories
* @param options
**/
export const getComicBooks = (options) => async (dispatch) => { export const getComicBooks = (options) => async (dispatch) => {
const { paginationOptions, predicate, comicStatus } = options; const { paginationOptions, predicate, comicStatus } = options;
@@ -127,6 +126,11 @@ export const getComicBooks = (options) => async (dispatch) => {
} }
}; };
/**
* Makes a call to library service to import the comic book metadata into the ThreeTwo data store.
* @returns Nothing.
* @param payload
*/
export const importToDB = (payload?: any) => (dispatch) => { export const importToDB = (payload?: any) => (dispatch) => {
try { try {
const comicBookMetadata = { const comicBookMetadata = {
@@ -164,6 +168,7 @@ export const importToDB = (payload?: any) => (dispatch) => {
}); });
} }
}; };
export const fetchVolumeGroups = () => async (dispatch) => { export const fetchVolumeGroups = () => async (dispatch) => {
try { try {
dispatch({ dispatch({

View File

@@ -13,6 +13,7 @@ import {
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { RootState, SearchInstance } from "threetwo-ui-typings"; import { RootState, SearchInstance } from "threetwo-ui-typings";
import ellipsize from "ellipsize"; import ellipsize from "ellipsize";
import { Form, Field } from "react-final-form";
import { isEmpty, isNil, map } from "lodash"; import { isEmpty, isNil, map } from "lodash";
import { AirDCPPSocketContext } from "../../context/AirDCPPSocket"; import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
interface IAcquisitionPanelProps { interface IAcquisitionPanelProps {
@@ -106,7 +107,33 @@ export const AcquisitionPanel = (
<> <>
<div className="comic-detail columns"> <div className="comic-detail columns">
{!isEmpty(ADCPPSocket) ? ( {!isEmpty(ADCPPSocket) ? (
<div className="column is-one-fifth"> <Form
onSubmit={getDCPPSearchResults}
initialValues={{
issueName,
}}
render={({ handleSubmit, form, submitting, pristine, values }) => (
<div className="column is-three-quarters">
<div className="box search">
<div className="columns">
<Field name="issueName">
{({ input, meta }) => {
return (
<div className="column is-two-thirds">
<input
{...input}
className="input main-search-bar is-medium"
placeholder="Type an issue/volume name"
/>
<span className="help is-clearfix is-light is-info">
Use this to manually override the search.
</span>
</div>
);
}}
</Field>
<div className="column">
<button <button
className={ className={
isAirDCPPSearchInProgress isAirDCPPSearchInProgress
@@ -121,6 +148,11 @@ export const AcquisitionPanel = (
<span className="airdcpp-text">Search on AirDC++</span> <span className="airdcpp-text">Search on AirDC++</span>
</button> </button>
</div> </div>
</div>
</div>
</div>
)}
/>
) : ( ) : (
<div className="column is-three-fifths"> <div className="column is-three-fifths">
<article className="message is-info"> <article className="message is-info">
@@ -131,13 +163,14 @@ export const AcquisitionPanel = (
</article> </article>
</div> </div>
)} )}
</div>
{/* AirDC++ search instance details */} {/* AirDC++ search instance details */}
{!isNil(searchInfo) && !isNil(searchInstance) && ( {!isNil(searchInfo) && !isNil(searchInstance) && (
<> <div className="columns">
<div className="column is-one-quarter is-size-7"> <div className="column is-one-quarter is-size-7">
<div className="card"> <div className="card">
<div className="card-content"> <div className="card-content">
<div className="content">
<dl> <dl>
<dt> <dt>
<div className="tags mb-1"> <div className="tags mb-1">
@@ -151,19 +184,15 @@ export const AcquisitionPanel = (
</div> </div>
</dt> </dt>
<dt>Query: {searchInfo.query.pattern}</dt> <dt>Query: {searchInfo.query.pattern}</dt>
<dd> <dd>Extensions: {searchInfo.query.extensions.join(", ")}</dd>
Extensions: {searchInfo.query.extensions.join(", ")}
</dd>
<dd>File type: {searchInfo.query.file_type}</dd> <dd>File type: {searchInfo.query.file_type}</dd>
</dl> </dl>
</div> </div>
</div> </div>
</div> </div>
</div>
<div className="column is-one-quarter is-size-7"> <div className="column is-one-quarter is-size-7">
<div className="card"> <div className="card">
<div className="card-content"> <div className="card-content">
<div className="content">
<dl> <dl>
<dt>Search Instance: {searchInstance.id}</dt> <dt>Search Instance: {searchInstance.id}</dt>
<dt>Owned by {searchInstance.owner}</dt> <dt>Owned by {searchInstance.owner}</dt>
@@ -173,12 +202,12 @@ export const AcquisitionPanel = (
</div> </div>
</div> </div>
</div> </div>
</>
)} )}
</div>
{/* AirDC++ results */} {/* AirDC++ results */}
<div className="columns"> <div className="columns">
{!isNil(airDCPPSearchResults) && !isEmpty(airDCPPSearchResults) ? ( {!isNil(airDCPPSearchResults) && !isEmpty(airDCPPSearchResults) ? (
<div className="column">
<table className="table"> <table className="table">
<thead> <thead>
<tr> <tr>
@@ -193,7 +222,9 @@ export const AcquisitionPanel = (
return ( return (
<tr <tr
key={idx} key={idx}
className={!isNil(result.dupe) ? "dupe-search-result" : ""} className={
!isNil(result.dupe) ? "dupe-search-result" : ""
}
> >
<td> <td>
<p className="mb-2"> <p className="mb-2">
@@ -256,6 +287,7 @@ export const AcquisitionPanel = (
})} })}
</tbody> </tbody>
</table> </table>
</div>
) : ( ) : (
<div className="column is-three-fifths"> <div className="column is-three-fifths">
<article className="message is-info"> <article className="message is-info">