diff --git a/release.json b/release.json index d5c11ef..09da4f1 100644 --- a/release.json +++ b/release.json @@ -1,24 +1,24 @@ { "Name": "TorrServer", - "Version": "1.1.68", - "BuildDate": "09.10.2018", + "Version": "1.1.69", + "BuildDate": "15.01.2019", "Links": { - "android-386": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-android-386", - "android-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-android-amd64", - "android-arm64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-android-arm64", - "android-arm7": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-android-arm7", - "darwin-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-darwin-amd64", - "linux-386": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-386", - "linux-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-amd64", - "linux-arm5": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-arm5", - "linux-arm6": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-arm6", - "linux-arm64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-arm64", - "linux-arm7": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-arm7", - "linux-mips": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-mips", - "linux-mips64": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-mips64", - "linux-mips64le": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-mips64le", - "linux-mipsle": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-linux-mipsle", - "windows-386.exe": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-windows-386.exe", - "windows-amd64.exe": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-windows-amd64.exe" + "android-386": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-android-386", + "android-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-android-amd64", + "android-arm64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-android-arm64", + "android-arm7": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-android-arm7", + "darwin-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-darwin-amd64", + "linux-386": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-386", + "linux-amd64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-amd64", + "linux-arm5": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-arm5", + "linux-arm6": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-arm6", + "linux-arm64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-arm64", + "linux-arm7": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-arm7", + "linux-mips": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-mips", + "linux-mips64": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-mips64", + "linux-mips64le": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-mips64le", + "linux-mipsle": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-linux-mipsle", + "windows-386.exe": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-windows-386.exe", + "windows-amd64.exe": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-windows-amd64.exe" } } \ No newline at end of file diff --git a/src/main/main.go b/src/main/main.go index a96da3b..9b3a9ef 100644 --- a/src/main/main.go +++ b/src/main/main.go @@ -28,18 +28,6 @@ func (args) Version() string { var params args func main() { - //test() - //return - //for _, g := range tmdb.GetMovieGenres("ru") { - // fmt.Println(g.Name, g.ID) - //} - //return - - //movs, _ := tmdb.DiscoverShows(map[string]string{}, 1) - //js, _ := json.MarshalIndent(movs, "", " ") - //fmt.Println(string(js)) - //return - arg.MustParse(¶ms) if params.Path == "" { diff --git a/src/server/version/Version.go b/src/server/version/Version.go index 049f7a5..81f8270 100644 --- a/src/server/version/Version.go +++ b/src/server/version/Version.go @@ -1,3 +1,3 @@ package version -const Version = "1.1.68" +const Version = "1.1.69" diff --git a/src/server/web/helpers/M3u.go b/src/server/web/helpers/M3u.go index 5c4ad8c..084addd 100644 --- a/src/server/web/helpers/M3u.go +++ b/src/server/web/helpers/M3u.go @@ -13,7 +13,7 @@ func MakeM3ULists(torrents []*settings.Torrent, host string) string { m3u := "#EXTM3U\n" for _, t := range torrents { - m3u += "#EXTINF:0," + t.Name + "\n" + m3u += "#EXTINF:0 type=\"playlist\", " + t.Name + "\n" m3u += host + "/torrent/play?link=" + url.QueryEscape(t.Magnet) + "&m3u=true&fname=" + utils.CleanFName(t.Name+".m3u") + "\n\n" } return m3u @@ -24,7 +24,7 @@ func MakeM3UPlayList(tor torr.TorrentStats, magnet string, host string) string { for _, f := range tor.FileStats { if GetMimeType(f.Path) != "*/*" { - m3u += "#EXTINF:-1," + f.Path + "\n" + m3u += "#EXTINF:-1 type=\"playlist\", " + f.Path + "\n" mag := url.QueryEscape(magnet) m3u += host + "/torrent/play?link=" + mag + "&file=" + fmt.Sprint(f.Id) + "\n\n" }