Merge branch 'master' of ssh://projects.vdr-developer.org/vdr-manager

45 files changed, 70 insertions, 49 deletions

diff --git a/vdr-vdrmanager/HISTORY b/vdr-vdrmanager/HISTORY
index 8cbe662..a9a03f9 100644
--- a/vdr-vdrmanager/HISTORY
+++ b/vdr-vdrmanager/HISTORY
@@ -1,8 +1,14 @@
 VDR Plugin 'vdrmanager' Revision History
 ------------------------------------
 2011-10-12: Version 0.2-pre
+
 - Recording Info via recordings command
+- Delete a recording via drecord <recording index> commmand
 - shortText delivery with event commands
+- Timer Modification flow rewritten
+- Search for event for a timer
+- bug fixes
+
 
 2011-03-19: Version 0.1
 
diff --git a/vdrmanager-0.2/debian/README.Debian b/vdr-vdrmanager/debian/README.Debian
index 0dcc16d..0dcc16d 100644
--- a/vdrmanager-0.2/debian/README.Debian
+++ b/vdr-vdrmanager/debian/README.Debian
diff --git a/vdrmanager-0.2/debian/README.source b/vdr-vdrmanager/debian/README.source
index ab16d44..ab16d44 100644
--- a/vdrmanager-0.2/debian/README.source
+++ b/vdr-vdrmanager/debian/README.source
diff --git a/vdrmanager-0.2/debian/changelog b/vdr-vdrmanager/debian/changelog
index 906188a..906188a 100644
--- a/vdrmanager-0.2/debian/changelog
+++ b/vdr-vdrmanager/debian/changelog
diff --git a/vdrmanager-0.2/debian/compat b/vdr-vdrmanager/debian/compat
index 7f8f011..7f8f011 100644
--- a/vdrmanager-0.2/debian/compat
+++ b/vdr-vdrmanager/debian/compat
diff --git a/vdrmanager-0.2/debian/control b/vdr-vdrmanager/debian/control
index 3e4e459..3e4e459 100644
--- a/vdrmanager-0.2/debian/control
+++ b/vdr-vdrmanager/debian/control
diff --git a/vdrmanager-0.2/debian/copyright b/vdr-vdrmanager/debian/copyright
index 03f8e1b..03f8e1b 100644
--- a/vdrmanager-0.2/debian/copyright
+++ b/vdr-vdrmanager/debian/copyright
diff --git a/vdrmanager-0.2/debian/cron.d.ex b/vdr-vdrmanager/debian/cron.d.ex
index cc35139..cc35139 100644
--- a/vdrmanager-0.2/debian/cron.d.ex
+++ b/vdr-vdrmanager/debian/cron.d.ex
diff --git a/vdrmanager-0.2/debian/docs b/vdr-vdrmanager/debian/docs
index e845566..e845566 100644
--- a/vdrmanager-0.2/debian/docs
+++ b/vdr-vdrmanager/debian/docs
diff --git a/vdrmanager-0.2/debian/emacsen-install.ex b/vdr-vdrmanager/debian/emacsen-install.ex
index 26118ad..26118ad 100644
--- a/vdrmanager-0.2/debian/emacsen-install.ex
+++ b/vdr-vdrmanager/debian/emacsen-install.ex
diff --git a/vdrmanager-0.2/debian/emacsen-remove.ex b/vdr-vdrmanager/debian/emacsen-remove.ex
index 304e9a2..304e9a2 100644
--- a/vdrmanager-0.2/debian/emacsen-remove.ex
+++ b/vdr-vdrmanager/debian/emacsen-remove.ex
diff --git a/vdrmanager-0.2/debian/emacsen-startup.ex b/vdr-vdrmanager/debian/emacsen-startup.ex
index 3f3efa9..3f3efa9 100644
--- a/vdrmanager-0.2/debian/emacsen-startup.ex
+++ b/vdr-vdrmanager/debian/emacsen-startup.ex
diff --git a/vdr-vdrmanager/debian/files b/vdr-vdrmanager/debian/files
new file mode 100644
index 0000000..31caf59
--- /dev/null
+++ b/vdr-vdrmanager/debian/files
@@ -0,0 +1 @@
+vdr-plugin-vdrmanager_0.2-1_amd64.deb video extra
diff --git a/vdrmanager-0.2/debian/init.d.ex b/vdr-vdrmanager/debian/init.d.ex
index c56b5ff..c56b5ff 100644
--- a/vdrmanager-0.2/debian/init.d.ex
+++ b/vdr-vdrmanager/debian/init.d.ex
diff --git a/vdrmanager-0.2/debian/init.d.lsb.ex b/vdr-vdrmanager/debian/init.d.lsb.ex
index cf31c60..cf31c60 100644
--- a/vdrmanager-0.2/debian/init.d.lsb.ex
+++ b/vdr-vdrmanager/debian/init.d.lsb.ex
diff --git a/vdrmanager-0.2/debian/install b/vdr-vdrmanager/debian/install
index 223e336..223e336 100644
--- a/vdrmanager-0.2/debian/install
+++ b/vdr-vdrmanager/debian/install
diff --git a/vdrmanager-0.2/debian/links.ex b/vdr-vdrmanager/debian/links.ex
index 164b570..164b570 100644
--- a/vdrmanager-0.2/debian/links.ex
+++ b/vdr-vdrmanager/debian/links.ex
diff --git a/vdrmanager-0.2/debian/manpage.1.ex b/vdr-vdrmanager/debian/manpage.1.ex
index 2efda3c..2efda3c 100644
--- a/vdrmanager-0.2/debian/manpage.1.ex
+++ b/vdr-vdrmanager/debian/manpage.1.ex
diff --git a/vdrmanager-0.2/debian/manpage.sgml.ex b/vdr-vdrmanager/debian/manpage.sgml.ex
index ae506e1..ae506e1 100644
--- a/vdrmanager-0.2/debian/manpage.sgml.ex
+++ b/vdr-vdrmanager/debian/manpage.sgml.ex
diff --git a/vdrmanager-0.2/debian/manpage.xml.ex b/vdr-vdrmanager/debian/manpage.xml.ex
index e69468c..e69468c 100644
--- a/vdrmanager-0.2/debian/manpage.xml.ex
+++ b/vdr-vdrmanager/debian/manpage.xml.ex
diff --git a/vdrmanager-0.2/debian/menu.ex b/vdr-vdrmanager/debian/menu.ex
index 03fc26b..03fc26b 100644
--- a/vdrmanager-0.2/debian/menu.ex
+++ b/vdr-vdrmanager/debian/menu.ex
diff --git a/vdrmanager-0.2/debian/plugin.vdrmanager.conf b/vdr-vdrmanager/debian/plugin.vdrmanager.conf
index 5081563..5081563 100644
--- a/vdrmanager-0.2/debian/plugin.vdrmanager.conf
+++ b/vdr-vdrmanager/debian/plugin.vdrmanager.conf
diff --git a/vdrmanager-0.2/debian/postinst.ex b/vdr-vdrmanager/debian/postinst.ex
index 118dd5e..118dd5e 100644
--- a/vdrmanager-0.2/debian/postinst.ex
+++ b/vdr-vdrmanager/debian/postinst.ex
diff --git a/vdrmanager-0.2/debian/postrm.ex b/vdr-vdrmanager/debian/postrm.ex
index b61f79d..b61f79d 100644
--- a/vdrmanager-0.2/debian/postrm.ex
+++ b/vdr-vdrmanager/debian/postrm.ex
diff --git a/vdrmanager-0.2/debian/preinst.ex b/vdr-vdrmanager/debian/preinst.ex
index 104f32f..104f32f 100644
--- a/vdrmanager-0.2/debian/preinst.ex
+++ b/vdr-vdrmanager/debian/preinst.ex
diff --git a/vdrmanager-0.2/debian/prerm.ex b/vdr-vdrmanager/debian/prerm.ex
index 488d901..488d901 100644
--- a/vdrmanager-0.2/debian/prerm.ex
+++ b/vdr-vdrmanager/debian/prerm.ex
diff --git a/vdrmanager-0.2/debian/rules b/vdr-vdrmanager/debian/rules
index 2e942e5..2e942e5 100755
--- a/vdrmanager-0.2/debian/rules
+++ b/vdr-vdrmanager/debian/rules
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.debhelper.log b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.debhelper.log
index 0211d39..723aaba 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.debhelper.log
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.debhelper.log
@@ -1,3 +1,4 @@
+dh_prep
 dh_installdirs
 dh_installdirs
 dh_installdocs
