diff --git a/README.md b/README.md index 70814c1045..ef44b507e0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Collection of 6000+ free IPTV channels from all over the world. To open the playlist in VLC player you just need click `File` - > `Open Network...` and in the window that opens, insert a link to the playlist itself: `https://raw.githubusercontent.com/freearhey/iptv/master/index.m3u` -![VLC Network Panel](https://github.com/freearhey/iptv/raw/master/images/vlc-network-panel.png) +![VLC Network Panel](https://github.com/freearhey/iptv/raw/master/preview.png) then just press the 'Open' button diff --git a/src/generate.js b/helpers/generate.js similarity index 83% rename from src/generate.js rename to helpers/generate.js index 18df3301df..52a09c6c68 100644 --- a/src/generate.js +++ b/helpers/generate.js @@ -2,7 +2,7 @@ const parsers = require('playlist-parser') const M3U = parsers.M3U const fs = require("fs") const path = require('path') -const helper = require('./helper') +const urlParser = require('url') let outputPath = path.resolve(__dirname) + '/../index.all.m3u' let channels = 0 @@ -59,13 +59,20 @@ function writeToFile(title, file) { } function addToCache(url) { - let id = helper.getUrlPath(url) + let id = getUrlPath(url) cache[id] = true } function checkCache(url) { - let id = helper.getUrlPath(url) + let id = getUrlPath(url) return cache.hasOwnProperty(id) +} + +function getUrlPath(u) { + let parsed = urlParser.parse(u) + let searchQuery = parsed.search || '' + + return parsed.host + parsed.pathname + searchQuery } \ No newline at end of file diff --git a/images/vlc-preview.png b/images/vlc-preview.png deleted file mode 100644 index 7cb23342df..0000000000 Binary files a/images/vlc-preview.png and /dev/null differ diff --git a/package.json b/package.json index fb1091d85d..36765c1e1e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "main": "index.m3u", "scripts": { "test": "node test/index.js", - "generate": "node src/generate.js" + "generate": "node helpers/generate.js" }, "repository": { "type": "git", diff --git a/images/vlc-network-panel.png b/preview.png similarity index 100% rename from images/vlc-network-panel.png rename to preview.png diff --git a/src/helper.js b/src/helper.js deleted file mode 100644 index d15c5eaf6e..0000000000 --- a/src/helper.js +++ /dev/null @@ -1,12 +0,0 @@ -const parser = require('url') - -function getUrlPath(u) { - let parsedUrl = parser.parse(u) - let searchQuery = parsedUrl.search || '' - - return parsedUrl.host + parsedUrl.pathname + searchQuery -} - -module.exports = { - getUrlPath -}