From dfd92b17300a7fcb62a555c42e814413422ce370 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 9 Apr 2021 12:59:28 +0200 Subject: [PATCH 01/15] new tvshowspage --- src/App.tsx | 71 +++++++++++++++-------------- src/pages/Player/Player.tsx | 6 +-- src/pages/TVShowPage/TVShowPage.tsx | 9 ++++ 3 files changed, 50 insertions(+), 36 deletions(-) create mode 100644 src/pages/TVShowPage/TVShowPage.tsx diff --git a/src/App.tsx b/src/App.tsx index 8f7ff4a..91b9e4f 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -17,6 +17,7 @@ import ActorOverviewPage from './pages/ActorOverviewPage/ActorOverviewPage'; import ActorPage from './pages/ActorPage/ActorPage'; import {SettingsTypes} from './types/ApiTypes'; import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage'; +import TVShowPage from './pages/TVShowPage/TVShowPage'; interface state { password: boolean | null; // null if uninitialized - true if pwd needed false if not needed @@ -93,9 +94,8 @@ class App extends React.Component<{}, state> { } render(): JSX.Element { - const themeStyle = GlobalInfos.getThemeStyle(); // add the main theme to the page body - document.body.className = themeStyle.backgroundcolor; + document.body.className = GlobalInfos.getThemeStyle().backgroundcolor; if (this.state.password === true) { // render authentication page if auth is neccessary @@ -104,37 +104,7 @@ class App extends React.Component<{}, state> { return (
-
-
{this.state.mediacentername}
- - Home - - - Random Video - - - - Categories - - - Settings - -
+ {this.navBar()} {this.routing()}
@@ -144,6 +114,38 @@ class App extends React.Component<{}, state> { } } + /** + * render the top navigation bar + */ + navBar(): JSX.Element { + const themeStyle = GlobalInfos.getThemeStyle(); + + return ( +
+
{this.state.mediacentername}
+ + Home + + + Random Video + + + + Categories + + + TV Shows + + + Settings + +
+ ); + } + + /** + * render the react router elements + */ routing(): JSX.Element { return ( @@ -153,6 +155,9 @@ class App extends React.Component<{}, state> { + + + diff --git a/src/pages/Player/Player.tsx b/src/pages/Player/Player.tsx index dde90f9..4651f11 100644 --- a/src/pages/Player/Player.tsx +++ b/src/pages/Player/Player.tsx @@ -287,9 +287,9 @@ export class Player extends React.Component { sources: [ { src: - (process.env.REACT_APP_CUST_BACK_DOMAIN - ? process.env.REACT_APP_CUST_BACK_DOMAIN - : GlobalInfos.getVideoPath()) + result.MovieUrl, + (process.env.REACT_APP_CUST_BACK_DOMAIN ? process.env.REACT_APP_CUST_BACK_DOMAIN : '') + + GlobalInfos.getVideoPath() + + result.MovieUrl, type: 'video/mp4', size: 1080 } diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx new file mode 100644 index 0000000..49c2f9e --- /dev/null +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -0,0 +1,9 @@ +import React from 'react'; + +class TVShowPage extends React.Component { + render(): JSX.Element { + return <>; + } +} + +export default TVShowPage; From 57a7a9a827f5e363c29d4d0e4539852323f2730b Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 16 Apr 2021 18:20:39 +0200 Subject: [PATCH 02/15] abstract dynamic video tile load within new dynamicloader class to allow to load other elements dynamically. --- .../DynamicContentContainer.module.css} | 2 +- .../DynamicContentContainer.test.js | 30 +++++++ .../DynamicContentContainer.tsx | 87 ++++++++++++++++++ .../VideoContainer/VideoContainer.test.js | 20 ----- .../VideoContainer/VideoContainer.tsx | 90 +++---------------- src/pages/CategoryPage/TagView.tsx | 24 ++--- src/pages/TVShowPage/TVShowPage.tsx | 2 +- 7 files changed, 144 insertions(+), 111 deletions(-) rename src/elements/{VideoContainer/VideoContainer.module.css => DynamicContentContainer/DynamicContentContainer.module.css} (96%) create mode 100644 src/elements/DynamicContentContainer/DynamicContentContainer.test.js create mode 100644 src/elements/DynamicContentContainer/DynamicContentContainer.tsx diff --git a/src/elements/VideoContainer/VideoContainer.module.css b/src/elements/DynamicContentContainer/DynamicContentContainer.module.css similarity index 96% rename from src/elements/VideoContainer/VideoContainer.module.css rename to src/elements/DynamicContentContainer/DynamicContentContainer.module.css index 972756a..ee66207 100644 --- a/src/elements/VideoContainer/VideoContainer.module.css +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.module.css @@ -1,4 +1,4 @@ .maincontent { float: left; width: 70%; -} \ No newline at end of file +} diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.test.js b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js new file mode 100644 index 0000000..176fd4f --- /dev/null +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js @@ -0,0 +1,30 @@ +import {shallow} from 'enzyme'; +import React from 'react'; +import DynamicContentContainer from './DynamicContentContainer'; + +describe('', function () { + it('renders without crashing ', function () { + const wrapper = shallow( (<>)}/>); + wrapper.unmount(); + }); + + it('inserts tiles correctly if enough available', () => { + const wrapper = shallow( ()}/>); + expect(wrapper.find('a')).toHaveLength(16); + }); + + it('inserts tiles correctly if not enough available', () => { + const wrapper = shallow( ()}/>); + expect(wrapper.find('a')).toHaveLength(4); + }); + + it('no items available', () => { + const wrapper = shallow( ()}/>); + expect(wrapper.find('a')).toHaveLength(0); + expect(wrapper.find('.maincontent').text()).toBe('no items to show!'); + }); +}); diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx new file mode 100644 index 0000000..c49300b --- /dev/null +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx @@ -0,0 +1,87 @@ +import React from 'react'; +import style from './DynamicContentContainer.module.css'; + +interface Props { + renderElement: (elem: T) => JSX.Element; + data: T[]; + initialLoadNr?: number; +} + +interface state { + loadeditems: T[]; + selectionnr: number; +} + +/** + * A videocontainer storing lots of Preview elements + * includes scroll handling and loading of preview infos + */ +class DynamicContentContainer extends React.Component, state> { + // stores current index of loaded elements + loadindex: number = 0; + + constructor(props: Props) { + super(props); + + this.state = { + loadeditems: [], + selectionnr: 0 + }; + } + + componentDidMount(): void { + document.addEventListener('scroll', this.trackScrolling); + + this.loadPreviewBlock(this.props.initialLoadNr ? this.props.initialLoadNr : 16); + } + + render(): JSX.Element { + return ( +
+ {this.state.loadeditems.map((elem) => { + return this.props.renderElement(elem); + })} + {/*todo css for no items to show*/} + {this.state.loadeditems.length === 0 ? 'no items to show!' : null} + {this.props.children} +
+ ); + } + + componentWillUnmount(): void { + // unbind scroll listener when unmounting component + document.removeEventListener('scroll', this.trackScrolling); + } + + /** + * load previews to the container + * @param nr number of previews to load + */ + loadPreviewBlock(nr: number): void { + let ret = []; + for (let i = 0; i < nr; i++) { + // only add if not end + if (this.props.data.length > this.loadindex + i) { + ret.push(this.props.data[this.loadindex + i]); + } + } + + this.setState({ + loadeditems: [...this.state.loadeditems, ...ret] + }); + + this.loadindex += nr; + } + + /** + * scroll event handler -> load new previews if on bottom + */ + trackScrolling = (): void => { + // comparison if current scroll position is on bottom --> 200 is bottom offset to trigger load + if (window.innerHeight + document.documentElement.scrollTop + 200 >= document.documentElement.offsetHeight) { + this.loadPreviewBlock(8); + } + }; +} + +export default DynamicContentContainer; diff --git a/src/elements/VideoContainer/VideoContainer.test.js b/src/elements/VideoContainer/VideoContainer.test.js index 3a76654..18f5187 100644 --- a/src/elements/VideoContainer/VideoContainer.test.js +++ b/src/elements/VideoContainer/VideoContainer.test.js @@ -7,24 +7,4 @@ describe('', function () { const wrapper = shallow(); wrapper.unmount(); }); - - it('inserts tiles correctly if enough available', () => { - const wrapper = shallow(); - expect(wrapper.find('Preview')).toHaveLength(16); - }); - - it('inserts tiles correctly if not enough available', () => { - const wrapper = shallow(); - expect(wrapper.find('Preview')).toHaveLength(4); - }); - - it('no items available', () => { - const wrapper = shallow(); - expect(wrapper.find('Preview')).toHaveLength(0); - expect(wrapper.find('.maincontent').text()).toBe('no items to show!'); - }); }); diff --git a/src/elements/VideoContainer/VideoContainer.tsx b/src/elements/VideoContainer/VideoContainer.tsx index 01fb205..efce56c 100644 --- a/src/elements/VideoContainer/VideoContainer.tsx +++ b/src/elements/VideoContainer/VideoContainer.tsx @@ -1,89 +1,21 @@ import React from 'react'; import Preview from '../Preview/Preview'; -import style from './VideoContainer.module.css'; import {VideoTypes} from '../../types/ApiTypes'; +import DynamicContentContainer from '../DynamicContentContainer/DynamicContentContainer'; interface Props { data: VideoTypes.VideoUnloadedType[]; + children?: JSX.Element; } -interface state { - loadeditems: VideoTypes.VideoUnloadedType[]; - selectionnr: number; -} - -/** - * A videocontainer storing lots of Preview elements - * includes scroll handling and loading of preview infos - */ -class VideoContainer extends React.Component { - // stores current index of loaded elements - loadindex: number = 0; - - constructor(props: Props) { - super(props); - - this.state = { - loadeditems: [], - selectionnr: 0 - }; - } - - componentDidMount(): void { - document.addEventListener('scroll', this.trackScrolling); - - this.loadPreviewBlock(16); - } - - render(): JSX.Element { - return ( -
- {this.state.loadeditems.map((elem) => ( - - ))} - {/*todo css for no items to show*/} - {this.state.loadeditems.length === 0 ? 'no items to show!' : null} - {this.props.children} -
- ); - } - - componentWillUnmount(): void { - this.setState({}); - // unbind scroll listener when unmounting component - document.removeEventListener('scroll', this.trackScrolling); - } - - /** - * load previews to the container - * @param nr number of previews to load - */ - loadPreviewBlock(nr: number): void { - console.log('loadpreviewblock called ...'); - let ret = []; - for (let i = 0; i < nr; i++) { - // only add if not end - if (this.props.data.length > this.loadindex + i) { - ret.push(this.props.data[this.loadindex + i]); - } - } - - this.setState({ - loadeditems: [...this.state.loadeditems, ...ret] - }); - - this.loadindex += nr; - } - - /** - * scroll event handler -> load new previews if on bottom - */ - trackScrolling = (): void => { - // comparison if current scroll position is on bottom --> 200 is bottom offset to trigger load - if (window.innerHeight + document.documentElement.scrollTop + 200 >= document.documentElement.offsetHeight) { - this.loadPreviewBlock(8); - } - }; -} +const VideoContainer = (props: Props): JSX.Element => { + return ( + } + data={props.data}> + {props.children} + + ); +}; export default VideoContainer; diff --git a/src/pages/CategoryPage/TagView.tsx b/src/pages/CategoryPage/TagView.tsx index 616b698..cf99f4d 100644 --- a/src/pages/CategoryPage/TagView.tsx +++ b/src/pages/CategoryPage/TagView.tsx @@ -1,6 +1,5 @@ import {TagType} from '../../types/VideoTypes'; import React from 'react'; -import videocontainerstyle from '../../elements/VideoContainer/VideoContainer.module.css'; import {Link} from 'react-router-dom'; import {TagPreview} from '../../elements/Preview/Preview'; import {APINode, callAPI} from '../../utils/Api'; @@ -9,6 +8,7 @@ import SideBar, {SideBarTitle} from '../../elements/SideBar/SideBar'; import Tag from '../../elements/Tag/Tag'; import {DefaultTags} from '../../types/GeneralTypes'; import NewTagPopup from '../../elements/Popups/NewTagPopup/NewTagPopup'; +import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; interface TagViewState { loadedtags: TagType[]; @@ -53,15 +53,19 @@ class TagView extends React.Component { Add a new Tag! -
- {this.state.loadedtags - ? this.state.loadedtags.map((m) => ( - - - - )) - : 'loading'} -
+ {this.state.loadedtags.length !== 0 ? ( + ( + + + + )} + initialLoadNr={20} + /> + ) : ( + 'loading' + )} {this.handlePopups()} ); diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index 49c2f9e..7d6edd3 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -2,7 +2,7 @@ import React from 'react'; class TVShowPage extends React.Component { render(): JSX.Element { - return <>; + return <>TvShowPage; } } From fdcecb0a758f83907030e8a40a718a7e0cafaf33 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 16 Apr 2021 21:12:56 +0200 Subject: [PATCH 03/15] * no unauthorized init * more dynamic Preview element --- apiGo/api/ApiBase.go | 8 --- apiGo/api/Init.go | 39 ---------- apiGo/api/Settings.go | 28 ++++++++ apiGo/main.go | 1 - src/App.tsx | 14 +++- .../DynamicContentContainer.tsx | 20 +++++- src/elements/Preview/Preview.tsx | 71 +++++++++++-------- .../VideoContainer/VideoContainer.tsx | 19 ++++- .../ActorOverviewPage/ActorOverviewPage.tsx | 14 ++-- src/pages/ActorPage/ActorPage.tsx | 2 +- src/pages/CategoryPage/TagView.tsx | 22 +++--- src/pages/HomePage/HomePage.tsx | 2 +- src/pages/TVShowPage/TVShowPage.tsx | 7 +- src/utils/Api.ts | 3 +- 14 files changed, 142 insertions(+), 108 deletions(-) delete mode 100644 apiGo/api/Init.go diff --git a/apiGo/api/ApiBase.go b/apiGo/api/ApiBase.go index 8914dfb..4dd760b 100644 --- a/apiGo/api/ApiBase.go +++ b/apiGo/api/ApiBase.go @@ -15,7 +15,6 @@ const ( TagNode = iota SettingsNode = iota ActorNode = iota - InitNode = iota ) type actionStruct struct { @@ -42,9 +41,6 @@ func ServerInit() { http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(settingsHandler)) http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(actorHandler)) - // initialization api calls to check if password is neccessaray - http.Handle(APIPREFIX+"/init", http.HandlerFunc(initHandler)) - // initialize oauth service and add corresponding auth routes oauth.InitOAuth() } @@ -85,10 +81,6 @@ func settingsHandler(rw http.ResponseWriter, req *http.Request) { handlefunc(rw, req, SettingsNode) } -func initHandler(rw http.ResponseWriter, req *http.Request) { - handlefunc(rw, req, InitNode) -} - func handlefunc(rw http.ResponseWriter, req *http.Request, node int) { // only allow post requests if req.Method != "POST" { diff --git a/apiGo/api/Init.go b/apiGo/api/Init.go deleted file mode 100644 index b79eda9..0000000 --- a/apiGo/api/Init.go +++ /dev/null @@ -1,39 +0,0 @@ -package api - -import ( - "encoding/json" - "openmediacenter/apiGo/database/settings" - "regexp" - "strings" -) - -func AddInitHandlers() { - passwordNeeded() -} - -func passwordNeeded() { - AddHandler("loadInitialData", InitNode, nil, func() []byte { - sett := settings.LoadSettings() - - type InitialDataTypeResponse struct { - DarkMode bool - Pasword bool - MediacenterName string - VideoPath string - } - - regexMatchUrl := regexp.MustCompile("^http(|s):\\/\\/([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}") - videoUrl := regexMatchUrl.FindString(sett.VideoPath) - serverVideoPath := strings.TrimPrefix(sett.VideoPath, videoUrl) - - res := InitialDataTypeResponse{ - DarkMode: sett.DarkMode, - Pasword: sett.Pasword != "-1", - MediacenterName: sett.Mediacenter_name, - VideoPath: serverVideoPath, - } - - str, _ := json.Marshal(res) - return str - }) -} diff --git a/apiGo/api/Settings.go b/apiGo/api/Settings.go index 3383f38..2f6a296 100644 --- a/apiGo/api/Settings.go +++ b/apiGo/api/Settings.go @@ -1,9 +1,13 @@ package api import ( + "encoding/json" "openmediacenter/apiGo/api/types" "openmediacenter/apiGo/database" + "openmediacenter/apiGo/database/settings" "openmediacenter/apiGo/videoparser" + "regexp" + "strings" ) func AddSettingsHandlers() { @@ -17,6 +21,30 @@ func getSettingsFromDB() { result := database.GetSettings() return jsonify(result) }) + AddHandler("loadInitialData", SettingsNode, nil, func() []byte { + sett := settings.LoadSettings() + + type InitialDataTypeResponse struct { + DarkMode bool + Pasword bool + MediacenterName string + VideoPath string + } + + regexMatchUrl := regexp.MustCompile("^http(|s):\\/\\/([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}") + videoUrl := regexMatchUrl.FindString(sett.VideoPath) + serverVideoPath := strings.TrimPrefix(sett.VideoPath, videoUrl) + + res := InitialDataTypeResponse{ + DarkMode: sett.DarkMode, + Pasword: sett.Pasword != "-1", + MediacenterName: sett.Mediacenter_name, + VideoPath: serverVideoPath, + } + + str, _ := json.Marshal(res) + return str + }) } func saveSettingsToDB() { diff --git a/apiGo/main.go b/apiGo/main.go index 77652c5..17974e8 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -30,7 +30,6 @@ func main() { api.AddSettingsHandlers() api.AddTagHandlers() api.AddActorsHandlers() - api.AddInitHandlers() // add the static files static.ServeStaticFiles() diff --git a/src/App.tsx b/src/App.tsx index 91b9e4f..d3d4c81 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,7 +9,7 @@ import style from './App.module.css'; import SettingsPage from './pages/SettingsPage/SettingsPage'; import CategoryPage from './pages/CategoryPage/CategoryPage'; -import {APINode, apiTokenValid, callApiUnsafe, refreshAPIToken} from './utils/Api'; +import {APINode, apiTokenValid, callAPI, refreshAPIToken} from './utils/Api'; import {BrowserRouter as Router, NavLink, Route, Switch} from 'react-router-dom'; import Player from './pages/Player/Player'; @@ -75,7 +75,7 @@ class App extends React.Component<{}, state> { initialAPICall(): void { // this is the first api call so if it fails we know there is no connection to backend - callApiUnsafe(APINode.Init, {action: 'loadInitialData'}, (result: SettingsTypes.initialApiCallData) => { + callAPI(APINode.Settings, {action: 'loadInitialData'}, (result: SettingsTypes.initialApiCallData) => { // set theme GlobalInfos.enableDarkTheme(result.DarkMode); @@ -99,7 +99,15 @@ class App extends React.Component<{}, state> { if (this.state.password === true) { // render authentication page if auth is neccessary - return this.setState({password: false})} />; + return ( + { + this.setState({password: false}); + // reinit general infos + this.initialAPICall(); + }} + /> + ); } else if (this.state.password === false) { return ( diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx index c49300b..4b19b99 100644 --- a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx @@ -9,7 +9,6 @@ interface Props { interface state { loadeditems: T[]; - selectionnr: number; } /** @@ -24,8 +23,7 @@ class DynamicContentContainer extends React.Component, state> { super(props); this.state = { - loadeditems: [], - selectionnr: 0 + loadeditems: [] }; } @@ -35,6 +33,22 @@ class DynamicContentContainer extends React.Component, state> { this.loadPreviewBlock(this.props.initialLoadNr ? this.props.initialLoadNr : 16); } + componentDidUpdate(prevProps: Props): void { + // when source props change force update! + if (prevProps.data.length !== this.props.data.length) { + this.clean(); + this.loadPreviewBlock(this.props.initialLoadNr ? this.props.initialLoadNr : 16); + } + } + + /** + * clear all elements rendered... + */ + clean(): void { + this.loadindex = 0; + this.setState({loadeditems: []}); + } + render(): JSX.Element { return (
diff --git a/src/elements/Preview/Preview.tsx b/src/elements/Preview/Preview.tsx index 52b9bec..93abc7c 100644 --- a/src/elements/Preview/Preview.tsx +++ b/src/elements/Preview/Preview.tsx @@ -3,17 +3,18 @@ import style from './Preview.module.css'; import {Spinner} from 'react-bootstrap'; import {Link} from 'react-router-dom'; import GlobalInfos from '../../utils/GlobalInfos'; -import {APINode, callAPIPlain} from '../../utils/Api'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; import {faPhotoVideo} from '@fortawesome/free-solid-svg-icons'; interface PreviewProps { name: string; - movieId: number; + picLoader: (callback: (pic: string) => void) => void; + linkPath?: string; + onClick?: () => void; } interface PreviewState { - previewpicture: string | null; + picLoaded: boolean | null; } /** @@ -21,49 +22,61 @@ interface PreviewState { * floating side by side */ class Preview extends React.Component { + // store the picture to display + pic?: string; + constructor(props: PreviewProps) { super(props); this.state = { - previewpicture: null + picLoaded: null }; } componentDidMount(): void { - callAPIPlain(APINode.Video, {action: 'readThumbnail', movieid: this.props.movieId}, (result) => { + this.props.picLoader((result) => { + this.pic = result; this.setState({ - previewpicture: result + picLoaded: result !== '' }); }); } render(): JSX.Element { + if (this.props.linkPath !== undefined) { + return {this.content()}; + } else { + return this.content(); + } + } + + content(): JSX.Element { const themeStyle = GlobalInfos.getThemeStyle(); return ( - -
-
{this.props.name}
-
- {this.state.previewpicture === '' ? ( - - ) : this.state.previewpicture === null ? ( - - - - ) : ( - Pic loading. - )} -
-
+
+
{this.props.name}
+
+ {this.state.picLoaded === false ? ( + + ) : this.state.picLoaded === null ? ( + + + + ) : ( + Pic loading. + )}
- +
+
); } } diff --git a/src/elements/VideoContainer/VideoContainer.tsx b/src/elements/VideoContainer/VideoContainer.tsx index efce56c..e2804f5 100644 --- a/src/elements/VideoContainer/VideoContainer.tsx +++ b/src/elements/VideoContainer/VideoContainer.tsx @@ -2,6 +2,7 @@ import React from 'react'; import Preview from '../Preview/Preview'; import {VideoTypes} from '../../types/ApiTypes'; import DynamicContentContainer from '../DynamicContentContainer/DynamicContentContainer'; +import {APINode, callAPIPlain} from '../../utils/Api'; interface Props { data: VideoTypes.VideoUnloadedType[]; @@ -11,7 +12,23 @@ interface Props { const VideoContainer = (props: Props): JSX.Element => { return ( } + renderElement={(el): JSX.Element => ( + void): void => { + callAPIPlain( + APINode.Video, + { + action: 'readThumbnail', + movieid: el.MovieId + }, + (result) => callback(result) + ); + }} + name={el.MovieName} + linkPath={'/player/' + el.MovieId} + /> + )} data={props.data}> {props.children} diff --git a/src/pages/ActorOverviewPage/ActorOverviewPage.tsx b/src/pages/ActorOverviewPage/ActorOverviewPage.tsx index 0e74a37..bdc0cf9 100644 --- a/src/pages/ActorOverviewPage/ActorOverviewPage.tsx +++ b/src/pages/ActorOverviewPage/ActorOverviewPage.tsx @@ -4,9 +4,10 @@ import {ActorType} from '../../types/VideoTypes'; import ActorTile from '../../elements/ActorTile/ActorTile'; import PageTitle from '../../elements/PageTitle/PageTitle'; import SideBar from '../../elements/SideBar/SideBar'; -import style from './ActorOverviewPage.module.css'; +// import style from './ActorOverviewPage.module.css'; import {Button} from '../../elements/GPElements/Button'; import NewActorPopup from '../../elements/Popups/NewActorPopup/NewActorPopup'; +import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; interface Props {} @@ -36,11 +37,12 @@ class ActorOverviewPage extends React.Component {
Attention: This is an early preview! - {this.state.data.length !== 0 ? :
No Data found!
} + ); } diff --git a/src/pages/CategoryPage/TagView.tsx b/src/pages/CategoryPage/TagView.tsx index cf99f4d..da47e02 100644 --- a/src/pages/CategoryPage/TagView.tsx +++ b/src/pages/CategoryPage/TagView.tsx @@ -53,19 +53,15 @@ class TagView extends React.Component { Add a new Tag! - {this.state.loadedtags.length !== 0 ? ( - ( - - - - )} - initialLoadNr={20} - /> - ) : ( - 'loading' - )} + ( + + + + )} + initialLoadNr={20} + /> {this.handlePopups()} ); diff --git a/src/pages/HomePage/HomePage.tsx b/src/pages/HomePage/HomePage.tsx index b7af48e..dd6b102 100644 --- a/src/pages/HomePage/HomePage.tsx +++ b/src/pages/HomePage/HomePage.tsx @@ -157,7 +157,7 @@ export class HomePage extends React.Component { }} /> - {this.state.data.length !== 0 ? :
No Data found!
} +
diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index 7d6edd3..dfec9d5 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -1,8 +1,13 @@ import React from 'react'; +import Preview from '../../elements/Preview/Preview'; class TVShowPage extends React.Component { render(): JSX.Element { - return <>TvShowPage; + return ( + <> + callback('')} /> + + ); } } diff --git a/src/utils/Api.ts b/src/utils/Api.ts index 0649014..404b408 100644 --- a/src/utils/Api.ts +++ b/src/utils/Api.ts @@ -279,6 +279,5 @@ export enum APINode { Settings = 'settings', Tags = 'tags', Actor = 'actor', - Video = 'video', - Init = 'init' + Video = 'video' } From 45391472081fbcc37259f70dad30609c6e826f78 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 16 Apr 2021 22:44:56 +0200 Subject: [PATCH 04/15] add tvshow syntax to db basic tvshow api request to show available tvshows limit randompage videos to 3 improve settings object to remove one useless copy --- apiGo/api/ApiBase.go | 26 +++++--------------- apiGo/api/Helpers.go | 16 ++++++++++++ apiGo/api/Settings.go | 13 ++++++++-- apiGo/api/TVShows.go | 15 ++++++++++++ apiGo/api/Tags.go | 2 +- apiGo/api/oauth/Oauth.go | 4 +-- apiGo/api/types/Types.go | 35 +++++++++++++++------------ apiGo/database/settings/DBSettings.go | 33 +++++++++---------------- apiGo/main.go | 1 + apiGo/videoparser/VideoParser.go | 5 ++++ database.sql | 20 +++++++++++++++ src/App.tsx | 2 +- src/pages/RandomPage/RandomPage.tsx | 6 +++-- src/pages/TVShowPage/TVShowPage.tsx | 31 ++++++++++++++++++++++-- src/types/ApiTypes.ts | 11 +++++++++ src/utils/Api.ts | 3 ++- src/utils/GlobalInfos.ts | 11 ++++++++- 17 files changed, 165 insertions(+), 69 deletions(-) create mode 100644 apiGo/api/TVShows.go diff --git a/apiGo/api/ApiBase.go b/apiGo/api/ApiBase.go index 4dd760b..bc83d1f 100644 --- a/apiGo/api/ApiBase.go +++ b/apiGo/api/ApiBase.go @@ -15,6 +15,7 @@ const ( TagNode = iota SettingsNode = iota ActorNode = iota + TVShowNode = iota ) type actionStruct struct { @@ -36,10 +37,11 @@ func AddHandler(action string, apiNode int, n interface{}, h func() []byte) { } func ServerInit() { - http.Handle(APIPREFIX+"/video", oauth.ValidateToken(videoHandler)) - http.Handle(APIPREFIX+"/tags", oauth.ValidateToken(tagHandler)) - http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(settingsHandler)) - http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(actorHandler)) + http.Handle(APIPREFIX+"/video", oauth.ValidateToken(handlefunc, VideoNode)) + http.Handle(APIPREFIX+"/tags", oauth.ValidateToken(handlefunc, TagNode)) + http.Handle(APIPREFIX+"/settings", oauth.ValidateToken(handlefunc, SettingsNode)) + http.Handle(APIPREFIX+"/actor", oauth.ValidateToken(handlefunc, ActorNode)) + http.Handle(APIPREFIX+"/tvshow", oauth.ValidateToken(handlefunc, TVShowNode)) // initialize oauth service and add corresponding auth routes oauth.InitOAuth() @@ -65,22 +67,6 @@ func handleAPICall(action string, requestBody string, apiNode int) []byte { return nil } -func actorHandler(rw http.ResponseWriter, req *http.Request) { - handlefunc(rw, req, ActorNode) -} - -func videoHandler(rw http.ResponseWriter, req *http.Request) { - handlefunc(rw, req, VideoNode) -} - -func tagHandler(rw http.ResponseWriter, req *http.Request) { - handlefunc(rw, req, TagNode) -} - -func settingsHandler(rw http.ResponseWriter, req *http.Request) { - handlefunc(rw, req, SettingsNode) -} - func handlefunc(rw http.ResponseWriter, req *http.Request, node int) { // only allow post requests if req.Method != "POST" { diff --git a/apiGo/api/Helpers.go b/apiGo/api/Helpers.go index 1437a68..2407997 100644 --- a/apiGo/api/Helpers.go +++ b/apiGo/api/Helpers.go @@ -61,6 +61,22 @@ func readActorsFromResultset(rows *sql.Rows) []types.Actor { return result } +// ID - Name : pay attention to the order! +func readTVshowsFromResultset(rows *sql.Rows) []types.TVShow { + result := []types.TVShow{} + for rows.Next() { + var vid types.TVShow + err := rows.Scan(&vid.Id, &vid.Name) + if err != nil { + panic(err.Error()) // proper error handling instead of panic in your app + } + result = append(result, vid) + } + rows.Close() + + return result +} + func jsonify(v interface{}) []byte { // jsonify results str, err := json.Marshal(v) diff --git a/apiGo/api/Settings.go b/apiGo/api/Settings.go index 2f6a296..6229903 100644 --- a/apiGo/api/Settings.go +++ b/apiGo/api/Settings.go @@ -29,17 +29,21 @@ func getSettingsFromDB() { Pasword bool MediacenterName string VideoPath string + TVShowPath string } - regexMatchUrl := regexp.MustCompile("^http(|s):\\/\\/([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}") + regexMatchUrl := regexp.MustCompile("^http(|s)://([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}\\.([0-9]){1,3}:[0-9]{1,5}") videoUrl := regexMatchUrl.FindString(sett.VideoPath) + tvshowurl := regexMatchUrl.FindString(sett.TVShowPath) serverVideoPath := strings.TrimPrefix(sett.VideoPath, videoUrl) + serverTVShowPath := strings.TrimPrefix(sett.TVShowPath, tvshowurl) res := InitialDataTypeResponse{ DarkMode: sett.DarkMode, Pasword: sett.Pasword != "-1", - MediacenterName: sett.Mediacenter_name, + MediacenterName: sett.MediacenterName, VideoPath: serverVideoPath, + TVShowPath: serverTVShowPath, } str, _ := json.Marshal(res) @@ -74,6 +78,11 @@ func reIndexHandling() { return database.ManualSuccessResponse(nil) }) + AddHandler("startTVShowReindex", SettingsNode, nil, func() []byte { + videoparser.StartTVShowReindex() + return database.ManualSuccessResponse(nil) + }) + AddHandler("cleanupGravity", SettingsNode, nil, func() []byte { videoparser.StartCleanup() return nil diff --git a/apiGo/api/TVShows.go b/apiGo/api/TVShows.go new file mode 100644 index 0000000..f06dafa --- /dev/null +++ b/apiGo/api/TVShows.go @@ -0,0 +1,15 @@ +package api + +import "openmediacenter/apiGo/database" + +func AddTvshowHandlers() { + var dT struct { + TagId int + Force bool + } + AddHandler("getTVShows", TVShowNode, &dT, func() []byte { + query := "SELECT id, name FROM tvshow" + rows := database.Query(query) + return jsonify(readTVshowsFromResultset(rows)) + }) +} diff --git a/apiGo/api/Tags.go b/apiGo/api/Tags.go index 6845926..8701731 100644 --- a/apiGo/api/Tags.go +++ b/apiGo/api/Tags.go @@ -37,7 +37,7 @@ func deleteFromDB() { return database.ManualSuccessResponse(err) } else { // check with regex if its the key constraint error - r, _ := regexp.Compile("^.*a foreign key constraint fails.*$") + r := regexp.MustCompile("^.*a foreign key constraint fails.*$") if r.MatchString(err.Error()) { return []byte(`{"result":"not empty tag"}`) } else { diff --git a/apiGo/api/oauth/Oauth.go b/apiGo/api/oauth/Oauth.go index ef5ec93..0d98e25 100644 --- a/apiGo/api/oauth/Oauth.go +++ b/apiGo/api/oauth/Oauth.go @@ -48,7 +48,7 @@ func InitOAuth() { }) } -func ValidateToken(f http.HandlerFunc) http.HandlerFunc { +func ValidateToken(f func(rw http.ResponseWriter, req *http.Request, node int), node int) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { _, err := srv.ValidationBearerToken(r) if err != nil { @@ -56,6 +56,6 @@ func ValidateToken(f http.HandlerFunc) http.HandlerFunc { return } - f.ServeHTTP(w, r) + f(w, r, node) } } diff --git a/apiGo/api/types/Types.go b/apiGo/api/types/Types.go index 7e6d6c3..e0d9652 100644 --- a/apiGo/api/types/Types.go +++ b/apiGo/api/types/Types.go @@ -7,12 +7,12 @@ type VideoUnloadedType struct { type FullVideoType struct { MovieName string - MovieId int + MovieId uint32 MovieUrl string Poster string - Likes int - Quality int - Length int + Likes uint64 + Quality uint16 + Length uint16 Tags []Tag SuggestedTag []Tag Actors []Actor @@ -20,22 +20,22 @@ type FullVideoType struct { type Tag struct { TagName string - TagId int + TagId uint32 } type Actor struct { - ActorId int + ActorId uint32 Name string Thumbnail string } type StartData struct { - VideoNr int - FullHdNr int - HDNr int - SDNr int - DifferentTags int - Tagged int + VideoNr uint32 + FullHdNr uint32 + HDNr uint32 + SDNr uint32 + DifferentTags uint32 + Tagged uint32 } type SettingsType struct { @@ -47,10 +47,15 @@ type SettingsType struct { TMDBGrabbing bool DarkMode bool - VideoNr int + VideoNr uint32 DBSize float32 - DifferentTags int - TagsAdded int + DifferentTags uint32 + TagsAdded uint32 PathPrefix string } + +type TVShow struct { + Id uint32 + Name string +} diff --git a/apiGo/database/settings/DBSettings.go b/apiGo/database/settings/DBSettings.go index 5323ace..75cbf51 100644 --- a/apiGo/database/settings/DBSettings.go +++ b/apiGo/database/settings/DBSettings.go @@ -15,35 +15,24 @@ func GetPassword() *string { } type SettingsType struct { - DarkMode bool - Pasword string - Mediacenter_name string - VideoPath string + DarkMode bool + Pasword string + MediacenterName string + VideoPath string + TVShowPath string } func LoadSettings() *SettingsType { - query := "SELECT DarkMode, password, mediacenter_name, video_path from settings" + query := "SELECT DarkMode, password, mediacenter_name, video_path, episode_path from settings" - type RawSettingsType struct { - DarkMode int - Pasword string - Mediacenter_name string - VideoPath string - } + result := SettingsType{} + var darkmode uint8 - result := RawSettingsType{} - - err := database.QueryRow(query).Scan(&result.DarkMode, &result.Pasword, &result.Mediacenter_name, &result.VideoPath) + err := database.QueryRow(query).Scan(&darkmode, &result.Pasword, &result.MediacenterName, &result.VideoPath, &result.TVShowPath) if err != nil { fmt.Println("error while parsing db data: " + err.Error()) } - res := SettingsType{ - DarkMode: result.DarkMode != 0, - Pasword: result.Pasword, - Mediacenter_name: result.Mediacenter_name, - VideoPath: result.VideoPath, - } - - return &res + result.DarkMode = darkmode != 0 + return &result } diff --git a/apiGo/main.go b/apiGo/main.go index 17974e8..2328dd9 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -30,6 +30,7 @@ func main() { api.AddSettingsHandlers() api.AddTagHandlers() api.AddActorsHandlers() + api.AddTvshowHandlers() // add the static files static.ServeStaticFiles() diff --git a/apiGo/videoparser/VideoParser.go b/apiGo/videoparser/VideoParser.go index bfc5348..8e2dd5c 100644 --- a/apiGo/videoparser/VideoParser.go +++ b/apiGo/videoparser/VideoParser.go @@ -54,6 +54,11 @@ func StartReindex() bool { return true } +// StartTVShowReindex reindex dir walks for TVShow reindex +func StartTVShowReindex() { + // todo implement walking through dirs and reindex! +} + func GetStatusMessage() *StatusMessage { msg := StatusMessage{ Messages: messageBuffer, diff --git a/database.sql b/database.sql index 4579e35..9b2fd9e 100644 --- a/database.sql +++ b/database.sql @@ -24,6 +24,26 @@ create table if not exists tags tag_name varchar(50) null ); +create table if not exists tvshow +( + name varchar(100) null, + thumbnail mediumblob null, + id int auto_increment + primary key +); + +create table if not exists tvshow_episodes +( + id int auto_increment + primary key, + name varchar(100) null, + season int null, + poster mediumblob null, + tvshow_id int null, + constraint tvshow_episodes_tvshow_id_fk + foreign key (tvshow_id) references tvshow (id) +); + create table if not exists videos ( movie_id int auto_increment diff --git a/src/App.tsx b/src/App.tsx index d3d4c81..77f440d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -79,7 +79,7 @@ class App extends React.Component<{}, state> { // set theme GlobalInfos.enableDarkTheme(result.DarkMode); - GlobalInfos.setVideoPath(result.VideoPath); + GlobalInfos.setVideoPaths(result.VideoPath, result.TVShowPath); this.setState({ mediacentername: result.MediacenterName diff --git a/src/pages/RandomPage/RandomPage.tsx b/src/pages/RandomPage/RandomPage.tsx index ffd3a79..c3468be 100644 --- a/src/pages/RandomPage/RandomPage.tsx +++ b/src/pages/RandomPage/RandomPage.tsx @@ -23,6 +23,8 @@ interface GetRandomMoviesType { * Randompage shuffles random viedeopreviews and provides a shuffle btn */ class RandomPage extends React.Component<{}, state> { + readonly LoadNR = 3; + constructor(props: {}) { super(props); @@ -37,7 +39,7 @@ class RandomPage extends React.Component<{}, state> { componentDidMount(): void { addKeyHandler(this.keypress); - this.loadShuffledvideos(4); + this.loadShuffledvideos(this.LoadNR); } componentWillUnmount(): void { @@ -75,7 +77,7 @@ class RandomPage extends React.Component<{}, state> { * click handler for shuffle btn */ shuffleclick(): void { - this.loadShuffledvideos(4); + this.loadShuffledvideos(this.LoadNR); } /** diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index dfec9d5..24fdd91 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -1,11 +1,38 @@ import React from 'react'; import Preview from '../../elements/Preview/Preview'; +import {APINode, callAPI} from '../../utils/Api'; +import {TVShow} from '../../types/ApiTypes'; +import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; + +interface State { + loading: boolean; +} + +interface Props {} + +class TVShowPage extends React.Component { + state = { + loading: true + }; + + data: TVShow.TVshowType[] = []; + + componentDidMount(): void { + callAPI(APINode.TVShow, {action: 'getTVShows'}, (resp: TVShow.TVshowType[]) => { + this.data = resp; + this.setState({loading: false}); + }); + } -class TVShowPage extends React.Component { render(): JSX.Element { return ( <> - callback('')} /> + ( + callback('')} linkPath={'/tvshows/' + elem.Id} /> + )} + data={this.state.loading ? [] : this.data} + /> ); } diff --git a/src/types/ApiTypes.ts b/src/types/ApiTypes.ts index 25f1e88..882171f 100644 --- a/src/types/ApiTypes.ts +++ b/src/types/ApiTypes.ts @@ -35,6 +35,7 @@ export namespace SettingsTypes { Password: boolean; MediacenterName: string; VideoPath: string; + TVShowPath: string; } export interface loadGeneralSettingsType { @@ -58,6 +59,16 @@ export namespace SettingsTypes { } } +export namespace TVShow { + /** + * result of actor fetch + */ + export interface TVshowType { + Id: number; + Name: string; + } +} + export namespace ActorTypes { /** * result of actor fetch diff --git a/src/utils/Api.ts b/src/utils/Api.ts index 404b408..2d68ccd 100644 --- a/src/utils/Api.ts +++ b/src/utils/Api.ts @@ -279,5 +279,6 @@ export enum APINode { Settings = 'settings', Tags = 'tags', Actor = 'actor', - Video = 'video' + Video = 'video', + TVShow = 'tvshow' } diff --git a/src/utils/GlobalInfos.ts b/src/utils/GlobalInfos.ts index 37f4065..e55b570 100644 --- a/src/utils/GlobalInfos.ts +++ b/src/utils/GlobalInfos.ts @@ -8,6 +8,7 @@ import lighttheme from '../AppLightTheme.module.css'; class StaticInfos { private darktheme: boolean = true; private videopath: string = ''; + private tvshowpath: string = ''; /** * check if the current theme is the dark theme @@ -47,8 +48,9 @@ class StaticInfos { * set the current videopath * @param vidpath videopath with beginning and ending slash */ - setVideoPath(vidpath: string): void { + setVideoPaths(vidpath: string, tvshowpath: string): void { this.videopath = vidpath; + this.tvshowpath = tvshowpath; } /** @@ -58,6 +60,13 @@ class StaticInfos { return this.videopath; } + /** + * return the current tvshow path + */ + getTVShowPath(): string { + return this.tvshowpath; + } + /** * load the Password page manually */ From 32c7e8a01ba5ee1b0ea366d9eb567a4a4c0aade1 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 16 Apr 2021 22:48:41 +0200 Subject: [PATCH 05/15] rename file --- apiGo/videoparser/{ReIndex.go => ReIndexVideos.go} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename apiGo/videoparser/{ReIndex.go => ReIndexVideos.go} (98%) diff --git a/apiGo/videoparser/ReIndex.go b/apiGo/videoparser/ReIndexVideos.go similarity index 98% rename from apiGo/videoparser/ReIndex.go rename to apiGo/videoparser/ReIndexVideos.go index 32305f2..32b00b7 100644 --- a/apiGo/videoparser/ReIndex.go +++ b/apiGo/videoparser/ReIndexVideos.go @@ -100,7 +100,7 @@ func processVideo(fileNameOrig string) { fmt.Printf("Processing %s video-", fileNameOrig) // match the file extension - r, _ := regexp.Compile(`\.[a-zA-Z0-9]+$`) + r := regexp.MustCompile(`\.[a-zA-Z0-9]+$`) fileName := r.ReplaceAllString(fileNameOrig, "") // match the year and cut year from name @@ -172,7 +172,7 @@ func addVideo(videoName string, fileName string, year int) { } func matchYear(fileName string) (int, string) { - r, _ := regexp.Compile(`\([0-9]{4}?\)`) + r := regexp.MustCompile(`\([0-9]{4}?\)`) years := r.FindAllString(fileName, -1) if len(years) == 0 { return -1, fileName From 5656428de7fd6052c98d1be0a69e159e3383e0d5 Mon Sep 17 00:00:00 2001 From: lukas Date: Sun, 18 Apr 2021 21:16:38 +0200 Subject: [PATCH 06/15] implement websocket to send reindex messages --- apiGo/api/Settings.go | 4 - apiGo/go.mod | 1 + apiGo/go.sum | 58 +++++----- apiGo/main.go | 3 + apiGo/videoparser/Helpers.go | 120 +++++++++++++++++++ apiGo/videoparser/ReIndexTVShows.go | 7 ++ apiGo/videoparser/ReIndexVideos.go | 103 +---------------- apiGo/videoparser/VideoParser.go | 85 +++++++++++--- apiGo/videoparser/WebSocketConnector.go | 139 +++++++++++++++++++++++ src/pages/SettingsPage/MovieSettings.tsx | 116 ++++++++++++------- 10 files changed, 452 insertions(+), 184 deletions(-) create mode 100644 apiGo/videoparser/Helpers.go create mode 100644 apiGo/videoparser/ReIndexTVShows.go create mode 100644 apiGo/videoparser/WebSocketConnector.go diff --git a/apiGo/api/Settings.go b/apiGo/api/Settings.go index 6229903..b54cfca 100644 --- a/apiGo/api/Settings.go +++ b/apiGo/api/Settings.go @@ -87,8 +87,4 @@ func reIndexHandling() { videoparser.StartCleanup() return nil }) - - AddHandler("getStatusMessage", SettingsNode, nil, func() []byte { - return jsonify(videoparser.GetStatusMessage()) - }) } diff --git a/apiGo/go.mod b/apiGo/go.mod index d97fa64..3615d28 100644 --- a/apiGo/go.mod +++ b/apiGo/go.mod @@ -5,4 +5,5 @@ go 1.16 require ( github.com/go-sql-driver/mysql v1.5.0 gopkg.in/oauth2.v3 v3.12.0 + nhooyr.io/websocket v1.8.7 ) diff --git a/apiGo/go.sum b/apiGo/go.sum index a8a6512..1671ea2 100644 --- a/apiGo/go.sum +++ b/apiGo/go.sum @@ -1,54 +1,58 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= -github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2T1yBBLxTan3mn/3OM0CyRt0= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/klauspost/compress v1.8.2 h1:Bx0qjetmNjdFXASH02NSAREKpiaDwkO1DRZ3dV2KCcs= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w= +github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8= +github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCxxfCtI1qN+fYpKTKJ/5opWmZ34k= github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8= @@ -66,22 +70,16 @@ github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2K github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao= github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE= github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.6.0 h1:uWF8lgKmeaIewWVPwi4GRq2P6+R46IgYZdxWtM+GtEY= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY= github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= -github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA= github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -89,7 +87,6 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -97,8 +94,13 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -106,5 +108,7 @@ gopkg.in/oauth2.v3 v3.12.0 h1:yOffAPoolH/i2JxwmC+pgtnY3362iPahsDpLXfDFvNg= gopkg.in/oauth2.v3 v3.12.0/go.mod h1:XEYgKqWX095YiPT+Aw5y3tCn+7/FMnlTFKrupgSiJ3I= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= +nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= diff --git a/apiGo/main.go b/apiGo/main.go index 2328dd9..0b52cb2 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -8,6 +8,7 @@ import ( "openmediacenter/apiGo/api" "openmediacenter/apiGo/database" "openmediacenter/apiGo/static" + "openmediacenter/apiGo/videoparser" ) func main() { @@ -32,6 +33,8 @@ func main() { api.AddActorsHandlers() api.AddTvshowHandlers() + videoparser.SetupSettingsWebsocket() + // add the static files static.ServeStaticFiles() diff --git a/apiGo/videoparser/Helpers.go b/apiGo/videoparser/Helpers.go new file mode 100644 index 0000000..3c82b45 --- /dev/null +++ b/apiGo/videoparser/Helpers.go @@ -0,0 +1,120 @@ +package videoparser + +import ( + "encoding/base64" + "encoding/json" + "fmt" + "os/exec" + "strconv" +) + +func AppendMessage(message string) { + msger := TextMessage{ + MessageBase: MessageBase{Action: "message"}, + Message: message, + } + marshal, err := json.Marshal(msger) + if err != nil { + return + } + + IndexSender.Publish(marshal) +} + +func SendEvent(message string) { + msger := ReindexEvent{ + MessageBase: MessageBase{Action: "reindexAction"}, + Event: message, + } + marshal, err := json.Marshal(msger) + if err != nil { + return + } + + IndexSender.Publish(marshal) +} + +// ext dependency support check +func checkExtDependencySupport() *ExtDependencySupport { + var extDepsAvailable ExtDependencySupport + + extDepsAvailable.FFMpeg = commandExists("ffmpeg") + extDepsAvailable.MediaInfo = commandExists("mediainfo") + + return &extDepsAvailable +} + +// check if a specific system command is available +func commandExists(cmd string) bool { + _, err := exec.LookPath(cmd) + return err == nil +} + +// parse the thumbail picture from video file +func parseFFmpegPic(path string) (*string, error) { + app := "ffmpeg" + + cmd := exec.Command(app, + "-hide_banner", + "-loglevel", "panic", + "-ss", "00:04:00", + "-i", path, + "-vframes", "1", + "-q:v", "2", + "-f", "singlejpeg", + "pipe:1") + + stdout, err := cmd.Output() + + if err != nil { + fmt.Println(err.Error()) + fmt.Println(string(err.(*exec.ExitError).Stderr)) + return nil, err + } + + strEncPic := base64.StdEncoding.EncodeToString(stdout) + if strEncPic == "" { + return nil, nil + } + backpic64 := fmt.Sprintf("data:image/jpeg;base64,%s", strEncPic) + + return &backpic64, nil +} + +func getVideoAttributes(path string) *VideoAttributes { + app := "mediainfo" + + arg0 := path + arg1 := "--Output=JSON" + + cmd := exec.Command(app, arg1, "-f", arg0) + stdout, err := cmd.Output() + + var t struct { + Media struct { + Track []struct { + Duration string + FileSize string + Width string + } + } + } + err = json.Unmarshal(stdout, &t) + + if err != nil { + fmt.Println(err.Error()) + return nil + } + + duration, err := strconv.ParseFloat(t.Media.Track[0].Duration, 32) + filesize, err := strconv.Atoi(t.Media.Track[0].FileSize) + width, err := strconv.Atoi(t.Media.Track[1].Width) + + ret := VideoAttributes{ + Duration: float32(duration), + FileSize: uint(filesize), + Width: uint(width), + } + + return &ret +} diff --git a/apiGo/videoparser/ReIndexTVShows.go b/apiGo/videoparser/ReIndexTVShows.go new file mode 100644 index 0000000..dee9ec0 --- /dev/null +++ b/apiGo/videoparser/ReIndexTVShows.go @@ -0,0 +1,7 @@ +package videoparser + +import "openmediacenter/apiGo/api/types" + +func startTVShowReindex(files []Show, sett types.SettingsType) { + // have fun with db insertions here! +} diff --git a/apiGo/videoparser/ReIndexVideos.go b/apiGo/videoparser/ReIndexVideos.go index 32b00b7..50f5626 100644 --- a/apiGo/videoparser/ReIndexVideos.go +++ b/apiGo/videoparser/ReIndexVideos.go @@ -2,13 +2,10 @@ package videoparser import ( "database/sql" - "encoding/base64" - "encoding/json" "fmt" "openmediacenter/apiGo/api/types" "openmediacenter/apiGo/database" "openmediacenter/apiGo/videoparser/tmdb" - "os/exec" "regexp" "strconv" "strings" @@ -51,9 +48,8 @@ func ReIndexVideos(path []string, sett types.SettingsType) { processVideo(s) } - AppendMessageBuffer("reindex finished successfully!") - - contentAvailable = false + AppendMessage("reindex finished successfully!") + SendEvent("stop") fmt.Println("Reindexing finished!") } @@ -125,7 +121,7 @@ func addVideo(videoName string, fileName string, year int) { } if mExtDepsAvailable.FFMpeg { - ppic, err = parseFFmpegPic(fileName) + ppic, err = parseFFmpegPic(mSettings.VideoPath + fileName) if err != nil { fmt.Printf("FFmpeg error occured: %s\n", err.Error()) } else { @@ -134,7 +130,7 @@ func addVideo(videoName string, fileName string, year int) { } if mExtDepsAvailable.MediaInfo { - atr := getVideoAttributes(fileName) + atr := getVideoAttributes(mSettings.VideoPath + fileName) if atr != nil { vidAtr = atr } @@ -168,7 +164,7 @@ func addVideo(videoName string, fileName string, year int) { insertTMDBTags(tmdbData.GenreIds, insertId) } - AppendMessageBuffer(fmt.Sprintf("%s - added!", videoName)) + AppendMessage(fmt.Sprintf("%s - added!", videoName)) } func matchYear(fileName string) (int, string) { @@ -189,95 +185,6 @@ func matchYear(fileName string) (int, string) { return year, r.ReplaceAllString(fileName, "") } -// parse the thumbail picture from video file -func parseFFmpegPic(fileName string) (*string, error) { - app := "ffmpeg" - - cmd := exec.Command(app, - "-hide_banner", - "-loglevel", "panic", - "-ss", "00:04:00", - "-i", mSettings.VideoPath+fileName, - "-vframes", "1", - "-q:v", "2", - "-f", "singlejpeg", - "pipe:1") - - stdout, err := cmd.Output() - - if err != nil { - fmt.Println(err.Error()) - fmt.Println(string(err.(*exec.ExitError).Stderr)) - return nil, err - } - - strEncPic := base64.StdEncoding.EncodeToString(stdout) - if strEncPic == "" { - return nil, nil - } - backpic64 := fmt.Sprintf("data:image/jpeg;base64,%s", strEncPic) - - return &backpic64, nil -} - -func getVideoAttributes(fileName string) *VideoAttributes { - app := "mediainfo" - - arg0 := mSettings.VideoPath + fileName - arg1 := "--Output=JSON" - - cmd := exec.Command(app, arg1, "-f", arg0) - stdout, err := cmd.Output() - - var t struct { - Media struct { - Track []struct { - Duration string - FileSize string - Width string - } - } - } - err = json.Unmarshal(stdout, &t) - - if err != nil { - fmt.Println(err.Error()) - return nil - } - - duration, err := strconv.ParseFloat(t.Media.Track[0].Duration, 32) - filesize, err := strconv.Atoi(t.Media.Track[0].FileSize) - width, err := strconv.Atoi(t.Media.Track[1].Width) - - ret := VideoAttributes{ - Duration: float32(duration), - FileSize: uint(filesize), - Width: uint(width), - } - - return &ret -} - -func AppendMessageBuffer(message string) { - messageBuffer = append(messageBuffer, message) -} - -// ext dependency support check -func checkExtDependencySupport() *ExtDependencySupport { - var extDepsAvailable ExtDependencySupport - - extDepsAvailable.FFMpeg = commandExists("ffmpeg") - extDepsAvailable.MediaInfo = commandExists("mediainfo") - - return &extDepsAvailable -} - -// check if a specific system command is available -func commandExists(cmd string) bool { - _, err := exec.LookPath(cmd) - return err == nil -} - // insert the default size tags to corresponding video func insertSizeTag(width uint, videoId uint) { var tagType uint diff --git a/apiGo/videoparser/VideoParser.go b/apiGo/videoparser/VideoParser.go index 8e2dd5c..9e15195 100644 --- a/apiGo/videoparser/VideoParser.go +++ b/apiGo/videoparser/VideoParser.go @@ -2,25 +2,22 @@ package videoparser import ( "fmt" + "io/ioutil" "openmediacenter/apiGo/database" "os" "path/filepath" "strings" ) -var messageBuffer []string -var contentAvailable = false - type StatusMessage struct { Messages []string ContentAvailable bool } func StartReindex() bool { - messageBuffer = []string{} - contentAvailable = true - fmt.Println("starting reindex..") + SendEvent("start") + AppendMessage("starting reindex..") mSettings := database.GetSettings() // add the path prefix to videopath @@ -29,6 +26,8 @@ func StartReindex() bool { // check if path even exists if _, err := os.Stat(mSettings.VideoPath); os.IsNotExist(err) { fmt.Println("Reindex path doesn't exist!") + AppendMessage(fmt.Sprintf("Reindex path doesn't exist! :%s", mSettings.VideoPath)) + SendEvent("stop") return false } @@ -49,25 +48,79 @@ func StartReindex() bool { fmt.Println(err.Error()) } // start reindex process - AppendMessageBuffer("Starting Reindexing!") + AppendMessage("Starting Reindexing!") go ReIndexVideos(files, mSettings) return true } -// StartTVShowReindex reindex dir walks for TVShow reindex -func StartTVShowReindex() { - // todo implement walking through dirs and reindex! +type Show struct { + Name string + files []string } -func GetStatusMessage() *StatusMessage { - msg := StatusMessage{ - Messages: messageBuffer, - ContentAvailable: contentAvailable, +// StartTVShowReindex reindex dir walks for TVShow reindex +func StartTVShowReindex() { + fmt.Println("starting tvshow reindex..") + SendEvent("start") + AppendMessage("starting tvshow reindex...") + + mSettings := database.GetSettings() + // add the path prefix to videopath + mSettings.EpisodePath = mSettings.PathPrefix + mSettings.EpisodePath + + // add slash suffix if not existing + if !strings.HasSuffix(mSettings.EpisodePath, "/") { + mSettings.EpisodePath += "/" } - messageBuffer = []string{} + // check if path even exists + if _, err := os.Stat(mSettings.EpisodePath); os.IsNotExist(err) { + msg := fmt.Sprintf("Reindex path doesn't exist! :%s", mSettings.EpisodePath) + fmt.Println(msg) + AppendMessage(msg) + SendEvent("stop") + return + } - return &msg + var files []Show + + filess, err := ioutil.ReadDir(mSettings.EpisodePath) + if err != nil { + fmt.Println(err.Error()) + } + + for _, file := range filess { + if file.IsDir() { + elem := Show{ + Name: file.Name(), + files: nil, + } + + fmt.Println(file.Name()) + + episodefiles, err := ioutil.ReadDir(mSettings.EpisodePath + file.Name()) + if err != nil { + fmt.Println(err.Error()) + } + + for _, epfile := range episodefiles { + if strings.HasSuffix(epfile.Name(), ".mp4") { + elem.files = append(elem.files, epfile.Name()) + } + } + files = append(files, elem) + } + } + + fmt.Println(files) + + if err != nil { + fmt.Println(err.Error()) + } + + // start reindex process + AppendMessage("Starting Reindexing!") + go startTVShowReindex(files, mSettings) } func StartCleanup() { diff --git a/apiGo/videoparser/WebSocketConnector.go b/apiGo/videoparser/WebSocketConnector.go new file mode 100644 index 0000000..a1fe5ca --- /dev/null +++ b/apiGo/videoparser/WebSocketConnector.go @@ -0,0 +1,139 @@ +package videoparser + +import ( + "context" + "errors" + "fmt" + "net/http" + "nhooyr.io/websocket" + "sync" + "time" +) + +// subscriber represents a subscriber. +// Messages are sent on the msgs channel and if the client +// cannot keep up with the messages, closeSlow is called. +type subscriber struct { + msgs chan []byte + closeSlow func() +} + +type ChatSender struct { + subscribersMu sync.Mutex + subscribers map[*subscriber]struct{} +} + +func newChatSender() *ChatSender { + return &ChatSender{ + subscribers: make(map[*subscriber]struct{}), + } +} + +func (t *ChatSender) TestCall() { + fmt.Println("hello world") +} + +func (t *ChatSender) ServeHTTP(w http.ResponseWriter, r *http.Request) { + c, err := websocket.Accept(w, r, &websocket.AcceptOptions{ + OriginPatterns: []string{"*"}, + }) + if err != nil { + fmt.Println(err.Error()) + return + } + defer c.Close(websocket.StatusInternalError, "") + + err = t.subscribe(r.Context(), c) + if errors.Is(err, context.Canceled) { + return + } + if websocket.CloseStatus(err) == websocket.StatusNormalClosure || + websocket.CloseStatus(err) == websocket.StatusGoingAway { + return + } + if err != nil { + fmt.Println(err.Error()) + return + } +} + +func (t *ChatSender) subscribe(ctx context.Context, c *websocket.Conn) error { + ctx = c.CloseRead(ctx) + + s := &subscriber{ + msgs: make(chan []byte, 16), + closeSlow: func() { + c.Close(websocket.StatusPolicyViolation, "connection too slow to keep up with messages") + }, + } + t.addSubscriber(s) + defer t.deleteSubscriber(s) + + for { + select { + case msg := <-s.msgs: + err := writeTimeout(ctx, time.Second*5, c, msg) + if err != nil { + return err + } + case <-ctx.Done(): + return ctx.Err() + } + } +} + +type MessageBase struct { + Action string +} + +type TextMessage struct { + MessageBase + + Message string +} + +type ReindexEvent struct { + MessageBase + + Event string +} + +func (t *ChatSender) Publish(msg []byte) { + t.subscribersMu.Lock() + defer t.subscribersMu.Unlock() + + for s := range t.subscribers { + select { + case s.msgs <- msg: + default: + go s.closeSlow() + } + } +} + +var IndexSender = newChatSender() + +func SetupSettingsWebsocket() { + http.Handle("/subscribe", IndexSender) +} + +// addSubscriber registers a subscriber. +func (t *ChatSender) addSubscriber(s *subscriber) { + t.subscribersMu.Lock() + t.subscribers[s] = struct{}{} + t.subscribersMu.Unlock() +} + +// deleteSubscriber deletes the given subscriber. +func (t *ChatSender) deleteSubscriber(s *subscriber) { + t.subscribersMu.Lock() + delete(t.subscribers, s) + t.subscribersMu.Unlock() +} + +func writeTimeout(ctx context.Context, timeout time.Duration, c *websocket.Conn, msg []byte) error { + ctx, cancel := context.WithTimeout(ctx, timeout) + defer cancel() + + return c.Write(ctx, websocket.MessageText, msg) +} diff --git a/src/pages/SettingsPage/MovieSettings.tsx b/src/pages/SettingsPage/MovieSettings.tsx index ba610de..06e63c8 100644 --- a/src/pages/SettingsPage/MovieSettings.tsx +++ b/src/pages/SettingsPage/MovieSettings.tsx @@ -2,7 +2,6 @@ import React from 'react'; import style from './MovieSettings.module.css'; import {APINode, callAPI} from '../../utils/Api'; import {GeneralSuccess} from '../../types/GeneralTypes'; -import {SettingsTypes} from '../../types/ApiTypes'; interface state { text: string[]; @@ -11,13 +10,23 @@ interface state { interface Props {} +interface MessageBase { + Action: string; +} + +interface TextMessage extends MessageBase { + Message: string; +} + +interface ReindexEvent extends MessageBase { + Event: string; +} + /** * Component for MovieSettings on Settingspage * handles settings concerning to movies in general */ class MovieSettings extends React.Component { - myinterval: number = -1; - constructor(props: Props) { super(props); @@ -28,12 +37,61 @@ class MovieSettings extends React.Component { } componentDidMount(): void { - this.myinterval = window.setInterval(this.updateStatus, 1000); + // expectingMessage is set to true + this.dial(); } - componentWillUnmount(): void { - if (this.myinterval !== -1) { - clearInterval(this.myinterval); + dial(): void { + console.log('trying to connect...'); + const conn = new WebSocket(`ws://${window.location.host}/subscribe`); + console.log('dd to connect...'); + conn.addEventListener('close', (ev) => { + this.appendLog(`WebSocket Disconnected code: ${ev.code}, reason: ${ev.reason}`, true); + if (ev.code !== 1001) { + this.appendLog('Reconnecting in 1s', true); + setTimeout((): void => this.dial(), 1000); + } + }); + conn.addEventListener('open', (_ev) => { + console.info('websocket connected'); + }); + + // This is where we handle messages received. + conn.addEventListener('message', (ev) => { + console.log('new message!'); + if (typeof ev.data !== 'string') { + console.error('unexpected message type', typeof ev.data); + return; + } + this.handleMessage(ev.data); + }); + } + + handleMessage(message: string): void { + const obj: MessageBase = JSON.parse(message); + + if (obj.Action === 'message') { + const msg = obj as TextMessage; + this.appendLog(msg.Message); + } else if (obj.Action === 'reindexAction') { + const msg = obj as ReindexEvent; + if (msg.Event === 'start') { + this.setState({startbtnDisabled: true}); + } else if (msg.Event === 'stop') { + this.setState({startbtnDisabled: false}); + } + } + } + + // appendLog appends the passed text to messageLog. + appendLog(text: string, error?: boolean): void { + this.setState({ + // insert a string for each line + text: [text, ...this.state.text] + }); + + if (error) { + console.log('heyy err'); } } @@ -51,9 +109,9 @@ class MovieSettings extends React.Component {
{this.state.text.map((m) => ( @@ -70,44 +128,15 @@ class MovieSettings extends React.Component { * starts the reindex process of the videos in the specified folder */ startReindex(): void { + this.setState({text: []}); // clear output text before start - this.setState({text: [], startbtnDisabled: true}); - callAPI(APINode.Settings, {action: 'startReindex'}, (result: GeneralSuccess): void => { - console.log(result); if (result.result === 'success') { console.log('started successfully'); - } else { - console.log('error, reindex already running'); - this.setState({startbtnDisabled: true}); } }); - - if (this.myinterval !== -1) { - clearInterval(this.myinterval); - } - this.myinterval = window.setInterval(this.updateStatus, 1000); } - /** - * This interval function reloads the current status of reindexing from backend - */ - updateStatus = (): void => { - callAPI(APINode.Settings, {action: 'getStatusMessage'}, (result: SettingsTypes.getStatusMessageType) => { - this.setState({ - // insert a string for each line - text: [...result.Messages, ...this.state.text] - }); - // todo 2020-07-4: scroll to bottom of div here - if (!result.ContentAvailable) { - // clear refresh interval if no content available - clearInterval(this.myinterval); - - this.setState({startbtnDisabled: false}); - } - }); - }; - /** * send request to cleanup db gravity */ @@ -118,6 +147,15 @@ class MovieSettings extends React.Component { }); }); } + + private startTVShowReindex(): void { + this.setState({text: []}); + callAPI(APINode.Settings, {action: 'startTVShowReindex'}, (result: GeneralSuccess): void => { + if (result.result === 'success') { + console.log('started successfully'); + } + }); + } } export default MovieSettings; From 6d41b861200abacb3f026b165f07cd99947317b6 Mon Sep 17 00:00:00 2001 From: lukas Date: Mon, 19 Apr 2021 20:31:56 +0200 Subject: [PATCH 07/15] new logo, partly implement tvshow reindex * add tvshow to db * add episodes to db new route switcher for tvshows --- apiGo/videoparser/ReIndexTVShows.go | 118 +++++++++++++++++++++++- apiGo/videoparser/WebSocketConnector.go | 4 - public/favicon.ico | Bin 3150 -> 0 bytes public/index.html | 4 +- public/logo192.png | Bin 5347 -> 0 bytes public/logo512.png | Bin 9664 -> 0 bytes public/logo_circle.png | Bin 0 -> 25699 bytes src/pages/TVShowPage/TVShowPage.tsx | 30 ++++-- 8 files changed, 140 insertions(+), 16 deletions(-) delete mode 100644 public/favicon.ico delete mode 100644 public/logo192.png delete mode 100644 public/logo512.png create mode 100644 public/logo_circle.png diff --git a/apiGo/videoparser/ReIndexTVShows.go b/apiGo/videoparser/ReIndexTVShows.go index dee9ec0..7f5336c 100644 --- a/apiGo/videoparser/ReIndexTVShows.go +++ b/apiGo/videoparser/ReIndexTVShows.go @@ -1,7 +1,123 @@ package videoparser -import "openmediacenter/apiGo/api/types" +import ( + "fmt" + "openmediacenter/apiGo/api/types" + "openmediacenter/apiGo/database" + "regexp" + "strconv" + "strings" +) func startTVShowReindex(files []Show, sett types.SettingsType) { // have fun with db insertions here! + + allTVshows := getAllTVShows() + + for _, file := range files { + // insert new TVShow entry if not existing. + insertShowIfNotExisting(file, allTVshows) + + insertEpisodesIfNotExisting(file) + } +} + +func insertEpisodesIfNotExisting(show Show) { + query := fmt.Sprintf("SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name='%s'", show.Name) + rows := database.Query(query) + + var dbepisodes []string + for rows.Next() { + var epname string + var season int + var episode int + err := rows.Scan(&epname, &season, &episode) + if err != nil { + fmt.Println(err.Error()) + } + + dbepisodes = append(dbepisodes, fmt.Sprintf("%s S%02dE%02d.mp4", epname, season, episode)) + } + + // get those episodes that are missing in db + diff := difference(show.files, dbepisodes) + + for _, s := range diff { + insertEpisode(s, show.Name) + } + + fmt.Println("diff is...") + fmt.Println(diff) +} + +func insertEpisode(path string, ShowName string) { + seasonRegex := regexp.MustCompile("S[0-9][0-9]") + episodeRegex := regexp.MustCompile("E[0-9][0-9]") + matchENDPattern := regexp.MustCompile(" S[0-9][0-9]E[0-9][0-9].+$") + + seasonStr := seasonRegex.FindString(path)[1:] + episodeStr := episodeRegex.FindString(path)[1:] + extString := matchENDPattern.FindString(path) + name := strings.TrimSuffix(path, extString) + + season, err := strconv.ParseInt(seasonStr, 10, 8) + episode, err := strconv.ParseInt(episodeStr, 10, 8) + if err != nil { + fmt.Println(err.Error()) + } + + query := fmt.Sprintf(` +INSERT INTO tvshow_episodes (name, season, poster, tvshow_id, episode) +VALUES ('%s', %d, '%s', (SELECT tvshow.id FROM tvshow WHERE tvshow.name='%s'), %d)`, name, season, "", ShowName, episode) + err = database.Edit(query) + if err != nil { + fmt.Println(err.Error()) + } +} + +// difference returns the elements in `a` that aren't in `b`. +func difference(a, b []string) []string { + mb := make(map[string]struct{}, len(b)) + for _, x := range b { + mb[x] = struct{}{} + } + var diff []string + for _, x := range a { + if _, found := mb[x]; !found { + diff = append(diff, x) + } + } + return diff +} + +func insertShowIfNotExisting(show Show, allShows *[]string) { + // if show already exists return + fmt.Println(*allShows) + for _, s := range *allShows { + if s == show.Name { + return + } + } + + // todo load tmdb pic + query := fmt.Sprintf("INSERT INTO tvshow (name, thumbnail) VALUES ('%s', '%s')", show.Name, "") + err := database.Edit(query) + if err != nil { + fmt.Println(err.Error()) + } +} + +func getAllTVShows() *[]string { + query := "SELECT name FROM tvshow" + rows := database.Query(query) + + var res []string + for rows.Next() { + var show string + rows.Scan(&show) + + res = append(res, show) + } + + return &res } diff --git a/apiGo/videoparser/WebSocketConnector.go b/apiGo/videoparser/WebSocketConnector.go index a1fe5ca..7aaac6f 100644 --- a/apiGo/videoparser/WebSocketConnector.go +++ b/apiGo/videoparser/WebSocketConnector.go @@ -29,10 +29,6 @@ func newChatSender() *ChatSender { } } -func (t *ChatSender) TestCall() { - fmt.Println("hello world") -} - func (t *ChatSender) ServeHTTP(w http.ResponseWriter, r *http.Request) { c, err := websocket.Accept(w, r, &websocket.AcceptOptions{ OriginPatterns: []string{"*"}, diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index bcd5dfd67cd0361b78123e95c2dd96031f27f743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3150 zcmaKtc{Ei0AIGn;MZ^<@lHD*OV;K7~W1q3jSjJcqNywTkMOhP*k~Oj?GO|6{m(*C2 zC7JA+hN%%Bp7T4;J@?%2_x=5zbI<2~->=X60stMr0B~{wzpi9D0MG|# zyuANt7z6;uz%?PEfAnimLl^)6h5ARwGXemG2>?hqQv-I^Gpyh$JH}Ag92}3{$a#z& zd`il2Sb#$U&e&4#^4R|GTgk!Qs+x*PCL{2+`uB5mqtnqLaaw`*H2oqJ?XF(zUACc2 zSibBrdQzcidqv*TK}rpEv1ie&;Famq2IK5%4c}1Jt2b1x_{y1C!?EU)@`_F)yN*NK z)(u03@%g%uDawwXGAMm%EnP9FgoucUedioDwL~{6RVO@A-Q$+pwVRR%WYR>{K3E&Q zzqzT!EEZ$_NHGYM6&PK#CGUV$pTWsiI5#~m>htoJ!vbc0=gm3H8sz8KzIiVN5xdCT z%;}`UH2Pc8))1VS-unh?v4*H*NIy5On{MRKw7BTmOO9oE2UApwkCl9Z?^dod9M^#w z51tEZhf+#dpTo#GDDy#kuzoIjMjZ?%v*h$ z*vwUMOjGc?R0(FjLWkMD)kca4z6~H45FIzQ!Zzu&-yWyMdCBsDr2`l}Q{8fH$H@O< z$&snNzbqLk?(GIe?!PVh?F~2qk4z^rMcp$P^hw^rUPjyCyoNTRw%;hNOwrCoN?G0E z!wT^=4Loa9@O{t;Wk(Nj=?ms1Z?UN_;21m%sUm?uib=pg&x|u)8pP#l--$;B9l47n zUUnMV0sXLe*@Gvy>XWjRoqc2tOzgYn%?g@Lb8C&WsxV1Kjssh^ZBs*Ysr+E6%tsC_ zCo-)hkYY=Bn?wMB4sqm?WS>{kh<6*DO)vXnQpQ9`-_qF6!#b;3Nf@;#B>e2j$yokl6F|9p1<($2 z=WSr%)Z?^|r6njhgbuMrIN>8JE05u0x5t@_dEfbGn9r0hK4c2vp>(*$GXsjeLL_uz zWpyfUgdv!~-2N;llVzik#s2*XB*%7u8(^sJv&T3pzaR&<9({17Zs~UY>#ugZZkHBs zD+>0_an$?}utGp$dcXtyFHnTQZJ}SF=oZ}X07dz~K>^o(vjTzw8ZQc!Fw1W=&Z?9% zv63|~l}70sJbY?H8ON8j)w5=6OpXuaZ}YT03`2%u8{;B0Vafo_iY7&BiQTbRkdJBYL}?%ATfmc zLG$uXt$@3j#OIjALdT&Ut$=9F8cgV{w_f5eS)PjoVi z&oemp-SKJ~UuGuCP1|iY?J^S&P z)-IG?O-*=z6kfZrX5H*G=aQ{ZaqnOqP@&+_;nq@mA>EcjgxrYX8EK|Iq4&E&rxR?R z8N$QOdRwY zr{P`O)=87>YLHtFfGXW z6P)ucrhj~It_9w<^v5>T6N1U}+BkS))=WX*2JY=}^b2czGhH<`?`(}}qMcpPx_%>M zM|fs(+I1m&_h(zqp-HgP>re$2O^o$q)xu#fl0ivOJE({duU)a*OD(eYgSi^cdTn}pqcPM(;S)2%1By^Wh%-CaC%>d9hi`7J zaxL7@;nhA>PE%s99&;z{8>VFgf{u!(-B-x7Of6ueme+ScryL`h(^qKE)DtieWY>-7 zgB)VJESQS4*1LU(2&@pgLvSt{(((C?K_V(rQk``i&5}ZPG;G^FiPlZ$7|-vEmMWlU z5lQ%iK2nu=h2wd_7>gK@vX=*AG+u~rQP$NwPC`ZA?4nh{3tui1x@bT6-;Rk3yDQ>d z?3qRD#+PeV7#FAa>s`Xwxsx_oRFcN$StW2=CW`=qObsT?SD^#^jM1Yk}PSPxJ zG@-_mnNU_)vM|iLRSI>UMp|hatyS}17R{10IuL0TLlupt>9dRs_SPQbv7BLYyC#qv16E-y@XZ= z-!p7I%#r-BVi$nQq3&ssRc_IC%R6$tA&^s_l46880~Wst3@>(|EO<}T4~ci~#!=e; zD)B>o%1+$ksURD1p7I-<3ehlFyVkqrySf&gg>Bp0Z9?JaG|gyTZ{Cb8SdvAWVmFX7v2ohs!OCc!Udk zUITUpmZ33rKLI#(&lDj}cKA#dpL4Fil=$5pu_wi1XJR!llw` zSItPBDEdMHk2>c7#%lBxZHHvtVUOZ$}v?=?AT~9!Jcqa@IJGuMg(s^7r>pcTrd)pS`{5Cu8WPey` z9)!!OUUY@L%9Q+bZa*S5`3f_|lFCPN6kdp_M2>{le8;cn^XUsPa+TUk47qd6)IBR% zk*&Ip?!Ge_gmmdj)BX}P_5o@VI2*wbZ^>UhFju}0gQZh!pP%4XT9{@w;G#b3XK8sN zF(7i$Jv(IM$8Akys9dhP^^~H2(7BfJp}yDW1#@!CL-!mGcSCnJ599WK9MV@yo_u$v MDeX2GIKR{Qf5okjU;qFB diff --git a/public/index.html b/public/index.html index 92fbfdd..880a2f1 100644 --- a/public/index.html +++ b/public/index.html @@ -2,14 +2,14 @@ - + - + infinite spinner + const wrapper = shallow( {}}/>); // expect load animation to be visible expect(wrapper.find('.loadAnimation')).toHaveLength(1); diff --git a/src/pages/ActorOverviewPage/ActorOverviewPage.test.js b/src/pages/ActorOverviewPage/ActorOverviewPage.test.js index 4aa8886..fa61605 100644 --- a/src/pages/ActorOverviewPage/ActorOverviewPage.test.js +++ b/src/pages/ActorOverviewPage/ActorOverviewPage.test.js @@ -8,20 +8,6 @@ describe('', function () { wrapper.unmount(); }); - it('test inerstion of actor tiles', function () { - const wrapper = shallow(); - - wrapper.setState({ - actors: [{ - thumbnail: '', - name: 'testname', - actor_id: 42 - }] - }); - - expect(wrapper.find('ActorTile')).toHaveLength(1); - }); - it('test newtagpopup visibility', function () { const wrapper = shallow(); diff --git a/src/pages/CategoryPage/TagView.test.js b/src/pages/CategoryPage/TagView.test.js index e5d24da..477e40f 100644 --- a/src/pages/CategoryPage/TagView.test.js +++ b/src/pages/CategoryPage/TagView.test.js @@ -8,13 +8,6 @@ describe('', function () { wrapper.unmount(); }); - it('test Tag insertion', function () { - const wrapper = shallow(); - wrapper.setState({loadedtags: [{tag_name: 'test', tag_id: 42}]}); - - expect(wrapper.find('TagPreview')).toHaveLength(1); - }); - it('test new tag popup', function () { const wrapper = shallow(); diff --git a/src/pages/HomePage/HomePage.test.js b/src/pages/HomePage/HomePage.test.js index aa279fa..aa8abe2 100644 --- a/src/pages/HomePage/HomePage.test.js +++ b/src/pages/HomePage/HomePage.test.js @@ -10,21 +10,6 @@ describe('', function () { wrapper.unmount(); }); - it('test data insertion', function () { - const wrapper = shallow(); - - expect(wrapper.find('VideoContainer')).toHaveLength(0); - - wrapper.setState({ - data: [ - {}, {} - ] - }); - - // there shoud be loaded the Videocontainer element into dom after fetching videos correctly - expect(wrapper.find('VideoContainer')).toHaveLength(1); - }); - it('test title and nr insertions', function () { const wrapper = shallow(); diff --git a/src/pages/Player/Player.tsx b/src/pages/Player/Player.tsx index 4651f11..4711750 100644 --- a/src/pages/Player/Player.tsx +++ b/src/pages/Player/Player.tsx @@ -279,8 +279,6 @@ export class Player extends React.Component { APINode.Video, {action: 'loadVideo', MovieId: parseInt(this.props.match.params.id, 10)}, (result: VideoTypes.loadVideoType) => { - console.log(result); - console.log(process.env.REACT_APP_CUST_BACK_DOMAIN); this.setState({ sources: { type: 'video', diff --git a/src/pages/SettingsPage/MovieSettings.test.js b/src/pages/SettingsPage/MovieSettings.test.js index 5b5aa04..b5bca6c 100644 --- a/src/pages/SettingsPage/MovieSettings.test.js +++ b/src/pages/SettingsPage/MovieSettings.test.js @@ -1,7 +1,6 @@ import {shallow} from 'enzyme'; import React from 'react'; import MovieSettings from './MovieSettings'; -import {callAPI} from "../../utils/Api"; describe('', function () { it('renders without crashing ', function () { @@ -31,98 +30,4 @@ describe('', function () { // initial send of reindex request to server expect(global.fetch).toBeCalledTimes(1); }); - - it('test failing reindex start', done => { - global.fetch = global.prepareFetchApi({success: false}); - const wrapper = shallow(); - - wrapper.find('button').findWhere(e => e.text() === 'Reindex Movie' && e.type() === 'button').simulate('click'); - - // initial send of reindex request to server - expect(global.fetch).toBeCalledTimes(1); - - process.nextTick(() => { - // reindex already running --> so disable startbdn - expect(wrapper.state()).toMatchObject({startbtnDisabled: true}); - - global.fetch.mockClear(); - done(); - }); - }); - - it('content available received and in state', () => { - const wrapper = shallow(); - callAPIMock({ - ContentAvailable: true, - Messages: ['firstline', 'secondline'] - }) - - wrapper.instance().updateStatus(); - - expect(wrapper.state()).toMatchObject({ - text: [ - 'firstline', - 'secondline' - ] - }); - }); - - it('test reindex with no content available', () => { - callAPIMock({ - Messages: [], - ContentAvailable: false - }) - - global.clearInterval = jest.fn(); - - const wrapper = shallow(); - wrapper.instance().updateStatus(); - - // expect the refresh interval to be cleared - expect(global.clearInterval).toBeCalledTimes(1); - - // expect startbtn to be reenabled - expect(wrapper.state()).toMatchObject({startbtnDisabled: false}); - }); - - it('test simulate gravity cleanup', () => { - // global.fetch = global.prepareFetchApi('mmi'); - callAPIMock({}) - const wrapper = shallow(); - wrapper.instance().setState = jest.fn(); - - wrapper.find('button').findWhere(e => e.text() === 'Cleanup Gravity' && e.type() === 'button').simulate('click'); - - // initial send of reindex request to server - expect(callAPI).toBeCalledTimes(1); - - expect(wrapper.instance().setState).toBeCalledTimes(1); - }); - - it('expect insertion before existing ones', function () { - const wrapper = shallow(); - - callAPIMock({ - ContentAvailable: true, - Messages: ['test'] - }) - - wrapper.instance().updateStatus(); - - expect(wrapper.state()).toMatchObject({ - text: ['test'] - }); - - // expect an untouched state if we try to add an empty string... - callAPIMock({ - ContentAvailable: true, - Messages: [''] - }) - - wrapper.instance().updateStatus(); - - expect(wrapper.state()).toMatchObject({ - text: ['', 'test'] - }); - }); }); diff --git a/src/pages/TVShowPage/EpisodePage.tsx b/src/pages/TVShowPage/EpisodePage.tsx new file mode 100644 index 0000000..56f3aca --- /dev/null +++ b/src/pages/TVShowPage/EpisodePage.tsx @@ -0,0 +1,61 @@ +import * as React from 'react'; +import {RouteComponentProps} from 'react-router'; +import {withRouter} from 'react-router-dom'; +import {APINode, callAPI} from '../../utils/Api'; +import {Link} from 'react-router-dom'; +import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; + +interface Props extends RouteComponentProps<{id: string}> {} + +interface State { + loaded: boolean; +} + +interface Episode { + ID: number; + Name: string; + Season: number; + Episode: number; +} + +class EpisodePage extends React.Component { + episodes: Episode[] = []; + + state = { + loaded: false + }; + + componentDidMount(): void { + callAPI(APINode.TVShow, {action: 'getEpisodes', ShowID: parseInt(this.props.match.params.id, 10)}, (episodes: Episode[]) => { + this.episodes = episodes; + this.setState({loaded: true}); + }); + } + + render(): JSX.Element { + if (!this.state.loaded) { + return <>loading...; + } + + return ( + <> + } + data={this.episodes} + /> + + ); + } +} + +const EpisodeTile = (props: {episode: Episode}): JSX.Element => { + return ( + +
+ Season:{props.episode.Season} Episode:{props.episode.Episode} {props.episode.Name} +
+ + ); +}; + +export default withRouter(EpisodePage); diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index 9343379..18273aa 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -4,6 +4,7 @@ import {APINode, callAPI} from '../../utils/Api'; import {TVShow} from '../../types/ApiTypes'; import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; import {Route, Switch, useRouteMatch} from 'react-router-dom'; +import EpisodePage from './EpisodePage'; interface State { loading: boolean; @@ -29,7 +30,12 @@ class TVShowPage extends React.Component { return ( ( - callback('')} linkPath={'/tvshows/' + elem.Id} /> + callback('')} + linkPath={'/tvshows/' + elem.Id} + /> )} data={this.state.loading ? [] : this.data} /> @@ -42,8 +48,8 @@ export default function (): JSX.Element { return ( - -
hey from episode page
+ + diff --git a/src/utils/Api.ts b/src/utils/Api.ts index 2d68ccd..a7c27b3 100644 --- a/src/utils/Api.ts +++ b/src/utils/Api.ts @@ -68,7 +68,6 @@ export function refreshAPIToken(callback: (error: string) => void, force?: boole callFuncQue(result.error); return; } - console.log(result); // set api token apiToken = result.access_token; // set expire time @@ -188,7 +187,6 @@ export function callAPI( errorcallback: (_: string) => void = (_: string): void => {} ): void { checkAPITokenValid(() => { - console.log(apiToken); fetch(APIPREFIX + apinode, { method: 'POST', body: JSON.stringify(fd), diff --git a/src/utils/GlobalInfos.ts b/src/utils/GlobalInfos.ts index e55b570..72e13cc 100644 --- a/src/utils/GlobalInfos.ts +++ b/src/utils/GlobalInfos.ts @@ -27,7 +27,7 @@ class StaticInfos { // trigger onThemeChange handlers this.handlers.map((func) => { - return func(); + func(); }); } From f72a3e5fb4acec27805b9a4f7f92f2c36d597774 Mon Sep 17 00:00:00 2001 From: lukas Date: Thu, 22 Apr 2021 20:31:36 +0200 Subject: [PATCH 09/15] add a new TVPlayer component, add tv episode path to db --- apiGo/api/TVShows.go | 32 ++++++++++ apiGo/videoparser/ReIndexTVShows.go | 7 ++- database.sql | 39 ++++++------ src/App.tsx | 4 ++ src/pages/Player/Player.tsx | 27 ++------ src/pages/TVShowPage/TVPlayer.tsx | 97 +++++++++++++++++++++++++++++ src/types/GeneralTypes.ts | 18 ++++++ 7 files changed, 181 insertions(+), 43 deletions(-) create mode 100644 src/pages/TVShowPage/TVPlayer.tsx diff --git a/apiGo/api/TVShows.go b/apiGo/api/TVShows.go index 6c614b5..573459c 100644 --- a/apiGo/api/TVShows.go +++ b/apiGo/api/TVShows.go @@ -40,4 +40,36 @@ func AddTvshowHandlers() { return jsonify(episodes) }) + + var le struct { + ID uint32 + } + AddHandler("loadEpisode", TVShowNode, &le, func() []byte { + query := fmt.Sprintf(` +SELECT tvshow_episodes.name, season, tvshow_id, episode, filename, t.foldername +FROM tvshow_episodes +JOIN tvshow t on t.id = tvshow_episodes.tvshow_id +WHERE tvshow_episodes.id=%d`, le.ID) + row := database.QueryRow(query) + + var ret struct { + Name string + Season uint8 + Episode uint8 + TVShowID uint32 + Path string + } + var filename string + var foldername string + + err := row.Scan(&ret.Name, &ret.Season, &ret.TVShowID, &ret.Episode, &filename, &foldername) + if err != nil { + fmt.Println(err.Error()) + return nil + } + + ret.Path = foldername + "/" + filename + + return jsonify(ret) + }) } diff --git a/apiGo/videoparser/ReIndexTVShows.go b/apiGo/videoparser/ReIndexTVShows.go index 7f5336c..efb70f6 100644 --- a/apiGo/videoparser/ReIndexTVShows.go +++ b/apiGo/videoparser/ReIndexTVShows.go @@ -67,8 +67,8 @@ func insertEpisode(path string, ShowName string) { } query := fmt.Sprintf(` -INSERT INTO tvshow_episodes (name, season, poster, tvshow_id, episode) -VALUES ('%s', %d, '%s', (SELECT tvshow.id FROM tvshow WHERE tvshow.name='%s'), %d)`, name, season, "", ShowName, episode) +INSERT INTO tvshow_episodes (name, season, poster, tvshow_id, episode, filename) +VALUES ('%s', %d, '%s', (SELECT tvshow.id FROM tvshow WHERE tvshow.name='%s'), %d, '%s')`, name, season, "", ShowName, episode, path) err = database.Edit(query) if err != nil { fmt.Println(err.Error()) @@ -100,7 +100,8 @@ func insertShowIfNotExisting(show Show, allShows *[]string) { } // todo load tmdb pic - query := fmt.Sprintf("INSERT INTO tvshow (name, thumbnail) VALUES ('%s', '%s')", show.Name, "") + // currently the foldernamme == name which mustn't necessarily be + query := fmt.Sprintf("INSERT INTO tvshow (name, thumbnail, foldername) VALUES ('%s', '%s', '%s')", show.Name, "", show.Name) err := database.Edit(query) if err != nil { fmt.Println(err.Error()) diff --git a/database.sql b/database.sql index 9b2fd9e..295fe42 100644 --- a/database.sql +++ b/database.sql @@ -9,12 +9,12 @@ create table if not exists actors create table if not exists settings ( - video_path varchar(255) null, - episode_path varchar(255) null, - password varchar(32) null, - mediacenter_name varchar(32) null, - TMDB_grabbing tinyint null, - DarkMode tinyint default 0 null + video_path varchar(255) null, + episode_path varchar(255) null, + password varchar(32) default '-1' null, + mediacenter_name varchar(32) default 'OpenMediaCenter' null, + TMDB_grabbing tinyint null, + DarkMode tinyint default 0 null ); create table if not exists tags @@ -26,10 +26,11 @@ create table if not exists tags create table if not exists tvshow ( - name varchar(100) null, - thumbnail mediumblob null, - id int auto_increment - primary key + name varchar(100) null, + thumbnail mediumblob null, + id int auto_increment + primary key, + foldername varchar(100) null ); create table if not exists tvshow_episodes @@ -40,6 +41,8 @@ create table if not exists tvshow_episodes season int null, poster mediumblob null, tvshow_id int null, + episode int null, + filename varchar(100) null, constraint tvshow_episodes_tvshow_id_fk foreign key (tvshow_id) references tvshow (id) ); @@ -48,14 +51,14 @@ create table if not exists videos ( movie_id int auto_increment primary key, - movie_name varchar(200) null, - movie_url varchar(250) null, - thumbnail mediumblob null, - likes int default 0 null, - create_date datetime default CURRENT_TIMESTAMP null, - quality int null, - length int null comment 'in seconds', - poster mediumblob null + movie_name varchar(200) null, + movie_url varchar(250) null, + thumbnail mediumblob null, + poster mediumblob null, + likes int default 0 null, + quality int null, + length int null comment 'in seconds', + create_date datetime default current_timestamp() null ); create table if not exists actors_videos diff --git a/src/App.tsx b/src/App.tsx index 77f440d..6232cfe 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -18,6 +18,7 @@ import ActorPage from './pages/ActorPage/ActorPage'; import {SettingsTypes} from './types/ApiTypes'; import AuthenticationPage from './pages/AuthenticationPage/AuthenticationPage'; import TVShowPage from './pages/TVShowPage/TVShowPage'; +import TVPlayer from './pages/TVShowPage/TVPlayer'; interface state { password: boolean | null; // null if uninitialized - true if pwd needed false if not needed @@ -172,6 +173,9 @@ class App extends React.Component<{}, state> { + + + diff --git a/src/pages/Player/Player.tsx b/src/pages/Player/Player.tsx index 4711750..342ec9c 100644 --- a/src/pages/Player/Player.tsx +++ b/src/pages/Player/Player.tsx @@ -15,14 +15,14 @@ import ActorTile from '../../elements/ActorTile/ActorTile'; import {withRouter} from 'react-router-dom'; import {APINode, callAPI} from '../../utils/Api'; import {RouteComponentProps} from 'react-router'; -import {GeneralSuccess} from '../../types/GeneralTypes'; +import {DefaultPlyrOptions, GeneralSuccess} from '../../types/GeneralTypes'; import {ActorType, TagType} from '../../types/VideoTypes'; import PlyrJS from 'plyr'; import {Button} from '../../elements/GPElements/Button'; import {VideoTypes} from '../../types/ApiTypes'; import GlobalInfos from '../../utils/GlobalInfos'; -interface myprops extends RouteComponentProps<{id: string}> {} +interface Props extends RouteComponentProps<{id: string}> {} interface mystate { sources?: PlyrJS.SourceInfo; @@ -42,25 +42,8 @@ interface mystate { * Player page loads when a video is selected to play and handles the video view * and actions such as tag adding and liking */ -export class Player extends React.Component { - options: PlyrJS.Options = { - controls: [ - 'play-large', // The large play button in the center - 'play', // Play/pause playback - 'progress', // The progress bar and scrubber for playback and buffering - 'current-time', // The current time of playback - 'duration', // The full duration of the media - 'mute', // Toggle mute - 'volume', // Volume control - 'captions', // Toggle captions - 'settings', // Settings menu - 'airplay', // Airplay (currently Safari only) - 'download', // Show a download button with a link to either the current source or a custom URL you specify in your options - 'fullscreen' // Toggle fullscreen - ] - }; - - constructor(props: myprops) { +export class Player extends React.Component { + constructor(props: Props) { super(props); this.state = { @@ -94,7 +77,7 @@ export class Player extends React.Component {
{/* video component is added here */} {this.state.sources ? ( - + ) : (
not loaded yet
)} diff --git a/src/pages/TVShowPage/TVPlayer.tsx b/src/pages/TVShowPage/TVPlayer.tsx new file mode 100644 index 0000000..40f0fa1 --- /dev/null +++ b/src/pages/TVShowPage/TVPlayer.tsx @@ -0,0 +1,97 @@ +import * as React from 'react'; +import {RouteComponentProps} from 'react-router'; +import {withRouter} from 'react-router-dom'; +import PageTitle from '../../elements/PageTitle/PageTitle'; +import style from '../Player/Player.module.css'; +import {Plyr} from 'plyr-react'; +import plyrstyle from 'plyr-react/dist/plyr.css'; +import {DefaultPlyrOptions} from '../../types/GeneralTypes'; +import {APINode, callAPI} from '../../utils/Api'; +import GlobalInfos from '../../utils/GlobalInfos'; +import PlyrJS from 'plyr'; + +interface Props extends RouteComponentProps<{id: string}> {} + +interface State { + loaded: boolean; +} + +interface EpisodeData { + Name: string; + Season: number; + Episode: number; + TVShowID: number; + Path: string; +} + +class TVPlayer extends React.Component { + state = { + loaded: false + }; + + data: EpisodeData | null = null; + + componentDidMount(): void { + this.loadVideo(); + } + + loadVideo(): void { + callAPI( + APINode.TVShow, + { + action: 'loadEpisode', + ID: parseInt(this.props.match.params.id, 10) + }, + (data: EpisodeData) => { + console.log(data); + this.data = data; + this.setState({loaded: true}); + } + ); + } + + assemblePlyrObject(): JSX.Element { + if (this.state.loaded && this.data !== null) { + const sources: PlyrJS.SourceInfo = { + type: 'video', + sources: [ + { + src: + (process.env.REACT_APP_CUST_BACK_DOMAIN ? process.env.REACT_APP_CUST_BACK_DOMAIN : '') + + GlobalInfos.getTVShowPath() + + this.data.Path, + type: 'video/mp4', + size: 1080 + } + ], + poster: '' + }; + + return ; + } else { + return
not loaded yet
; + } + } + + render(): JSX.Element { + return ( +
+ + +
+ {/* video component is added here */} + {this.assemblePlyrObject()} +
+ +
+ ); + } + + private closebtn(): void { + this.props.history.goBack(); + } +} + +export default withRouter(TVPlayer); diff --git a/src/types/GeneralTypes.ts b/src/types/GeneralTypes.ts index 443ff15..fe62aa3 100644 --- a/src/types/GeneralTypes.ts +++ b/src/types/GeneralTypes.ts @@ -1,4 +1,5 @@ import {TagType} from './VideoTypes'; +import PlyrJS from 'plyr'; export interface GeneralSuccess { result: string; @@ -14,3 +15,20 @@ export const DefaultTags: TagarrayType = { lowq: {TagId: 3, TagName: 'lowquality'}, hd: {TagId: 4, TagName: 'hd'} }; + +export const DefaultPlyrOptions: PlyrJS.Options = { + controls: [ + 'play-large', // The large play button in the center + 'play', // Play/pause playback + 'progress', // The progress bar and scrubber for playback and buffering + 'current-time', // The current time of playback + 'duration', // The full duration of the media + 'mute', // Toggle mute + 'volume', // Volume control + 'captions', // Toggle captions + 'settings', // Settings menu + 'airplay', // Airplay (currently Safari only) + 'download', // Show a download button with a link to either the current source or a custom URL you specify in your options + 'fullscreen' // Toggle fullscreen + ] +}; From d952538f0ae075a059dc8fdef3d556b4bd8d9099 Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 23 Apr 2021 21:23:51 +0200 Subject: [PATCH 10/15] implement thubnail loading from tmdb fix lots of errors if ' char occurs in path strings correct reverse proxy for websocket --- apiGo/api/TVShows.go | 17 +++++ apiGo/api/Video.go | 2 +- apiGo/main.go | 3 + apiGo/videoparser/ReIndexTVShows.go | 41 +++++++---- apiGo/videoparser/tmdb/TMDBApi.go | 68 ++++++++++++++++++- .../sites-available/OpenMediaCenter.conf | 7 ++ .../DynamicContentContainer.tsx | 10 ++- src/pages/TVShowPage/EpisodePage.tsx | 1 + src/pages/TVShowPage/TVShowPage.tsx | 14 +++- 9 files changed, 142 insertions(+), 21 deletions(-) diff --git a/apiGo/api/TVShows.go b/apiGo/api/TVShows.go index 573459c..d536938 100644 --- a/apiGo/api/TVShows.go +++ b/apiGo/api/TVShows.go @@ -72,4 +72,21 @@ WHERE tvshow_episodes.id=%d`, le.ID) return jsonify(ret) }) + + var rtn struct { + Id int + } + AddHandler("readThumbnail", TVShowNode, &rtn, func() []byte { + var pic []byte + + query := fmt.Sprintf("SELECT thumbnail FROM tvshow WHERE id=%d", rtn.Id) + + err := database.QueryRow(query).Scan(&pic) + if err != nil { + fmt.Printf("the thumbnail of movie id %d couldn't be found", rtn.Id) + return nil + } + + return pic + }) } diff --git a/apiGo/api/Video.go b/apiGo/api/Video.go index e2e7391..9ddca40 100644 --- a/apiGo/api/Video.go +++ b/apiGo/api/Video.go @@ -44,7 +44,7 @@ func getVideoHandlers() { AddHandler("readThumbnail", VideoNode, &rtn, func() []byte { var pic []byte - query := fmt.Sprintf("SELECT thumbnail FROM videos WHERE movie_id='%d'", rtn.Movieid) + query := fmt.Sprintf("SELECT thumbnail FROM videos WHERE movie_id=%d", rtn.Movieid) err := database.QueryRow(query).Scan(&pic) if err != nil { diff --git a/apiGo/main.go b/apiGo/main.go index 0b52cb2..1c46361 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -9,12 +9,15 @@ import ( "openmediacenter/apiGo/database" "openmediacenter/apiGo/static" "openmediacenter/apiGo/videoparser" + "openmediacenter/apiGo/videoparser/tmdb" ) func main() { fmt.Println("init OpenMediaCenter server") port := 8081 + tmdb.SearchTVShow("Arrow") + db, verbose, pathPrefix := handleCommandLineArguments() // todo some verbosity logger or sth diff --git a/apiGo/videoparser/ReIndexTVShows.go b/apiGo/videoparser/ReIndexTVShows.go index efb70f6..7b7392e 100644 --- a/apiGo/videoparser/ReIndexTVShows.go +++ b/apiGo/videoparser/ReIndexTVShows.go @@ -4,6 +4,7 @@ import ( "fmt" "openmediacenter/apiGo/api/types" "openmediacenter/apiGo/database" + "openmediacenter/apiGo/videoparser/tmdb" "regexp" "strconv" "strings" @@ -23,8 +24,8 @@ func startTVShowReindex(files []Show, sett types.SettingsType) { } func insertEpisodesIfNotExisting(show Show) { - query := fmt.Sprintf("SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name='%s'", show.Name) - rows := database.Query(query) + query := "SELECT tvshow_episodes.name, season, episode FROM tvshow_episodes JOIN tvshow t on t.id = tvshow_episodes.tvshow_id WHERE t.name=?" + rows := database.Query(query, show.Name) var dbepisodes []string for rows.Next() { @@ -47,7 +48,7 @@ func insertEpisodesIfNotExisting(show Show) { } fmt.Println("diff is...") - fmt.Println(diff) + fmt.Println(len(diff)) } func insertEpisode(path string, ShowName string) { @@ -55,21 +56,27 @@ func insertEpisode(path string, ShowName string) { episodeRegex := regexp.MustCompile("E[0-9][0-9]") matchENDPattern := regexp.MustCompile(" S[0-9][0-9]E[0-9][0-9].+$") - seasonStr := seasonRegex.FindString(path)[1:] - episodeStr := episodeRegex.FindString(path)[1:] + seasonStr := seasonRegex.FindString(path) + episodeStr := episodeRegex.FindString(path) extString := matchENDPattern.FindString(path) + // handle invalid matches + if len(seasonStr) != 3 || len(episodeStr) != 3 || len(extString) < 8 { + fmt.Printf("Error inserting episode: %s -- %s/%s/%s\n", path, seasonStr, episodeStr, extString) + return + } + name := strings.TrimSuffix(path, extString) - season, err := strconv.ParseInt(seasonStr, 10, 8) - episode, err := strconv.ParseInt(episodeStr, 10, 8) + season, err := strconv.ParseInt(seasonStr[1:], 10, 8) + episode, err := strconv.ParseInt(episodeStr[1:], 10, 8) if err != nil { fmt.Println(err.Error()) } - query := fmt.Sprintf(` + query := ` INSERT INTO tvshow_episodes (name, season, poster, tvshow_id, episode, filename) -VALUES ('%s', %d, '%s', (SELECT tvshow.id FROM tvshow WHERE tvshow.name='%s'), %d, '%s')`, name, season, "", ShowName, episode, path) - err = database.Edit(query) +VALUES (?, ?, ?, (SELECT tvshow.id FROM tvshow WHERE tvshow.name=?), ?, ?)` + err = database.Edit(query, name, season, "", ShowName, episode, path) if err != nil { fmt.Println(err.Error()) } @@ -99,10 +106,18 @@ func insertShowIfNotExisting(show Show, allShows *[]string) { } } - // todo load tmdb pic + // insert empty thubnail if tmdb fails + thubnail := "" + + // load tmdb infos + tmdbInfo := tmdb.SearchTVShow(show.Name) + if tmdbInfo != nil { + thubnail = tmdbInfo.Thumbnail + } + // currently the foldernamme == name which mustn't necessarily be - query := fmt.Sprintf("INSERT INTO tvshow (name, thumbnail, foldername) VALUES ('%s', '%s', '%s')", show.Name, "", show.Name) - err := database.Edit(query) + query := "INSERT INTO tvshow (name, thumbnail, foldername) VALUES (?, ?, ?)" + err := database.Edit(query, show.Name, thubnail, show.Name) if err != nil { fmt.Println(err.Error()) } diff --git a/apiGo/videoparser/tmdb/TMDBApi.go b/apiGo/videoparser/tmdb/TMDBApi.go index 2a81d4c..659adc3 100644 --- a/apiGo/videoparser/tmdb/TMDBApi.go +++ b/apiGo/videoparser/tmdb/TMDBApi.go @@ -21,6 +21,12 @@ type VideoTMDB struct { GenreIds []int } +type TVShowTMDB struct { + Thumbnail string + Overview string + GenreIds []int +} + type tmdbVidResult struct { Poster_path string Adult bool @@ -89,7 +95,7 @@ func SearchVideo(MovieName string, year int) *VideoTMDB { // continue label cont: - thumbnail := fetchPoster(tmdbVid) + thumbnail := fetchPoster(tmdbVid.Poster_path) result := VideoTMDB{ Thumbnail: *thumbnail, @@ -101,8 +107,64 @@ cont: return &result } -func fetchPoster(vid tmdbVidResult) *string { - url := fmt.Sprintf("%s%s", pictureBase, vid.Poster_path) +type tmdbTvResult struct { + PosterPath string `json:"poster_path"` + Popularity int `json:"popularity"` + Id int `json:"id"` + BackdropPath string `json:"backdrop_path"` + VoteAverage int `json:"vote_average"` + Overview string `json:"overview"` + FirstAirDate string `json:"first_air_date"` + OriginCountry []string `json:"origin_country"` + GenreIds []int `json:"genre_ids"` + OriginalLanguage string `json:"original_language"` + VoteCount int `json:"vote_count"` + Name string `json:"name"` + OriginalName string `json:"original_name"` +} + +func SearchTVShow(Name string) *TVShowTMDB { + fmt.Printf("Searching TMDB for: TVShow: %s\n", Name) + queryURL := fmt.Sprintf("%ssearch/tv?api_key=%s&query=%s", baseUrl, apiKey, url.QueryEscape(Name)) + resp, err := http.Get(queryURL) + if err != nil { + fmt.Println(err.Error()) + return nil + } + + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + fmt.Println(err.Error()) + return nil + } + + var t struct { + Results []tmdbTvResult `json:"results"` + } + err = json.Unmarshal(body, &t) + + fmt.Println(len(t.Results)) + + if len(t.Results) == 0 { + return nil + } + + res := TVShowTMDB{ + Thumbnail: "", + Overview: t.Results[0].Overview, + GenreIds: t.Results[0].GenreIds, + } + + thumbnail := fetchPoster(t.Results[0].PosterPath) + if thumbnail != nil { + res.Thumbnail = *thumbnail + } + + return &res +} + +func fetchPoster(posterPath string) *string { + url := fmt.Sprintf("%s%s", pictureBase, posterPath) resp, err := http.Get(url) if err != nil { diff --git a/deb/OpenMediaCenter/etc/nginx/sites-available/OpenMediaCenter.conf b/deb/OpenMediaCenter/etc/nginx/sites-available/OpenMediaCenter.conf index 8ee1e5f..cbdb815 100755 --- a/deb/OpenMediaCenter/etc/nginx/sites-available/OpenMediaCenter.conf +++ b/deb/OpenMediaCenter/etc/nginx/sites-available/OpenMediaCenter.conf @@ -16,4 +16,11 @@ server { location ~* ^/(api/|token) { proxy_pass http://127.0.0.1:8081; } + location /subscribe { + proxy_pass http://127.0.0.1:8081; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } } diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx index 4b19b99..e83cebd 100644 --- a/src/elements/DynamicContentContainer/DynamicContentContainer.tsx +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.tsx @@ -19,6 +19,12 @@ class DynamicContentContainer extends React.Component, state> { // stores current index of loaded elements loadindex: number = 0; + readonly InitialLoadNR = this.props.initialLoadNr + ? this.props.initialLoadNr === -1 + ? this.props.data.length + : this.props.initialLoadNr + : 16; + constructor(props: Props) { super(props); @@ -30,14 +36,14 @@ class DynamicContentContainer extends React.Component, state> { componentDidMount(): void { document.addEventListener('scroll', this.trackScrolling); - this.loadPreviewBlock(this.props.initialLoadNr ? this.props.initialLoadNr : 16); + this.loadPreviewBlock(this.InitialLoadNR); } componentDidUpdate(prevProps: Props): void { // when source props change force update! if (prevProps.data.length !== this.props.data.length) { this.clean(); - this.loadPreviewBlock(this.props.initialLoadNr ? this.props.initialLoadNr : 16); + this.loadPreviewBlock(this.InitialLoadNR); } } diff --git a/src/pages/TVShowPage/EpisodePage.tsx b/src/pages/TVShowPage/EpisodePage.tsx index 56f3aca..be58dcc 100644 --- a/src/pages/TVShowPage/EpisodePage.tsx +++ b/src/pages/TVShowPage/EpisodePage.tsx @@ -42,6 +42,7 @@ class EpisodePage extends React.Component { } data={this.episodes} + initialLoadNr={-1} /> ); diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index 18273aa..fa005c6 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -1,6 +1,6 @@ import React from 'react'; import Preview from '../../elements/Preview/Preview'; -import {APINode, callAPI} from '../../utils/Api'; +import {APINode, callAPI, callAPIPlain} from '../../utils/Api'; import {TVShow} from '../../types/ApiTypes'; import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; import {Route, Switch, useRouteMatch} from 'react-router-dom'; @@ -33,11 +33,21 @@ class TVShowPage extends React.Component { callback('')} + picLoader={(callback: (pic: string) => void): void => { + callAPIPlain( + APINode.TVShow, + { + action: 'readThumbnail', + Id: elem.Id + }, + (result) => callback(result) + ); + }} linkPath={'/tvshows/' + elem.Id} /> )} data={this.state.loading ? [] : this.data} + initialLoadNr={20} /> ); } From 8c44a931def45a4d3a5639c34281e882aef90e5c Mon Sep 17 00:00:00 2001 From: lukas Date: Fri, 23 Apr 2021 21:37:57 +0200 Subject: [PATCH 11/15] some reformattings remove test code from main --- apiGo/main.go | 3 -- apiGo/videoparser/tmdb/TMDBApi.go | 75 +++++++++++++++---------------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/apiGo/main.go b/apiGo/main.go index 1c46361..0b52cb2 100644 --- a/apiGo/main.go +++ b/apiGo/main.go @@ -9,15 +9,12 @@ import ( "openmediacenter/apiGo/database" "openmediacenter/apiGo/static" "openmediacenter/apiGo/videoparser" - "openmediacenter/apiGo/videoparser/tmdb" ) func main() { fmt.Println("init OpenMediaCenter server") port := 8081 - tmdb.SearchTVShow("Arrow") - db, verbose, pathPrefix := handleCommandLineArguments() // todo some verbosity logger or sth diff --git a/apiGo/videoparser/tmdb/TMDBApi.go b/apiGo/videoparser/tmdb/TMDBApi.go index 659adc3..957ea80 100644 --- a/apiGo/videoparser/tmdb/TMDBApi.go +++ b/apiGo/videoparser/tmdb/TMDBApi.go @@ -28,20 +28,36 @@ type TVShowTMDB struct { } type tmdbVidResult struct { - Poster_path string - Adult bool - Overview string - Release_date string - Genre_ids []int - Id int - Original_title string - Original_language string - Title string - Backdrop_path string - Popularity int - Vote_count int - Video bool - Vote_average int + PosterPath string `json:"poster_path"` + Adult bool `json:"adult"` + Overview string `json:"overview"` + ReleaseDate string `json:"release_date"` + GenreIds []int `json:"genre_ids"` + Id int `json:"id"` + OriginalTitle string `json:"original_title"` + OriginalLanguage string `json:"original_language"` + Title string `json:"title"` + BackdropPath string `json:"backdrop_path"` + Popularity int `json:"popularity"` + VoteCount int `json:"vote_count"` + Video bool `json:"video"` + VoteAverage int `json:"vote_average"` +} + +type tmdbTvResult struct { + PosterPath string `json:"poster_path"` + Popularity int `json:"popularity"` + Id int `json:"id"` + BackdropPath string `json:"backdrop_path"` + VoteAverage int `json:"vote_average"` + Overview string `json:"overview"` + FirstAirDate string `json:"first_air_date"` + OriginCountry []string `json:"origin_country"` + GenreIds []int `json:"genre_ids"` + OriginalLanguage string `json:"original_language"` + VoteCount int `json:"vote_count"` + Name string `json:"name"` + OriginalName string `json:"original_name"` } type TMDBGenre struct { @@ -80,7 +96,7 @@ func SearchVideo(MovieName string, year int) *VideoTMDB { if year != -1 { for _, result := range t.Results { r, _ := regexp.Compile(fmt.Sprintf(`^%d-[0-9]{2}?-[0-9]{2}?$`, year)) - if r.MatchString(result.Release_date) { + if r.MatchString(result.ReleaseDate) { tmdbVid = result // continue parsing goto cont @@ -95,34 +111,18 @@ func SearchVideo(MovieName string, year int) *VideoTMDB { // continue label cont: - thumbnail := fetchPoster(tmdbVid.Poster_path) + thumbnail := fetchPoster(tmdbVid.PosterPath) result := VideoTMDB{ Thumbnail: *thumbnail, Overview: tmdbVid.Overview, Title: tmdbVid.Title, - GenreIds: tmdbVid.Genre_ids, + GenreIds: tmdbVid.GenreIds, } return &result } -type tmdbTvResult struct { - PosterPath string `json:"poster_path"` - Popularity int `json:"popularity"` - Id int `json:"id"` - BackdropPath string `json:"backdrop_path"` - VoteAverage int `json:"vote_average"` - Overview string `json:"overview"` - FirstAirDate string `json:"first_air_date"` - OriginCountry []string `json:"origin_country"` - GenreIds []int `json:"genre_ids"` - OriginalLanguage string `json:"original_language"` - VoteCount int `json:"vote_count"` - Name string `json:"name"` - OriginalName string `json:"original_name"` -} - func SearchTVShow(Name string) *TVShowTMDB { fmt.Printf("Searching TMDB for: TVShow: %s\n", Name) queryURL := fmt.Sprintf("%ssearch/tv?api_key=%s&query=%s", baseUrl, apiKey, url.QueryEscape(Name)) @@ -164,9 +164,8 @@ func SearchTVShow(Name string) *TVShowTMDB { } func fetchPoster(posterPath string) *string { - url := fmt.Sprintf("%s%s", pictureBase, posterPath) - - resp, err := http.Get(url) + posterURL := fmt.Sprintf("%s%s", pictureBase, posterPath) + resp, err := http.Get(posterURL) if err != nil { fmt.Println(err.Error()) return nil @@ -185,8 +184,8 @@ func fetchPoster(posterPath string) *string { var tmdbGenres *[]TMDBGenre func fetchGenres() *[]TMDBGenre { - url := fmt.Sprintf("%sgenre/movie/list?api_key=%s", baseUrl, apiKey) - resp, err := http.Get(url) + posterURL := fmt.Sprintf("%sgenre/movie/list?api_key=%s", baseUrl, apiKey) + resp, err := http.Get(posterURL) if err != nil { fmt.Println(err.Error()) return nil From 4ae9f279024d31f1707b58eb14892bd4c6578746 Mon Sep 17 00:00:00 2001 From: lukas Date: Wed, 28 Apr 2021 17:31:38 +0200 Subject: [PATCH 12/15] add some unit tests pretify episodepage --- .../DynamicContentContainer.module.css | 1 + .../DynamicContentContainer.test.js | 7 +++ src/pages/TVShowPage/EpisodePage.test.js | 43 +++++++++++++++ src/pages/TVShowPage/EpisodePage.tsx | 30 +++++++++-- src/pages/TVShowPage/EpisodeTile.module.css | 15 ++++++ src/pages/TVShowPage/TVShowPage.tsx | 54 ++++++++++++------- 6 files changed, 126 insertions(+), 24 deletions(-) create mode 100644 src/pages/TVShowPage/EpisodePage.test.js create mode 100644 src/pages/TVShowPage/EpisodeTile.module.css diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.module.css b/src/elements/DynamicContentContainer/DynamicContentContainer.module.css index ee66207..0278419 100644 --- a/src/elements/DynamicContentContainer/DynamicContentContainer.module.css +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.module.css @@ -1,4 +1,5 @@ .maincontent { float: left; width: 70%; + flex: 1; } diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.test.js b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js index 176fd4f..2792ce3 100644 --- a/src/elements/DynamicContentContainer/DynamicContentContainer.test.js +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js @@ -27,4 +27,11 @@ describe('', function () { expect(wrapper.find('a')).toHaveLength(0); expect(wrapper.find('.maincontent').text()).toBe('no items to show!'); }); + + it('test clean', function () { + const wrapper = shallow( ()}/>); + expect(wrapper.find('a')).toHaveLength(3); + wrapper.instance().clean(); + expect(wrapper.find('a')).toHaveLength(0); + }); }); diff --git a/src/pages/TVShowPage/EpisodePage.test.js b/src/pages/TVShowPage/EpisodePage.test.js new file mode 100644 index 0000000..2dce8c0 --- /dev/null +++ b/src/pages/TVShowPage/EpisodePage.test.js @@ -0,0 +1,43 @@ +import {shallow} from 'enzyme'; +import React from 'react'; +import {EpisodePage, EpisodeTile} from './EpisodePage'; + +describe('', function () { + it('renders without crashing ', function () { + const wrapper = shallow(); + wrapper.unmount(); + }); + + it('content showing when loaded', function () { + const wrapper = shallow(); + + expect(wrapper.find('DynamicContentContainer')).toHaveLength(0) + + wrapper.setState({loaded: true}); + + expect(wrapper.find('DynamicContentContainer')).toHaveLength(1) + }); +}); + +describe('', () => { + it('renders without crashing', function () { + const wrapper = shallow(); + wrapper.unmount(); + }); + + it('renders text', function () { + const wrapper = shallow(); + + expect(wrapper.findWhere(e => e.text() === 'testname')).toHaveLength(1) + }); +}) diff --git a/src/pages/TVShowPage/EpisodePage.tsx b/src/pages/TVShowPage/EpisodePage.tsx index be58dcc..99405a1 100644 --- a/src/pages/TVShowPage/EpisodePage.tsx +++ b/src/pages/TVShowPage/EpisodePage.tsx @@ -4,6 +4,12 @@ import {withRouter} from 'react-router-dom'; import {APINode, callAPI} from '../../utils/Api'; import {Link} from 'react-router-dom'; import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; +import tileStyle from './EpisodeTile.module.css'; +import GlobalInfos from '../../utils/GlobalInfos'; +import {faPlay} from '@fortawesome/free-solid-svg-icons'; +import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; +import PageTitle, {Line} from '../../elements/PageTitle/PageTitle'; +import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar'; interface Props extends RouteComponentProps<{id: string}> {} @@ -18,7 +24,7 @@ interface Episode { Episode: number; } -class EpisodePage extends React.Component { +export class EpisodePage extends React.Component { episodes: Episode[] = []; state = { @@ -39,6 +45,14 @@ class EpisodePage extends React.Component { return ( <> + + + Infos: + + + {this.episodes.length} Episodes Total! + + } data={this.episodes} @@ -49,11 +63,19 @@ class EpisodePage extends React.Component { } } -const EpisodeTile = (props: {episode: Episode}): JSX.Element => { +export const EpisodeTile = (props: {episode: Episode}): JSX.Element => { + const themestyle = GlobalInfos.getThemeStyle(); return ( -
- Season:{props.episode.Season} Episode:{props.episode.Episode} {props.episode.Name} +
+ + Season: {props.episode.Season} Episode: {props.episode.Episode} {props.episode.Name}
); diff --git a/src/pages/TVShowPage/EpisodeTile.module.css b/src/pages/TVShowPage/EpisodeTile.module.css new file mode 100644 index 0000000..d2af5e7 --- /dev/null +++ b/src/pages/TVShowPage/EpisodeTile.module.css @@ -0,0 +1,15 @@ +.tile { + margin: 15px; + padding-top: 15px; + padding-bottom: 15px; + width: 50%; + padding-left: 15px; +} + +.tile:hover { + opacity: 0.7; +} + +.tile:hover svg { + color: dodgerblue; +} diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index fa005c6..4e14191 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -5,6 +5,8 @@ import {TVShow} from '../../types/ApiTypes'; import DynamicContentContainer from '../../elements/DynamicContentContainer/DynamicContentContainer'; import {Route, Switch, useRouteMatch} from 'react-router-dom'; import EpisodePage from './EpisodePage'; +import PageTitle, {Line} from '../../elements/PageTitle/PageTitle'; +import SideBar, {SideBarItem, SideBarTitle} from '../../elements/SideBar/SideBar'; interface State { loading: boolean; @@ -28,27 +30,39 @@ class TVShowPage extends React.Component { render(): JSX.Element { return ( - ( - void): void => { - callAPIPlain( - APINode.TVShow, - { - action: 'readThumbnail', - Id: elem.Id - }, - (result) => callback(result) - ); - }} - linkPath={'/tvshows/' + elem.Id} + <> + + + Infos: + + + {this.data.length} TV-Shows Total! + + +
+ ( + void): void => { + callAPIPlain( + APINode.TVShow, + { + action: 'readThumbnail', + Id: elem.Id + }, + (result) => callback(result) + ); + }} + linkPath={'/tvshows/' + elem.Id} + /> + )} + data={this.state.loading ? [] : this.data} + initialLoadNr={20} /> - )} - data={this.state.loading ? [] : this.data} - initialLoadNr={20} - /> +
+ ); } } From 5fac3a07801dfe2ba07f1ab6e8aaabe1bfeab36e Mon Sep 17 00:00:00 2001 From: lukas Date: Sat, 1 May 2021 15:18:38 +0200 Subject: [PATCH 13/15] add some unit tests --- .../DynamicContentContainer.test.js | 12 ++++++++++++ src/pages/TVShowPage/TVPlayer.test.js | 10 ++++++++++ src/pages/TVShowPage/TVPlayer.tsx | 2 +- src/pages/TVShowPage/TVShowPage.test.js | 10 ++++++++++ src/pages/TVShowPage/TVShowPage.tsx | 2 +- 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/pages/TVShowPage/TVPlayer.test.js create mode 100644 src/pages/TVShowPage/TVShowPage.test.js diff --git a/src/elements/DynamicContentContainer/DynamicContentContainer.test.js b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js index 2792ce3..53c916a 100644 --- a/src/elements/DynamicContentContainer/DynamicContentContainer.test.js +++ b/src/elements/DynamicContentContainer/DynamicContentContainer.test.js @@ -34,4 +34,16 @@ describe('', function () { wrapper.instance().clean(); expect(wrapper.find('a')).toHaveLength(0); }); + + it('test update', function () { + const wrapper = shallow( ()}/>); + + const func = jest.fn(); + wrapper.instance().clean = func; + + // perform component update + wrapper.setProps({data: [{}, {}]}); + + expect(func).toHaveBeenCalledTimes(1); + }); }); diff --git a/src/pages/TVShowPage/TVPlayer.test.js b/src/pages/TVShowPage/TVPlayer.test.js new file mode 100644 index 0000000..892e6cd --- /dev/null +++ b/src/pages/TVShowPage/TVPlayer.test.js @@ -0,0 +1,10 @@ +import {shallow} from 'enzyme'; +import {TVPlayer} from './TVPlayer'; +import React from 'react'; + +describe('', () => { + it('renders without crashing', function () { + const wrapper = shallow(); + wrapper.unmount(); + }); +}) diff --git a/src/pages/TVShowPage/TVPlayer.tsx b/src/pages/TVShowPage/TVPlayer.tsx index 40f0fa1..6885e32 100644 --- a/src/pages/TVShowPage/TVPlayer.tsx +++ b/src/pages/TVShowPage/TVPlayer.tsx @@ -24,7 +24,7 @@ interface EpisodeData { Path: string; } -class TVPlayer extends React.Component { +export class TVPlayer extends React.Component { state = { loaded: false }; diff --git a/src/pages/TVShowPage/TVShowPage.test.js b/src/pages/TVShowPage/TVShowPage.test.js new file mode 100644 index 0000000..c1e7af6 --- /dev/null +++ b/src/pages/TVShowPage/TVShowPage.test.js @@ -0,0 +1,10 @@ +import {shallow} from 'enzyme'; +import {TVShowPage} from './TVShowPage'; +import React from 'react'; + +describe('', () => { + it('renders without crashing', function () { + const wrapper = shallow(); + wrapper.unmount(); + }); +}) diff --git a/src/pages/TVShowPage/TVShowPage.tsx b/src/pages/TVShowPage/TVShowPage.tsx index 4e14191..eee8d71 100644 --- a/src/pages/TVShowPage/TVShowPage.tsx +++ b/src/pages/TVShowPage/TVShowPage.tsx @@ -14,7 +14,7 @@ interface State { interface Props {} -class TVShowPage extends React.Component { +export class TVShowPage extends React.Component { state = { loading: true }; From d6fd2cbd9cfa289dbee476c436218fb5028f4d35 Mon Sep 17 00:00:00 2001 From: lukas Date: Sat, 1 May 2021 15:57:58 +0200 Subject: [PATCH 14/15] add some MovieSettings unit tests --- src/pages/SettingsPage/MovieSettings.test.js | 48 +++++++++++++++++++- src/pages/SettingsPage/MovieSettings.tsx | 4 +- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/pages/SettingsPage/MovieSettings.test.js b/src/pages/SettingsPage/MovieSettings.test.js index b5bca6c..8f9c6e5 100644 --- a/src/pages/SettingsPage/MovieSettings.test.js +++ b/src/pages/SettingsPage/MovieSettings.test.js @@ -1,6 +1,7 @@ import {shallow} from 'enzyme'; import React from 'react'; import MovieSettings from './MovieSettings'; +import {callAPI} from '../../utils/Api'; describe('', function () { it('renders without crashing ', function () { @@ -22,12 +23,55 @@ describe('', function () { }); it('test simulate reindex', function () { - global.fetch = global.prepareFetchApi({success: true}); + callAPIMock({success: true}) const wrapper = shallow(); wrapper.find('button').findWhere(e => e.text() === 'Reindex Movie' && e.type() === 'button').simulate('click'); // initial send of reindex request to server - expect(global.fetch).toBeCalledTimes(1); + expect(callAPI).toBeCalledTimes(1); + }); + + it('test simulate tvshow reindex', function () { + callAPIMock({success: true}) + const wrapper = shallow(); + + wrapper.find('button').findWhere(e => e.text() === 'TVShow Reindex' && e.type() === 'button').simulate('click'); + + // initial send of reindex request to server + expect(callAPI).toBeCalledTimes(1); + }); + + it('test handlemessage ', function () { + const wrapper = shallow(); + const func = jest.fn((str) => {}) + wrapper.instance().appendLog = func + wrapper.instance().handleMessage('{"Action":"message", "Message":"testmsg"}') + + expect(func).toHaveBeenCalledTimes(1); + expect(func).toHaveBeenLastCalledWith('testmsg') + + wrapper.setState({startbtnDisabled: false}); + + // expect button to get disabled! + wrapper.instance().handleMessage('{"Action":"reindexAction", "Event":"start"}'); + expect(wrapper.state().startbtnDisabled).toBeTruthy() + + // expect button to get enabled + wrapper.instance().handleMessage('{"Action":"reindexAction", "Event":"stop"}'); + expect(wrapper.state().startbtnDisabled).not.toBeTruthy() + }); + + it('test appendlog', function () { + const wrapper = shallow(); + + wrapper.instance().appendLog("testmsg"); + expect(wrapper.state().text).toHaveLength(1) + expect(wrapper.state().text[0]).toBe('testmsg') + + wrapper.instance().appendLog("testmsg2"); + expect(wrapper.state().text).toHaveLength(2) + expect(wrapper.state().text[0]).toBe('testmsg2') + expect(wrapper.state().text[1]).toBe('testmsg') }); }); diff --git a/src/pages/SettingsPage/MovieSettings.tsx b/src/pages/SettingsPage/MovieSettings.tsx index 06e63c8..3231466 100644 --- a/src/pages/SettingsPage/MovieSettings.tsx +++ b/src/pages/SettingsPage/MovieSettings.tsx @@ -44,7 +44,6 @@ class MovieSettings extends React.Component { dial(): void { console.log('trying to connect...'); const conn = new WebSocket(`ws://${window.location.host}/subscribe`); - console.log('dd to connect...'); conn.addEventListener('close', (ev) => { this.appendLog(`WebSocket Disconnected code: ${ev.code}, reason: ${ev.reason}`, true); if (ev.code !== 1001) { @@ -58,7 +57,6 @@ class MovieSettings extends React.Component { // This is where we handle messages received. conn.addEventListener('message', (ev) => { - console.log('new message!'); if (typeof ev.data !== 'string') { console.error('unexpected message type', typeof ev.data); return; @@ -80,6 +78,8 @@ class MovieSettings extends React.Component { } else if (msg.Event === 'stop') { this.setState({startbtnDisabled: false}); } + } else { + console.error('unexpected response from server: ' + message); } } From 5295f0b18220d420f54aa75c7368fd9552df0b29 Mon Sep 17 00:00:00 2001 From: lukas Date: Sat, 1 May 2021 16:25:32 +0200 Subject: [PATCH 15/15] add go unit test send status messages when tvshow reindexing --- apiGo/videoparser/ReIndexTVShows.go | 13 ++++++------- apiGo/videoparser/ReIndexTVShows_test.go | 13 +++++++++++++ apiGo/videoparser/VideoParser.go | 4 +--- 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 apiGo/videoparser/ReIndexTVShows_test.go diff --git a/apiGo/videoparser/ReIndexTVShows.go b/apiGo/videoparser/ReIndexTVShows.go index 7b7392e..f496add 100644 --- a/apiGo/videoparser/ReIndexTVShows.go +++ b/apiGo/videoparser/ReIndexTVShows.go @@ -2,7 +2,6 @@ package videoparser import ( "fmt" - "openmediacenter/apiGo/api/types" "openmediacenter/apiGo/database" "openmediacenter/apiGo/videoparser/tmdb" "regexp" @@ -10,17 +9,19 @@ import ( "strings" ) -func startTVShowReindex(files []Show, sett types.SettingsType) { - // have fun with db insertions here! - +func startTVShowReindex(files []Show) { allTVshows := getAllTVShows() for _, file := range files { // insert new TVShow entry if not existing. insertShowIfNotExisting(file, allTVshows) + AppendMessage("Processing show: " + file.Name) insertEpisodesIfNotExisting(file) } + + AppendMessage("reindex finished successfully!") + SendEvent("stop") } func insertEpisodesIfNotExisting(show Show) { @@ -44,11 +45,9 @@ func insertEpisodesIfNotExisting(show Show) { diff := difference(show.files, dbepisodes) for _, s := range diff { + AppendMessage("Adding Episode: " + s) insertEpisode(s, show.Name) } - - fmt.Println("diff is...") - fmt.Println(len(diff)) } func insertEpisode(path string, ShowName string) { diff --git a/apiGo/videoparser/ReIndexTVShows_test.go b/apiGo/videoparser/ReIndexTVShows_test.go new file mode 100644 index 0000000..fc05648 --- /dev/null +++ b/apiGo/videoparser/ReIndexTVShows_test.go @@ -0,0 +1,13 @@ +package videoparser + +import "testing" + +func TestDifference(t *testing.T) { + arr1 := []string{"test1", "test2", "test3"} + arr2 := []string{"test1", "test3"} + + res := difference(arr1, arr2) + if len(res) != 1 || res[0] != "test2" { + t.Errorf("wrong difference result.") + } +} diff --git a/apiGo/videoparser/VideoParser.go b/apiGo/videoparser/VideoParser.go index 9e15195..f056b7b 100644 --- a/apiGo/videoparser/VideoParser.go +++ b/apiGo/videoparser/VideoParser.go @@ -112,15 +112,13 @@ func StartTVShowReindex() { } } - fmt.Println(files) - if err != nil { fmt.Println(err.Error()) } // start reindex process AppendMessage("Starting Reindexing!") - go startTVShowReindex(files, mSettings) + go startTVShowReindex(files) } func StartCleanup() {