]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
bugfix for autorecs duplicate episode number detection in autorecs
authorHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>
Fri, 31 May 2019 18:00:59 +0000 (20:00 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 15 Oct 2019 07:02:03 +0000 (09:02 +0200)
"record if different episode number" doesn't work as expected in the master branch:
see https://tvheadend.org/issues/5632

With this modification, the season will be taken into account,
as it was before, in order to determine if two episodes have different episode numbers or not.

src/dvr/dvr_db.c

index ee8bb8130bce4cf3ca98185d39660c23e8b8119b..701211850e4296859136b67b0792492cd2ae6b30 100644 (file)
@@ -1484,11 +1484,7 @@ typedef int (*_dvr_duplicate_fcn_t)(dvr_entry_t *de, dvr_entry_t *de2, void **au
 
 static int _dvr_duplicate_epnum(dvr_entry_t *de, dvr_entry_t *de2, void **aux)
 {
-  if (de->de_epnum.e_num && de2->de_epnum.e_num)
-    return de->de_epnum.e_num == de2->de_epnum.e_num;
-  if (de->de_epnum.text && de2->de_epnum.text)
-    return strcmp(de->de_epnum.text, de2->de_epnum.text) == 0;
-  return 0;
+  return ! epg_episode_number_cmp(&(de->de_epnum), &(de2->de_epnum)) ;
 }
 
 static int _dvr_duplicate_title(dvr_entry_t *de, dvr_entry_t *de2, void **aux)