From a3ce90ee675a9dba4629bd695258e6a55b5cbdb2 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Mon, 1 May 2023 21:34:16 +0300 Subject: [PATCH] Update store/setters --- scripts/commands/database/create.js | 12 ++++++------ scripts/store/setters/channel.js | 2 +- scripts/store/setters/http_referrer.js | 2 +- scripts/store/setters/index.js | 1 - scripts/store/setters/url.js | 7 ------- scripts/store/setters/user_agent.js | 2 +- 6 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 scripts/store/setters/url.js diff --git a/scripts/commands/database/create.js b/scripts/commands/database/create.js index 5cce0dd19..67c3fd440 100644 --- a/scripts/commands/database/create.js +++ b/scripts/commands/database/create.js @@ -18,12 +18,12 @@ async function main() { const stream = store.create() - stream.set('channel', { channel: item.tvg.id }) - stream.set('title', { title: item.name }) - stream.set('filepath', { filepath: item.filepath }) - stream.set('url', { url: item.url }) - stream.set('http_referrer', { http_referrer: item.http.referrer }) - stream.set('user_agent', { user_agent: item.http['user-agent'] }) + stream.set('channel', item.tvg.id) + stream.set('title', item.name) + stream.set('filepath', item.filepath) + stream.set('url', item.url) + stream.set('http_referrer', item.http.referrer) + stream.set('user_agent', item.http['user-agent']) streams.push(stream) } diff --git a/scripts/store/setters/channel.js b/scripts/store/setters/channel.js index 5d9c3ea3c..a1aed8f2e 100644 --- a/scripts/store/setters/channel.js +++ b/scripts/store/setters/channel.js @@ -1,3 +1,3 @@ -module.exports = function ({ channel }) { +module.exports = function (channel) { return channel || null } diff --git a/scripts/store/setters/http_referrer.js b/scripts/store/setters/http_referrer.js index fdbb31c46..d7cc83b24 100644 --- a/scripts/store/setters/http_referrer.js +++ b/scripts/store/setters/http_referrer.js @@ -1,3 +1,3 @@ -module.exports = function ({ http_referrer }) { +module.exports = function (http_referrer) { return http_referrer || null } diff --git a/scripts/store/setters/index.js b/scripts/store/setters/index.js index ff02bcce3..a09baefae 100644 --- a/scripts/store/setters/index.js +++ b/scripts/store/setters/index.js @@ -1,4 +1,3 @@ -exports.url = require('./url') exports.http_referrer = require('./http_referrer') exports.user_agent = require('./user_agent') exports.channel = require('./channel') diff --git a/scripts/store/setters/url.js b/scripts/store/setters/url.js deleted file mode 100644 index 995159399..000000000 --- a/scripts/store/setters/url.js +++ /dev/null @@ -1,7 +0,0 @@ -const normalize = require('normalize-url') - -module.exports = function ({ url }) { - const normalized = normalize(url, { stripWWW: false }) - - return decodeURIComponent(normalized).replace(/\s/g, '+') -} diff --git a/scripts/store/setters/user_agent.js b/scripts/store/setters/user_agent.js index ccc0c0599..38cbbaa21 100644 --- a/scripts/store/setters/user_agent.js +++ b/scripts/store/setters/user_agent.js @@ -1,3 +1,3 @@ -module.exports = function ({ user_agent }) { +module.exports = function (user_agent) { return user_agent || null }