🔧 Fixes to docker-compose config
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -13,3 +13,4 @@ tests/**/*.jsx
|
||||
src/client/assets/scss/App.css.map
|
||||
yarn-error.log
|
||||
.nova
|
||||
environment.list
|
||||
@@ -18,9 +18,10 @@ services:
|
||||
- importapi
|
||||
depends_on:
|
||||
- db
|
||||
- elasticsearch
|
||||
- libraryqueue
|
||||
- redis
|
||||
- nats
|
||||
# - traefik
|
||||
- settings
|
||||
- importapi
|
||||
- import
|
||||
- imagetransformation
|
||||
@@ -41,7 +42,7 @@ services:
|
||||
SERVICES: api
|
||||
env_file: comicvine-service.env
|
||||
depends_on:
|
||||
- nats
|
||||
- redis
|
||||
networks:
|
||||
- proxy
|
||||
|
||||
@@ -75,7 +76,7 @@ services:
|
||||
- ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
|
||||
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics
|
||||
depends_on:
|
||||
- nats
|
||||
- redis
|
||||
- db
|
||||
networks:
|
||||
- proxy
|
||||
@@ -87,7 +88,7 @@ services:
|
||||
container_name: import
|
||||
depends_on:
|
||||
- db
|
||||
- nats
|
||||
- redis
|
||||
environment:
|
||||
SERVICES: import
|
||||
volumes:
|
||||
@@ -108,7 +109,7 @@ services:
|
||||
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics
|
||||
depends_on:
|
||||
- db
|
||||
- nats
|
||||
- redis
|
||||
environment:
|
||||
SERVICES: imagetransformation
|
||||
env_file: threetwo-import-service.env
|
||||
@@ -125,7 +126,7 @@ services:
|
||||
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics
|
||||
depends_on:
|
||||
- db
|
||||
- nats
|
||||
- redis
|
||||
environment:
|
||||
SERVICES: libraryqueue
|
||||
env_file: threetwo-import-service.env
|
||||
@@ -142,7 +143,7 @@ services:
|
||||
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics
|
||||
depends_on:
|
||||
- db
|
||||
- nats
|
||||
- redis
|
||||
environment:
|
||||
SERVICES: settings
|
||||
env_file: threetwo-import-service.env
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
import React, { useCallback, useContext, ReactElement, useEffect } from "react";
|
||||
import React, {
|
||||
useCallback,
|
||||
useContext,
|
||||
ReactElement,
|
||||
useEffect,
|
||||
useState,
|
||||
} from "react";
|
||||
import {
|
||||
search,
|
||||
downloadAirDCPPItem,
|
||||
@@ -7,7 +13,7 @@ import {
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { RootState, SearchInstance } from "threetwo-ui-typings";
|
||||
import ellipsize from "ellipsize";
|
||||
import { isEmpty, isNil, isUndefined, map, pick } from "lodash";
|
||||
import { isEmpty, isNil, map } from "lodash";
|
||||
import { AirDCPPSocketContext } from "../context/AirDCPPSocket";
|
||||
interface IAcquisitionPanelProps {
|
||||
comicBookMetadata: any;
|
||||
@@ -38,6 +44,25 @@ export const AcquisitionPanel = (
|
||||
const userSettings = useSelector((state: RootState) => state.settings.data);
|
||||
const { ADCPPSocket } = useContext(AirDCPPSocketContext);
|
||||
const dispatch = useDispatch();
|
||||
const [dcppQuery, setDcppQuery] = useState({});
|
||||
|
||||
useEffect(() => {
|
||||
if (!isNil(userSettings.directConnect)) {
|
||||
// AirDC++ search query
|
||||
const dcppSearchQuery = {
|
||||
query: {
|
||||
pattern: `${sanitizedVolumeName.replace(/#/g, "")}`,
|
||||
extensions: ["cbz", "cbr"],
|
||||
},
|
||||
hub_urls: map(
|
||||
userSettings.directConnect.client.hubs,
|
||||
(item) => item.value,
|
||||
),
|
||||
priority: 5,
|
||||
};
|
||||
setDcppQuery(dcppSearchQuery);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const getDCPPSearchResults = useCallback(
|
||||
async (searchQuery) => {
|
||||
@@ -51,18 +76,6 @@ export const AcquisitionPanel = (
|
||||
[dispatch, ADCPPSocket],
|
||||
);
|
||||
|
||||
// AirDC++ search query
|
||||
const dcppQuery = {
|
||||
query: {
|
||||
pattern: `${sanitizedVolumeName.replace(/#/g, "")}`,
|
||||
// pattern: "Templier T2.cbr",
|
||||
extensions: ["cbz", "cbr"],
|
||||
},
|
||||
// "comic-scans.no-ip.biz:24674",
|
||||
hub_urls: map(userSettings.directConnect.client.hubs, (item) => item.value),
|
||||
priority: 5,
|
||||
};
|
||||
|
||||
// download via AirDC++
|
||||
const downloadDCPPResult = useCallback(
|
||||
(searchInstanceId, resultId, comicBookObjectId) => {
|
||||
|
||||
Reference in New Issue
Block a user