Release of Version 0.1.0

New features / Bugfixes:
-Feature: block.conf format and path changed
-Feature: Whitelist function
-Feature: New Setup Option 'Fuzzy Fallback' (see whitelist section above)
-Feature: Duplicate entries are not allowed anymore!
-Feature: New key handling in the plugins setup
-Feature: 'New' jumps to an existing 'New entry'
-Feature: Parental Guidance and main menu entry
-Feature: In Parental Guidance mode replay may be blocked
-Feature: Consideration of empty or no EPG data
-Feature: Italian translation added (thanks to Diego Pierotto)
-Feature: Added list sorting.
-Feature: Changes are applied immediately.
-Bugfix: In rare cases shows were not blocked. Fixed.
-Bugfix: Zap direction
-Bugfix: Changing the zap direction on block events to 'down' should now work (again).
-Bugfix: Unwanted behaviour if OSD is open
-Bugfix: Syslog spams on channels with no or empty EPG

please see HISTORY and README for more details

1 files changed, 58 insertions, 22 deletions

diff --git a/README b/README
index f561d68..cfdb5fc 100644
--- a/README
+++ b/README
@@ -29,21 +29,34 @@ another channel.
 
 Unwanted shows are identified by their EPG title in a predefined blacklist.
 You can add the current title to the block plugin blacklist by choosing
-'Block Broadcast' from the main VDR menu or by editing the blacklist in the
-setup of the plugin. In the latter case make sure you close the submenus as
-well as the setup menu by 'ok' to properly save your changes. This would
-also be the right place to remove entries from the blacklist.
-
+'De-/Block Broadcast' from the main VDR menu or by editing the blacklist in
+the setup of the plugin. In the latter case make sure you close the submenus
+as well as the setup menu by 'ok' to properly save your changes. This would
+also be the right place to remove entries from the blacklist. Once a show is
+blocked you could also deblock the current show by again choosing 
+'De-/Block Broadcast' from the main menu, while the show is running on the
+current channel.
+
+There are two detection methods which can be chosen in the plugins setup
+under 'Detection Method' - On Switch or Channel EPG.
+On Switch:
 Every time the VDR switches to another channel the block plugin checks if
 the EPG title of the current show matches with a blacklist entry and if so
 the show won't be displayed and after a configurable pause (default 2s) the
 VDR switches to another channel automatically. Usually this will be the next
 possible lower channel number if you were coming from a higher one or
 vice-versa. If this is not possible, the vdr switches to the last channel
-displayed. Of course you can zap to another channel yourself as well.
+displayed.
+Channel EPG:
+If set to this option the plugin scans the epg title not only on channel
+switches but it will scan permanently. This way also block events in the
+current channel are detected. This is mandatory for parental guidance mode
+and automatically set in this mode.
 
 In case you unexpectedly want to watch a blacklisted show you can override
-the block rule by pressing 'Ok' while the message is displayed.
+the block rule by pressing 'Ok' while the message is displayed. This
+behaviour can be deactivated in the plugins setup (automatically in parental
+guidance mode).
 
 For VDR versions <= 1.3.16 you will have to apply the included patch to the
 VDR source in order to have multiple channels being blocked in a row.
@@ -62,13 +75,19 @@ Block current show:
 Choose 'Block Broadcast' from the main vdr menu.
 
 
-Edit, delete or manually add new entries:
------------------------------------------
+Edit, white/blacklist, delete or manually add new entries:
+----------------------------------------------------------
 
 Go to the plugins setup in the vdr menu, where you will find the blacklist.
 Use the color keys as shown in the osd.
 Editing additionally allows you to ignore case, or to use regular 
-expressions.
+expressions and to white/blacklist the entry.
+In Parental Guidance mode it is only possible to add entries and editing
+is restricted to new entries and to changes to the pattern and regular
+expression mode.
+Black/whitelisting is switched by choosing the main menu entry of the 
+plugin and can also be changed in the plugins pattern list (by blue/F4)
+or in the editing view of an entry.
 
 
 Setup Options:
@@ -79,7 +98,7 @@ Hide main menu entry: Shows/doesn't show the block plugin main menu entry.
 Timeout: Defines how long the block osd message is displayed, before the
          plugin switches to another channel.
 
-Method: In version 0.0.2 there was a new detection method added. You can
+Method: In version 0.0.2 there a new detection method was added. You can
         choose between 'On Switch' which is the old method that only scans
         at zap events. The other method is 'Channel EPG' which scans the
         current epg title permanentely. If you are setting up a parental
@@ -92,13 +111,18 @@ Ok deblocks temporarily: If set to yes this allows a blocked show to be
                          guidance config you want to set this to 'no'
                          (see below).
 
+Fuzzy Fallback: As of version 0.1.0 whitelisting function was added which
+                could lead to contradictory rules for a list entry. If so
+                the plugin falls back to the value fo Fuzzy Fallback which
+                could be set to black or white.
+
 
 Parental Guidance Setup 
 (Experimental as of version 0.0.2+dev):
 ---------------------------------------
 
 First of all: I can't guarantee a perfectly failsafe childprotection.
-              Feel free to test the Parental Guidance Config at your
+              Feel free to test the Parental Guidance config at your
               own risk but don't forget, that it is you not me who
               takes care of your children. Nevertheless the method
               used by the plugin should work quite good, as long as
@@ -106,23 +130,35 @@ First of all: I can't guarantee a perfectly failsafe childprotection.
               with the current show.
 
 How to: Several prerequisites have to be configured in the plugins
-        setup. For your convenience these are set by manually adding
+        setup. For your convenience these are set by manually adding 
+        or setting
 
         block.ParentalGuidance=1
 
         to vdrs setup.conf. vdr has to be stopped before you edit
         the file, otherwise it will be overwritten the 
-        next time vdr stops and your changes will be lost.
+        next time vdr stops and your changes will be lost. Note that
+        once the setting has been added to setup.conf the only way
+        to deactivate parental guidance mode is to set
+
+        block.ParentalGuidance=0
+        
+        (again with vdr being stopped) or by removing the row from
+        setup.conf.
+        
+        Setting ParentalGuidance to 1 overrides three other setup
+        options: 'Detection Method' is set to 'Channel EPG',
+        'Ok deblocks temporarily' is set to 'No' and 'Fuzzy fallback'
+        is set to 'black', as obviously other settings would undermine 
+        Parental Guidance mode. Furthermore the color keys yellow
+        (Delete) and blue (switch black/white) are deactivated in the
+        plugins setup. Editing is only allowed for new entries, for 
+        which you are only allowed to change the pattern and to set
+        regular expression mode.
         
-        Setting ParentalGuidance to 1 overrides two other setup
-        options: Detection Method is set to 'Channel EPG' and
-        Ok deblocks temporarily is set to 'No', as obviously
-        other settings would undermine Parental Guidance mode.
-        Furthermore the color keys (Edit, New, Delete) are
-        deactivated in the plugins setup.
 
 
-Finally improvements may depend on your feeback, so please drop me a line 
+Finally improvements may depend on your feedback, so please drop me a line 
 if you experience any kind of potential misbehaviour of the plugin, if you
 have suggestions how to make the block plugin better etc. or if you just
-want to say thank you ;) !
\ No newline at end of file
+want to say thank you ;) !