This commit is contained in:
yourok
2019-01-15 16:55:42 +03:00
parent 7204a664d4
commit 9af0423188
4 changed files with 22 additions and 34 deletions

View File

@@ -1,24 +1,24 @@
{ {
"Name": "TorrServer", "Name": "TorrServer",
"Version": "1.1.68", "Version": "1.1.69",
"BuildDate": "09.10.2018", "BuildDate": "15.01.2019",
"Links": { "Links": {
"android-386": "https://github.com/YouROK/TorrServer/releases/download/1.1.68/TorrServer-android-386", "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.68/TorrServer-android-amd64", "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.68/TorrServer-android-arm64", "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.68/TorrServer-android-arm7", "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.68/TorrServer-darwin-amd64", "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.68/TorrServer-linux-386", "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.68/TorrServer-linux-amd64", "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.68/TorrServer-linux-arm5", "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.68/TorrServer-linux-arm6", "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.68/TorrServer-linux-arm64", "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.68/TorrServer-linux-arm7", "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.68/TorrServer-linux-mips", "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.68/TorrServer-linux-mips64", "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.68/TorrServer-linux-mips64le", "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.68/TorrServer-linux-mipsle", "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.68/TorrServer-windows-386.exe", "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.68/TorrServer-windows-amd64.exe" "windows-amd64.exe": "https://github.com/YouROK/TorrServer/releases/download/1.1.69/TorrServer-windows-amd64.exe"
} }
} }

View File

@@ -28,18 +28,6 @@ func (args) Version() string {
var params args var params args
func main() { 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(&params) arg.MustParse(&params)
if params.Path == "" { if params.Path == "" {

View File

@@ -1,3 +1,3 @@
package version package version
const Version = "1.1.68" const Version = "1.1.69"

View File

@@ -13,7 +13,7 @@ func MakeM3ULists(torrents []*settings.Torrent, host string) string {
m3u := "#EXTM3U\n" m3u := "#EXTM3U\n"
for _, t := range torrents { 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" m3u += host + "/torrent/play?link=" + url.QueryEscape(t.Magnet) + "&m3u=true&fname=" + utils.CleanFName(t.Name+".m3u") + "\n\n"
} }
return m3u return m3u
@@ -24,7 +24,7 @@ func MakeM3UPlayList(tor torr.TorrentStats, magnet string, host string) string {
for _, f := range tor.FileStats { for _, f := range tor.FileStats {
if GetMimeType(f.Path) != "*/*" { if GetMimeType(f.Path) != "*/*" {
m3u += "#EXTINF:-1," + f.Path + "\n" m3u += "#EXTINF:-1 type=\"playlist\", " + f.Path + "\n"
mag := url.QueryEscape(magnet) mag := url.QueryEscape(magnet)
m3u += host + "/torrent/play?link=" + mag + "&file=" + fmt.Sprint(f.Id) + "\n\n" m3u += host + "/torrent/play?link=" + mag + "&file=" + fmt.Sprint(f.Id) + "\n\n"
} }