-
- {props.pic.large_width + " X " + props.pic.large_height}
-
- {props.pic.src.split(".").at(-1) === "png" && PNG}
+
+
+
+ {props.pic.large_width + " X " + props.pic.large_height}
+
+
);
diff --git a/src/components/MainImageCard.js b/src/components/MainImageCard.js
index f39f527..1467ed2 100644
--- a/src/components/MainImageCard.js
+++ b/src/components/MainImageCard.js
@@ -3,28 +3,29 @@ import { DownloadButton } from "./DownloadButton";
import { toggleSelected } from "../js/commonFunctions";
export function MainImageCard(props) {
- const src = props.png ? props.pic : props.pic.src;
-
return (
{
ev.preventDefault();
- toggleSelected(props.selected, props.setSelected, src);
+ toggleSelected(props.selected, props.setSelected, props.pic.src);
}}>
-
- {props.png ? (
-
- PNG
-
- ) : (
- props.pic.large_width + " X " + props.pic.large_height
- )}
+
+ {props.pic.extension === "png" && PNG}
+
+ {props.pic.large_width + " X " + props.pic.large_height}
+
-
+
);
}
diff --git a/src/components/RelevantPicCardGroup.js b/src/components/RelevantPicCardGroup.js
index 8ffd0dd..81607a9 100644
--- a/src/components/RelevantPicCardGroup.js
+++ b/src/components/RelevantPicCardGroup.js
@@ -2,16 +2,30 @@ import { CardGroup } from "react-bootstrap";
import { ImageCard } from "./ImageCard";
export function RelevantPicCardGroup(props) {
- return props.pics.length ? (
+ return (
- {props.pics.map(pic => {
- return ;
- })}
+ {props.isParent ? (
+ props.pic ? (
+
+ ) : (
+
+ )
+ ) : props.pics.length ? (
+ props.pics
+ .filter(pic => !!pic)
+ .map(pic => {
+ return ;
+ })
+ ) : (
+
+ )}
- ) : (
-
- No {props.isParent ? "parent" : "children"} pictures fetched. If you are sure about them, please refresh,
- and wait for all tabs to close.
-
);
}
+
+const NotFoundMessage = props => {
+
+ No {props.isParent ? "parent" : "children"} pictures fetched. If you are sure about them, please refresh, and
+ wait for all tabs to close.
+
;
+};
diff --git a/src/js/fetchRelevant.js b/src/js/fetchRelevant.js
index c64d19b..8496c1b 100644
--- a/src/js/fetchRelevant.js
+++ b/src/js/fetchRelevant.js
@@ -1,66 +1,80 @@
/*global chrome*/
-export function fetchMainPic(mainPicUrl, setMainPic, setHighQual) {
- if (!mainPicUrl) return undefined;
- chrome.tabs.create({ url: mainPicUrl, active: false }, tab => {
- chrome.scripting.executeScript(
- {
- target: { tabId: tab.id },
- files: ["getMainPicObj.js"]
- },
- () => {
- chrome.storage.local.get(["mainPic"], data => {
- setMainPic(() => data.mainPic);
- setHighQual(() => data.mainPic.pngUrl);
+export function fetchRelevantPics(type, urlList) {
+ urlList.forEach(url => {
+ chrome.tabs.create({ url: url, active: false }, tab => {
+ chrome.scripting.executeScript(
+ { target: { tabId: tab.id }, func: fetchRelPicsFromPage, args: [type] },
+ () => {
chrome.tabs.remove(tab.id);
- });
- }
- );
+ }
+ );
+ });
});
}
-export function fetchParentPic(parentPicUrl) {
- let parentPic = [];
- if (parentPicUrl.length === 0) return [];
- chrome.tabs.create({ url: parentPicUrl[0], active: false }, tab => {
+function fetchRelPicsFromPage(type) {
+ const pageUrl = window.location.href;
+ const image = document.getElementById("image");
+ const pngLink = document.getElementById("png");
+ const pngHref = pngLink ? pngLink.href : "";
+ const src = !!pngHref ? pngHref : image.src;
+ const hasDeeperRelatives = findDeeperRelatives(pageUrl);
+ const properties = {
+ pageUrl,
+ src,
+ hasDeeperRelatives,
+ extension: src.split(".").pop(),
+ large_height: image.getAttribute("large_height"),
+ large_width: image.getAttribute("large_width")
+ };
+ let picObj = {};
+ switch (type) {
+ case "parent": {
+ picObj.parentPic = properties;
+ break;
+ }
+ case "child": {
+ picObj.childPic = properties;
+ break;
+ }
+ case "main": {
+ picObj.mainPic = properties;
+ break;
+ }
+ default: {
+ break;
+ }
+ }
+ chrome.runtime.sendMessage(undefined, picObj);
+}
+
+export const fetchByPageUrl = pageUrl => {
+ chrome.tabs.create({ url: pageUrl, active: false }, tab => {
chrome.scripting.executeScript(
{
target: { tabId: tab.id },
- files: ["getParentPicObj.js"]
+ files: ["fetchRelevantPicUrls.js"]
},
() => {
- chrome.storage.local.get(["parentPic"], data => {
- parentPic.push(data.parentPic);
- chrome.storage.local.remove(["parentPic"]);
- chrome.tabs.remove(tab.id);
- });
+ chrome.tabs.remove(tab.id);
+ chrome.tabs.reload(chrome.tabs.getCurrent().id, { bypassCache: true });
}
);
});
- return parentPic;
-}
+};
-export function fetchChildrenPics(childrenPicUrls) {
- let childrenPicObjs = [];
- if (childrenPicUrls.length === 0) {
- return [];
+function findDeeperRelatives(pageUrl) {
+ let result = { hasParent: false, hasChildren: false };
+ const divPostView = document.getElementById("post-view");
+ const divStatusNotice = Array.from(divPostView.getElementsByClassName("status-notice"));
+ for (let div of divStatusNotice) {
+ const a = Array.from(div.getElementsByTagName("a"));
+ if (a[0].text.includes("parent")) {
+ result.hasParent = true;
+ } else if (a[0].text.includes("child")) {
+ result.hasChildren = true;
+ }
}
- childrenPicUrls.forEach(url => {
- chrome.tabs.create({ url: url, active: false }, tab => {
- chrome.scripting.executeScript(
- {
- target: { tabId: tab.id },
- files: ["getChildPicObjs.js"]
- },
- () => {
- chrome.storage.local.get(["childPic"], data => {
- childrenPicObjs.push(data.childPic);
- chrome.storage.local.remove(["childPic"]);
- chrome.tabs.remove(tab.id);
- });
- }
- );
- });
- });
- return childrenPicObjs;
+ return result;
}