Compare commits

..

No commits in common. "87bc3827475a2e7982aa206937c9834c3e6415fe" and "f7c03b011030f35f5c6c6f07d6e9eb5067d910b7" have entirely different histories.

3 changed files with 7 additions and 18 deletions

View File

@ -48,7 +48,9 @@ func handlePlayer(w http.ResponseWriter, r *http.Request) {
var data []J var data []J
for _, track := range tracks { for _, track := range tracks {
u, _ := url.Parse("stream") host := "music.nxshock.me"
u, _ := url.Parse(fmt.Sprintf("https://%s/stream", host))
q := make(url.Values) q := make(url.Values)
q.Add("url", track.Url) q.Add("url", track.Url)
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
@ -86,7 +88,7 @@ func handleGetM3u(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "audio/x-mpegurl") w.Header().Set("Content-Type", "audio/x-mpegurl")
w.Header().Set("Accept-Ranges", "none") w.Header().Set("Accept-Ranges", "none")
_, _ = w.Write(b) w.Write(b)
} }
func handleStream(w http.ResponseWriter, r *http.Request) { func handleStream(w http.ResponseWriter, r *http.Request) {

View File

@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"net/http"
"net/url" "net/url"
"strconv" "strconv"
"strings" "strings"
@ -41,13 +40,7 @@ func UpdateGenres() error {
func updateGenreList() ([]Genre, error) { func updateGenreList() ([]Genre, error) {
url := "https://promodj.com/music" url := "https://promodj.com/music"
resp, err := http.Get(url) doc, err := goquery.NewDocument(url)
if err != nil {
return nil, err
}
defer resp.Body.Close()
doc, err := goquery.NewDocumentFromReader(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -61,13 +54,7 @@ func updateGenreList() ([]Genre, error) {
} }
func parsePage(url string, resultsChan chan TrackInfo) { func parsePage(url string, resultsChan chan TrackInfo) {
resp, err := http.Get(url) doc, err := goquery.NewDocument(url)
if err != nil {
return
}
defer resp.Body.Close()
doc, err := goquery.NewDocumentFromReader(resp.Body)
if err != nil { if err != nil {
return return
} }

View File

@ -57,7 +57,7 @@ func encode(url string, w io.Writer) error {
buf := buffer.New(int64(config.BufferSize) * 1024 * 1024) buf := buffer.New(int64(config.BufferSize) * 1024 * 1024)
_, err = nio.Copy(w, out, buf) _, err = nio.Copy(w, out, buf)
if err != nil { if err != nil {
_ = cmd.Process.Kill() cmd.Process.Kill()
} }
return nil return nil