3.4_fix6

Author: Markus Ehrnsperger

HISTORY

@@ -183,15 +183,18 @@ Summary of changes to Version 3.2:
 2025-  -  : Version 3.4.1:
 - Fix: Parsing additional times used in multischedule and what's on
 - Fix: Crash in case of an empty entry in channelgroups. Thanks to SHofmann @vdr-portal.de for reporting
+- Fix: Ensure to have locks before any access to VDR objects like cEvent, cRecording, ...
 - Timers & Recordings: Remove locks defined in live, rely on VDRs locks only
-- Fix (ongoing): Ensure to have locks before any access to VDR objects like cEvent, cRecording, ...
 - Remove grab.h, grab.cpp, tasks.h, tasks.cpp
 -   note for grab.h: Snapshot picture has now less delay to picture on tv
 -                    Allow shorter Snapshot-Interval
 -   note for tasks.h:
--     These tasks require VDR LOCKS. While it seems to be a good idea to
--     have these LOCKS in a separate thread, it is actually a bad one:
+-     These tasks require VDR LOCKs. While it seems to be a good idea to
+-     have these LOCKs in a separate thread, it is actually a bad one:
 -     As we wait for these tasks to finish, this can result in invalid LOCK
 -     sequences not detected by VDR but resulting in deadlocks.
 -     affected: Switch channel, remove timer, remove recording,
         (play, pause, stop, forward, backward) recording
+
+- remove PCRE2 dependency, use c++ std::regex / std::regex_match
+- Hide empty directories in recordings on search (thanks to maazl for the patch)

Makefile

@@ -13,8 +13,6 @@ VERSION := $(shell awk '/$(HASH)define LIVEVERSION/ { print $$3 }' setup.h | sed
 # $(info $$VERSION is [${VERSION}])
 
 PKG_CONFIG ?= pkg-config
-### Check for libpcre2
-HAVE_PCRE2 := $(shell if $(PKG_CONFIG) --exists libpcre2-8; then echo "1"; else echo "0"; fi )
 
 ### The directory environment:
 # Use package data if installed...otherwise assume we're under the VDR source directory:
@@ -60,11 +58,6 @@ CXXTOOLVER := $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre
 
 ### Optional configuration features
 PLUGINFEATURES :=
-ifeq ($(HAVE_PCRE2),1)
-	PLUGINFEATURES += -DHAVE_PCRE2
-	CXXFLAGS       += $(shell $(PKG_CONFIG) --cflags libpcre2-8)
-	LIBS           += $(shell $(PKG_CONFIG) --libs   libpcre2-8)
-endif
 
 # -Wno-deprecated-declarations .. get rid of warning: ‘template<class> class std::auto_ptr’ is deprecated
 CXXFLAGS += -std=c++17 -Wfatal-errors -Wundef -Wno-deprecated-declarations
@@ -94,7 +87,7 @@ VERSIONSUFFIX = gen_version_suffix.h
 PLUGINOBJS := $(PLUGIN).o recman.o epg_events.o thread.o tntconfig.o setup.o \
               timers.o tools.o status.o epgsearch.o \
               md5.o filecache.o livefeatures.o preload.o timerconflict.o \
-              users.o osd_status.o ffmpeg.o StringMatch.o xxhash.o i18n.o
+              users.o osd_status.o ffmpeg.o xxhash.o i18n.o
 PLUGINSRCS := $(patsubst %.o,%.cpp,$(PLUGINOBJS))
 
 WEB_LIB_PAGES := libpages.a

README

@@ -35,10 +35,6 @@ Cxxtools >= 2.2.1  - http://www.tntnet.org/download.hms  // https://web.archive.
 
 Tntnet provides basic web server functions for live and needs cxxtools.
 
-PCRE2 >= 10.38     - https://github.com/PhilipHazel/pcre2/releases
-PCRE2 provides filtering for recordings using Perl regexp language.
-If you don't need filtering, PCRE2 is optional.
-
 Installation:
 =============
 

StringMatch.cpp

@@ -0,0 +1,10 @@
+Concept:
+
+A method returning a VDR object like cRecording requires the corresponding
+VDR global table (cRecordings) as input parameter.
+
+Reasoning:
+cRecordings (LOCK_RECORDINGS_READ) must be locked anyhow, otherwise it is
+not allowed to use the returned cRecording.
+So, requesting this paramater reduces the chance that the developer will
+forget this rule ...

StringMatch.h

@@ -126,16 +126,17 @@ namespace vdrlive
       tChannelID channelid;
       tEventID eventid;
       DecodeDomId(epgid, channelid, eventid);
-      if ( !channelid.Valid() || eventid == 0 ) return false;
-      const cSchedule *schedule = Schedules->GetSchedule(channelid);
+      if (!channelid.Valid() || eventid == 0) return false;
+      channel = Channels->GetByChannelID(channelid);
+      if (!channel) return false;
+      const cSchedule *schedule = Schedules->GetSchedule(channel);
       if (!schedule) return false;
 #if APIVERSNUM >= 20502
       event = schedule->GetEventById(eventid);
 #else
       event = schedule->GetEvent(eventid);
 #endif
-      channel = Channels->GetByChannelID(channelid);
-      return event && channel;
+      return event;
     }