Changeset 4332

Timestamp:

03/16/10 20:54:45 (6 months ago)

Author:

andoma

Message:

• Inject entries in DVR schedule as soon as we know about an EPG entry that matches an autorecording rule. Previously Tvheadend would scan the EPG continously and just grab shows as they neared air time. The drawbacks of this approach was that it's a bit hard to understand what is happening. It also makes (more) correct wakeup from suspend hard to do.

Location:

trunk/tvheadend

Files:

• debian/changelog (modified) (1 diff)
• src/dvr/dvr.h (modified) (4 diffs)
• src/dvr/dvr_autorec.c (modified) (11 diffs)
• src/dvr/dvr_db.c (modified) (9 diffs)
• src/epg.c (modified) (2 diffs)
• src/htsp.c (modified) (1 diff)
• src/webui/extjs.c (modified) (2 diffs)
• src/webui/simpleui.c (modified) (1 diff)

trunk/tvheadend/debian/changelog

@@ -8 +8 @@
     written to disk as Tvheadend tunes to it. This should aid a lot when
     it comes to debugging
+
+  * Inject entries in DVR schedule as soon as we know about an EPG
+    entry that matches an autorecording rule. Previously Tvheadend
+    would scan the EPG continously and just grab shows as they neared
+    air time.  The drawbacks of this approach was that it's a bit hard
+    to understand what is happening. It also makes (more) correct
+    wakeup from suspend hard to do.
 
 hts-tvheadend (2.10) hts; urgency=high

trunk/tvheadend/src/dvr/dvr.h

@@ -21 +21 @@
 
 #include <libavformat/avformat.h>
+#include <regex.h>
 #include "epg.h"
 #include "channels.h"
@@ -98 +99 @@
   
   /**
+   * Autorec linkage
+   */
+  LIST_ENTRY(dvr_entry) de_autorec_link;
+  struct dvr_autorec_entry *de_autorec;
+
+  /**
    * Fields for recording
    */
@@ -130 +137 @@
 } dvr_entry_t;
 
+
+/**
+ * Autorec entry
+ */
+typedef struct dvr_autorec_entry {
+  TAILQ_ENTRY(dvr_autorec_entry) dae_link;
+  char *dae_id;
+
+  int dae_enabled;
+  char *dae_creator;
+  char *dae_comment;
+
+  char *dae_title;
+  regex_t dae_title_preg;
+  
+  epg_content_group_t *dae_ecg;
+
+  int dae_weekdays;
+
+  channel_t *dae_channel;
+  LIST_ENTRY(dvr_autorec_entry) dae_channel_link;
+
+  channel_tag_t *dae_channel_tag;
+  LIST_ENTRY(dvr_autorec_entry) dae_channel_tag_link;
+
+  struct dvr_entry_list dae_spawns;
+
+} dvr_autorec_entry_t;
+
+
 /**
  * Prototypes
  */
-dvr_entry_t *dvr_entry_create_by_event(event_t *e, const char *creator);
+void dvr_entry_create_by_autorec(event_t *e, dvr_autorec_entry_t *dae);
+
+dvr_entry_t *dvr_entry_create_by_event(event_t *e, const char *creator,
+                                       dvr_autorec_entry_t *dae);
 
 dvr_entry_t *dvr_entry_create(channel_t *ch, time_t start, time_t stop, 
                               const char *title, const char *description,
-                              const char *creator);
+                              const char *creator, dvr_autorec_entry_t *dae);
 
 void dvr_init(void);
@@ -191 +231 @@
                      const char *creator, const char *comment);
 
-void dvr_autorec_check(event_t *e);
+void dvr_autorec_check_event(event_t *e);
 
 void autorec_destroy_by_channel(channel_t *ch);
 
+dvr_autorec_entry_t *autorec_entry_find(const char *id, int create);
+
 #endif /* DVR_H  */

trunk/tvheadend/src/dvr/dvr_autorec.c

@@ -26 +26 @@
 #include <stdarg.h>
 #include <errno.h>
-#include <regex.h>
-
 
 #include "tvhead.h"
@@ -42 +40 @@
 struct dvr_autorec_entry_queue autorec_entries;
 
-typedef struct dvr_autorec_entry {
-  TAILQ_ENTRY(dvr_autorec_entry) dae_link;
-  char *dae_id;
-
-  int dae_enabled;
-  char *dae_creator;
-  char *dae_comment;
-
-  char *dae_title;
-  regex_t dae_title_preg;
-  
-  epg_content_group_t *dae_ecg;
-
-  int dae_weekdays;
-
-  channel_t *dae_channel;
-  LIST_ENTRY(dvr_autorec_entry) dae_channel_link;
-
-  channel_tag_t *dae_channel_tag;
-  LIST_ENTRY(dvr_autorec_entry) dae_channel_tag_link;
-
-} dvr_autorec_entry_t;
-
-static void dvr_autorec_check_just_enabled(dvr_autorec_entry_t *dae);
-
+static void dvr_autorec_changed(dvr_autorec_entry_t *dae);
+
+/**
+ *
+ */
+static void
+dvr_autorec_purge_spawns(dvr_autorec_entry_t *dae)
+{
+  dvr_entry_t *de;
+
+  while((de = LIST_FIRST(&dae->dae_spawns)) != NULL) {
+    LIST_REMOVE(de, de_autorec_link);
+    de->de_autorec = NULL;
+    dvr_entry_cancel(de);
+  }
+}
 
 
@@ -99 +88 @@
   }
   
