diff --git a/app/src/App.js b/app/src/App.js index 343d0de5..cd82db13 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -21,8 +21,6 @@ import {SemanticToastContainer} from "react-semantic-toasts-2"; import {FilePreviewProvider} from "./components/FilePreview"; import {TagsProvider} from "./Tags"; import {ZimRoute} from "./components/Zim"; -import {IframeViewer} from "./components/Common"; -import {CalculatorsRoute} from "./components/Calculators"; function PageNotFound() { const {t} = useContext(ThemeContext); diff --git a/app/src/DashboardPage.js b/app/src/DashboardPage.js index d0a25616..6857e6c1 100644 --- a/app/src/DashboardPage.js +++ b/app/src/DashboardPage.js @@ -1,6 +1,6 @@ import {LoadStatistic, PageContainer, SearchResultsInput, useTitle} from "./components/Common"; import React, {useContext, useState} from "react"; -import {Media, QueryContext, SettingsContext, StatusContext} from "./contexts/contexts"; +import {Media, SettingsContext, StatusContext} from "./contexts/contexts"; import {DownloadMenu} from "./components/Download"; import { Button, @@ -24,7 +24,7 @@ import {TagsDashboard} from "./Tags"; import {Upload} from "./components/Upload"; import {SearchView, useSearch, useSearchSuggestions} from "./components/Search"; import {KiwixRestartMessage, OutdatedZimsMessage} from "./components/Zim"; -import {useSearchDate, useSearchFilter, useWROLMode} from "./hooks/customHooks"; +import {useSearchFilter, useWROLMode} from "./hooks/customHooks"; import {FileSearchFilterButton} from "./components/Files"; import {DateSelectorButton} from "./components/DatesSelector"; diff --git a/app/src/components/Search.js b/app/src/components/Search.js index 85bdda02..740943c4 100644 --- a/app/src/components/Search.js +++ b/app/src/components/Search.js @@ -1,7 +1,7 @@ import React, {useState} from "react"; import {Route, Routes, useNavigate} from "react-router-dom"; import {FilesSearchView} from "./Files"; -import {useLatestRequest, usePages, useSearchDate, useSearchFiles, useSearchFilter} from "../hooks/customHooks"; +import {useLatestRequest, usePages, useSearchDate, useSearchFilter} from "../hooks/customHooks"; import {ZimSearchView} from "./Zim"; import {searchEstimateFiles, searchEstimateZims, searchSuggestions} from "../api"; import {filterToMimetypes, fuzzyMatch, normalizeEstimate, SearchResultsInput, TabLinks} from "./Common"; diff --git a/modules/archive/api.py b/modules/archive/api.py index 01128d88..dd93b21e 100644 --- a/modules/archive/api.py +++ b/modules/archive/api.py @@ -4,9 +4,9 @@ from sanic import response, Request, Blueprint from sanic_ext import validate from sanic_ext.extensions.openapi import openapi +from wrolpi.api_utils import json_response from wrolpi.common import logger, wrol_mode_check, api_param_limiter from wrolpi.errors import ValidationError -from wrolpi.api_utils import json_response from wrolpi.schema import JSONErrorResponse from . import lib, schema diff --git a/modules/archive/test/test_lib.py b/modules/archive/test/test_lib.py index dbb171ad..78555dd4 100644 --- a/modules/archive/test/test_lib.py +++ b/modules/archive/test/test_lib.py @@ -13,11 +13,11 @@ from modules.archive import lib from modules.archive.lib import get_or_create_domain, get_new_archive_files, delete_archives, model_archive_result, \ get_domains from modules.archive.models import Archive, Domain +from wrolpi.api_utils import CustomJSONEncoder from wrolpi.common import get_wrolpi_config from wrolpi.db import get_db_session from wrolpi.files import lib as files_lib from wrolpi.files.models import FileGroup -from wrolpi.api_utils import CustomJSONEncoder from wrolpi.test.common import skip_circleci diff --git a/modules/inventory/test/test_inventory.py b/modules/inventory/test/test_inventory.py index 13d47ae7..8b77f315 100644 --- a/modules/inventory/test/test_inventory.py +++ b/modules/inventory/test/test_inventory.py @@ -9,7 +9,6 @@ from pint import Quantity from wrolpi.common import Base from wrolpi.db import get_db_session -from wrolpi.api_utils import api_app from wrolpi.test.common import PytestCase from .. import init from ..common import sum_by_key, get_inventory_by_category, get_inventory_by_subcategory, get_inventory_by_name, \ diff --git a/modules/videos/channel/api.py b/modules/videos/channel/api.py index 849d42da..ad23fde0 100644 --- a/modules/videos/channel/api.py +++ b/modules/videos/channel/api.py @@ -7,11 +7,11 @@ from sanic.request import Request from sanic_ext import validate from sanic_ext.extensions.openapi import openapi +from wrolpi.api_utils import json_response from wrolpi.common import logger, wrol_mode_check, make_media_directory, \ get_media_directory, run_after, get_relative_to_media_directory from wrolpi.downloader import download_manager from wrolpi.events import Events -from wrolpi.api_utils import json_response from wrolpi.schema import JSONErrorResponse from wrolpi.vars import PYTEST from . import lib diff --git a/modules/videos/conftest.py b/modules/videos/conftest.py index 6b2b3dcc..81d7c024 100644 --- a/modules/videos/conftest.py +++ b/modules/videos/conftest.py @@ -11,11 +11,11 @@ import pytest from PIL import Image from modules.videos.downloader import VideoDownloader, ChannelDownloader -from modules.videos.lib import set_test_channels_config, set_test_downloader_config, get_channels_config +from modules.videos.lib import set_test_channels_config, set_test_downloader_config from modules.videos.models import Channel, Video +from wrolpi.api_utils import api_app from wrolpi.downloader import DownloadFrequency, DownloadManager, Download from wrolpi.files.models import FileGroup -from wrolpi.api_utils import api_app from wrolpi.vars import PROJECT_DIR diff --git a/modules/videos/test/test_video.py b/modules/videos/test/test_video.py index 4f90ad0e..bcdc9704 100644 --- a/modules/videos/test/test_video.py +++ b/modules/videos/test/test_video.py @@ -2,7 +2,6 @@ from datetime import datetime, timezone import pytest -from modules.videos.lib import save_channels_config from modules.videos.models import Video from wrolpi.errors import FileGroupIsTagged from wrolpi.files import lib as files_lib diff --git a/modules/videos/video/api.py b/modules/videos/video/api.py index ccfef2c7..88414d4a 100644 --- a/modules/videos/video/api.py +++ b/modules/videos/video/api.py @@ -1,14 +1,11 @@ -import json -import sys from http import HTTPStatus -import sanic.response from sanic import response, Blueprint from sanic.request import Request from sanic_ext import validate from sanic_ext.extensions.openapi import openapi -from wrolpi.api_utils import json_response, CustomJSONEncoder +from wrolpi.api_utils import json_response from wrolpi.common import logger, wrol_mode_check, run_after from wrolpi.errors import InvalidOrderBy, ValidationError from wrolpi.events import Events