From patchwork Wed Feb  4 19:01:54 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Artem Makhutov <artem@makhutov.org>
X-Patchwork-Id: 12703
Received: from bane.moelleritberatung.de ([77.37.2.25])
	by www.linuxtv.org with esmtp (Exim 4.63)
	(envelope-from <artem@moelleritberatung.de>) id 1LUn0X-0001Jz-Ek
	for vdr@linuxtv.org; Wed, 04 Feb 2009 20:01:58 +0100
Received: by bane.moelleritberatung.de (Postfix, from userid 1007)
	id 44EA499BE5; Wed,  4 Feb 2009 20:01:54 +0100 (CET)
Date: Wed, 4 Feb 2009 20:01:54 +0100
From: Artem Makhutov <artem@makhutov.org>
To: VDR Mailing List <vdr@linuxtv.org>
Message-ID: <20090204190154.GI25932@titan.makhutov-it.de>
References: <20090203232154.GG25932@titan.makhutov-it.de>
	<8011fa4d0902040008p32437874o2184241b8ab5b0c7@mail.gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <8011fa4d0902040008p32437874o2184241b8ab5b0c7@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-LSpam-Score: -2.6 (--)
X-LSpam-Report: No, score=-2.6 required=5.0 tests=AWL=0.023,
	BAYES_00=-2.599 autolearn=ham
Subject: [vdr] [PATCH] VDRAdmin-AM for VDR 1.7.4
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2009 19:01:59 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 19481

Hello,

On Wed, Feb 04, 2009 at 09:08:17AM +0100, Andreas Mair wrote:
> Hello!
> 
> Sure, there are plans to support vdr 1.7.4 but I didn't have the time
> to setup vdr 1.7.4, do some recordings and modify VDRAdmin-AM.

I have attached a patch with makes vdradmin-am able to playback the new .ts
recorings and also the old ones.

I am not an regexp expert, so there could be a nicer way to do this.

Regards, Artem

--- vdradmind.pl.old	2009-02-04 19:48:12.000000000 +0100
+++ vdradmind.pl	2009-02-04 19:52:29.000000000 +0100
@@ -4830,8 +4830,8 @@
     my $data;
     $title =~ s/ /_/g;
     $title =~ s/~/\//g;
-    Log(LOG_DEBUG, "rec_stream: find $CONFIG{VIDEODIR}/ -follow -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr\"");
-    my @files = `find $CONFIG{VIDEODIR}/ -follow -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr" | sort -r`;
+    Log(LOG_DEBUG, "rec_stream: find $CONFIG{VIDEODIR}/ -follow -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute..?.?...\\.rec/\\(...\\.vdr\\|.....\\.ts\\)\"");
+    my @files = `find $CONFIG{VIDEODIR}/ -follow -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute..?.?...\\.rec/\\(...\\.vdr\\|.....\\.ts\\)" | sort -r`;
     foreach (@files) {
         chomp;
         Log(LOG_DEBUG, "findVideoFiles: found ($_)\n");