From e20ff8d0fd0fb85a3c74c856931d2396df0b9d5c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 10 Sep 2012 11:00:39 -0500
Subject: LinHES-system: misc_which_recorder.pl: add search for analog mpeg
 recordings

---
 abs/core/LinHES-system/PKGBUILD               | 4 ++--
 abs/core/LinHES-system/misc_which_recorder.pl | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 6b33779..9112d73 100644
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=2
-pkgrel=58
+pkgrel=59
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
@@ -87,7 +87,7 @@ md5sums=('d1a5963c5a440a608031c6d750232633'
          '54ebcc024db2e0ebe8121305d8926767'
          '45f46d1f9193c8dde18e56369ec29a1e'
          'a8edbe7bc37e9932e8749d9f5f89c16f'
-         '14cea9e87654441b766a97576233ba5a'
+         'afd621cd8a8cf5fcff5d00b9f340a9a9'
          'eb879fee9603a05d5420d4ce8ed9e450'
          'f1870a9522c79e6b248fcbf81dec3280'
          '84492954db16740f949d795b74383189'
diff --git a/abs/core/LinHES-system/misc_which_recorder.pl b/abs/core/LinHES-system/misc_which_recorder.pl
index f8a1022..56d076c 100755
--- a/abs/core/LinHES-system/misc_which_recorder.pl
+++ b/abs/core/LinHES-system/misc_which_recorder.pl
@@ -60,7 +60,8 @@ while (<$fh>)
 {
 #   Myth .24 regex to find start of recording
 #    if (/^(.*)(?:\d(?: I )?|I.* -) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/)
-    if (/^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/)
+#   Myth .25 regex to find start of recording for digital and analog MPEG
+    if (/^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) (?:Started|Tuning) recording: (.*): channel (\d+) on cardid (\d+), sourceid (\d+)/ || /^(\d+-\d+-\d+T\d+\:\d+\:\d+)(?:.*) \(UpdateRecStatus\) Updating status for (.*)() on cardid (\d+) \(Will Record => Recording\)()/)
     {
         if ($mode eq "--noheader")
         {
@@ -75,7 +76,8 @@ while (<$fh>)
         $index++;
 
         ($time, $title, $chanid, $cardid, $sourceid) = ($1, $2, $3, $4, $5);
-        $time = `date -d $time +%a' '%m/%d' '%H:%M' '%p`;
+        $time =~ s/T/ /;
+        $time = `date -d $time +%a' '%m/%d' '%l:%M' '%p`;
         chomp ($time);
         if (($title =~ /"?(.+)"?:"?(.*)"?/) || ($title =~ /(.+) "(.*)"/))
         {
-- 
cgit v0.12