diff --git a/js/tvstreamrecord.basic.js b/js/tvstreamrecord.basic.js index e34c57b..c4bcf8b 100644 --- a/js/tvstreamrecord.basic.js +++ b/js/tvstreamrecord.basic.js @@ -1262,11 +1262,11 @@ $(function() { alert( $(this).attr('alert') ); myalert = true; } - } else if ($(this).attr('id')=="cfg_record_mask") { + /*} else if ($(this).attr('id')=="cfg_record_mask") { if ( value.lastIndexOf("%date%")==-1 && value.lastIndexOf("%title%")==-1) { alert( $(this).attr('alert') ); myalert = true; - } + }*/ } else if ($(this).attr('id').startsWith('cfg_switch') && $(this).attr('type')!="checkbox") { value = "null"; } else if ($(this).attr('id').startsWith('cfg_switch')) { diff --git a/synology/INFO b/synology/INFO index a17ad01..cd7bad3 100644 --- a/synology/INFO +++ b/synology/INFO @@ -1,5 +1,5 @@ package="tvstreamrecord" -version="1.3.4" +version="1.3.4b" maintainer="Pavion" description="Program to record TV streams. Python required. Server runs at port 8030 (changeable)" reloadui="yes" diff --git a/tvstreamrecord.py b/tvstreamrecord.py index ee675af..9dbd532 100644 --- a/tvstreamrecord.py +++ b/tvstreamrecord.py @@ -20,7 +20,7 @@ from __future__ import unicode_literals from __future__ import division -from bottle import CherryPyServer, TEMPLATES +from bottle import CherryPyServer # , TEMPLATES from bottle import route, run, template, post, request, response from bottle import static_file, redirect from datetime import datetime, timedelta, time, date @@ -62,7 +62,7 @@ def total(timedelta): localdate = "%d.%m.%Y" dayshown = datetime.combine(date.today(), time.min) shutdown = False -version = '1.3.4' +version = '1.3.4b' @route('/live/') def server_static9(filename): @@ -1028,16 +1028,16 @@ def doRecord(self): fn = config.cfg_record_mask # Placeholders - fn = fn.replace("%date%", dateholder) - fn = fn.replace("%title%", titleholder) - fn = fn.replace("%month%", datetime.now().strftime("%m")) - fn = fn.replace("%year%", datetime.now().strftime("%Y")) - fn = fn.replace("%day%", datetime.now().strftime("%d")) - fn = fn.replace("%channelid%", idholder) - fn = fn.replace("%channel%", self.myrow[9]) + fn = fn.replace("%date%", dateholder).replace("%title%", titleholder) + fn = fn.replace("%month%", datetime.now().strftime("%m")).replace("%year%", datetime.now().strftime("%Y")).replace("%day%", datetime.now().strftime("%d")) + fn = fn.replace("%hour%", datetime.now().strftime("%H")).replace("%minute%", datetime.now().strftime("%M")).replace("%second%", datetime.now().strftime("%S")) + fn = fn.replace("%channelid%", idholder).replace("%channel%", self.myrow[9]) # Placeholders end for i in range(0, len(ffargs)): - ffargs[i] = ffargs[i].replace("%date%", dateholder).replace("%title%", titleholder).replace("%month%", datetime.now().strftime("%m")).replace("%year%", datetime.now().strftime("%Y")).replace("%day%", datetime.now().strftime("%d")).replace("%channelid%", idholder).replace("%channel%", self.myrow[9]) + ffargs[i] = ffargs[i].replace("%date%", dateholder).replace("%title%", titleholder) + ffargs[i] = ffargs[i].replace("%month%", datetime.now().strftime("%m")).replace("%year%", datetime.now().strftime("%Y")).replace("%day%", datetime.now().strftime("%d")) + ffargs[i] = ffargs[i].replace("%hour%", datetime.now().strftime("%H")).replace("%minute%", datetime.now().strftime("%M")).replace("%second%", datetime.now().strftime("%S")) + ffargs[i] = ffargs[i].replace("%channelid%", idholder).replace("%channel%", self.myrow[9]) if "/" in fn or "\\" in fn: try: diff --git a/views/config.tpl b/views/config.tpl index 90759dc..b54d008 100644 --- a/views/config.tpl +++ b/views/config.tpl @@ -97,7 +97,7 @@ * §For more information regarding ffmpeg and its command line parameters please visit its homepage at§: ffmpeg.org
-** §Valid placeholders§: %date%, %title%, %year%, %month%, %day%, %channel%, %channelid%. +** §Valid placeholders§: %date%, %title%, %year%, %month%, %day%, %hour%, %minute%, %second%, %channel%, %channelid%.
@@ -122,7 +122,7 @@ §Password-free IPs start with (comma separated, default§: '10.,127.,192.,localhost') -* §Valid placeholders§: %date%, %title%, %year%, %month%, %day%, %channel%, %channelid%. +* §Valid placeholders§: %date%, %title%, %year%, %month%, %day%, %hour%, %minute%, %second%, %channel%, %channelid%.