💽 ComicInfo.xml conversion and import wiring up

This commit is contained in:
2022-02-27 23:48:18 -08:00
parent 50f59f9493
commit e4b04c51eb
5 changed files with 38 additions and 13 deletions

View File

@@ -43,7 +43,7 @@ export const getWeeklyPullList = (options) => async (dispatch) => {
url: `${COMICVINE_SERVICE_URI}/getWeeklyPullList`, url: `${COMICVINE_SERVICE_URI}/getWeeklyPullList`,
method: "get", method: "get",
params: { params: {
startDate: "2022-2-28", startDate: "2022-3-7",
pageSize: "15", pageSize: "15",
currentPage: "1", currentPage: "1",
}, },

View File

@@ -120,6 +120,9 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
const isComicBookMetadataAvailable = const isComicBookMetadataAvailable =
comicBookDetailData.sourcedMetadata && comicBookDetailData.sourcedMetadata &&
!isUndefined(comicBookDetailData.sourcedMetadata.comicvine) && !isUndefined(comicBookDetailData.sourcedMetadata.comicvine) &&
!isUndefined(
comicBookDetailData.sourcedMetadata.comicvine.volumeInformation,
) &&
!isEmpty(comicBookDetailData.sourcedMetadata); !isEmpty(comicBookDetailData.sourcedMetadata);
// Tab content and header details // Tab content and header details
@@ -214,10 +217,7 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
); );
imagePath = escapePoundSymbol(encodedFilePath); imagePath = escapePoundSymbol(encodedFilePath);
comicBookTitle = comicBookDetailData.rawFileDetails.name; comicBookTitle = comicBookDetailData.rawFileDetails.name;
} else if ( } else if (isComicBookMetadataAvailable) {
!isNil(comicBookDetailData.sourcedMetadata) &&
!isNil(comicBookDetailData.sourcedMetadata.comicvine)
) {
imagePath = comicBookDetailData.sourcedMetadata.comicvine.image.small_url; imagePath = comicBookDetailData.sourcedMetadata.comicvine.image.small_url;
comicBookTitle = comicBookDetailData.sourcedMetadata.comicvine.name; comicBookTitle = comicBookDetailData.sourcedMetadata.comicvine.name;
} }
@@ -254,10 +254,19 @@ export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
inferredMetadata: comicBookDetailData.inferredMetadata, inferredMetadata: comicBookDetailData.inferredMetadata,
}} }}
/> />
{!isNil(comicBookDetailData.sourcedMetadata.comicInfo) && (
<div className="box">
<pre className="has-text-size-7">
{JSON.stringify(
comicBookDetailData.sourcedMetadata, null, 2
)}
</pre>
</div>
)}
</> </>
)} )}
{/* comic vine scraped metadata */} {/* comic vine scraped metadata */}
{!isNil(comicBookDetailData.sourcedMetadata.comicvine) && ( {isComicBookMetadataAvailable && (
<ComicVineDetails <ComicVineDetails
data={comicBookDetailData.sourcedMetadata.comicvine} data={comicBookDetailData.sourcedMetadata.comicvine}
updatedAt={comicBookDetailData.updatedAt} updatedAt={comicBookDetailData.updatedAt}

View File

@@ -7,6 +7,7 @@ import { PullList } from "./PullList";
import { getComicBooks } from "../../actions/fileops.actions"; import { getComicBooks } from "../../actions/fileops.actions";
import { getLibraryStatistics } from "../../actions/comicinfo.actions"; import { getLibraryStatistics } from "../../actions/comicinfo.actions";
import { isEmpty, isNil, isUndefined, map } from "lodash"; import { isEmpty, isNil, isUndefined, map } from "lodash";
import prettyBytes from "pretty-bytes";
export const Dashboard = (): ReactElement => { export const Dashboard = (): ReactElement => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@@ -46,7 +47,7 @@ export const Dashboard = (): ReactElement => {
<h4 className="title is-4 mt-2">Statistics</h4> <h4 className="title is-4 mt-2">Statistics</h4>
<div className="columns is-multiline"> <div className="columns is-multiline">
<div className="column is-narrow is-one-quarter"> <div className="column is-narrow is-two-quarter">
<dl className="box"> <dl className="box">
<dd className="is-size-4"> <dd className="is-size-4">
<span className="has-text-weight-bold"> <span className="has-text-weight-bold">
@@ -54,6 +55,14 @@ export const Dashboard = (): ReactElement => {
</span>{" "} </span>{" "}
files files
</dd> </dd>
<dd className="is-size-4">
Library size
<span className="has-text-weight-bold">
{" "}
{libraryStatistics.comicDirectorySize &&
prettyBytes(libraryStatistics.comicDirectorySize)}
</span>
</dd>
{!isUndefined(libraryStatistics.statistics) && {!isUndefined(libraryStatistics.statistics) &&
!isEmpty(libraryStatistics.statistics[0].issues) && ( !isEmpty(libraryStatistics.statistics[0].issues) && (
<dd className="is-size-6"> <dd className="is-size-6">

View File

@@ -3,7 +3,7 @@ import Card from "../Carda";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import ellipsize from "ellipsize"; import ellipsize from "ellipsize";
import { escapePoundSymbol } from "../../shared/utils/formatting.utils"; import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
import { isNil, isUndefined, map } from "lodash"; import { isEmpty, isNil, isUndefined, map } from "lodash";
import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils"; import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
import Masonry from "react-masonry-css"; import Masonry from "react-masonry-css";
import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints"; import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
@@ -21,6 +21,7 @@ export const RecentlyImported = ({
700: 2, 700: 2,
600: 2, 600: 2,
}; };
return ( return (
<> <>
<div className="content"> <div className="content">
@@ -37,6 +38,11 @@ export const RecentlyImported = ({
{map( {map(
comicBookCovers.docs, comicBookCovers.docs,
({ _id, rawFileDetails, sourcedMetadata }) => { ({ _id, rawFileDetails, sourcedMetadata }) => {
const isComicBookMetadataAvailable =
sourcedMetadata &&
!isUndefined(sourcedMetadata.comicvine) &&
!isUndefined(sourcedMetadata.comicvine.volumeInformation) &&
!isEmpty(sourcedMetadata);
let imagePath = ""; let imagePath = "";
let comicName = ""; let comicName = "";
if (!isNil(rawFileDetails)) { if (!isNil(rawFileDetails)) {
@@ -45,7 +51,7 @@ export const RecentlyImported = ({
); );
imagePath = escapePoundSymbol(encodedFilePath); imagePath = escapePoundSymbol(encodedFilePath);
comicName = rawFileDetails.name; comicName = rawFileDetails.name;
} else if (!isNil(sourcedMetadata.comicvine)) { } else if (!isEmpty(sourcedMetadata.comicvine)) {
imagePath = sourcedMetadata.comicvine.image.small_url; imagePath = sourcedMetadata.comicvine.image.small_url;
comicName = sourcedMetadata.comicvine.name; comicName = sourcedMetadata.comicvine.name;
} }
@@ -63,7 +69,7 @@ export const RecentlyImported = ({
title={comicName ? titleElement : null} title={comicName ? titleElement : null}
> >
<div className="content is-flex is-flex-direction-row"> <div className="content is-flex is-flex-direction-row">
{!isNil(sourcedMetadata.comicvine) && ( {isComicBookMetadataAvailable && (
<span className="icon custom-icon is-small"> <span className="icon custom-icon is-small">
<img src="/img/cvlogo.svg" /> <img src="/img/cvlogo.svg" />
</span> </span>
@@ -75,7 +81,7 @@ export const RecentlyImported = ({
</span> </span>
)} )}
{/* Issue type */} {/* Issue type */}
{!isUndefined(sourcedMetadata.comicvine) && {isComicBookMetadataAvailable &&
!isNil( !isNil(
detectIssueTypes( detectIssueTypes(
sourcedMetadata.comicvine.volumeInformation.description, sourcedMetadata.comicvine.volumeInformation.description,

View File

@@ -4,7 +4,7 @@ import { useHistory } from "react-router";
import { useTable, usePagination } from "react-table"; import { useTable, usePagination } from "react-table";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { getComicBooks } from "../actions/fileops.actions"; import { getComicBooks } from "../actions/fileops.actions";
import { isEmpty, isNil } from "lodash"; import { isEmpty, isNil, isUndefined } from "lodash";
import RawFileDetails from "./Library/RawFileDetails"; import RawFileDetails from "./Library/RawFileDetails";
import ComicVineDetails from "./Library/ComicVineDetails"; import ComicVineDetails from "./Library/ComicVineDetails";
import SearchBar from "./Library/SearchBar"; import SearchBar from "./Library/SearchBar";
@@ -79,7 +79,8 @@ export const Library = ({}: IComicBookLibraryProps): ReactElement => {
accessor: "sourcedMetadata", accessor: "sourcedMetadata",
Cell(props) { Cell(props) {
return ( return (
!isNil(props.cell.value.comicvine) && ( !isUndefined(props.cell.value) &&
!isUndefined(props.cell.value.comicvine) && (
<div>{props.cell.value.comicvine.issue_number}</div> <div>{props.cell.value.comicvine.issue_number}</div>
) )
); );