diff --git a/lib/apache_functions.js b/lib/apache_functions.js old mode 100644 new mode 100755 index 08b9d2f..a1b978f --- a/lib/apache_functions.js +++ b/lib/apache_functions.js @@ -4,6 +4,34 @@ const { getStreamsNew } = require('../routes/getStreams') apache_config = 'tv.k-world' +const { exec } = require("child_process"); + +function restart() { + exec("sudo service apache2 reload", (error, stdout, stderr) => { + if (error) { + console.log(`error: ${error.message}`); + return; + } + if (stderr) { + console.log(`stderr: ${stderr}`); + return; + } + console.log(`no issues`); + }); + +} + +function makeid() { + var result = ''; + var characters = 'abcdefghijklmnopqrstuvwxyz0123456789'; + var charactersLength = characters.length; + for (var i = 0; i < 5; i++) { + result += characters.charAt(Math.floor(Math.random() * + charactersLength)); + } + return result; +} + async function get_config() { return await configs.readConfig(apache_config, true, true) } @@ -13,11 +41,9 @@ async function split_streams(siteList) { final_array = siteList.map(function (item) { if (item.content.includes('Redirect')) { - // console.log(item) var cleanString = item.content.replace(/^(.*?)\//g, ""); cleanString = cleanString.split(' ') cleanString[1] = cleanString[1].replace(/"/g, "") - // console.log(cleanString) return cleanString } }).filter(notUndefined) @@ -45,7 +71,6 @@ async function checkExists(fullStreamList, mappedStreams) { newstreams = mappedStreams.map(function (s) { return s[1] }) - // console.log(newstreams) myArray = fullStreamList.filter(function (el) { return newstreams.indexOf(el) < 0; }); @@ -57,17 +82,6 @@ async function checkExists(fullStreamList, mappedStreams) { return myArray } -function makeid() { - var result = ''; - var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - var charactersLength = characters.length; - for (var i = 0; i < 5; i++) { - result += characters.charAt(Math.floor(Math.random() * - charactersLength)); - } - return result; -} - async function addNewStreams(config, streamList) { streamList.forEach(stream => { @@ -78,7 +92,6 @@ async function addNewStreams(config, streamList) { } catch (error) { console.log(error) } - await actions.restartApache() } // update('DIAZ', 'http://google.com', 'https://watchtower.ddns.net:8443') @@ -86,10 +99,11 @@ async function addNewStreams(config, streamList) { async function main() { streams = await getStreamsNew() - a = await get_config() - b = await split_streams(a.children[0].children) - c = await checkExists(streams, b) - d = await addNewStreams(a, c) + config = await get_config() + streamsFromConfig = await split_streams(config.children[0].children) + missingStreamsInApache = await checkExists(streams, streamsFromConfig) + resultOfAddStreams = await addNewStreams(config, missingStreamsInApache) + await restart() } -main() \ No newline at end of file +main()