Merge pull request #14 from Coledunsby/master

Add support for "video/m2ts" video streams

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+demo
 compiler
 files
 update_xteve*.sh

README.md

@@ -81,11 +81,6 @@ Including:
 - Crond: Daemon to execute scheduled commands  
 - Perl: Programming language   
 
-## Beta version
-
-New features are first available in the beta version and will be added to the master branch after successful testing
-If you prefer to use the beta version, you can always switch between master and beta branch.
-
 ---
 
 ### xTeVe Beta branch

changelog-beta.md

@@ -1,3 +1,14 @@
+#### 2.0.1.0012-beta
+```diff
++ Add support for "video/m2ts" video streams (Pull request #14)
+```
+#### 2.0.1.0011-beta
+```diff
++ Original group title is shown in the Mapping Editor
+```
+##### Fixes
+- incorrect original-air-date
+
 #### 2.0.1.0010-beta
 ```diff
 + Set timestamp to <episode-num system="original-air-date">

html/js/menu_ts.js

@@ -1288,6 +1288,9 @@ function openPopUp(dataType, element) {
             var input = content.createInput("text", dbKey, data[dbKey]);
             input.setAttribute("onchange", "javascript: this.className = 'changed'");
             content.appendRow("{{.mapping.m3uGroupTitle.title}}", input);
+            if (data["group-title"] != undefined) {
+                content.description(data["group-title"]);
+            }
             // XMLTV Datei
             var dbKey = "x-xmltv-file";
             var xmlFile = data[dbKey];

src/buffer.go

@@ -790,7 +790,7 @@ InitBuffer:
 			}
 
 		// Video Stream (TS)
-		case "video/mpeg", "video/mp4", "video/mp2t", "application/octet-stream", "binary/octet-stream", "application/mp2t":
+		case "video/mpeg", "video/mp4", "video/mp2t", "video/m2ts", "application/octet-stream", "binary/octet-stream", "application/mp2t":
 
 			var fileSize int
 

src/webserver.go

@@ -205,6 +205,7 @@ func xTeVe(w http.ResponseWriter, r *http.Request) {
 	// XMLTV Datei
 	if strings.Contains(path, "xmltv/") {
 
+		w.Header().Set("Content-Type", "application/xml")
 		requestType = "xml"
 
 		file = System.Folder.Data + getFilenameFromPath(path)

src/xepg.go

@@ -828,7 +828,16 @@ func getEpisodeNum(program *Program, xmltvProgram *Program, xepgChannel XEPGChan
 	if len(xepgChannel.XCategory) > 0 && xepgChannel.XCategory != "Movie" {
 
 		if len(xmltvProgram.EpisodeNum) == 0 {
-			program.EpisodeNum = append(program.EpisodeNum, &EpisodeNum{Value: time.Now().Format("2006-01-02  15:04:05"), System: "original-air-date"})
+
+			var timeLayout = "20060102150405"
+
+			t, err := time.Parse(timeLayout, strings.Split(xmltvProgram.Start, " ")[0])
+			if err == nil {
+				program.EpisodeNum = append(program.EpisodeNum, &EpisodeNum{Value: t.Format("2006-01-02 15:04:05"), System: "original-air-date"})
+			} else {
+				ShowError(err, 0)
+			}
+
 		}
 
 	}

ts/menu_ts.ts

@@ -1572,6 +1572,10 @@ function openPopUp(dataType, element) {
       input.setAttribute("onchange", "javascript: this.className = 'changed'")
       content.appendRow("{{.mapping.m3uGroupTitle.title}}", input)
 
+      if (data["group-title"] != undefined) {
+        content.description(data["group-title"])
+      }
+
       // XMLTV Datei
       var dbKey:string = "x-xmltv-file"
       var xmlFile = data[dbKey]

xteve.go

@@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe-
 const Name = "xTeVe"
 
 // Version : Version, die Build Nummer wird in der main func geparst.
-const Version = "2.0.1.0010"
+const Version = "2.0.2.0020"
 
 // DBVersion : Datanbank Version
 const DBVersion = "2.0.0"