frishi/threetwo
1
0
Fork 0
Code Issues 9 Pull Requests 6 Actions Packages Projects Releases 2 Wiki Activity

🔧 Fixed a long standing issue with CV-sourced comics, which should not be scraped again

Browse Source
This commit is contained in:
Rishi Ghan
2021-12-06 14:45:16 -08:00
parent 1b57092d3b
commit 03c24328ed
6 changed files with 122 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/client/actions/fileops.actions.tsx
View File

@@ -154,66 +154,58 @@ export const fetchVolumeGroups = () => (dispatch) => {
}); });
} }
}; };
export const fetchComicVineMatches = (searchPayload) => (dispatch) => { export const fetchComicVineMatches =
try { (searchPayload, issueSearchQuery, seriesSearchQuery?) => (dispatch) => {
const issueString = searchPayload.rawFileDetails.name; try {
const issueSearchQuery: IComicVineSearchQuery = refineQuery(issueString); dispatch({
let seriesSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery; type: CV_API_CALL_IN_PROGRESS,
if (searchPayload.rawFileDetails.containedIn !== "comics") { });
seriesSearchQuery = refineQuery(
searchPayload.rawFileDetails.containedIn.split("/").pop(),
);
}
dispatch({ axios
type: CV_API_CALL_IN_PROGRESS, .request({
}); url: `${COMICBOOKINFO_SERVICE_URI}/fetchresource`,
method: "POST",
axios data: {
.request({ format: "json",
url: `${COMICBOOKINFO_SERVICE_URI}/fetchresource`, sort: "name%3Aasc",
method: "POST", // hack
data: { query: issueSearchQuery.searchParams.searchTerms.name
format: "json", .replace(/[^a-zA-Z0-9 ]/g, "")
sort: "name%3Aasc", .trim(),
// hack fieldList: "id",
query: issueSearchQuery.searchParams.searchTerms.name limit: "20",
.replace(/[^a-zA-Z0-9 ]/g, "") offset: "0",
.trim(), resources: "issue",
fieldList: "id", scorerConfiguration: {
limit: "20", searchQuery: {
offset: "0", issue: issueSearchQuery,
resources: "issue", series: seriesSearchQuery,
scorerConfiguration: { },
searchQuery: { rawFileDetails: searchPayload.rawFileDetails,
},
},
transformResponse: (r) => {
const matches = JSON.parse(r);
return sortBy(matches, (match) => -match.score);
},
})
.then((response) => {
dispatch({
type: CV_SEARCH_SUCCESS,
searchResults: response.data,
searchQueryObject: {
issue: issueSearchQuery, issue: issueSearchQuery,
series: seriesSearchQuery, series: seriesSearchQuery,
}, },
rawFileDetails: searchPayload.rawFileDetails, });
},
},
transformResponse: (r) => {
const matches = JSON.parse(r);
return sortBy(matches, (match) => -match.score);
},
})
.then((response) => {
dispatch({
type: CV_SEARCH_SUCCESS,
searchResults: response.data,
searchQueryObject: {
issue: issueSearchQuery,
series: seriesSearchQuery,
},
}); });
});
/* return { issueSearchQuery, series: seriesSearchQuery.searchParams }; */ /* return { issueSearchQuery, series: seriesSearchQuery.searchParams }; */
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
dispatch({ dispatch({
type: CV_CLEANUP, type: CV_CLEANUP,
}); });
}; };

8
src/client/components/ComicDetail.tsx
View File

@@ -15,6 +15,7 @@ import { RawFileDetails } from "./ComicDetail/RawFileDetails";
import { ArchiveOperations } from "./ComicDetail/Tabs/ArchiveOperations"; import { ArchiveOperations } from "./ComicDetail/Tabs/ArchiveOperations";
import AcquisitionPanel from "./ComicDetail/AcquisitionPanel"; import AcquisitionPanel from "./ComicDetail/AcquisitionPanel";
import DownloadsPanel from "./ComicDetail/DownloadsPanel"; import DownloadsPanel from "./ComicDetail/DownloadsPanel";
import { EditMetadataPanel } from "./ComicDetail/EditMetadataPanel";
import { Menu } from "./ComicDetail/ActionMenu/Menu"; import { Menu } from "./ComicDetail/ActionMenu/Menu";
import { isEmpty, isUndefined, isNil } from "lodash"; import { isEmpty, isUndefined, isNil } from "lodash";
@@ -62,7 +63,6 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
const comicBookDetailData = useSelector( const comicBookDetailData = useSelector(
(state: RootState) => state.comicInfo.comicBookDetail, (state: RootState) => state.comicInfo.comicBookDetail,
); );
const { comicObjectId } = useParams<{ comicObjectId: string }>(); const { comicObjectId } = useParams<{ comicObjectId: string }>();
const userSettings = useSelector((state: RootState) => state.settings.data); const userSettings = useSelector((state: RootState) => state.settings.data);
const { ADCPPSocket, setADCPPSocket } = useContext(AirDCPPSocketContext); const { ADCPPSocket, setADCPPSocket } = useContext(AirDCPPSocketContext);
@@ -75,7 +75,6 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
useEffect(() => { useEffect(() => {
if (isEmpty(ADCPPSocket) && !isNil(userSettings.directConnect)) { if (isEmpty(ADCPPSocket) && !isNil(userSettings.directConnect)) {
console.log(userSettings.directConnect.client.host.hostname);
setADCPPSocket( setADCPPSocket(
new AirDCPPSocket({ new AirDCPPSocket({
protocol: `${userSettings.directConnect.client.host.protocol}`, protocol: `${userSettings.directConnect.client.host.protocol}`,
@@ -118,10 +117,11 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
} }
}, },
}, },
editComicArchive: { editComicBookMetadata: {
content: () => <></>, content: () => <EditMetadataPanel />,
}, },
}; };
console.log(comicVineSearchQueryObject);
const [active, setActive] = useState(1); const [active, setActive] = useState(1);

35
src/client/components/ComicDetail/ActionMenu/Menu.tsx
View File

@@ -1,24 +1,44 @@
import { filter, isEmpty, isNil, isUndefined } from "lodash";
import React, { ReactElement, useCallback } from "react"; import React, { ReactElement, useCallback } from "react";
import { useSelector, useDispatch } from "react-redux"; import { useSelector, useDispatch } from "react-redux";
import Select, { components } from "react-select"; import Select, { components } from "react-select";
import { fetchComicVineMatches } from "../../../actions/fileops.actions"; import { fetchComicVineMatches } from "../../../actions/fileops.actions";
import { refineQuery } from "../../../shared/utils/filenameparser.utils";
export const Menu = (props): ReactElement => { export const Menu = (props): ReactElement => {
const { data } = props; const { data } = props;
const { setSlidingPanelContentId, setVisible } = props.handlers; const { setSlidingPanelContentId, setVisible } = props.handlers;
const dispatch = useDispatch(); const dispatch = useDispatch();
const openDrawerWithCVMatches = useCallback(() => { const openDrawerWithCVMatches = useCallback(() => {
dispatch(fetchComicVineMatches(data)); let seriesSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
let issueSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
if (!isUndefined(data.rawFileDetails)) {
issueSearchQuery = refineQuery(data.rawFileDetails.name);
if (data.rawFileDetails.containedIn !== "comics") {
seriesSearchQuery = refineQuery(
data.rawFileDetails.containedIn.split("/").pop(),
);
}
} else if (!isEmpty(data.sourcedMetadata)) {
issueSearchQuery = refineQuery(data.sourcedMetadata.comicvine.name);
}
dispatch(fetchComicVineMatches(data, issueSearchQuery, seriesSearchQuery));
setSlidingPanelContentId("CVMatches"); setSlidingPanelContentId("CVMatches");
setVisible(true); setVisible(true);
}, [dispatch, data]); }, [dispatch, data]);
const openEditMetadataPanel = useCallback(() => {
setSlidingPanelContentId("editComicBookMetadata");
setVisible(true);
}, []);
// Actions menu options and handler // Actions menu options and handler
const CVMatchLabel = ( const CVMatchLabel = (
<span> <span>
<i className="fa-solid fa-wand-magic"></i> Match on ComicVine <i className="fa-solid fa-wand-magic"></i> Match on ComicVine
</span> </span>
); );
const editLabel = ( const editLabel = (
<span> <span>
<i className="fa-regular fa-pen-to-square"></i> Edit Metadata <i className="fa-regular fa-pen-to-square"></i> Edit Metadata
@@ -38,11 +58,20 @@ export const Menu = (props): ReactElement => {
{ value: "delete-comic", label: deleteLabel }, { value: "delete-comic", label: deleteLabel },
]; ];
const filteredActionOptions = filter(actionOptions, (item) => {
if (isUndefined(data.rawFileDetails)) {
return item.value !== "match-on-comic-vine";
}
return item;
});
const handleActionSelection = (action) => { const handleActionSelection = (action) => {
switch (action.value) { switch (action.value) {
case "match-on-comic-vine": case "match-on-comic-vine":
openDrawerWithCVMatches(); openDrawerWithCVMatches();
break; break;
case "edit-metdata":
openEditMetadataPanel();
break;
default: default:
console.log("No valid action selected."); console.log("No valid action selected.");
break; break;
@@ -61,7 +90,7 @@ export const Menu = (props): ReactElement => {
} }
name="actions" name="actions"
isSearchable={false} isSearchable={false}
options={actionOptions} options={filteredActionOptions}
onChange={handleActionSelection} onChange={handleActionSelection}
/> />
); );

52
src/client/components/ComicDetail/ComicVineMatchPanel.tsx
View File

@@ -14,36 +14,38 @@ export const ComicVineMatchPanel = (comicVineData): ReactElement => {
console.log(comicVineData); console.log(comicVineData);
return ( return (
<> <>
<div className="card search-criteria-card"> {!isEmpty(comicVineSearchQueryObject) && (
<div className="card-content"> <div className="card search-criteria-card">
<ComicVineSearchForm /> <div className="card-content">
<p className="is-size-6">Searching against:</p> <ComicVineSearchForm />
<div className="field is-grouped is-grouped-multiline"> <p className="is-size-6">Searching against:</p>
<div className="control"> <div className="field is-grouped is-grouped-multiline">
<div className="tags has-addons"> <div className="control">
<span className="tag">Title</span> <div className="tags has-addons">
<span className="tag is-info"> <span className="tag">Title</span>
{ <span className="tag is-info">
comicVineSearchQueryObject.issue.searchParams.searchTerms {
.name comicVineSearchQueryObject.issue.searchParams.searchTerms
} .name
</span> }
</span>
</div>
</div> </div>
</div> <div className="control">
<div className="control"> <div className="tags has-addons">
<div className="tags has-addons"> <span className="tag">Number</span>
<span className="tag">Number</span> <span className="tag is-info">
<span className="tag is-info"> {
{ comicVineSearchQueryObject.issue.searchParams.searchTerms
comicVineSearchQueryObject.issue.searchParams.searchTerms .number
.number }
} </span>
</span> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> )}
<div className="search-results-container"> <div className="search-results-container">
{!isEmpty(comicVineSearchResults) && ( {!isEmpty(comicVineSearchResults) && (
<MatchResult <MatchResult

8
src/client/components/ComicDetail/DownloadsPanel.tsx
View File

@@ -124,10 +124,10 @@ export const DownloadsPanel = (
return !isNil(props.data) ? ( return !isNil(props.data) ? (
<> <>
{!isNil(downloadProgressTick) ? ( <div className="columns is-multiline">
<ProgressTick data={downloadProgressTick} /> {!isNil(downloadProgressTick) ? (
) : null} <ProgressTick data={downloadProgressTick} />
<div className="columns"> ) : null}
{!isEmpty(ADCPPSocket) ? ( {!isEmpty(ADCPPSocket) ? (
<Bundles data={bundles} /> <Bundles data={bundles} />
) : ( ) : (

7
src/client/components/ComicDetail/EditMetadataPanel.tsx Normal file
View File

@@ -0,0 +1,7 @@
import React, { ReactElement } from "react";
export const EditMetadataPanel = (props): ReactElement => {
return <>adsasdasd</>;
};
export default EditMetadataPanel;