-  if(dae->dae_title != NULL && e->e_title != NULL &&
-     regexec(&dae->dae_title_preg, e->e_title, 0, NULL, 0))
+  if(dae->dae_title != NULL) {
+    if(e->e_title == NULL ||
+       regexec(&dae->dae_title_preg, e->e_title, 0, NULL, 0))
     return 0;
+  }
 
   if(dae->dae_weekdays != 0x7f) {
@@ -116 +107 @@
  *
  */
-static dvr_autorec_entry_t *
+dvr_autorec_entry_t *
 autorec_entry_find(const char *id, int create)
 {
@@ -155 +146 @@
 autorec_entry_destroy(dvr_autorec_entry_t *dae)
 {
+  dvr_autorec_purge_spawns(dae);
+
   free(dae->dae_id);
 
@@ -294 +287 @@
     return NULL;
 
-  tvh_str_set(&dae->dae_creator, htsmsg_get_str(values, "creator"));
-  tvh_str_set(&dae->dae_comment, htsmsg_get_str(values, "comment"));
+  printf("autorec_record_update\n");
+  htsmsg_print(values);
+
+  tvh_str_update(&dae->dae_creator, htsmsg_get_str(values, "creator"));
+  tvh_str_update(&dae->dae_comment, htsmsg_get_str(values, "comment"));
 
   if((s = htsmsg_get_str(values, "channel")) != NULL) {
@@ -341 +337 @@
     dae->dae_enabled = u32;
 
-  if(dae->dae_enabled)
-    dvr_autorec_check_just_enabled(dae);
+  dvr_autorec_changed(dae);
 
   return autorec_record_build(dae);
@@ -436 +431 @@
   notify_by_msg("autorec", m);
 
-  dvr_autorec_check_just_enabled(dae);
-}
-
-/**
- *
- */
-static void
-autorec_schedule(event_t *e, dvr_autorec_entry_t *dae)
-{
-  char buf[200];
-
-  snprintf(buf, sizeof(buf), "Auto recording by: %s", dae->dae_creator);
-  dvr_entry_create_by_event(e, buf);
+  dvr_autorec_changed(dae);
 }
 
@@ -456 +439 @@
  */
 void
-dvr_autorec_check(event_t *e)
+dvr_autorec_check_event(event_t *e)
 {
   dvr_autorec_entry_t *dae;
@@ -462 +445 @@
   TAILQ_FOREACH(dae, &autorec_entries, dae_link)
     if(autorec_cmp(dae, e))
-      autorec_schedule(e, dae);
-
-  if((e = RB_NEXT(e, e_channel_link)) == NULL)
-    return;
-
-  /* Check next event too */
-  TAILQ_FOREACH(dae, &autorec_entries, dae_link)
-    if(autorec_cmp(dae, e))
-      autorec_schedule(e, dae);
+      dvr_entry_create_by_autorec(e, dae);
 }
 
@@ -477 +452 @@
  */
 static void
-dvr_autorec_check_just_enabled(dvr_autorec_entry_t *dae)
+dvr_autorec_changed(dvr_autorec_entry_t *dae)
 {
   channel_t *ch;
+  event_t *e;
+
+  dvr_autorec_purge_spawns(dae);
 
   RB_FOREACH(ch, &channel_name_tree, ch_name_link) {
-    if(ch->ch_epg_current == NULL)
-      continue;
-
-    if(autorec_cmp(dae, ch->ch_epg_current))
-      autorec_schedule(ch->ch_epg_current, dae);
+    RB_FOREACH(e, &ch->ch_epg_events, e_channel_link) {
+      if(autorec_cmp(dae, e))
+        dvr_entry_create_by_autorec(e, dae);
+    }
   }
 }

trunk/tvheadend/src/dvr/dvr_db.c

@@ -138 +138 @@
 dvr_entry_create(channel_t *ch, time_t start, time_t stop, 
                  const char *title, const char *description,
-                 const char *creator)
+                 const char *creator, dvr_autorec_entry_t *dae)
 {
   dvr_entry_t *de;
@@ -175 +175 @@
   strftime(tbuf, sizeof(tbuf), "%c", &tm);
 
+  de->de_autorec = dae;
+  LIST_INSERT_HEAD(&dae->dae_spawns, de, de_autorec_link);
+
   tvhlog(LOG_INFO, "dvr", "\"%s\" on \"%s\" starting at %s, "
          "scheduled for recording by \"%s\"",
@@ -189 +192 @@
  */
 dvr_entry_t *
-dvr_entry_create_by_event(event_t *e, const char *creator)
+dvr_entry_create_by_event(event_t *e, const char *creator, 
+                          dvr_autorec_entry_t *dae)
 {
   if(e->e_channel == NULL || e->e_title == NULL)
@@ -195 +199 @@
 
   return dvr_entry_create(e->e_channel, e->e_start, e->e_stop, 
-                          e->e_title, e->e_desc, creator);
+                          e->e_title, e->e_desc, creator, dae);
+}
+
+
+/**
+ *
+ */
+void
+dvr_entry_create_by_autorec(event_t *e, dvr_autorec_entry_t *dae)
+{
+  char buf[200];
+
+  snprintf(buf, sizeof(buf), "Auto recording by: %s", dae->dae_creator);
+  dvr_entry_create_by_event(e, buf, dae);
 }
 
@@ -211 +228 @@
     return;
   }
+
+  if(de->de_autorec != NULL)
+    LIST_REMOVE(de, de_autorec_link);
 
   free(de->de_creator);
@@ -302 +322 @@
 
   htsmsg_get_u32(c, "noresched", &de->de_dont_reschedule);
+
+  s = htsmsg_get_str(c, "autorec");
+  if(s != NULL) {
+    dvr_autorec_entry_t *dae = autorec_entry_find(s, 0);
+
+    if(dae != NULL) {
+      de->de_autorec = dae;
+      LIST_INSERT_HEAD(&dae->dae_spawns, de, de_autorec_link);
+    }
+  }
+
   dvr_entry_link(de);
 }
@@ -359 +390 @@
 
   htsmsg_add_u32(m, "noresched", de->de_dont_reschedule);
+
+  if(de->de_autorec != NULL)
+    htsmsg_add_str(m, "autorec", de->de_autorec->dae_id);
 
   hts_settings_save(m, "dvr/log/%d", de->de_id);
@@ -590 +624 @@
   }
 