@@ -16,6 +17,7 @@ dh_installlogcheck
 dh_installchangelogs
 dh_installudev
 dh_lintian
+dh_bugfiles
 dh_install
 dh_link
 dh_installmime
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.default.ex b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.default.ex
index 4abf0f7..4abf0f7 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.default.ex
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.default.ex
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.doc-base.EX b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.doc-base.EX
index 9af9e47..9af9e47 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.doc-base.EX
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.doc-base.EX
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.substvars b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.substvars
index 00de03c..5cbcb86 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager.substvars
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager.substvars
@@ -1,3 +1,3 @@
 shlibs:Depends=libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
-vdr:Depends=vdr-abi-1.7.16-yavdr9
+vdr:Depends=vdr-abi-1.7.21-yavdr0
 misc:Depends=
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles
new file mode 100644
index 0000000..ad8a805
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/conffiles
@@ -0,0 +1 @@
+/etc/vdr/plugins/plugin.vdrmanager.conf
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/DEBIAN/control b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/control
index a552858..9420642 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/DEBIAN/control
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: vdr-plugin-vdrmanager
 Version: 0.2-1
-Architecture: i386
+Architecture: amd64
 Maintainer: root <root@unknown>
-Installed-Size: 140
-Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), vdr-abi-1.7.16-yavdr9
+Installed-Size: 144
+Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), vdr-abi-1.7.21-yavdr0
 Section: video
 Priority: extra
 Homepage: <url://example.com>
