🔧 Fixes to docker-compose config

This commit is contained in:
2021-11-24 07:38:57 -08:00
parent 2941559a18
commit bde76a81b7
3 changed files with 37 additions and 22 deletions

1
.gitignore vendored
View File

@@ -13,3 +13,4 @@ tests/**/*.jsx
src/client/assets/scss/App.css.map src/client/assets/scss/App.css.map
yarn-error.log yarn-error.log
.nova .nova
environment.list

View File

@@ -18,9 +18,10 @@ services:
- importapi - importapi
depends_on: depends_on:
- db - db
- elasticsearch
- libraryqueue
- redis - redis
- nats - settings
# - traefik
- importapi - importapi
- import - import
- imagetransformation - imagetransformation
@@ -41,7 +42,7 @@ services:
SERVICES: api SERVICES: api
env_file: comicvine-service.env env_file: comicvine-service.env
depends_on: depends_on:
- nats - redis
networks: networks:
- proxy - proxy
@@ -75,7 +76,7 @@ services:
- ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
depends_on: depends_on:
- nats - redis
- db - db
networks: networks:
- proxy - proxy
@@ -87,7 +88,7 @@ services:
container_name: import container_name: import
depends_on: depends_on:
- db - db
- nats - redis
environment: environment:
SERVICES: import SERVICES: import
volumes: volumes:
@@ -108,7 +109,7 @@ services:
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
depends_on: depends_on:
- db - db
- nats - redis
environment: environment:
SERVICES: imagetransformation SERVICES: imagetransformation
env_file: threetwo-import-service.env env_file: threetwo-import-service.env
@@ -125,7 +126,7 @@ services:
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
depends_on: depends_on:
- db - db
- nats - redis
environment: environment:
SERVICES: libraryqueue SERVICES: libraryqueue
env_file: threetwo-import-service.env env_file: threetwo-import-service.env
@@ -142,7 +143,7 @@ services:
- ${COMICS_DIRECTORY}:/threetwo-import-service/comics - ${COMICS_DIRECTORY}:/threetwo-import-service/comics
depends_on: depends_on:
- db - db
- nats - redis
environment: environment:
SERVICES: settings SERVICES: settings
env_file: threetwo-import-service.env env_file: threetwo-import-service.env

View File

@@ -1,4 +1,10 @@
import React, { useCallback, useContext, ReactElement, useEffect } from "react"; import React, {
useCallback,
useContext,
ReactElement,
useEffect,
useState,
} from "react";
import { import {
search, search,
downloadAirDCPPItem, downloadAirDCPPItem,
@@ -7,7 +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 { isEmpty, isNil, isUndefined, map, pick } from "lodash"; import { isEmpty, isNil, map } from "lodash";
import { AirDCPPSocketContext } from "../context/AirDCPPSocket"; import { AirDCPPSocketContext } from "../context/AirDCPPSocket";
interface IAcquisitionPanelProps { interface IAcquisitionPanelProps {
comicBookMetadata: any; comicBookMetadata: any;
@@ -38,6 +44,25 @@ export const AcquisitionPanel = (
const userSettings = useSelector((state: RootState) => state.settings.data); const userSettings = useSelector((state: RootState) => state.settings.data);
const { ADCPPSocket } = useContext(AirDCPPSocketContext); const { ADCPPSocket } = useContext(AirDCPPSocketContext);
const dispatch = useDispatch(); 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( const getDCPPSearchResults = useCallback(
async (searchQuery) => { async (searchQuery) => {
@@ -51,18 +76,6 @@ export const AcquisitionPanel = (
[dispatch, ADCPPSocket], [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++ // download via AirDC++
const downloadDCPPResult = useCallback( const downloadDCPPResult = useCallback(
(searchInstanceId, resultId, comicBookObjectId) => { (searchInstanceId, resultId, comicBookObjectId) => {