+  dvr_autorec_init();
+
   dvr_db_load();
-
-  dvr_autorec_init();
-
 }
 
@@ -612 +645 @@
   htsmsg_add_u32(m, "date-in-title",    !!(dvr_flags & DVR_DATE_IN_TITLE));
   htsmsg_add_u32(m, "time-in-title",    !!(dvr_flags & DVR_TIME_IN_TITLE));
-  htsmsg_add_u32(m, "whitespace-in-title",    !!(dvr_flags & DVR_WHITESPACE_IN_TITLE));
+  htsmsg_add_u32(m, "whitespace-in-title", !!(dvr_flags & DVR_WHITESPACE_IN_TITLE));
   if(dvr_postproc != NULL)
     htsmsg_add_str(m, "postproc", dvr_postproc);

trunk/tvheadend/src/epg.c

@@ -58 +58 @@
 
   ch->ch_epg_current = e;
-  if(e != NULL) {
+  if(e != NULL)
     gtimer_arm_abs(&ch->ch_epg_timer_current, epg_ch_check_current_event,
                    ch, MAX(e->e_stop, dispatch_clock + 1));
-    dvr_autorec_check(e);
-  }
   htsp_event_update(ch, e);
 }
@@ -114 +112 @@
 epg_event_changed(event_t *e)
 {
-  /* nothing atm  */
+  dvr_autorec_check_event(e);
 }
 

trunk/tvheadend/src/htsp.c

@@ -498 +498 @@
   
   //create the dvr entry
-  de = dvr_entry_create_by_event(e, (htsp->htsp_username) ? htsp->htsp_username:"anonymous");
+  de = dvr_entry_create_by_event(e, 
+                                 htsp->htsp_username ? 
+                                 htsp->htsp_username : "anonymous",
+                                 NULL);
 
   dvr_status = de != NULL ? de->de_sched_state : DVR_NOSTATE;

trunk/tvheadend/src/webui/extjs.c

@@ -725 +725 @@
     }
 
-    dvr_entry_create_by_event(e, hc->hc_representative);
+    dvr_entry_create_by_event(e, hc->hc_representative, NULL);
 
     out = htsmsg_create_map();
@@ -778 +778 @@
       stop += 86400;
 
-    dvr_entry_create(ch, start, stop, title, NULL, hc->hc_representative);
+    dvr_entry_create(ch, start, stop, title, NULL, hc->hc_representative, NULL);
 
     out = htsmsg_create_map();

trunk/tvheadend/src/webui/simpleui.c

@@ -210 +210 @@
 
   if((http_arg_get(&hc->hc_req_args, "rec")) != NULL) {
-    de = dvr_entry_create_by_event(e, hc->hc_username ?: "anonymous");
+    de = dvr_entry_create_by_event(e, hc->hc_username ?: "anonymous", NULL);
   } else if(de != NULL && (http_arg_get(&hc->hc_req_args, "cancel")) != NULL) {
     de = dvr_entry_cancel(de);