mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-02-28 16:45:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development' into autonomous

Browse source
This commit is contained in:
morpheus65535 2021-09-08 22:38:31 -04:00
commit 739ef9724e
7 changed files with 50 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
frontend/package-lock.json generated
View file

@ -25,7 +25,7 @@
"react-dom": "^17",
"react-helmet": "^6.1",
"react-redux": "^7.2",
"react-router-dom": "^5.2",
"react-router-dom": "^5.3",
"react-scripts": "^4",
"react-select": "^4",
"react-table": "^7",
@ -17095,11 +17095,11 @@
}
},
"node_modules/react-router": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
"integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz",
"integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==",
"dependencies": {
"@babel/runtime": "^7.1.2",
"@babel/runtime": "^7.12.13",
"history": "^4.9.0",
"hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1",
@ -17115,15 +17115,15 @@
}
},
"node_modules/react-router-dom": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
"integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz",
"integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==",
"dependencies": {
"@babel/runtime": "^7.1.2",
"@babel/runtime": "^7.12.13",
"history": "^4.9.0",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-router": "5.2.0",
"react-router": "5.2.1",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0"
},
@ -35324,11 +35324,11 @@
}
},
"react-router": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
"integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz",
"integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==",
"requires": {
"@babel/runtime": "^7.1.2",
"@babel/runtime": "^7.12.13",
"history": "^4.9.0",
"hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1",
@ -35341,15 +35341,15 @@
}
},
"react-router-dom": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
"integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz",
"integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==",
"requires": {
"@babel/runtime": "^7.1.2",
"@babel/runtime": "^7.12.13",
"history": "^4.9.0",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-router": "5.2.0",
"react-router": "5.2.1",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0"
}

2
frontend/package.json
View file

@ -30,7 +30,7 @@
"react-dom": "^17",
"react-helmet": "^6.1",
"react-redux": "^7.2",
"react-router-dom": "^5.2",
"react-router-dom": "^5.3",
"react-scripts": "^4",
"react-select": "^4",
"react-table": "^7",

2
frontend/src/DisplayItem/Episodes/index.tsx
View file

@ -102,7 +102,7 @@ const SeriesEpisodesView: FunctionComponent<Props> = (props) => {
seriesid: id,
}
);
dispatchTask("Scaning disk...", [task], "Scaning...");
dispatchTask("Scanning disk...", [task], "Scanning...");
}}
>
Scan Disk

19
frontend/src/Navigation/RootRedirect.tsx Normal file
View file

@ -0,0 +1,19 @@
import { FunctionComponent } from "react";
import { Redirect } from "react-router-dom";
import { useIsRadarrEnabled, useIsSonarrEnabled } from "../@redux/hooks";
const RootRedirect: FunctionComponent = () => {
const sonarr = useIsSonarrEnabled();
const radarr = useIsRadarrEnabled();
let path = "/settings";
if (sonarr) {
path = "/series";
} else if (radarr) {
path = "movies";
}
return <Redirect to={path}></Redirect>;
};
export default RootRedirect;

7
frontend/src/Navigation/index.ts
View file

@ -37,6 +37,7 @@ import SystemTasksView from "../System/Tasks";
import WantedMoviesView from "../Wanted/Movies";
import WantedSeriesView from "../Wanted/Series";
import { Navigation } from "./nav";
import RootRedirect from "./RootRedirect";
export function useNavigationItems() {
const seriesEnabled = useIsSeriesEnabled();
@ -51,6 +52,12 @@ export function useNavigationItems() {
component: EmptyPage,
routeOnly: true,
},
{
name: "Redirect",
path: "/",
component: RootRedirect,
routeOnly: true,
},
{
icon: faPlay,
name: "Series",

3
libs/subliminal_patch/providers/addic7ed.py
View file

@ -252,7 +252,8 @@ class Addic7edProvider(_Addic7edProvider):
type, media_id = link['href'].split('/')
if type == 'movie':
media_title = link.text
if match := re.search(r'(.+)\s\((\d{4})\)$', media_title):
match = re.search(r'(.+)\s\((\d{4})\)$', media_title)
if match:
media_name = match.group(1)
media_year = match.group(2)
if sanitize(media_name.lower()) == sanitize(movie.lower()) and media_year == str(year):

2
libs/subliminal_patch/providers/titrari.py
View file

@ -97,7 +97,7 @@ class TitrariProvider(Provider, ProviderSubtitleArchiveMixin):
languages = {Language(l) for l in ['ron', 'eng']}
languages.update(set(Language.rebuild(l, forced=True) for l in languages))
api_url = 'https://www.titrari.ro/'
query_advanced_search = 'cautaredevansata'
query_advanced_search = 'cautarenedevansata'
def __init__(self):
self.session = None