diff --git a/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf
new file mode 100644
index 0000000..5081563
--- /dev/null
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/etc/vdr/plugins/plugin.vdrmanager.conf
@@ -0,0 +1,6 @@
+# Command line parameters for vdr-plugin-vdrmanager
+#
+#   For more details see:
+#   http://projects.vdr-developer.org/projects/vdr-manager/wiki
+-p 6420
+-P change
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README
index 7d82ff0..7d82ff0 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian
index 0dcc16d..0dcc16d 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/README.Debian
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
index 8c20172..8c20172 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright
index 03f8e1b..03f8e1b 100644
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright
+++ b/vdr-vdrmanager/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/copyright
diff --git a/vdrmanager-0.2/debian/watch.ex b/vdr-vdrmanager/debian/watch.ex
index 6cc77f0..6cc77f0 100644
--- a/vdrmanager-0.2/debian/watch.ex
+++ b/vdr-vdrmanager/debian/watch.ex
diff --git a/vdr-vdrmanager/helpers.cpp b/vdr-vdrmanager/helpers.cpp
index 4d7422e..23e4d28 100644
--- a/vdr-vdrmanager/helpers.cpp
+++ b/vdr-vdrmanager/helpers.cpp
@@ -58,16 +58,20 @@ string cHelpers::SearchEvents(string args) {
 
   args = Trim(args);
 
+  string wantedChannels;
+  string pattern;
+  
+
   size_t space = args.find(' ');
-  if (space == string::npos) {
-    return "!ERROR\r\n";
+  if (space == string::npos) {//so only search term
+    pattern = args;
+    wantedChannels = "";
+  } else {
+    wantedChannels = args.substr(0, space);
+    pattern = args.substr(space+1);
   }
 
-  string wantedChannels = args.substr(0, space);
-  string pattern = args.substr(space+1);
-
   return SafeCall(SearchEventsIntern, Trim(wantedChannels), Trim(pattern));
-
 }
 
 string cHelpers::GetTimersIntern() {
@@ -294,7 +298,7 @@ string cHelpers::SearchEventsIntern(string wantedChannels, string pattern) {
   cSchedulesLock schedulesLock;
   const cSchedules * schedules = cSchedules::Schedules(schedulesLock);
   for(cSchedule * schedule = schedules->First(); schedule; schedule = schedules->Next(schedule)) {
-
+    
     cChannel * channel = Channels.GetByChannelID(schedule->ChannelID());
     if (!IsWantedChannel(channel, wantedChannels)) {
       continue;
@@ -302,8 +306,8 @@ string cHelpers::SearchEventsIntern(string wantedChannels, string pattern) {
 
     const cList<cEvent> * events = schedule->Events();
     for(cEvent * event = events->First(); event; event = events->Next(event)) {
-
-      if (IsWantedEvent(event, pattern)) {
+      
+      if (IsWantedTime(0, event) && IsWantedEvent(event, pattern) ) {//time must be ok, so stop > now
         result += ToText(event);
       }
     }
@@ -362,8 +366,12 @@ string cHelpers::ToText(cRecording * recording){
   sprintf(buf, "%lu", endTime);
   result += buf;
   result += ":";
-
-  result += info -> ChannelName();
+  
+  if(info -> ChannelName()){
+    result += info -> ChannelName();
+  } else {
+    result += "<unknown>";
+  }
   result += ":";
 
   result += MapSpecialChars(event->Title());
@@ -389,23 +397,24 @@ string cHelpers::ToText(cTimer * timer) {
   const cChannel * channel = timer->Channel();
   const char * channelName = channel->Name();
   
-  cSchedulesLock schedulesLock;
-  const cSchedules * schedules = cSchedules::Schedules(schedulesLock);
+  //cSchedulesLock schedulesLock;
+  //  const cSchedules * schedules = cSchedules::Schedules(schedulesLock);
   
-  const cSchedule * schedule = schedules->GetSchedule(channel->GetChannelID());
+  //  const cSchedule * schedule = schedules->GetSchedule(channel->GetChannelID());
   
-  const cList<cEvent> * events = schedule->Events();
-  cEvent * match = NULL;
-  for(cEvent * event = events->First(); event; event = events->Next(event)) {
-    
-    time_t startTime = event->StartTime();
-    time_t stopTime = startTime + event->Duration();
-    if(startTime <= timer->StartTime() && timer->StopTime() >= stopTime){
-      match = event;
-      break;
-    }
-  }
+  //const cList<cEvent> * events = schedule->Events();
+  //  cEvent * match = NULL;
+  //  for(cEvent * event = events->First(); event; event = events->Next(event)) {
+  //
+  //time_t startTime = event->StartTime();
+  //    time_t stopTime = startTime + event->Duration();
+  //if(startTime <= timer->StartTime() && timer->StopTime() >= stopTime){
+  //  match = event;
+  //  break;
+  //}
+  //  }
   
+
   string result;
   char buf[100];
   sprintf(buf, "T%d", timer->Index());
@@ -434,11 +443,12 @@ string cHelpers::ToText(cTimer * timer) {
   result += MapSpecialChars(timer->File());
   result += ":";
   result += MapSpecialChars(timer->Aux() ? timer->Aux() : "");
-  if(match && false){
+  const cEvent * event = timer->Event();
+  if(event){
     result += ":";
-    result += MapSpecialChars(match->ShortText()  ? match->ShortText() : "");
+    result += event->ShortText()  ? MapSpecialChars(event->ShortText()) : "";
     result += ":";
-    result += MapSpecialChars(match->Description() ? match->Description() : "");
+    result += event->Description() ? MapSpecialChars(event->Description()) : "";
   } else {
     result += "::";
   }
@@ -670,15 +680,17 @@ string cHelpers::MapSpecialChars(string text) {
   return result;
 }
 
-string cHelpers::replaceAll(string where, string what, string replacement){
-  int position = where.find(what);
-  int size = what.size();
-  while ( position != string::npos ) 
-    {
-      where.replace( position, size, replacement );
-      position = where.find(what, position + 1 );
-    } 
-  return where;
+
+//from live plugin StringReplace
+string cHelpers::replaceAll(string const& text, string const& substring, string const& replacement )
+{
+  string result = text;
+  string::size_type pos = 0;
+  while ( ( pos = result.find( substring, pos ) ) != string::npos ) {
+    result.replace( pos, substring.length(), replacement );
+    pos += replacement.length();
+  }
+  return result;
 }
 
 string cHelpers::UnMapSpecialChars(string text) {
diff --git a/vdr-vdrmanager/helpers.h b/vdr-vdrmanager/helpers.h
index 83e3630..4650b65 100644
--- a/vdr-vdrmanager/helpers.h
+++ b/vdr-vdrmanager/helpers.h
@@ -41,6 +41,6 @@ private:
   static string ToText(cTimer * timer);
   static string ToText(cRecording * recording);
   static string GetAudioTracks(const cChannel* channel);
-  static string replaceAll(string where, string what, string replacement);
+  static string replaceAll(const string& where, const string& what, const string& replacement);
   static string UnMapSpecialChars(string text);
 };
diff --git a/vdrmanager-0.2/debian/files b/vdrmanager-0.2/debian/files
deleted file mode 100644
index dd3f8cc..0000000
--- a/vdrmanager-0.2/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-vdr-plugin-vdrmanager_0.2-1_i386.deb video extra
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums b/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums
deleted file mode 100644
index e69c56b..0000000
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/DEBIAN/md5sums
+++ /dev/null
@@ -1,6 +0,0 @@
-0c3f9ceeaf1ea80b4a1adc1a00b47b65  usr/share/doc/vdr-plugin-vdrmanager/copyright
-a1487bf9f7c1ab844a4c42c720a8c005  usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
-691953c8881785e75b9d6069fa7fff31  usr/share/doc/vdr-plugin-vdrmanager/changelog.Debian.gz
-3a507cc957c2ab9889a865853deffc77  usr/share/doc/vdr-plugin-vdrmanager/README.Debian
-131368ba58e60dea97a17e88365dbad2  usr/share/doc/vdr-plugin-vdrmanager/README
-ac0f774fb2152122d18de02c4a4221df  usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.16
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.16 b/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.16
deleted file mode 100644
index 5099719..0000000
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/lib/vdr/plugins/libvdr-vdrmanager.so.1.7.16
+++ /dev/null
diff --git a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz b/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
deleted file mode 100644
index 7346e3f..0000000
--- a/vdrmanager-0.2/debian/vdr-plugin-vdrmanager/usr/share/doc/vdr-plugin-vdrmanager/changelog.gz
+++ /dev/null