From 5b6b1e3473c6c61f1f2ae982439b02bb9559118d Mon Sep 17 00:00:00 2001 From: Lukas Heiligenbrunner Date: Wed, 21 Oct 2020 19:14:45 +0000 Subject: [PATCH] improved reindexing to reindex in background new button to cleanup gravity --- api/extractionData.php | 18 ------ api/src/VideoParser.php | 6 +- api/src/handlers/RequestBase.php | 2 +- api/src/handlers/Settings.php | 55 ++++++++++++++++ api/src/handlers/Video.php | 2 +- package.json | 2 +- src/pages/SettingsPage/MovieSettings.js | 53 ++++++++++++---- .../SettingsPage/MovieSettings.module.css | 2 +- src/pages/SettingsPage/MovieSettings.test.js | 62 ++++++++++++++++++- src/setupTests.js | 1 + 10 files changed, 163 insertions(+), 40 deletions(-) delete mode 100644 api/extractionData.php diff --git a/api/extractionData.php b/api/extractionData.php deleted file mode 100644 index 4f02334..0000000 --- a/api/extractionData.php +++ /dev/null @@ -1,18 +0,0 @@ -message = $out; - $return->contentAvailable = true; - - if (substr($out, -strlen("-42")) == "-42") { - unlink("/tmp/output.log"); - } -} else { - $return->contentAvailable = false; -} - - -echo json_encode($return); diff --git a/api/src/VideoParser.php b/api/src/VideoParser.php index b6bff1d..bbc51a8 100644 --- a/api/src/VideoParser.php +++ b/api/src/VideoParser.php @@ -1,7 +1,7 @@ getFromDB(); $this->saveToDB(); + $this->reIndexHandling(); } /** @@ -102,4 +104,57 @@ class Settings extends RequestBase { } }); } + + /** + * methods for handling reindexing and cleanup of db gravity + */ + private function reIndexHandling() { + $this->addActionHandler("startReindex", function () { + $indexrunning = false; + if (file_exists("/tmp/output.log")) { + + $out = file_get_contents("/tmp/output.log"); + if (substr($out, -strlen("-42")) == "-42") { + unlink("/tmp/output.log"); + } else { + $indexrunning = true; + } + } + + if (!$indexrunning) { + // start extraction of video previews in background + + $cmd = 'php extractvideopreviews.php'; + exec(sprintf("%s > %s 2>&1 & echo $! >> %s", $cmd, '/dev/zero', '/tmp/openmediacenterpid')); + + $this->commitMessage('{"success": true}'); + } else { + $this->commitMessage('{"success": false}'); + } + }); + + $this->addActionHandler("cleanupGravity", function () { + $vp = new VideoParser(); + $vp->cleanUpGravity(); + }); + + $this->addActionHandler("getStatusMessage", function () { + $return = new stdClass(); + if (file_exists("/tmp/output.log")) { + $out = file_get_contents("/tmp/output.log"); + // clear log file + file_put_contents("/tmp/output.log", ""); + $return->message = $out; + $return->contentAvailable = true; + + if (substr($out, -strlen("-42")) == "-42") { + unlink("/tmp/output.log"); + } + } else { + $return->contentAvailable = false; + } + + $this->commitMessage(json_encode($return)); + }); + } } diff --git a/api/src/handlers/Video.php b/api/src/handlers/Video.php index abc21d8..bfb2247 100755 --- a/api/src/handlers/Video.php +++ b/api/src/handlers/Video.php @@ -1,5 +1,5 @@ - +
{this.state.text.map(m => (
{m}
@@ -50,13 +50,19 @@ class MovieSettings extends React.Component { this.setState({startbtnDisabled: true}); console.log("starting"); - const updateRequest = new FormData(); + const request = new FormData(); + request.append("action", "startReindex"); // fetch all videos available - fetch('/api/extractvideopreviews.php', {method: 'POST', body: updateRequest}) - .then((response) => response.text() + fetch('/api/settings.php', {method: 'POST', body: request}) + .then((response) => response.json() .then((result) => { - // todo 2020-07-4: some kind of return finished handler - console.log("returned"); + console.log(result); + if (result.success) { + console.log("started successfully"); + } else { + console.log("error, reindex already running"); + this.setState({startbtnDisabled: true}); + } })) .catch(() => { console.log("no connection to backend"); @@ -71,8 +77,10 @@ class MovieSettings extends React.Component { * This interval function reloads the current status of reindexing from backend */ updateStatus = () => { - const updateRequest = new FormData(); - fetch('/api/extractionData.php', {method: 'POST', body: updateRequest}) + const request = new FormData(); + request.append("action", "getStatusMessage"); + + fetch('/api/settings.php', {method: 'POST', body: request}) .then((response) => response.json() .then((result) => { if (result.contentAvailable === true) { @@ -94,6 +102,25 @@ class MovieSettings extends React.Component { console.log("no connection to backend"); }); }; + + /** + * send request to cleanup db gravity + */ + cleanupGravity() { + const request = new FormData(); + request.append("action", "cleanupGravity"); + + fetch('/api/settings.php', {method: 'POST', body: request}) + .then((response) => response.text() + .then((result) => { + this.setState({ + text: ['successfully cleaned up gravity!'] + }); + })) + .catch(() => { + console.log("no connection to backend"); + }); + } } export default MovieSettings; diff --git a/src/pages/SettingsPage/MovieSettings.module.css b/src/pages/SettingsPage/MovieSettings.module.css index 77e35e7..37c5ef8 100644 --- a/src/pages/SettingsPage/MovieSettings.module.css +++ b/src/pages/SettingsPage/MovieSettings.module.css @@ -9,5 +9,5 @@ overflow-x: auto; overflow-y: scroll; padding: 10px; - width: 50%; + width: 40%; } diff --git a/src/pages/SettingsPage/MovieSettings.test.js b/src/pages/SettingsPage/MovieSettings.test.js index f12734f..0a4e9f4 100644 --- a/src/pages/SettingsPage/MovieSettings.test.js +++ b/src/pages/SettingsPage/MovieSettings.test.js @@ -22,15 +22,33 @@ describe('', function () { }); it('test simulate reindex', function () { - global.fetch = global.prepareFetchApi({}); + global.fetch = global.prepareFetchApi({success: true}); const wrapper = shallow(); - wrapper.find(".reindexbtn").simulate("click"); + 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); }); + 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', done => { global.fetch = global.prepareFetchApi({ contentAvailable: true, @@ -51,4 +69,44 @@ describe('', function () { done(); }); }); + + it('test reindex with no content available', done=> { + global.fetch = global.prepareFetchApi({ + contentAvailable: false + }); + + global.clearInterval = jest.fn(); + + const wrapper = shallow(); + wrapper.instance().updateStatus(); + + process.nextTick(() => { + // expect the refresh interval to be cleared + expect(global.clearInterval).toBeCalledTimes(1); + + // expect startbtn to be reenabled + expect(wrapper.state()).toMatchObject({startbtnDisabled: false}); + + global.fetch.mockClear(); + done(); + }); + }); + + it('test simulate gravity cleanup', done => { + global.fetch = global.prepareFetchApi("mmi"); + 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(global.fetch).toBeCalledTimes(1); + + process.nextTick(() => { + expect(wrapper.instance().setState).toBeCalledTimes(1); + + global.fetch.mockClear(); + done(); + }); + }); }); diff --git a/src/setupTests.js b/src/setupTests.js index 95f17f2..ed58c8b 100644 --- a/src/setupTests.js +++ b/src/setupTests.js @@ -18,6 +18,7 @@ global.prepareFetchApi = (response) => { const mockJsonPromise = Promise.resolve(response); const mockFetchPromise = Promise.resolve({ json: () => mockJsonPromise, + text: () => mockJsonPromise }); return (jest.fn().mockImplementation(() => mockFetchPromise)); }