Packman Build Service PMBS

Changes of Revision 7

get_iplayer.changes Changed

get_iplayer.spec Changed

@@ -10,26 +10,61 @@
 %endif
 
 Name:           get_iplayer
-Version:        2.82
+Version:        3.20
 Release:        1
 License:        GPL-3.0
 Summary:        Downloads H.264 BBC IPlayer TV, Radio, and Podcast Programs
 Url:            http://www.infradead.org/get_iplayer/html/get_iplayer.html
 Group:          Productivity/Networking/File-Sharing
-Source0:        ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.82.tar.gz
+Source0:        get_iplayer-%{version}.tar.gz
 Source1:        get_iplayer.options
 Source2:        sysconfig.get_iplayer
 Source3:	get_iplayer_pvr
-BuildRequires:  ImageMagick
-BuildRequires:  update-desktop-files
-Requires:       MPlayer
-Requires:       lame
-Requires:       perl
-Requires:       perl-libwww-perl
-Requires:       rtmpdump
+BuildRequires: update-desktop-files
+Requires: ffmpeg
+Requires: perl(CGI)
+Requires: perl(CGI::Cookie)
+Requires: perl(Cwd)
+Requires: perl(Encode)
+Requires: perl(Env)
+Requires: perl(Fcntl)
+Requires: perl(File::Basename)
+Requires: perl(File::Copy)
+Requires: perl(File::Path)
+Requires: perl(File::Spec)
+Requires: perl(File::stat)
+Requires: perl(Getopt::Long)
+Requires: perl(HTML::Entities)
+Requires: perl(HTML::Parser)
+Requires: perl(HTTP::Cookies)
+Requires: perl(HTTP::Headers)
+Requires: perl(IO::File)
+Requires: perl(IO::Handle)
+Requires: perl(IO::Seekable)
+Requires: perl(IO::Select)
+Requires: perl(IO::Socket)
+Requires: perl(IPC::Open3)
+Requires: perl(JSON::PP)
+Requires: perl(LWP::ConnCache)
+Requires: perl(LWP::Protocol::https)
+Requires: perl(LWP::UserAgent)
+Requires: perl(List::Util)
+Requires: perl(Mojo::UserAgent)
+Requires: perl(PerlIO::encoding)
+Requires: perl(Socket)
+Requires: perl(Storable)
+Requires: perl(Symbol)
+Requires: perl(Text::ParseWords)
+Requires: perl(Text::Wrap)
+Requires: perl(Time::Local)
+Requires: perl(Time::Piece)
+Requires: perl(URI)
+Requires: perl(Unicode::Normalize)
+Requires: perl(XML::LibXML)
+Requires: perl(XML::LibXML::XPathContext)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-PreReq:         %fillup_prereq
+Requires(post): %fillup_prereq
 
 %description
 get_iplayer allows a user to download or stream any iPlayer program from the
@@ -47,8 +82,7 @@
 ** WARNING ** Never run this in an untrusted environment or facing the internet
 
 %prep
-%setup -q
-cp windows/installer_files/iplayer_logo.ico .
+%autosetup -p1
 
 %build
 #No build required
@@ -57,8 +91,6 @@
 install -Dm 0755 get_iplayer %{buildroot}%{_bindir}/get_iplayer
 mkdir -p %{buildroot}%{_mandir}/man1
 install -Dm 0644 get_iplayer.1 %{buildroot}%{_mandir}/man1/
-mkdir -p %{buildroot}%{_datadir}/%{name}/plugins
-install -Dm 0644 plugins/*.plugin %{buildroot}%{_datadir}/%{name}/plugins/
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 install -Dm 0644 %{S:1} %{buildroot}%{_sysconfdir}/%{name}/options
 # Install pvr files
@@ -66,7 +98,6 @@
 mkdir -p %{buildroot}%{_fillupdir}
 install -Dm 0644 %{S:2} %{buildroot}%{_fillupdir}/sysconfig.get_iplayer
 install -Dm 0755 %{S:3} %{buildroot}%{_bindir}/get_iplayer_pvr
-convert -geometry 48 iplayer_logo.ico iplayer_logo.png
 # Add desktop file
 cat > get_iplayer_pvr.desktop <<EOF
 [Desktop Entry]
@@ -75,14 +106,11 @@
 GenericName=get_iplayer_pvr
 Comment=get_iplayer Web PVR Manager
 Exec=get_iplayer_pvr
-Icon=iplayer_logo
 Terminal=false
 Type=Application
 StartupNotify=false
 Categories=Internet;FileTransfer;
 EOF
-%{__mkdir} -p %{buildroot}%{_datadir}/pixmaps
-cp iplayer_logo.png %{buildroot}%{_datadir}/pixmaps/iplayer_logo.png
 %suse_update_desktop_file -i get_iplayer_pvr
 
 %post pvr
@@ -90,22 +118,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG.txt CONTRIBUTORS LICENSE.txt README.txt
+%doc LICENSE.txt README.md
 %{_bindir}/get_iplayer
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/*.plugin
 %{_mandir}/man1/get_iplayer.1*
 %dir %{_sysconfdir}/%{name}
 %config (noreplace) %{_sysconfdir}/%{name}/options
 
 %files pvr
 %defattr(-,root,root,-)
-%doc CHANGELOG-get_iplayer.cgi.txt  LICENSE.txt README-get_iplayer.cgi.txt
 %{_bindir}/get_iplayer_pvr
-%{_datadir}/%{name}/get_iplayer.cgi
+%{_datadir}/%{name}
 %{_fillupdir}/sysconfig.%{name}
-%{_datadir}/pixmaps/iplayer_logo.png
 %{_datadir}/applications/get_iplayer_pvr.desktop
 
 %changelog

get_iplayer-2.82.tar.gz/CHANGELOG-get_iplayer.cgi.txt Deleted

@@ -1,234 +0,0 @@
-Version 0.70 - 20100226
-* Added Back buttons on recordings delete page.
-* Made delete page less verbose.
-* Changed 'Record' button and links to perform immediate recording in a new browser tab.
-* Added 'Queue' button and links to queue programme for PVR recording.
-
-Version 0.69 - 20100130
-* Added basic edit support for PVR List entries.
-
-Version 0.68 - 20100129
-* Fixed tab logic based on posted options as well as next page.
-
-Version 0.67 - 20100128
-* Set the pageno variable to 1 when we do a series/category/channel click otherwise results may be empty.
-
-Version 0.66 - 20100128
-* Disable update for win32 due to vista/win7 UAC VirtualStore problems.
-
-Version 0.65 - 20100125
-* Lots of cosmetic and layout changes.
-
-Version 0.64 - 20100124
-* Fixed problems with html entity encoding with passed search params.
-* Added Freevo FXD format into metadata formats.
-* Added PVR Hold off period option.
-* Currently displayed options tab is no longer saved as default.
-* Simplified the tab selection code.
-* Fixed a few CSS errors when hiding the options tabs.
-
-Version 0.63 - 20100122
-* Added Series, Category and Channel hyperlinks.
-* Moved column selectors to options panel.
-* Column selections are now saved with settings.
-* Added support for future programme schedule searches.
-* Delete button now removes thumbnail, subs and metadata files.
-
-Version 0.62 - 20100121
-* Integrated improvements in get_iplayer v2.65 using --skipdeleted option.
-* Guess URLs of missing thumbnails.
-
-Version 0.61 - 20100120
-* Added action bar after programme listings for ease of navigation.
-
-Version 0.60 - 20100107
-* Added Series/Episode Numbers to headings.
-
-Version 0.59 - 20091108
-* Check for get_iplayer script at start-up.
-* Added --before option to GUI
-
-Version 0.58 - 20091107
-* Fixed bug where multiple prog types werer being specified when record was clicked.
-
-Version 0.57 - 20091024
-* When multi-select Play is used in Search mode, if there is no mode associated with the programme, use the users modes list.
-* Force livetv mode to not transcode for stream modes.
-
-Version 0.56 - 20091023
-* Updated default modes lists to allow for new flashaachigh, flashaacstd and flashaaclow modes.
-
-Version 0.55 - 20091021
-* opml top-level menu mode added for new Squeezecenter plugin.
-
-Version 0.54 - 20091002
-* Fixed bug where refresh page didn't correctly set the selected prog types when reloading or forced refresh.
-
-Version 0.53 - 20090924
-* Minor UI tweaks to page titles and fixed a few typos.
-
-Version 0.52 - 20090922
-* Fixed bug where form.target value was set incorrectly after a pvr run.
-* Made bitrate, frame rate and video size options apply to all streaming playback methods except file based playlists.
-* 'Refresh Cache' and 'PVR Run' now open sepearate tabs and auto-run according to interval set in preferences.
-* Todo: Use of async web requests to refresh caches and run PVR.
-* Normal use of the Web interface no longer refreshes the cache - this must now be triggered manually or on a PVR Run
-
-Version 0.51 - 20090920
-* Fixed bug when form values are set and submit() is called and upon 'Back' the field is still set - created a js function to backup and restore form in a global hash.
-* Made Remote Stream Type into a popup box.
-* Fixed 'Play' link on recorded files to create a playlist to play the file streamed from the get_iplayer server.
-* Fixed libfaac bitrate to 160k - the maximum supported.
-* Fixed bug where apostrophies in prog names or pids caused js errors.
-
-Version 0.50 - 20090919
-* Fixed squeezebox wav streaming for liveradio which broke in 0.49.
-* Improved and fixed auto-detection for audio flv streaming.
-
-Version 0.49 - 20090918
-* Fixed bug where 'Play' links in search mode were not inheriting the modes option.
-* Added a Remote Stream Type option to allow user to control what media format gets sent to the media player.
-* If Remote Stream Type is set to 'none' then all transcoding is disabled.
-* Issue: Play links are causing stream_prog to remux get_iplayer flv output to flv, unavoidable unless we can get the mode in advance of streaming.
-* Issue: URL based pids like http://news.bbc.co.uk/1/hi/uk/7875336.stm which have different content at different times need to have a unique id added to pid.
-
-Version 0.48 - 20090918
-* Improved Options tabs navigation.
-* Simplified a few button labels.
-* 'Update Software' now updated get_iplayer also.
-* Todo: Read-only mode - i.e. start-up or ENV option to remove all write or PVR changes
-* Todo: Add a 'Run' action to each item in the PVR List to allow it to be recorded right away.
-
-Version 0.47 - 20090917
-* All recorded or localfiles media can now be streamed remotely - access PVR from anywhere.
-* Re-mux mp4/avi/mov files to flv when direct streaming recordings from the web server, this allows remote streaming into a media player.
-* Added Reverse Sort preference.
-* Added stream transcoding audio bitrate, video size and framerate options for 'Remote Play' streaming.
-* Added new Display/Search/Output/Streaming preferences tabs.
-
-Version 0.46 - 20090916
-* Rework playlist URLs
-* Added support for PlayFile action on pids that are files
-* Moved paging and sortng of search results into get_iplayer for better efficiency
-* Created functions to build the playlist and stream URLs
-* Forced ffmpeg to output stereo regardless of mono source - fixes problems with Squeezebox.
-* Added 'Quick URL' box to allow user to either record play any supported iPlayer or BBC video/audio page.
-* Known Bug: 'Play' link for Quick URL recordings where the pid is a URL doesn't work
-* Todo: Add a way of getting opml URLs (footer link?)
-
-Version 0.45 - 20090914
-* Where the recordings history has relative paths, try to convert to absolute paths so that playlists work
-* Added 'Create File Playlist' action button to 'Recordings' tab
-
-Version 0.44 - 20090913
-* Added 'Delete Selected Recordings' button
-* Hide deleted recordings option
-* In ACTION=direct mode, use PID=<pid>|<mode> because there may be >1 mode per pid
-* Added a preferences page/tab.
-
-Version 0.43 - 20090913
-* Added thumbnail, metadata and subtitle download support
-* Recording options now get applied with 'Queue'
-* 'Recordings' tab now works in non-search pages
-* Added filename and mode columns for Recordings list
-
-Version 0.42 - 20090912
-* Support https protocol under apache.
-
-Version 0.41 - 20090911
-* Added 'Recordings' Tab as a quick way of accessing history, clears a number of search items to make all history show in most recent order.
-* History setting is no longer saved as a cookie (please remove this cookie if you have it saved)
-
-Version 0.40 - 20090911
-* 'PVR Run' now opens a new tab.
-* Added direct streaming/playback of recorded files in the history.
-
-Version 0.39 - 20090911
-* Fixed Apache CGI support
-* Changed all stream URLs from http://127.0.0.1/METHOD?options to http://127.0.0.1/iplayer?ACTION=METHOD&options - see README-get_iplayer.cgi.txt
-* Old stream URLs should still work with embedded web server in addition to new form above.
-* Made Output directory override option apply to 'Queued for Recording' and 'Queue'
-
-Version 0.38 - 20090910
-* popup a warning if no programmes are selected for some actions.
-* Made the info page prettier, made URLs into hyperlinks and display a thumbnail, added Play and Queue buttons
-* Added ability to search PVR history of recordings.
-* Added tooltips for all options.
-* No display of broken thumbnails.
-
-Version 0.37 - 20090909
-* Fixed empty modes list for create playlist button.
-* Added flashstd mode to default modes list.
-
-Version 0.36 - 20090908
-* Added back buttons.
-* All PVR manipulation pages now re-list the PVR searches after performing the PVR add/queue/del.
-* Improved signal handling.
-
-Version 0.35 - 20090907
-* Remove SINCE option from Series link.
-
-Version 0.34 - 20090907
-* Created win32 specific command forking subroutings cos windows is rubbish with forking in perl.
-
-Version 0.33 - 20090905
-* Added 'Series' link to each listed programme to allow the creation of a PVR record for that series.
-
-Version 0.32 - 20090905
-* Improved external command invocation to use IPC::open3 and non-shell where possible
-* Latest automated installer 2.2 required for non-Unix platforms
-
-Version 0.31 - 20090813
-* Added tooltip help to buttons
-
-Version 0.30 - 20090813
-* Modified the items per page list. Now defaults to 10
-* Display the Programme Types in a multi-row table for better readability.
-
-Version 0.29 - 20090805
-* URL encode all user definable fields that are sent to get_iplayer to improve security
-* Changed versionlist to versions for sort and search fields
-* Added --listen option for listen address - defaults to 0.0.0.0
-* Warn user of insecure remote access capability if 127.0.0.1 is not used for a listen address
-* Added script update feature
-* Added Queue option for each programme
-
-Version 0.28 - 20090730
-* Tweaked Run PVR so that output gets rendered in browser.
-* Updated mouse pointers over links and buttons.
-* Added iphone and realaudio to the mode list for 'Play' generated playlists.
-* New Logo
-
-Version 0.27 - 20090729
-* Added a new 'P' link to each programme. Clicking on it opens a player to play the contained M3U playlist.
-
-Version 0.26 - 20090728
-* Added ability to create playlist from selected programmes in GUI
-
-Version 0.25 - 20090727
-* Added --port, --getiplayer, --debug and --ffmpeg options to replace old cmdline args
-* get_iplayer is now searched for in cwd and /usr/bin if not specified using --getiplayer
-* Fixed bug where get_iplayer command was not correctly called for plugin evaluation
-
-Version 0.24 - 20090724
-* Squeezebox Browseable OPML playlist support
-* Add a favourite to Squeezebox e.g. http://<SERVER_IP>:1935/opml?PROGTYPES=radio&MODES=flash,iphone&LIST=channel
-* Or for AAC liveradio: http://<SERVER_IP>:1935/opml?PROGTYPES=liveradio&OUTTYPE=wav
-* Requires get_iplayer 2.11 or later
-
-Version 0.23 - 20090723
-* Playlist generation support - point vlc or mplayer at "http://127.0.0.1:1935/playlist?TYPE=<progtype>"
-* Playlist URLs can use the SEARCH='<regex>' syntax to limit the playlist to names of programmes.
-* e.g. "http://127.0.0.1:1935/playlist?PROGTYPES=liveradio&SEARCH=' \d '" to limit to liveradio with single digits in names.
-* Syntax change for streaming proxy support: 
-* e.g. FLAC stream for liveradio: http://localhost:1935/stream?PID=liveradio:bbc_radio_one&MODES=flashaac&OUTTYPE=flac"
-* ffmpeg needs to be in the system PATH of the shell that invokes it.
-
-Version 0.22 - 20090722
-* Vastly improved streaming proxy support.
-* e.g. FLAC stream for liveradio: http://localhost:1935/stream?SEARCH=liveradio:bbc_radio_one&MODES=flashaac&OUTTYPE=flac"
-* Can now get high quality WAV streams of flashaac radio and liveradio on a Squeezebox.
-
-Version 0.21 - 20090719
-* Updated PVR Manager script with latest options changes.
-* PVR Manager now runs better under Win32 - still no streaming.

get_iplayer-2.82.tar.gz/CHANGELOG.txt Deleted

@@ -1,1384 +0,0 @@
-Version 2.75 - 20100307
-* Fixed bug where symlinks could be created when streaming-only.
-
-Version 2.74 - 20100307
-* Fixed regression from 2.74 in failing to make dir for non-existant output dir.
-
-Version 2.73 - 20100307
-* Fix typo in --refreshfuture option.
-* Only create output and/or subdir when actually required - fixes bug where subdir was created when streaming-only.
-* Removed incorrect entity decoding of iPlayer RDF.
-* Remove some deprecated options and tidied help a little.
-* Removed support for flvstreamer prior to v1.8.
-
-Version 2.72 - 20100226
-* Skip subtitles download if the file already exists.
-* Only rename the partial subtitle file after the whole stream is recorded  successfully.
-
-Version 2.71 - 20100225
-* Added modeshort substitution parameter which is the same as mode but without the trailing digit.
-* Make sure that any fileprefix that specifies mode doesn't use the trailing digit to prevent duplicate recordings in some cases.
-* Sort by connection priority in mode numbering.
-* Improve user agent function.
-
-Version 2.70 - 20100225
-* Added a new XML connection media detection for audio/mp3 for flashaudio mode.
-
-Version 2.69 - 20100225
-* Added BBC Radio Sussex into local radio lists.
-* Fixed regression bug where URLs would not get recorded if XML::Simple was available.
-* Improved error detection for bad rdf URLs.
-
-Version 2.68 - 20100222
-* Added ability to filter which PVR searches get run by '--pvr [<regex>]'
-* Added ability to exclude matching PVR searches by name using --pvr-exclude=<regex>
-* Fixed listing of embedded pids in a brand page that don't have a series.
-
-Version 2.67 - 20100219
-* Fixed iphone mode since BBC have recently removed the stream data from the public mediaselector XML metadata.
-* If --pid is used with series or brand pids/urls will now list record all contained episodes.
-* if --pid-recursive is used with the above it will record all the contained brand/series episodes.
-* The above feature requires XML::Simple perl module
-* Search now applies to the concatenated fields as opposed to each field individually,
-
-Version 2.66 - 20100123
-* Added episodenum and seriesnum to history.
-* Fixed a bug where if an invalid option was detected, output would revert to STDERR.
-
-Version 2.65 - 20100121
-* Fixed -V to display version even when --nocopyright or --silent is set.
-* Added ability to get iPlayer programme metadata and thumbs even if a programme is unavailable.
-* The use of --metadataonly, --subsonly or --thumbonly options will now prevent a recording when used with --pid.
-* Overhauled the method of getting metadata, subs and thumbnails for existing programmes in the history.
-* It will now create metadata files, subs and thumbs matching the prefix of the originally recorded file.
-* e.g. 'get_iplayer --history --metadataonly --subsonly --metadata=generic --thumbonly <search of history>'
-* Or, 'get_iplayer --history --metadataonly --subsonly --metadata=generic --thumbonly --pid <pid in history>'
-* Added --skipdeleted to skip matches if the media file has been deleted when in --history mode.
-* Metadata/thumbs/subs for previously recorded programmes will now use the historical fileprefix, dir and ext (use with --history).
-
-Version 2.64 - 20100119
-* Added ability to negate boolean options by prefixing with 'no-' e.g. --no-raw
-* Fixed buglet where invalid options resulted in an empty option being created.
-
-Version 2.63 - 20100118
-* Fixed --exclude option so that it now applies to all search fields specified using --fields (or --long).
-* Bad options in the options files will now no longer result in an error but only a warning.
-* Added -V to display version and exit.
-* Tidied up help and usage text.
-
-Version 2.62 - 20100117
-* Added the --subdir-format option to specify the format to be used for the subdirectory naming (--subdir) using substitution fields e.g. '<nameshort>/<seriesnum>'
-* If there is no series and episode number detected, make the <senum> field empty.
-* Fixed podcast and localfiles plugins to match rest of code clean-up done in 2.61.
-
-Version 2.61 - 20100115
-* Fixed bug where history was not checked when a BBC /programmes/ URL was used resulting in recording for multiple modes.
-* More code cleanup, less use of %hashes for readability.
-* Remove undefined tags in --fileprefix substitutions.
-* Added fields <nameshort> and <episodeshort> which are the same as <name> and <episode> but with the Series and Episode numbers stripped out.
-* Added field <senum> to contain s##n## format for Boxee, MythTV and XBMC series and episode number parsing.
-* e.g. use option --fileprefix='<nameshort> - <episodeshort>.<senum>.<pid>'
-* Added fields <descshort> and <descmedium> which are descriptions limited to 255 and 1024 chars respectively.
-* Improved metadata tagging of year for mp3 and qt files.
-
-Version 2.60 - 20100114
-* Fixed PVR mode bug from 2.59 where only the first search worked.
-* Cleaned up code lots and fixed almost all perl warnings.
-* Fixed bug in quicktime metadata atom insertion.
-
-Version 2.59 - 20100113
-* Added --future option to allow searching of future programme schedules / EPG for BBC Radio and TV (if indexed).
-* Added --refresh-future option to allow indexing of future programme schedules / EPG for BBC Radio and TV when refreshing the caches.
-* Running the PVR is now much faster due to caching the cache and history files in memory between PVR searches.
-* Updated list of available radio channels.
-* Improved display of help where options can be used in more than one context e.g. --long.
-* Prevent repeated metadata requests when the metadata retrieval fails.
-* Renamed --ignorechannels to --refresh-exclude.
-* Added --refresh-include option so that only matching channels are indexed when refreshed.
-* Fixed --multimode where existing file check was incorrectly failing.
-
-Version 2.58 - 20100109
-* More programme name and episode parsing improvements.
-
-Version 2.57 - 20100108
-* In freevo metadata format, do not use full path to media file.
-* Updated credits for --email options to Network Ned, andy <AT SIGN> networkned.co.uk, http://networkned.co.uk
-* Added --limit-matches so that this can be used as a safety-net incase a pvr search inadvertently has too many matches.
-* Updated help a little.
-
-Version 2.56 - 20100107
-* Fix flvstreamer/rtmpdump version detection.
-* Improved episode name extraction from meta-data to include episode number where appropriate.
-* Added episode and series numbers to caches.
-* Added freevo as a metadata format.
-* Added --email options to allow for scheduled html search results to be sent by email (Credit: Stroller). 
-
-Version 2.55 - 20100102
-* Fixed lockfile for --pvrscheduler option.
-
-Version 2.54 - 20100102
-* Added --pvrscheduler option to run the PVR at regular intervals.
-* Fixed buglet where stat was called on a non-existent cache file in debug mode.
-* Improve series/episode number extraction from meta-data.
-* Added workaround where abs_path does not work in win32.
-* Bumped copyright years.
-
-Version 2.53 - 20091231
-* Auto-detect http:// or <type>:http:// URLs in a search term and set it as if it were a --url option.
-* Revert change from 2.21 and read system-wide options additionally from /etc/get_iplayer/ as /var/lib/get_iplayer/ violates the FHS and Debian policy.
-* Display warning that /var/lib/get_iplayer/ will be deprecated in future.
-* Get extended metadata if --fileprefix is used.
-* Added support for extended / alternate programme versions that have no version name set.
-* Added support for multiple programme versions with the same name.
-* Added --show-cache-age option to display age of selected programme caches.
-* Removed a bunch of deprecated options.
-* Display only the mode names without the numerical suffix in help messages.
-* Added --ignorechannels option so that matching channels are not even indexed when refreshed.
-
-Version 2.52 - 20091226
-* Parse embedded mp3 flashaudio programmes that do not have the encoding attribute set.
-
-Version 2.51 - 20091221
-* Fix bug where essential stream metadata lookup was skipped if only iphone mode was specified.
-* URL encode the url passed to a prepend type proxy request.
-
-Version 2.50 - 20091220
-* Fixed iphone mode after BBC changed things earlier this week.
-* Improved and fixed mms and rtsp url parsing from asx and ram playlists which now parses new wma radio stream metadata.
-* Added new pattern to connection metadata parsing for aac audio which fixes world service.
-* Changed option --itvnothread to --mmsnothread.
-
-Version 2.49 - 20091118
-* Remove purchaseDate tag from mp4/AtomicParsley/iTunes tagging as this causes problems with iTunes.
-* Strip out unsubstituted tags in metadata files
-
-Version 2.48 - 20091110
-* Added episode and season numbers and aired date to metadata files and nfo files.
-* Added --fatfilename option for those DOS users. Submitted by David Pottage.
-
-Version 2.47 - 20091108
-* Tweaked tagging some more.
-
-Version 2.46 - 20091108
-* Fixed using full datespec for year tag in AtomicParsley tagging.
-* Improved metadata tagging format with AtomicParsley.
-
-Version 2.45 - 20091106
-* Fix bug with authstring typo in level3/iplayertok CDN rtmp parameters which caused iPlayer HD to often fail.
-
-Version 2.44 - 20091102
-* windows7 or Vista can set the HOME environment variable so check for USERPROFILE first to determine if this is a win system.
-* Added --before option to limit search results to programmes added before a specified number of hours.
-* Fixed bug where --atomicparsley path override was ignored.
-* Added advisory and genre tags to AtomicParsley tagging.
-* Use full datespec for year tag in AtomicParsley tagging.
-* Set AtomicParsley mp4 'stik' tag to 'Film' or 'TV Show' depending on programme category.
-
-Version 2.43 - 20091024
-* Added support for new flashvhigh, flashhigh, flashstd and flashnormal BBC Live TV modes.
-* Added --livetvmode option.
-* Updated iPlayer EMP swf revision.
-* Fixed bug where --exclude comma separated values were not split into different terms to exclude.
-* Added AtomicParsley support for tagging mp4 files - submitted by Jimmy Aitken.
-* Added detection for different audio rtmp AAC stream bitrates.
-* flashaac is now expanded into flashaachigh, flashaacstd and flashaaclow.
-
-Version 2.42 - 20091015
-* Fixed bug where external binary options got added to command line multiple times.
-
-Version 2.41 - 20091002
-* No longer make episode == title if the episode isn't defined as this makes the filename too long.
-* For user commands, escape characters that have a special meaning in bash double quotes.
-* Implemented workaround where mplayer cannot understand drive letters preceeding file paths for pcm output.
-* Check for generated filename paths longer than 255 characters and generate error.
-
-Version 2.40 - 20090926
-* Fixed bug introduced in 2.32 where using the info option with --get would result in a file extension of EXT.
-
-Version 2.39 - 20090924
-* Fixed bug where named pipe filename was not quoted in command strings causing problems where the user profile dir contained whitespace.
-
-Version 2.38 - 20090922
-* Fixed bug where --expiry option was being ignored.
-* localfiles plugin no longer uses unix find command so will work under win32.
-
-Version 2.37 - 20090921
-* Fixed name and episode extraction from URL title metadata.
-* Do thumbnail download before running user commands.
-
-Version 2.36 - 20090915
-* Fixed bug where options were not bound when refreshing cache for external plugins
-* Added Programme class method to set per-type expiry.
-* Added new experimental localfiles mp3 plugin - requires MP3::Info - only in SVN
-* Added new Streamer::filestreamonly class for localfiles plugin
-* Added --page, --pagesize, --sort=<field>, --sortreverse to control output of displayed matches
-* Sort mode disables tree mode
-* When getting index feeds for a programme type, don't delete the old cache file if it fails.
-* If name is not defined after getting metadata then set the name to longname - helps with naming of url recordings.
-* If the pid is a URL then set the metadata web field to this URL.
-* Removed old itv plugin because it no longer works.
-* Known bug: localfiles plugin does not work for win32 yet.
-
-Version 2.35 - 20090914
-* Save absolute paths in history instead of relative ones.
-
-Version 2.34 - 20090913
-* When loading history, if there is a duplicate pid append the mode and filename fields with the existing record.
-* Fixed bug where --pvrqueue ignored a default or preset --type value.
-* Made thumbsize support more intuitive, --thumbsize now affects thumb downloads and metadata files, --thumbsizecache only affects the caches upon refresh.
-
-Version 2.33 - 20090911
-* Added detection for bbc streaming urls with mediaselector params in them.
-
-Version 2.32 - 20090910
-* --info now shows fileprefix and filenames, EXT is used if the file extension is not yet known.
-* Added much more metadata to the history file to allow history search support.
-* History entries can now be listed and searched by adding --history .
-* The --info, --thumbonly, --metadataonly and --subsonly options can now be used with --history to get metadata after recording.
-
-Version 2.31 - 20090909
-* Added --thumbonly option to download the thumbnail without recording the programme
-* The --thumbonly option implies that the --thumbnail option is set.
-* Options --subsonly, --thumbonly, --metadataonly and --streaminfo are now done outside of the usual programme recording loop.
-* Corrected file open bug for subtitles and thumbnails which failed in nowrite mode.
-* Cleaned up stray newlines in logging.
-* Fixed versions list population for prog types that have no verpids.
-
-Version 2.30 - 20090909
-* Fixed bug where iplayer name and episode was parsed incorrectly if there was no ':' in the title.
-* Added 832x468 thumbnails to the list for --thumbsize.
-
-Version 2.29 - 20090908
-* Fixed bug: webrequest processing incorrectly used '-' as a delimiter.
-* Fixed bug: incorrectly interpreted error return codes from open3 external commands.
-* Send increasingly destructive signals to spawned commands if a SIGTERM/PIPE/INT is received.
-
-Version 2.28 - 20090907
-* Backed out change to use http://feeds.bbc.co.uk/iplayer/[channel]/list/limit/400 instead of http://feeds.bbc.co.uk/iplayer/[channel]/list as this results in more programmes.
-* Added in a SIGTERM handler for the external program calls - if get_iplayer gets a SIGTERM then send one to the external program.
-
-Version 2.27 - 20090905
-* Thumbnail size support.
-* Use --thumbsize=N to select the size of the thumbnails in the cache (use --info to see available thumbnail sizes).
-* Use --thumbsizemeta=N to select the size of the thumbnails used in the metadata (use --info to see available thumbnail sizes).
-* --thumbsize option requires the cacahe to be refreshed to update the default sizes.
-* Tweaked debug for exit code display in debug mode.
-* Added --help-basic for simplistic help page.
-* --debug now switches on --verbose.
-* Added new --series option which lists only series names with number of episodes and categories.
-* Remove commas from source category names otherwise the comma spearated list of categories gets confusing.
-* Improved accuracy of bbc iplayer programme feed name and episode parsing.
-* Fixed bug where streaming-only mode would fail if the recorded file already existed.
-
-Version 2.26 - 20090904
-* Dropped support for rtmpdump versions older than v1.5
-* Improved flvstreamer, id3v2, vlc, ffmpeg and mplayer invocation to avoid using shell
-* Fixed bug where unlink was called as a command when purging old recordings
-* Fixed --wav and --raw modes on non-Unix platforms for realaudio modes
-
-Version 2.25 - 20090901
-* Popular and Highlights tv and radio programmes are now tagged as categories.
-* e.g. To list most popular tv programmes use --category=popular
-* e.g. To list tv highlights use --category=highlights
-
-Version 2.24 - 20090901
-* Extract even longer description from BBC programmes site metadata for info and metadata files.
-
-Version 2.23 - 20090831
-* Extract longer description from BBC iPlayer metadata for info and metadata files.
-* Abort with an error if the download_hostory file is not writable in append mode.
-
-Version 2.22 - 20090827
-* Fixed small bug where number of matches was not displayed in non-pvr mode.
-* Added "Audio Described" category search to tv mode.
-* Changed method of merging the list of programme versions for tv/radio modes.
-* Made "Misc" options visible in advanced/long help mode.
-
-Version 2.21 - 20090826
-* Added --packagemanager=disable option for externally managed get_iplayer pkgs.
-* Changed /etc/get_iplayer/options to /var/lib/get_iplayer/options as a default system-wide options file for *nix to comply with Linux FHS.
-* Give a warning if options exist in /etc/get_iplayer/options
-
-Version 2.20 - 20090825
-* Added --metadataonly option to retrieve programme metadata without streaming or recording the programme.
-* Thumbnails can also be retrieved alone by using --thumbnail option with --metadataonly.
-* Added/improved --metadata=xbmc_movie format.
-
-Version 2.19 - 20090824
-* If --multimode is used record all modes in one invocation of get_iplayer.
-
-Version 2.18 - 20090822
-* If --multimode is used, --hide has no effect. Without this PVR mode will fail to work with multimode
-
-Version 2.17 - 20090822
-* If an unknown new CDN connection is found for an iPlayer programme, do not add it to the mode list
-* Added --multimode option to allow the recording of multiple modes of the same programme
-* WARNING: --multimode will record *all* specified/default modes for each programme
-* If multimode option is used, put the mode name in the default filename prefix
-
-Version 2.16 - 20090815
-* Added new flashstd iPlayer TV mode (480kbps H.264 640x360)
-* Changed default tv modes to: iphone,flashhigh,flashstd,flashnormal
-* Tweaked PVR text output
-* Fixed thumbnails and web urls for liveradio and livetv
-
-Version 2.15 - 20090804
-* Remove nocopyright option from pvr save options
-* Move --itvnothread option to main script as it is not actually used in itv plugin and causes problems for installer.
-
-Version 2.14 - 20090801
-* Run command even after streaming to stdout.
-* Allow --hash option to affect flvstreamer command if it supports this feature.
-* Made flvstreamer exit code handling better when streaming
-
-Version 2.13 - 20090729
-* With rtmp recordings, retry when any non-zero exitcode is returned from flvstreamer.
-
-Version 2.12 - 20090726
-* --force now overrides --hide. This allows force to have the desired effect in pvr mode.
-
-Version 2.11 - 20090724
-* --list now takes account of search parameters when counting and creating unique list
-
-Version 2.10 - 20090719
-* Updated PVR Manager script with latest options changes.
-* PVR Manager now runs better under Win32.
-* Renamed --rtmpstop & --rtmpstart to --stop & --start.
-* The --stop and --start can now be used with both realaudio and rtmp streams.
-* Improved partial proxy support.
-* Skip mediaselector stream lookup if only iphone mode is specified.
-
-Version 2.09 - 20090712
-* Ensure rtmpdump option is still recognised after warning.
-
-Version 2.08 - 20090709
-* Fixed bug in options and preset parsing.
-
-Version 2.07 - 20090708
-* Added new sislive realaudio CDN.
-* Run the init method before checking download history so that live streams ignore history.
-* min_download_size is now defined on a per programme type basis.
-* Added support for flvstreamer stop/start offsets using --rtmpstart and --rtmpstop options.
-* Use --rtmpstop to limit length of live rtmp recordings which have timestamped streams.
-* Allow --url to specify BBC iPlayer tv/radio short URLs like 'http://www.bbc.co.uk/i/lbtbg/'
-* iPlayer urls can optionally have a start offset appended like '?t=16m51s' (must use flvstreamer 1.8c or later).
-* Fixed download retry loop bug where a different mode for a programme was tried where the next programme should have been tried.
-* Prevent thumbnail download, id3tagging, command and download history logging if streaming only.
-* All option names, not just the internal names, are allowed in option and preset files.
-* Added patch by Steven Luo to make different speakers appear on different lines in subtitles.
-* mp3/aac mode auto-detect for audio EMP urls.
-
-Version 2.06 - 20090706
-* Improved and simplified CDN parser for iPlayer mediaselector data
-* New iPlayer CDN streams will now mostly be automatically found when added by the BBC.
-* Added checks for invalid and deprecated options in options files and presets.
-* Recognise iPlayer tv pids starting with p0.
-* iPhone redirect URL no longer looked up if iphone is not a selected mode.
-* Added BBC Radio 4 Long-Wave into liveradio channel list.
-* Added --rtmplivetvopts and --rtmpliveradioopts options.
-* flvstreamer v1.8b recommended for better reliability.
-* Reduced flvstreamer timeout to 10 secs because I'm impatient.
-
-Version 2.05 - 20090701
-* Fallback to allow xml BBC EMP playlist urls to be directly specified for --pid/--url requests.
-* Allow specification of a BBC Programmes page with an embedded player when using --url.
-* Allow spaces in path for external binaries.
-* Bumped player version for iPlayer.
-* Fixed flashaac1 mode to append authstring in playpath.
-
-Version 2.04 - 20090626
-* Simplified live BBC streaming support.
-* Added --type=livetv and --type=liveradio which simplifies searching/streaming/recording live BBC tv and radio channels.
-* Added --stream option which is an alias of --nowrite and --stdout.
-* Added --player option which will pipe all output to the specified command for direct streaming.
-* Added --attempts option to set the number of attempts to make or resume a failed connection.
-* Example usage: get_iplayer 'BBC Four' --type=livetv --stream --player='mplayer -cache 128 -'
-* Added --modes option - a general set of default modes for all programme types.
-* Changed --amode to --radiomode and added --liveradiomode options.
-* Changed --vmode to --tvmode.
-* Commandline search arguments now get added to presets and options if specified.
-* The id3tag tool can be used instead of id3v2 - use the --id3tag option to specify it.
-* Assume that ITV stream is successful if file is > 10MB even if there is a reported error to stdout.
-* The Chnagelog since the previous version is displayed after updatng get_iplayer.
-* rtsp and mms streamers now cope better with nested asx playlists.
-* Force --raw when --stream is used with radio or live radio to prevent lame or ffmpeg transcoding.
-* Fixed bug where tee function was not correctly referenced in rtsp streamer.
-* Fixed flashaac2 mode for mp3 streams.
-* Don't check download history when live streams are being streamed or recorded.
-* Fixed lwp timeout invocation bug.
-* Fixed get method return codes for iphone and mms streamers.
-* Error if stdout is requred for mms streams.
-* Check that external programs are also executable in exists_in_path function.
-* Deprecated --usertmpdumpexit option which is now always assumed to be true.
-* Caveats: --player and --stdout streaming does not work properly on windows.
-
-Version 2.03 - 20090620
-* Added in debug level options to control verbose output from flvstreamer
-
-Version 2.02 - 20090619
-* Added support for BBC world service Live and bulletin AAC streams from the worldservice page
-* Much more reliable Live streaming with new flvstreamer v1.8
-* Fixed bug where raw audio flv files were id3 tagged
-* Removed incorrect -auth parameter from flvstreamer
-* Bumped BBC iPlayer swf version
-
-Version 2.01 - 20090618
-* Fixed bug where cmdline options were being overridden by default options
-
-Version 2.00 - 20090617
-* Tag substitution now uses version-specific metadata about the recorded programme.
-* Caveat: if --pid is used to record a programme less metadata will be obtained
-* Added <dldate> and <dltime> tags to allow for these download timestamp tags in filenames etc.
-* Options presets can be applied so that you can have a saved set of options and invoke them using --preset or -z
-* User options and Presets can now be edited as follows
-* Option --prefs-show displays all options in the user options or preset if specified
-* Options --prefs-add and --prefs-del adds/deletes specified options from the user options file or preset if specified
-* Option --prefs-clear removes *all* options from the current preset or user options
-* Option --preset selects predefined sets of options
-* Option --preset-list lists all saved options presets
-* Using --save option now reports an error telling user to use --pref options
-* Option --pvr-single runs a specifically named PVR search
-* User profile direcotry can now be overridden using --profile-dir
-
-Version 1.99 - 20090613
-* Fixed Win32 file move and rename bug.
-* Added --metadata=<type> option which creates a file with programme metadata after download.
-* --metadata=xbmc creates a .nfo file (not verified in XBMC yet) and --metadata=generic creates an .xml file.
-* Improved the programme versions searching using version substring matches.
-* e.g. --versions=def,sign  will match and try to record default and signed programmes in that order.
-* Get full info metadata before any download so that full substitution works for --metadata and --command options
-* Only get verpid metadata if we dont have it already.
-* The various search options can now use a comma delimiter as an implied OR.
-
-Version 1.98 - 20090611
-* Bugfixes to prevent some metadata lookups for BBC EMP and Live iPlayer content
-* Set flvstreamer timeout down to 20 seconds
-* Fix id3 tagging where quotes were not properly escaped
-* Fix radio pid parsing for live URLs
-
-Version 1.97 - 20090610
-* supports many more BBC web pages with embedded media such as Learning Zone
-* Updated with new BBC iPlayer swfUrl
-* Prevent checking for iPhone stream for BBC EMP and Live requests
-* Improved BBC iPlayer pid parsing
-* Limit filename to 256 chars max
-
-Version 1.96 - 20090610
-* Added support for BBC Embedded Media Player Live Channels and Videos
-* To stream or record embedded BBC video use option --pid tv:<URL>
-* Use of flvstreamer or rtmpdump 1.6 is recommended - older versions are flakey.
-* Live Radio streams are AAC 128-192kbps
-* Human readble timeadded output in --info
-* Cleaned up a few perl warnings
-
-Version 1.95 - 20090609
-* Added live BBC iPlayer radio and tv support
-* Live TV Streams are either 512x288 or 640x360 VP6 500-800 kbps
-* For live TV use options: --pid tv:<Channel URL/ChannelID> --vmode flashnormal
-* For live Radio use options: --pid radio:<Channel URL/ChannelID> --vmode flashaac,wma,realaudio
-* ChannelID can be found in the URL for the channel on the BBC iPlayer web page
-* Note that not all Radio channels have AAC streams
-* To stream add: --nowrite --stdout | mplayer -cache 128 -
-* Live flash streaming requires flvstreamer or rtmpdump v1.5 or newer.
-* Added validity checking to date and time calculations.
-
-Version 1.94 - 20090609
-* Fixed $_ bug
-
-Version 1.93 - 20090609
-* Fixed time function overflow - year must be limited to max 2038
-
-Version 1.92 - 20090608
-* Decoded entities for longname attribute for iplayer programmes.
-* Added Estimates of file sizes for each mode in --info output.
-* Now read the Version PID rdf metadata to display first and last broadcast times in --info.
-
-Version 1.91 - 20090606
-* Fixed bug with using webrequest and search options with pvradd
-
-Version 1.90 - 20090525
-* Fixed bbc tv subtitle ttxt to srt conversion bug
-
-Version 1.89 - 20090525
-* Fixed bbc tv subtitle ttxt to srt conversion bug
-
-Version 1.88 - 20090523
-* Fixed stdout streaming support when using flvstreamer tool
-
-Version 1.87 - 20090522
-* Added support for flvstreamer tool
-
-Version 1.86 - 20090519
-* Overhauled the get_iplayer updater
-* Plugins will now only be updated if they are all writable
-* Plugins in the system and user plugins dirs will all be updated
-* Added hidden --packagemanager option to allow packages to disable script based updates
-* Added --plugins-update option to force get_iplayer to download or update all the latest plugins
-* plugins update will run if no installed plugins are found
-
-Version 1.85 - 20090511
-* Moved more web requests to use common request_url_retry method
-* Added prepend url support for proxy option
-
-Version 1.84 - 20090507
-* Added STDOUT Streaming support for rtmp streams - only works with both --stdout and --nowrite
-* Moved itv get_url method to itv plugin
-* Make updater retry failed web updates
-
-Version 1.83 - 20090506
-* Drop support for Hulu, Channel4 4oD and Demand Five plugins.
-* Added new option to allow custom options to be added to rtmpdump invocation for BBC iPlayer --rtmp-tv-opts and --rtmp-radio-opts.
-* Modified help to reflect recording nature of PVR
-* Added --listplugins option to list the currently found programme type plug-ins or built-ins.
-
-Version 1.82 - 20090505
-* Full metadata is now obtained from cache if it exists before every get so that --command works properly with --pid.
-* Added --rtmpport option to allow users to override the rtmp port - allows use of port 443.
-
-Version 1.81 - 20090505
-* Force the updater to run if there is no plugins dir detected - required to make old versions obtain the plugins.
-* Full metadata is now obtained before every get so that --command works properly.
-* Converted itv type into a plugin.
-* Moved more global vars into respective methods.
-* Changed user-agent for updater.
-* Improved ua string selection.
-* Updated swf versions for iplayer.
-* Fixed guidance parsing in itv plugin
-
-Version 1.80 - 20090505
-* Tweaked updater to fix plugin copy bug
-
-Version 1.79 - 20090505
-* Tweaked updater
-
-Version 1.78 - 20090505
-* Tweaked updater
-* New plugin based distribution.
-* The --force option can now be used with --update to disable version checking.
-
-Version 1.77 - 20090504
- to make get_iplayer appear to be more like a conventional web browser to the server.
-
-Version 1.76 - 20090503
-* Bugfixed user agent setting and for scraping.
-
-Version 1.75 - 20090501
-* Fix ch4 scraping
-
-Version 1.74 - 20090501
-* Fix ch4 scraping
-
-Version 1.73 - 20090429
-* Switch off cookies when scraping five site otherwise downloads fail.
-
-Version 1.72 - 20090429
-* Remove LWP debug - oops
-
-Version 1.71 - 20090429
-* Demand Five - Channel 5 flash content now searchable and downloadable.
-* Demand Five requires rtmpdump v1.5.
-* Demand Five type is --type=five.
-* New Automated Installer released.
-
-Version 1.70 - 20090428
-* Channel4 4oD Catch-up indexing and search support.
-* Channel4 type is '--type=ch4'.
-
-Version 1.69 - 20090427
-* Initial Channel4 4oD Catch-up download support - requires rtmpdump v1.5.
-* Channel4 support should use options: --pid ch4:<PLAYurl> --vmode=flashnormal.
-* Indexing of Channel4 programmes to follow.
-
-Version 1.68 - 20090426
-* Added --hash option to output basic progress hashes instead of detailed progress.
-* Fixed bug where pvr name was not sanitized.
-* Removed colons and parentheses from PVR queue names - breaks some platforms.
-
-Version 1.67 - 20090423
-* Minor mods to webrequest option parsing.
-* Removed <br> tags in description of BBC iPlayer progs.
-* Validation of prog type before creating an object.
-
-Version 1.66 - 20090422
-* Programme type detection fixed for --pid downloads which are not in cache.
-* No more history file read warnings unless in verbose mode.
-
-Version 1.65 - 20090420
-* Added --nocopyright option to make the startup quieter.
-* Added --webrequest option to allow options to be specified as a single urlencoded string.
-* Added automatic manpage generation using --manpage option.
-* Help sections are now ordered more logically.
-
-Version 1.64 - 20090419
-* Fixed bug where a succesful download was not exiting the mode loop thus downloading all specified versions.
-
-Version 1.63 - 20090419
-* Fixed itv default vmode bug
-
-Version 1.62 - 20090418
-* Added new akamai CDN for BBC iPlayer flashhigh vmode to make it work again.
-* Only modes that exist for a programme are now attempted to be downloaded.
-* All selected modes are tried for each prog version bofre falling back to next version.
-* Programme stream data is now downloaded only once per download attempt.
-* stream data is now an attribute of the prog object.
-* In verbose mode unknown streams or CDNs are now reported.
-* Added flashlow2 vmode for new reported CDN
-
-Version 1.61 - 20090416
-* Added 1280x720 3200kbps HD download support for BBC iPlayer. Use --vmode=flashhd
-
-Version 1.60 - 20090416
-* Added --nothreaditv option to force ITV programme parts to download one after another.
-* --nothreaditv option works around bugs in Windows ActivePerl or Strawberry Perl with Vista.
-* Fixed bug to decode html entities in ITV programmes name, episode and guidance text.
-* Removed html entities from radio channel names
-* Added patch to insert programme type and index number into mythtv xml output
-
-Version 1.59 - 20090409
-* Modified --pvrlist output to make it easier to parse
-* Guidance is now correctly detected for BBC iPlayer tv
-* Fixed a small scoping bug in iPlayer get_links method
-* Added programme web url to metadata listing for --info
-
-Version 1.58 - 20090408
-* Added --subsraw to allow saving of the raw subtitles file.
-* Fixed bug where iphone mode sometimes had no streaming class defined
-* Detect iphone mode 403 responses
-
-Version 1.57 - 20090407
-* Fixed bug where a // in a path resulted in a 2 being added to the path when --subdir was used.
-* Fixed bug when using --command the command string was being over-sanitized.
-
-Version 1.56 - 20090405
-* Added in wmvdrm vmode and renamed mobile vmode to mobile_wmvdrm.
-* New ability to download wmv drm streams - cannot decode them though.
-* Changed name of class Streamer::podcast to Streamer::http.
-* get_stream_data method now sets streamer class and filename ext.
-* iPlayer radio and tv classes now share a common download method.
-* Radio modes are now attempted to be downloaded based on stream metadata rather than blindly trying them.
-* realaudio mode now creates symlink when beginning to download if required
-
-Version 1.55 - 20090404
-* If downloaded programmes of over 30 days old still exist the user is prompted to delete them.
-* This fair-use behaviour can be disabled by using the --nopurge option.
-* Filenames are now added to download history
-* VLC now quits correctly after a download for n95_mobile and n95_wifi vmodes
-
-Version 1.54 - 20090403
-* New Hulu programme feed indexing method
-* Minor code cleanup
-
-Version 1.53 - 20090403
-* Fixed small $_ scoping bug
-
-Version 1.52 - 20090402
-* Rewrote BBC iPlayer stream metadata parser
-* flashaac, flashhigh and flashvhigh modes are now expanded to try all CDNs modes in turn if one fails
-* Fixed flashvhigh stream detection - wrongly parsed flashhigh stream as flashhigh
-* limelight CDN rtmp vmodes now working with rtmpdump v1.4
-
-Version 1.51 - 20090401
-* Added support for experimental 1500kbps 832x468 resolution BBC iPlayer streams as flashvhigh vmode
-
-Version 1.50 - 20090331
-* Now supports rtmpdump-1.4 for Hulu using current --hulu-decrypt-pid method
-* Removed unusable RTMPE streams from Hulu stream data parsing
-* Specified --protocol and --port when invoking rtmpdump 1.4 to stop it complaining
-
-Version 1.49 - 20090322
-* The list of available download vmodes/amodes for a programme are now shown when you use --info
-* Work around divide-by-zero error in average download speed calculation
-* --info option now works for all programme types
-
-Version 1.48 - 20090321
-* Worked around bug where perl move can delete a file if src and dest are the same file in strawberry perl.
-
-Version 1.47 - 20090319
-* If an rtmpdump download fails try to resume and get new streamdata again so that it isn't stale.
-* Use a different number of retries for above depending on the mode of download - more for rtmp modes.
-* Removed patch from 1.44 which was broken.
-* Changed flashhd to flashvhigh as this isnt really HD quality.
-
-Version 1.46 - 20090317
-* Improved BBC HD iPlayer 720x404 RTMP support - alpha.
-* rtmpdump can now download HD streams better if using Level3 CDN.
-* Added rtmpdump version detection - needed for Level3 HD downloads
-* Known issue: content is not playable beyond first part.
-* Changed calling params to Streamer::rtmp::get
-
-Version 1.45 - 20090317
-* BBC HD iPlayer 720x404 RTMP support - alpha. The BBC haven't actually launched this service yet so it is subject to change.
-* Added flashhd mode for BBC iPlayer high-definition TV support
-* Known issue: I suspect that rtmpdump currently has problems downloading the full hd stream without timeouts
-* Fixed flashhigh parsing due to BBC iPlayer changes
-
-Version 1.44 - 20090314
-* If rtmp downloads timeout with exitcode 2 then try to resume them automatically up to 6 times to workaround bug/issue where audio downloads hang after approx 40-60MB.
-* You must still wait a few minutes for the download to timeout but at least it is hands-off.
-* Based on a batch submitted by Simon Quinn.
-
-Version 1.43 - 20090309
-* The --hulu-decrypt-pid option now requires both the decrypted pid and the auth string to be returned, separated by a space from the external program.
-* Changed the smil URL for hulu
-
-Version 1.42 - 20090305
-* Updated support for BBC Radio AAC/AAC+ audio streams after they changed their content delivery provider
-* Added the --isodate option to change the date in the filename to ISO8601 format: YYYY-MM-DD
-* Fixed a buglet where the lwp http proxy was being set unnecessarily
-* Added advanced option --use-rtmpdump-exitcode to use the rtmpdump exit code to decide whether a stream downloaded OK
-
-Version 1.41 - 20090226
-* Fixed bug in subtitle sanitizing
-* Added --overwrite option to allow previously downloaded files to be overwritten
-
-Version 1.40 - 20090224
-* Added --thumb and --thumb-ext options to automatically download thumbnail image and set extension fo the file
-* Use --thumb --thumb-ext=tbn options to have XBMC pick up thumbnails automatically
-* Fixed bug: make all valid options usable as pvr options
-* Added --hulu-decrypt-pid option to specify the exernal program that returns the decrypted hulu pid given the encrypted one as the first argument
-* Use environment variables GETIPLAYERUSERPREFS and GETIPLAYERSYSPREFS if they are set to override the get_iplayer user and systems prefs directories
-
-Version 1.39 - 20090217
-* BBC iPlayer get_metadata method now doesnt assume that every prog has an episode name
-* --info now displays all collected metadata
-* iphone download now uses 12 digit random number - probably not significant though
-* Cleaned up XML output for Freevo and MythTV and fixed some matching bugs
-
-Version 1.38 - 20090216
-* Automatically fetch programme metadata if required - useful with --pid mode
-* Fix get_hex method call in debug mode
-* BBC iPlayer get_metadata method now obtains more data
-
-Version 1.37 - 20090215
-* Code cleanup for metadata extraction
-* Added --hulu-pages, --hulu-sort, --hulu-types options for controlling the indexing hulu.com
-* Fixed bug where first line of cache files was assumed to be a cache-order definition
-* Simplified channel hashes
-* Added --subtitles-only option to allow only the downloading of subtitles (also sets the --subtitles option)
-* Worked around a Programme/Streamer class instantiation bug where options instance would not get bound to the class unless there was a single instance
-
-Version 1.36 - 20090214
-* Added new audio download mode for AAC audio "flashaac" for BBC iPlayer Radio (requires rtmpdump)
-* id3v2 also tags AAC audio files
-
-Version 1.35 - 20090211
-* Failure to download subtitles now no longer results in an empty file in hulu
-* The hulu vmode classification is now based on bitrate ranges 
-
-Version 1.34 - 20090211
-* Fixed small bug in Hulu closed-captions / subtitles SMI format parsing
-
-Version 1.33 - 20090208
-* Now downloads Hulu closed-captions / subtitles in SMIL format and converts into SubRip / srt format
-
-Version 1.32 - 20090207
-* Improved Hulu indexing and stream download support
-* Rewritten Hulu indexing method to use page scraping which is more controlled and sometimes faster
-* Now using category-based channels from Hulu site and limiting the number of pages per channel (10) to speed up scraping
-* All Hulu movies now added to index
-* Fixed subtitles TT to SubRip conversion. The BBC decided to add new html tags which broke it.
-
-Version 1.31 - 20090206
-* Changes tv vmode flashwii to flashlow for consistency between iPlayer and Hulu
-* Renamed hulu vmodes flash1/2/3 to flashhigh/flashnormal/flashlow for consistency
-* Bugfix: parse the H264(flashhigh) hulu stream url which was accidentally skipped
-* Changed default vmode list for hulu to be flashnormal,flashlow because flashhigh requires encrypted rtmp support
-* Sort the hulu vmodes based on reported bitrate in the metadata
- 
-Version 1.30 - 20090206
-* Added beta Hulu TV indexing and download support (US only) with the support of rtmpdump
-* Used the Hulu download method by Andrej Stepanchuk, author of rtmpdump
-* URLs containing PIDs can be specified with --pid together with a single --type
-* If a pid and single type are specified, no indexing is performed
-
-Version 1.29 - 20090205
-* Added --fields option to allow user to customise which programme fields to search using a comma-separated list
-* if ".get_iplayer/" exists in current working directory, use its options file to override any user/system options
-* Added --pvrqueue option to allow matching programmes to be added to the pvr download queue on a one-off basis
-* Fixed bug: Only skip the current programme download, and not exit, if file already exists
-* Added benign --comment option to allow annotation of pvr searches
-
-Version 1.28 - 20090131
-* Changed behaviour - all ITV progs now get downloaded under directory specified with --outputitv and not from --outputtv
-* Made global type hash local
-* Removed global download_dir hash and put functionality into generate_file_prefix method
-* Added detection of bad request url for iphone download method
-* Detect lack of programmes in iplayer playlists and report unavailability
-* Allow --streminfo in --pid mode
-
-Version 1.27 - 20090126
-* Fixed bug where the programme type leaked between PVR entries
-
-Version 1.26 - 20090126
-* Fixed tv vmode parsing bug
-* Rewrote retry/fallback mode loop code
-* Added StreamImage thumbnail element to xmlchannels output for mythtv
-* Fixed Stream element locations in xmlchannels xml output for mythtv
-
-Version 1.25 - 20090126
-* Fixed bug where >1 search index numbers on the commandline would be ignored if the type was not specified in --type
-* Made the cache type loading more intelligent - now only loads specified --type caches if absolutely required
-
-Version 1.24 - 20090125
-* Fixed broken podcast downloading
-
-Version 1.23 - 20090123
-* Fix bug where symlink in itv mode was not created unless --raw was specified
-* Fix bug where symlink fields were not substituted for several modes
-* itv symlink target is now the multi-part dir if there is more than one part
-* itv prog parts now have zero-padded part number to ensure they are played back in the right order
-* By default, only simple options are shown under --help.
-* Added --help-long option to show all options.
-* Fix bug where subdirs were not created correctly in itv mode using --subdir option
-
-Version 1.22 - 20090123
-* Fix bug where license/version info was sent to stdout in pvr mode
-* Added --showoptions option to display all set options and where they were defined
-
-Version 1.21 - 20090123
-* More OO refactoring
-* Added GPL text at runtime as per GPLv3
-* Added --conditions and --warrany options for GPLv3
-
-Version 1.20 - 20090122
-* Changed behaviour, --pid=<pid> now limits download attempts to specified prog types unless --pid=<type>:<pid> form is used
-* Changed behaviour, a search term can contain a pid but it must be in the form of 'pid:<pid>' and the correct prog type must be specified using --type
-* Major refactoring using OO Perl
-* Created Programme, Pvr, Streamer & Options classes
-* Allow Programme/Streamer/Pvr subclasses to add thier own options (and usage text)
-* Command line options are now dynamically processed
-* Added --listformat option to allow a user to specify the search output text format (using usual substitution fields)
-* Added %index_prog hash "index => prog instance" (done away with global "index => pid" hash)
-* Cache file format is now read from first line of each cache file - this will allow future format changes
-* Fixed symlinking of downloaded file when resuming iplayer tv/radio
-* Fixed unescaped <Name> data in --xml-channels output.
-
-Version 1.19 - 20090112
-Fixed dumb bug where RTMP video was being wrongly demuxed audio-only
-
-Version 1.18 - 20090111
-* Now use mplayer to demux the flv stream into mp3, ffmpeg can only seem to retranscode the flv to mp3 with obvious loss in quality.
-* Some output message tweaks
-* Simplified search result display creation
-* Fixed the episode subdir creation when ITV episodes have more than 1 part
-* Failed ITV prog parts are retried up to 3 times (mplayer is returning zero even when failed). Use backticks and get the error messages which come out of mplayer
-* In ITV mode, if any prpg parts are less than a minimum size then retry the download.
-* Added programme web page link to cache to enhance --html output and fix it for ITV and podcasts
-* Improved readability of html output
-
-Version 1.17 - 20090109
-* Scrape and index ITV player 'TV Classics' programmes (in addition to ITV Catch-Up progs) 
-* Added 'guidance' info to caches
-
-Version 1.16 - 20090109
-* Restructured code to make various download methods more consistent
-* Moved all media stream url resolution into get_media_stream_data()
-* Fixed ITV PVR downloading
-* Improved the text of lots of messages
-* Try to guess if ffmpeg has successfully transcoded an flv file by looking at the resulting file size
-* Added the "--exclude <regex>" option so that you can exclude programme names from your search
-* The --amode and --vmode options can now specify a comma separated list of audio or video download methods to try in order
-* Unified the http user-agent setup
-* Added download rate reporting in itv mode
-* Record audio/video download mode in download history
-* Workaround rtmpdump non-zero exit code even when it appears to succeed
-
-Version 1.15 - 20090107
-* Fixed undefined hash ref in get_media_stream_data that was causing some downloads to fail
-
-Version 1.14 - 20090106
-* Handle thread waiting more gracefully in parallel download mode
-* Display download byte counters for each ITV download thread
-* Display download rate/time summary for each ITV download thread
-
-Version 1.13 - 20090106
-* Added ITVplayer Catch-up Indexing and Searching support (use --type=itv)
-* Fixed bug in --list option - programme names were being incorrectly parsed
-
-Version 1.12 - 20090106
-* Added alpha support for ITV Catch-up downloads (--pid itv:<numeric pid from itv site>)
-* Added parallel download support for all parts of ITV programmes because they stream in realtime.
-* Fixed field length bug in metadata tagging of mov files.
-
-Version 1.11 - 20090104
-* Added iPlayer Flash Audio download support via rtmpdump tool / ffmpeg
-* The --amode (Audio Mode) option can now be set to 'flashaudio'
-* Reworked get_media_stream_data function to return a hash for more flexible usage
-* Display --streaminfo data in a much clearer way
-* --pvrlist now displays entries sorted alphanumerically
-* Allow --partial-proxy to affect subtitle downloading
-* Add user meta-data to iPhone/h.264 downloaded video (hopefully helps with iTunes)
-* In Quicktime files ftyp atom is now the first one which makes it more mp4 compliant
-* Fixed stdout iphone video mode with resumed downloads (broke in v1.06)
-* Fixed retry reporting on failed downloads 
-* Known issue: flashaudio downloads appear to fail even though they complete with rtmpdump v1.2
-
-Version 1.10 - 20090103
-* In rtmp mode, remove pageUrl detection - not required
-* Added capability of downloading RTMP Wii Flash video
-* Deprecated --mp3audio, --realaudio, --rtmp, --n95 options (they still work for now).
-* New options --amode=[mp3|realaudio] (default: mp3 fallback to realaudio)
-* New option --vmode=[iphone|rtmp|n95|flashhigh|flashnormal|flashwii] (default: iphone)
-* If --vmode is set to "rtmp" then try all rtmp modes (flashhigh/flashnormal/flashwii) until one works
-* Fixed typo bug which prevented lame transcoding realaudio to mp3
-
-Version 1.09 - 20090102
-* In rtmp mode, use authstring from streaminfo for calling new version of rtmpdump v1.2
-
-Version 1.08 - 20081231
-* In rtmp mode, If High Quality Flash RTMP version is used, use mp4 file extension
-* In rtmp mode, If High Quality Flash RTMP version is not available then use Normal Quality Flash RTMP version
-* In rtmp mode, if Normal Quality Flash is used, an avi file is created (ffmpeg cannot yet demux vp6 flv streams into mp4 containers)
-
-Version 1.07 - 20081230
-* --raw option now also prevents ffmpeg converting flv to mp4 format in rtmp mode
-* search options now affect the results of --html and --xml output
-
-Version 1.06 - 20081228
-* Send all text output to stdout unless --stdout or --pvr modes are being used.
-
-Version 1.05 - 20081228
-* Added resume option to rtmpdump invocaton
-* Get RTMP application name from BBC media metadata
-
-Version 1.04 - 20081225
-* Show thumbnail url for --info
-* Added RTMP Flash High Quality video download additions using rtmpdump from Andrej Stepanchuk (--rtmp)
-
-Version 1.03 - 20081221
-* Now use the new Coyopa streams for BBC Local Radio.
-* Added all BBC local radio stations to the radio channel list
-
-Version 1.02 - 20081220
-* Dont get index info from BBC site if were only specifying a pid to download (using --pid)
-
-Version 1.01 - 20081125
-* Added proxy workaround for some broken web proxies (--partial-proxy)
-
-Version 1.00 - 20081109
-* Added --hide option to remove programmes in listings when they have already been downloaded
-* Force the --hide option on when running PVR
-
-Version 0.99 - 20081103
-* Added new radio and tv channels: bbc_radio_nan_gaidheal, bbc_radio_cymru, and bbc_alba
-
-Version 0.98 - 20081103
-* Added tree-view --tree option for listing programmes
-
-Version 0.97 - 20081103
-* streaminfo sub now uses request_url_retry instead of download_block because this caused problems getting the RTSP urls for some strange BBC reason
-
-Version 0.96 - 20081024
-* Added streaminfo detection of N95 3G stream (in addition to the N95 wifi stream)
-* Fixed streaminfo detection which was somewhat broken - now split the media tags before
-
-Version 0.95 - 20081020
-* Added another use of the --raw option to stop the iPhone video downloads having their moov atoms re-arranged for partial download playback capability
-
-Version 0.94 - 20081014
-* Changed all references to N96 into N95
-* Streaminfo option now displays new Mobile WMV DRM stream data
-
-Version 0.93 - 20081013
-* Added id3v2 dependancy to deb and rpm
-* Now run tagging on --pid downloads
-
-Version 0.92 - 20081007
-* Added writable check for --update option
-* More checks around update file permissions
-
-Version 0.91 - 20081005
-* Allow cmdline args to override pvr search options
-
-Version 0.90 - 20081004
-* Allow user to specify filename prefix format (not pathname or extension) using %prog field names. e.g. --file-prefix='<name>-<episode>-<pid>-<type>'
-* Fixed bug where saved options were ignored
- 
-Version 0.89 - 20081004
-* Fixed bug where <profile>/pvr/ dir not get created with --pvr-add
- 
-Version 0.88 - 20081003
-* Fixed update_script function which was downloading the new version twice! (darn, it is half as popular as I thought)
-* PVR enable/disable search support allows you to disable a search without deleting it. --pvr-enable=<searchname>, --pvr-disable=<searchname>
-* Using the --test option with --pvr no longer uses the lockfile
-
-Version 0.87 - 20081002
-* using --test with --pvr allows user to see which programmes will match the PVR downloads
-* implemented locking to prevent >1 --pvr process from running (in ~/.get_iplayer/pvr_lock)
-* When using --pvr option, a message is sent to STDOUT so that this can be piped to email for new programme downloads,
-* Ignore the --flush option with --pvr - use the --expiry option instead (i.e. set to just less than the frequency of the pvr schedule)
-
-Version 0.86 - 20081001
-* Improved --symlink option to allow format subtitution from %prog fields
-* Symlink option now works for radio and podcasts also
-
-Version 0.85 - 20081001
-* Fixed --pvr-add so that options derrived from options files are not saved to the PVR search
-* Options specified on the cmdline with --pvr option will override those options in the pvr searches
-* All PVR searches will, by default, use the options from the saved options files
-* Fixed bug where %prog hash was retained between pvr searches making the type option get ignored in some cases
-
-Version 0.84 - 20080929
-* New PVR functionality allows you to add a search criteria to a PVR search file for scheduled downloads
-* Added --pvr, --pvradd=<searchname>, --pvrdel=<searchname>, --pvrlist options
-* e.g. Add the following line to your crontab: '0 * * * * /path/to/get_iplayer --pvr 2>>/tmp/get_iplayer.log'
-
-Version 0.83 - 20080929
-* Remove 16MB block downloads for iphone mp3 radio - does not appear to be unnecessary
-* Improved and simplified metadata --info collection using new prog feed
-* Improved channel feed parser for TV so that Sign Zone progs are correctly detected
-* Added --version-list option so that the preferred version(s) of a programme can be specified e.g. --version-list=signed,default
-* Added --versions option to narraw search to specific programme versions (e.g. default or signed or any regex)
- 
-Version 0.82 - 20080929
-* Some code simplification
-* Remove web bug and cookie whitelisting crud
-* No more web scraping to get the version pids - use the iplayer metadata feed 
-* Use the media stream metadata to determine if PID is for radio or tv
-* Use the media stream metadata to determine subtitles url
-* Fixed streaminfo option to also parse world service media stream data
-* Added WMA audio into media stream data parser
-
-Version 0.81 - 20080927
-* Added get_iplayer user agent while getting podcasts as per request from James Cridland
-
-Version 0.80 - 20080927
-* Bugfixed -o option - it was incorrectly assigned to podcasts only
-
-Version 0.79 - 20080927
-* Use xml podcast feed - simpler to parse and contains a few additional progs
-
-Version 0.78 - 20080926
-* Cleaned up some more perl warnings after turning on this feature - now disabled
-* Behave better when a programme is listed but unavailable
-* Improve reporting of prgramme name when pid is already in download history
-
-Version 0.77 - 20080926
-* Added non-mandatory idv3 tagging support for MP3 files downloaded by new iPhone method using external id3 tools if available
-* Added --id3v2 option to specify non-default location of id3v2 binary
-* Added <fileprefix>, <ext> and <dir> to %prog so that it can be used in --command option
-* Tidied up definition of cache files
-* Cache files no longer get deleted upon get_iplayer upgrade
-
-Version 0.76 - 20080924
-* A few cosmetic tweaks like the 'number of matches' appearing at the end on the programme listing
-* Set the 'type' option according to the index number specified (i.e. 1xxxx => radio, < 10000 => tv and > 19999 => podcast)
-* The programme cache is additionally read if an index is specified in its number range
-
-Version 0.75 - 20080924
-* If an MP3 version of a radio programme is not available the default is to try to use the realaudio stream
-* --realaudio option prevents the downloading of radio MP3 streams
-* --mp3audio option ensures that realaudio stream is not used as a fallback for radio
-* A few cosmetic bug fixes
-* Check for existence of a PID when an index number is specified
-* Don't add empty pids to download_history file
-* Added --force-download option to override download history
-* Report final average download speed / bitrate / duration after successful downloads (not for rtsp streams)
-* Remove stdout logs - messes with stdout streaming in too many strange ways
-* Does not check download history if nowrite & stdout options are specified
-
-Version 0.74 - 20080924
-* Changed --list-categories and --list-channels to use --list <element_name> where element name can be any element name in the %prog hash
-* Bugfix --streaminfo doesn't add to download history
-* Allow h.264 download subroutines to now also download mp3 audio for iphone radio
-* Added --realaudio option for radio downloads where mp3 download is not available
-
-Version 0.73 - 20080922
-* Now remembers which PIDs/programmes have already been downloaded and will prevent downloading them after you delete the programme
-* The PID download history file is in ~/.get_iplayer/download_history
-* Added --outputradio --outputtv --outputpodcast to override --output so that different directories can be used for different programme types respectively
-* Added --list-categories and --list-channels support
-* Fixed a bug introduced in version 0.72 which --type=all would only result in --type=podcast
-
-Version 0.72 - 20080919
-* time stamping of cache entries
-* Added --since option to see what was added since a number of hours ago (using above time stamps)
-* --flush now refreshes the cache rather than simply deleting it (retains timestamps)
-
-Version 0.71 - 20080916
-* Workaround BBC World Service using non-standard PID format (not starting with b0)
-* Workaround BBC World Service HTTP redirects which contain extra whitespace and newlines around RTSP urls which mplayer does not like
-* Workaround BBC World Service where mediaselector metadata sets XML element kind="" instead of kind="audio"
-
-Version 0.70 - 20080916
-* Added BBC World Service to iPlayer radio channels list
-
-Version 0.69 - 20080915
-* Remove empty download file if download fails
-* Make all program info output go to stdout unless --stdout is specified
-
-Version 0.68 - 20080911
-* Added quotes to file= arg of mplayer for post-transcode wav option - breaks if there is a space in the path
-* Added rudimentary support for vlc to download/stream N96 iPlayer streams (lower quality 192kbps streams) using --n96 option
-* Added --vlc option to specify path to vlc (for N96 streams)
-
-Version 0.67 - 20080910
-* streaminfo option now gets Nokia N96 rtsp stream URL (not just the URl that points to it)
-* streaminfo option now makes all other functions quiet and sets --get and --test
-* Added all audio, subtitles, iphone and wii stream info to streaminfo option
-* quiet option can now be overridden by verbose or debug options
-
-Version 0.66 - 20080909
-* Changed --rtmp to --streaminfo
-* --streaminfo now gets Nokia N96 rtsp stream URL also
-
-Version 0.65 - 20080909
-* Created ability to have system-wide default configs for options (/etc/get_iplayer/ and '<allusersprofile>\get_iplayer\' on Win32)
-* Moved windows system/personal config dirs to <allusersprofile>\get_iplayer\ and <profile>\.get_iplayer\
-* System-wide options can be overridden by the personal options and cmdline options
-
-Version 0.64 - 20080909
-* Tweaked to get home directory (USERPROFILE) in ActivePerl
-* Renamed --freevo as --symlink (still backwards compatable)
-* Added ability for ActivePerl/Windows to transcode radio programmes to mp3 after downloading (thanks Simon Dible)
-
-Version 0.63 - 20080908
-* Added code to resolve rtmp url for future use (--rtmp returns the urls)
-
-Version 0.62 - 20080902
-* Added ID3 tagging for radio downloads (uses lame)
-
-Version 0.61 - 20080901
-* Subtitles can now be downloaded if available using --subtitles option and are converted automatically into SubRip (.srt) format
-* Subtitles can be offset by a number of milliseconds using --suboffset <ms> (the H.264 streams seem to start a little earlier than the flash video versions)
-
-Version 0.60 - 20080824
-* Now can create MythTV streams XML file aswell as Freevo fxd XML (thanks to ear9mrn)
-* Added --bandwidth option for rtsp streams (thanks to nrq)
-* Removed world writable perms on cache files
-* quiet option now works properly with radio downloads
-
-Version 0.59 - 20080813
-* de-duplication of search/match results
-
-Version 0.58 - 20080813
-* quote filenames in helper apps to allow whitespace in filenames for mp3 transcoding
-* provide better debug output for radio downloading
-* Known issue: mplayer bug means that it cannot accept whitespace in filenames when dumping to wav/pcm files
-
-Version 0.57 - 20080805
-* Now use an OPML feed from BBC to get a list of all podcast RSS feeds - no more web scraping
-* Fixed thumbnail parsing for podcasts
-* Removed obsolete and broken --scrape option
-* Fixed category parsing for changed iplayer XML feed format
-* Show Categories in --info display
-
-Version 0.56 - 20080804
-* Added raw realaudio stream saving support (--raw) which does not require lame (thanks to nrq)
-* Added new BBC channel 'BBC HD'
-* Improved efficiency of stco atom searching to make slow machines start streaming faster
-* Known issue: stdout support for radio wav and raw support can be problematic due to named pipe closing
-
-Version 0.55 - 20080718
-* Detect and report lack fo realaudio format for radio programmes
-
-Version 0.54 - 20080717
-* Fix rename radio file bug under Activeperl
-* Do not catch sigchld, quits prog after first download
-
-Version 0.53 - 20080717
-* Fix mkfifo quit under Activeperl
-
-Version 0.52 - 20080716
-* Fix inverted logic bug in --wav option
-* Fix already exists bug for partially downloaded radio progs
-* Use dynamic fifo file so simultaneous downloads can occur for radio
-* Use signal handler to clean up temp named pipe file
-
-Version 0.51 - 20080716
-* Fallback to wav mod for type=radio if platform doesn't support fifos (e.g. ActivePerl/Windows)
-* Added --wav option for radio (i.e. don't transcode to mp3)
-
-Version 0.50 - 20080714
-* Removed available time of tv/radio programmes because it was misleading and wrong, --info option should be used instead
-* Changed progress calc using file pointer instead of file stat - better for cygwin
-* Allow option to specify location of mplayer and lame binaries if not in path (--mplayer and --lame)
-
-Version 0.49 - 20080713
-* Re-corrected bad display of download rate calcs (I had a hangover yesterday)
-
-Version 0.48 - 20080713
-* changed shell escaping from --command option
-
-Version 0.47 - 20080712
-* Corrected bad display of download rate and time remaining calcs => now uses less cpu
-* --command option allows user to run a custom command after every successful download using substitution variables (see README.txt)
-* Improved --info metadata
-
-Version 0.46 - 20080712
-* Can now Index and Download BBC podcast mp3/aac streams using --type=podcast
-* Check external programme dependancies
-* Use non-shell mknod (POSIX mkfifo)
-
-Version 0.45 - 20080710
-* Use HTTP pipelined requests for feeds
-* Added info option (--info/-i) to get full programme metadata on searches below 40 matches
-
-Version 0.44 - 20080709
-* Add radio one into channels list - sorry!
-
-Version 0.43 - 20080709
-* Bugfixed stdout support for radio
-
-Version 0.42 - 20080709
-* Now uses channel specific atom feeds from iplayer site by default - scrape is still optional for TV index
-* Relocated all cache, cookies, config and namedpipe files into $HOME/.get_iplayer/
-* Indexes iplayer Radio programmes
-* Added --type to limit search to radio, tv or all (tv is default)
-* Radio RTSP stream now transcoded on the fly to mp3 using named pipes
-* Added stdout support for radio - still only creates small mp3 file when stdout used?!
-* TV and Radio now use separate index cache files that are populated independantly
-* Added retry loop for bad cookie detection - dont just fail
-* Added --exclude-channel/--exclude-category support
-* Added channel name to html output
-* Known issue: BBC has an error in their atom feeds which says that the programme has been available longer than it has.
-* Known issue: stdout support for radio only creates small mp3 file, lame stalls
- 
-Version 0.41 - 20080708
-* Fixed cookie deletion bug
-
-Version 0.40 - 20080707
-* Fixed saving of thumbnail url in cache
-* Added audio pid download/convert support (downloads rtsp and converts to mp3)
-
-Version 0.39 - 20080707
-* Download File name fixed in scrape mode - episode appeared twice
-* Image thumbnail url was wrong in scrape mode
-* html option never looked for a filename
-
-Version 0.38 - 20080707
-* Updates to allow downloading after the BBC updated their website - kludged for now using scrape method until I can work out the atom feed again
-* Category/channel searching (and fxd channel menus) and duration listing will be broken until atom feeds get fixed.
-* Programme version is broken - different URL now used for signed versions etc. Only Original versions are listed for now.
-* Added --terse listing mode
-* Don't display version, duration, channel and categories if we use scrape mode
-
-Version 0.37 - 20080703
-* Made fxd and html output formats optional with ability to specify output filenames
-* --fxd output now has 3 menu modes channel->progname->episode (--fxd-channels), progname->episode (--fxd-names), alpha->progname-episode (--fxd-alpha)
-* removed type=video attribute from fxd container tags
-* Now encode/decode xml entities for output
-* --stdout option now implies --get
-
-Version 0.36 - 20080701
-* Now use the --get/-g option to get the selected files, without this we only list matches
-* Re-use cookie for faster connections (no need to get web bugs every time)
-* Fixed download rate calc on 32M block downloads
-* Increased LWP timeouts to 20 seconds
-* Checks for when we get a duff moov atom length (i.e. an XORed file) then deletes the cookie and quits
-* Removed XML::Twig parser - use perl regex instead
-* Now reports how long ago rather than date made available...
-
-Version 0.35 - 20080630
-* Restructured downloading code
-* Now handles different versions better (i.e. Original, Signed) - tries to download next avaiable version type if one fails
-* Freevo FXD now has programmes sorted by channel
-
-Version 0.34 - 20080629
-* Fixed duplicate listing bug when using --long
-* Added --quiet option
-* Added freevo symlink creation option --freevo
-* FXD file for freevo now uses standard Video plugin with a player wrapper script
-* Use logger function instead of print
-
-Version 0.33 - 20080627
-* Now gets programme categories and channel from Atom feed
-* Only write the fxd and html files when writing cache
-* Channel and category search (regex) --channel --category
-* Fixed options saving/reading
-* Added download progress for Atom feed and movie header
-
-Version 0.32 - 20080626
-* Now uses Atom feed rather than scraping website for programme info (much more reliable availability info)
-* Now requires Perl XML::Twig
-* Reduced cache expiry to 4 hrs (atom feed is now quicker to download and is more up to date)
-* version pid (pid) is no longer used for reference - only programme pid (urlpid) == $pid
-* Index now contains duration and start of availability date/time (Atom method only)
-* Allow fallback to scraping website for programme index
-* Removed deprecated XOR decoding
-
-Version 0.31 - 20080624
-* Allow user to save options and specify default options in $HOME/.iplayerrc
-* Now uses long options also
-
-Version 0.30 - 20080622
-* Generate FXD file for Freevo iplayer streaming plugin
-* Now can resume downloads and strema to STDOUT simultaneously (streaming always starts from beginning of programme)
-* Retry loop for getting index pages incase BBC site breaks like it just did
- 
-Version 0.29 - 20080619:
-* Fixed streaming + file download mode
-* Added random numbers after some requests more like iphone
-* Added interrim checking of reported mp4 stream availability
-* Reduced index cacahe default to 12 hours
-
-Version 0.28 - 20080619:
-* Update get_iplayer option (-u)
-
-Version 0.27 - 20080619:
-* New option to allow streaming while downloading AND writing file to disk (allows you to watch while downloading while keeping a copy for later)
-* Sanity check to ensure we don't stream partially downloaded content
-
-Version 0.26 - 20080618:
-* Fixed partial download resuming
-* Changed file suffix for partially downloaded files to <prog>.partial.mov to ease playback of partially downloaded movies 
-
-Version 0.25 - 20080618:
-* Automatically re-arrange the atoms so that file can be streamed and start faster (used method from qt-faststart.c, v0.1 by Mike Melanson, melanson@pcisys.net)
-* Option -x allows STDOUT streaming during download (see usage)
-* All messages now go to STDERR
-
-Version 0.24 - 20080618:
-* Now supports downloading of *unencrypted* streams from BBC Iplayer site - no more XOR nonsense
-* Downloads web bugs to whitelist our cookies on BBC servers
-* Downloads the file in blocks to avoid XOR
-
-Version 0.23 - 20080617:
-* added binmode for decode sub also for windows to work properly
-
-Version 0.22 - 20080616:
-* Detect null Content-Length header upon download - doesn't replace a partially d/loaded file if there is a failure
-
-Version 0.21 - 20080616:
-* Added binmode for Windows file writing - fixes bug where windows would not decode properly
-
-Version 0.20 - 20080615:
-* Remaining time reported in hrs/mins/secs
-* Added sort-into-subdirectories option to create subdirectories for programmes
-
-Version 0.19 - 20080614:
-* Fixed PID searching
-* Now supports restarting downloads of incomplete files
-* Fixed swap detection bug where moov atom started on even byte offset
-* Remaining time added
-* Fixed kbps (not misreported kBps anymore)
-
-Version 0.18 - 20080613:
-* Auto detection of byte-swapping
-* Auto detection of XOR sequence
-
-Version 0.17 - 20080612:
-* Non-UK error detection
-* Not available error detection
-
-Version 0.16 - 20080612:
-* Fixed HTML output links 
-* Sanitized data structures
-* Now parses days/hours left
-* Fixed XOR % completion calculation
-* Reads IPLAYER_OUTDIR environment
-
-Version 0.15 - 20080611:
-* Fixed duplicate programme removal
-* Now supports different programme type downloads (i.e. Original, Signed, etc)
-* Changes hashes to give more meaningful names
-* Test option (-t) will now determine the programme type
-* Increased speed of XOR decoder by reading in 1024 blocks at a time
-
-Version 0.14 - 20080611:
-* Not using curl anymore - seems to fail through some firewalls mysteriously and will not work on Ubuntu
-* Using LWP for all http requests
-* Fixed indexing sort bug
-
-Version 0.01 - 20080312
-* Initial Release

get_iplayer-2.82.tar.gz/README-get_iplayer.cgi.txt Deleted

@@ -1,168 +0,0 @@
-get_iplayer PVR Manager
------------------------
-
-The world's most insecure web-based PVR manager and streaming proxy for get_iplayer
-** WARNING ** Never run this in an untrusted environment or facing the internet
-
-    Copyright (C) 2009-2010 Phil Lewis
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Author: Phil Lewis
-Email: iplayer2 (at sign) linuxcentre.net
-Web: http://linuxcentre.net/iplayer
-License: GPLv3 (see LICENSE.txt)
-
-Features:
-* Search for progs
-* Lists/Adds/Removes PVR entries
-* Acts as a proxy to stream any programme over HTTP
-* Automatically generates playlists for any programme type
-* See the web page
-
-
-** Instructions correct for v0.46 **
-
-
-Run with embedded web server
-----------------------------
-* By default this will run as the user you start the script with
-* Start with: ./get_iplayer.cgi -p 1935 [-g /path/to/get_iplayer] [-l 127.0.0.1] [--ffmpeg /path/to/ffmpeg]
-* On Win32 Start with: perl.exe .\get_iplayer.cgi 1935 .\get_iplayer.cmd
-* Access using: http://localhost:1935/
-
-
-Installation as Apache CGI script
----------------------------------
-* Run the below commands as 'root'
-* Create dirs in /var/www/get_iplayer/ :
-	mkdir -p /var/www/get_iplayer/output /var/www/get_iplayer/.get_iplayer
-* Allow apache user to write to these dirs:
-	chown apache.apache /var/www/get_iplayer/output /var/www/get_iplayer/.get_iplayer
-* Copy get_iplayer.cgi and get_iplayer into /var/www/get_iplayer/
-	cp -p get_iplayer.cgi get_iplayer /var/www/get_iplayer/
-* Ensure they are executable:
-	chmod 755 /var/www/get_iplayer/get_iplayer.cgi /var/www/get_iplayer/get_iplayer
-* Ensure you have the following lines in Apache's httpd.conf:
- ScriptAlias /iplayer "/var/www/get_iplayer/get_iplayer.cgi"
- SetEnv HOME /var/www/get_iplayer/
-* This will run as apache's user/group and save all settings files in /var/www/get_iplayer/.get_iplayer
-* Ensure that ffmpeg is in the default system PATH that apache exports such as /usr/bin/
-* Ensure that flvstreamer (and other binaries) are in the default system PATH that apache exports such as /usr/bin/
-* or, specify their locations in /var/www/get_iplayer/.get_iplayer/options,
-* and specify a default output directory in /var/www/get_iplayer/.get_iplayer/options, e.g.:
-output /var/www/get_iplayer/output
-ffmpeg /usr/bin/ffmpeg
-flvstreamer /path/to/flvstreamer
-* make sure that apache user can see and execute the binaries
-* Access using http://<your web server>/iplayer
-* Recordings will be in /var/www/get_iplayer/output/
-
-
-Usage:
-------
-Assumes web server is running with script at 'http://localhost/iplayer'
-Embedded web server can be accessed (assuming port 1935) as 'http://localhost:1935/' or 'http://localhost:1935/iplayer' instead
-Valid OUTTYPE values are: wav,mp3,rm,flv,mov
-You can open most of these URLs in 'vlc <URL>' or 'mplayer -cache=<kb> <URL>'
-Notes: - Ensure you open the playlist window in VLC
-
-
-Streaming URLs
---------------
-* Stream flash AAC liveradio as 320k mp3 stream: 
-	mplayer -cache 1024 "http://localhost/iplayer?ACTION=stream&PROGTYPES=liveradio&PID=<PID>&BITRATE=320&MODES=flashaac&OUTTYPE=nnn.mp3"
-* Stream flash livetv as flv stream:
-	mplayer -cache 1024 "http://localhost/iplayer?ACTION=stream&PROGTYPES=livetv&PID=<PID>&MODES=flashnormal&OUTTYPE=nnn.flv"
-* Stream flash AAC liveradio as an uncompressed wav stream:
-	mplayer -cache 1024 "http://localhost/iplayer?ACTION=stream&PROGTYPES=liveradio&PID=<PID>&MODES=flashaac&OUTTYPE=nnn.wav
-* Stream tv as http quicktime stream:
-	mplayer -cache 2048 "http://localhost/iplayer?ACTION=stream&PROGTYPES=tv&PID=<PID>&MODES=iphone&OUTTYPE=nnn.mov"
-* Stream iphone radio as http mp3 stream:
-	mplayer -cache 1024 "http://localhost/iplayer?ACTION=stream&PROGTYPES=radio&PID=<PID>&MODES=iphone&OUTTYPE=nnn.mp3"
-* Stream flash mp3 radio as http flac stream:
-	mplayer -cache 1024 "http://localhost/iplayer?ACTION=stream&PROGTYPES=radio&PID=<PID>&MODES=flashaudio&OUTTYPE=nnn.flac"
-
-
-Direct Streaming of Recorded Content
-------------------------------------
-* Stream Pre-recorded <TYPE> Programme with <PID> and <MODE>
-	"http://localhost/?ACTION=direct&PROGTYPES=<TYPE>&PID=<PID>&MODES=<MODE>"
-
-
-Playlists of Recorded Content
------------------------------
-* Create an M3U playlist with pre-recorded <TYPE> programmes with <SEARCH> in the PID (open this in vlc)
-	"http://localhost/?ACTION=playlistfiles&SEARCHFIELDS=pid&SEARCH=<SEARCH>&PROGTYPES=<TYPE>"
-* Create an M3U playlist with pre-recorded 'tv' programmes with 'news' in the 'name' field (open this in vlc)
-	"http://localhost/?ACTION=playlistfiles&SEARCHFIELDS=name&SEARCH=news&PROGTYPES=tv"
-
-
-Automatic Playlists
--------------------
-* All radio programmes - all modes (flashaac,flashaudio,iphone,realaudio):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=radio"
-* All tv programmes - all modes (flashhigh,iphone,flashnormal):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=tv"
-* All livetv channels:
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=livetv"
-* All liveradio channels:
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio"
-More specific examples:
-* All liveradio channels (e.g. flashaac as flv):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio&MODES=flashaac&OUTTYPE=flv"
-* All liveradio channels (e.g. flashaac as wav):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio&MODES=flashaac&OUTTYPE=wav"
-* All liveradio channels (e.g. realaudio):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio&MODES=realaudio&OUTTYPE=rm"
-* All liveradio channels (e.g. flashaac,realaudio):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio&MODES=flashaac,realaudio&OUTTYPE=flv"
-* All radio programmes (e.g. flash):
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=radio&MODES=flash&OUTTYPE=flv"
-* All liveradio channels with a single digit in their name
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=liveradio&SEARCH=\d"
-* All tv programmes with the word 'news' in their name:
-	"http://127.0.0.1/iplayer?ACTION=playlist&PROGTYPES=tv&SEARCH=news"
-
-
-Automatic OPML Playlists (works with Squeezebox)
-------------------------------------------------
-See: http://wiki.slimdevices.com/index.php/OPMLSupport for details on syntax
-Note: Programmes that are realaudio mode only will not work yet - only flashaudio, flashaac and iphone work
-
-In Squeezecenter, Add this URL to 'Favourites' and you will be able to navigate the programmes:
-* BBC iPlayer Listen Again:
-	http://<SERVER IP>/iplayer?ACTION=opml&PROGTYPES=radio&LIST=channel
-* BBC iPlayer Live Flash AAC:
-	http://<SERVER IP>/iplayer?ACTION=opml&PROGTYPES=liveradio&OUTTYPE=wav
-* BBC iPlayer Live Flash AAC (Numbered Channels only)
-	http://<SERVER IP>/iplayer?ACTION=opml&PROGTYPES=liveradio&MODES=flash&SEARCH=%20\d&OUTTYPE=wav
-
-
-Setup crontab for PVR to run
-----------------------------
-* Add a line in /etc/crontab to run the pvr: "0 * * * * apache /usr/bin/get_iplayer --pvr 2>/dev/null"
-
-
-Caveats:
---------
-* Sometimes takes a while to load page while refreshing caches
-* If a boolean param is in the cookies then it overrides the unchecked status on the form regardless
-* When using the stream, playlist or play links directly, cookies are not sent and the settings are not applied
-
-
-Todo:
-* Manual flush of Indicies (maybe normally set --expiry to 99999999 and warn that indicies are out of date)
-* in general, take presentation data out of the html and into css, take scripting out of the html and into the js
-* Add a button to save the playlist in M3U or OPML (playlist of selected progs?)

get_iplayer-2.82.tar.gz/README.txt Deleted

@@ -1,72 +0,0 @@
-BBC iplayer Indexing Tool and PVR (get_iplayer)
------------------------------------------------
-
-This file is well out of date - see: http://linuxcentre.net/getiplayer/
-
-Features:
-
-* Downloads Mov (mp4) streams from BBC iplayer site in much better quality than Flash player streams
-* Allow multiple programmes to be downloaded using a single command
-* Indexing of all available (i.e. listed) iplayer programs
-* Available Programme Index listing
-* Caching of Index (default 4hrs)
-* Full HTTP Proxy support (tested on Squid)
-* Regex search on programme name capability (makes it useful to run this from crontab)
-* Regex search on long programme description and episode capability
-* Tested on Linux (Fedora 6/7/8/9, Centos/RHEL 5, MacOSX, Ubuntu), Windows and loads more
-* Requires: perl 5.8, perl-LWP
-* Latest Version: http://linuxcentre.net/get_iplayer/get_iplayer
-
-Usage: See 'get_iplayer -h'
-
-
-Notes:
-
-* After downloading the script you can make it executable using:
-
-	chmod 755 ./get_iplayer
-
-* You can set the default dowload directory by putting the following in
-  your shell environment (e.g. ~/.bashrc):
-
-	export IPLAYER_OUTDIR="/path/to/my/output/dir"
-
-* The first time you run the script it will access the BBC website and
-  download an index of all programmes currently on iplayer.
-
-* Sometimes you will not be able to download a programme listed due to BBC
-  not encoding it yet for H.264 format (usually happens within 24hrs of airing).
-  Also BBC don't seem to create an H.264 version for some programmes at all.
-
-
-Examples:
-
-* List all programmes (either from BBC site or cached):
-
-	./get_iplayer
-
-* List all programmes with long descriptions:
-
-	./get_iplayer -l
-
-* Record programme number 123 (see index list):
-
-	./get_iplayer 123
-
-* Record all programmes with 'blue peter' in the title/episode:
-
- 	./get_iplayer 'blue peter'
-
-* Record all programmes with 'blue peter' in the title/episode, and
-  programme index 123:
-
-	./get_iplayer 'blue peter' 123
-
-* Record all programmes with URL that conatns a programme ID (pid) b002a23a:
-
-	./get_iplayer http://blah.blah.blah/b002a23a.shtml
-
-* Record all programmes with 'comedy' in the title, episode or long description:
-
-	./get_iplayer -l comedy
-

get_iplayer-2.82.tar.gz/html Deleted

get_iplayer-2.82.tar.gz/html/get_iplayer.html Deleted

@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html> <head>
-<title>get_iplayer lives!</title>
-</head>
-
-<body>
-
-<p><img title="getiplayer" src="getiplayer.jpg" alt="get_iplayer" width="238" height="134" /> lives! This project is the continuation of <A HREF="http://linuxcentre.net/getiplayer">Phil Lewis's excellent work on get_iplayer</A> <BR>
-<H1>About get_iplayer</H1>
-This tool allows you to search, index and record/stream:</p>
-<ul>
-<li><strong><a href="http://www.bbc.co.uk/iplayer/tv">BBC iPlayer TV</a></strong> - up to 3200 kbps HD 720p H.264 / Quicktime / MP4</li>
-<li><strong><a href="http://www.bbc.co.uk/iplayer/tv">BBC Live TV</a></strong> - 500 kbps H.264 / MP4</li>
-<li><strong><a href="http://www.bbc.co.uk/iplayer/radio">BBC iPlayer Radio</a></strong> - up to 192 kbps MP3 / AAC and Realaudio</li>
-
-<li><strong><a href="http://www.bbc.co.uk/iplayer/radio">BBC Live Radio</a></strong> - up to 192 kbps MP3 / AAC, WMA and Realaudio</li>
-<li><strong><a href="http://www.bbc.co.uk/radio/podcasts/directory/">BBC Podcasts</a></strong> - up to 192 kbps MP3 / AAC</li>
-<li><strong><a href="http://www.bbc.co.uk/iplayer/tv">BBC iPlayer TV subtitles</a></strong> - SubRip / srt</li>
-</ul>
-<p>Unlike the web sites above, get_iplayer has PVR-like capabilities (like Sky+ / TiVo / Series-Link); You can save lists of programme searches which are automatically recorded when they become available so that you can watch them when you choose and on devices that cannot run Adobe Flash Player - even if you don&#8217;t have adequate broadband speeds or if your broadband streams too slowly at peak hours when you want to watch a programme.</p>
-<p>The iPhone H.264 feeds from the BBC are higher quality than in the Flash iPlayer (normal quality). See the <a href="http://beebhack.wikia.com/wiki/IPlayer_TV#Comparison_Table">beebhack wiki</a> for a comparison. They are intended for the Apple iPhone and are consequently difficult to download for any other OS. The same goes for the iPhone MP3 radio streams. get_iplayer also allows recording of the high-quality (even HD 720p) flash based content using <A HREF="http://rtmpdump.mplayerhq.hu/">rtmpdump</A>. None of the above content is &#8216;protected&#8217; by DRM. get_iplayer cannot remove DRM.</p>
-
-<p>Phil Lewis and a few others worked out how to work around these problems and now have tools which essentially simulate an iPhone as far as the BBC web servers are concerned.</p>
-<p><em><a href="http://www.infradead.org/get_iplayer.html">get_iplayer</a></em> does the recording, indexing and searching of the iPlayer TV/Radio programmes and podcasts available. It can even stream the iPlayer TV programmes while recording them to mplayer, vlc or xine, etc.
-
-<H2>Download</H2>
-
-Released versions of get_iplayer can be downloaded from <A HREF="ftp://ftp.infradead.org/pub/get_iplayer/">ftp://ftp.infradead.org/pub/get_iplayer/</A>. The latest version is v2.82.<P>
-
-The latest changes can be found in the <A HREF="http://git-scm.com/">git</A> version control repository, at <TT>git://git.infradead.org/get_iplayer.git</TT> (<A HREF="http://git.infradead.org/get_iplayer.git">browse</A>).<P>
-
-
-Linux users should find that their distribution has a get_iplayer package which will automatically pull in all required dependencies (rtmpdump, ffmpeg, etc.). Fedora users, for example, will find get_iplayer in the <A HREF="http://www.rpmfusion.org/">RPM Fusion</A> repository of packages for the "Free World". Just issue the command '<TT>yum install get_iplayer</TT>'</P>
-
-
-
-Life is, as usual, more complex for Windows users. There is no sane
-packaging system under Windows which lets software packages express
-their dependencies and arrange for other software to be installed to
-meet their requirements. Therefore, we have created a Windows installer for get_iplayer which will attempt to download and install the various requirements. This can be obtained from:
-<P>
-<A HREF="http://www.infradead.org/get_iplayer_win/get_iplayer_setup_latest.exe">
-http://www.infradead.org/get_iplayer_win/get_iplayer_setup_latest.exe</A>
-
-<H2>Help / Development</H2>
-
-For help using get_iplayer, and to submit or suggest improvements,
-there is a <A
-HREF="http://lists.infradead.org/mailman/listinfo/get_iplayer">mailing
-list</A>, archived <A
-HREF="http://lists.infradead.org/pipermail/get_iplayer/">here</A> so
-you can see if your question has already been answered before you post
-it.<P>
-
-
-When using this (or any) mailing list, please observe standard rules
-of '<A HREF="http://david.woodhou.se/email.html">Netiquette</A>'
-&mdash; no HTML, no top-posting, no excessive quotations, etc.
-<P>
-If you submit patches for get_iplayer, please do try to make sure they apply cleanly to the current git tree, and that they're not mangled by your email software. Sending the patch to yourself first, then checking that you can save it to a file and apply it, is a useful technique.
-
-
-<H2>DRM</H2>get_iplayer does not circumvent any digital rights management security (see the <a href="http://news.bbc.co.uk/1/hi/technology/6944830.stm">BBC&#8217;s website</a> on how to do that with the Windows-only DRM content they provide). get_iplayer does not circumvent any effective technological measures. The BBC does not implement any such measures. They use RTMP which is a streaming protocol now publicly published by Adobe. Sometimes they use RTMP &#8216;SWF verification&#8217; which has proven to be ineffective in its current BBC implementation (flvstreamer cannot handle such verification requests so the stream is dropped and is then automatically resumed). The iPhone streams are also unprotected and use plain progressive download HTTP protocol. The WMA and realaudio streams and likewise unprotected. The BBC may at some point choose to effectively protect their streams with DRM or some &#8216;effective technological measure&#8217; in which case get_iplayer will no longer be a useful tool for those streams. The BBC do implement DRM on their Adobe Air downloadable files and therefore get_iplayer is not useful with those. The BBC iPlayer TV only works in the UK so that they can limit the reach of their output to UK TV Licence fee payers who fund iPlayer (although legally you do not require a licence to watch non-live iPlayer output).</p>
-<H2>Uses</H2>
-
-<p>The script is primarily intended for use for recording and playing back TV and Radio content on devices that cannot support Adobe Flash/Air/Silverlight, systems which run entirely on open-source software (i.e. no Adobe Flash/Air or Silverlight), recording content for mobile devices that have no access to broadband/wi-fi or running on devices that have such limited memory that running a browser with a flash player or AIR is not possible (or not permitted). For me this would be an <a href="http://www.xbox-linux.org/wiki/Xebian">Xbox running Xebian Linux</a> with <a href="http://freevo.org">Freevo</a> or XBMC. The Xbox only has 64MiB of memory and struggles enormously with Adobe flash (Adobe doesn&#8217;t permit you run flash player or AIR on a games console either). One major use of get_iplayer is for those unfortunate enough to have slow broadband speeds; get_iplayer can pre-record the programme you wish to watch so that you do not get the endless re-buffering that you experience with the flash player. Some ISPs actually throttle iPlayer streaming during peak hours. get_iplayer can actually lessen the ISP&#8217;s (and BBC&#8217;s) traffic load if the PVR functionality is used off-peak. Please use this tool responsibly and don&#8217;t try to download all BBC programmes for example. There is a built-in &#8216;limit matches&#8217; option to stop get_iplayer doing this just in case you accidentally set it up wrongly.</p>
-<H2>Fair Use</H2>
-
-<p>Of course, to respect the content providers&#8217; wishes and fair-use legislation in your jurisdiction, you should keep the recorded content for no longer than is locally acceptable (30 days seems to be accepted in the UK for TV video recordings for example), not attempt to obtain it from outside of the UK and not redistribute it. get_iplayer is not intended for use in making illegal copies of copyrighted content. Please respect the rights of the content owners when recording. get_iplayer will attempt to remove its recorded content which is more than 30 days old. Podcasts and certain radio programmes can be kept for longer but you must investigate this on a case-by-case basis.</p>
-<H2>Features</H2>
-<ul>
-<li>Recording/Streaming of TV, Radio and Podcasts from BBC sites</li>
-<li>Recording/Streaming of Live BBC iPlayer TV &amp; Radio</li>
-<li>Recording/Streaming of Embedded media in BBC Learning Zone, Archive and News sites</li>
-<li>PVR functionality allows predefined searches to be recorded from a scheduler such as cron or Windows scheduler</li>
-
-<li>Queuing of programmes for batched recording or for recording off-peak</li>
-<li>Resume recordings of partially recorded content</li>
-<li>Stream iPlayer or podcast content via mplayer or xine while recording it</li>
-<li>Allow multiple programmes to be recorded in one command</li>
-<li>Indexing of all available programmes</li>
-<li>Script update capability</li>
-<li>Advanced Searching on programme name, episode, description, channel or category, etc</li>
-<li>Limit search by programmes made available after a specific number of hours</li>
-<li>Removal of recorded content which is more than 30 days old</li>
-
-<li>Meta-tagging of recorded iPlayer iPhone/H.264 and mp3 files for importing into iTunes</li>
-<li>Plug-in based architecture to allow new channels and sites to be added by 3rd-parties</li>
-</ul>
-<H2>Reported to Work on:</H2>
-It has been tested by users under Linux (Fedora, Centos/RHEL, Ubuntu, Debian, OpenSuSE, OLPC, ArchLinux, Puppy, NSLU2), MacOSX, iPhone and Windows XP/VIsta/7 (Cygwin, Strawberry Perl)</p>
-		</div>
-
-
-<hr>
-<address>David Woodhouse &lt;<A HREF="mailto:dwmw2@infradead.org">dwmw2@infradead.org</A>&gt;</address>
-
-Last modified: Sun Jan  9 16:18:39 GMT 2011
-
-</body> </html>

get_iplayer-2.82.tar.gz/html/getiplayer.jpg Deleted

get_iplayer-2.82.tar.gz/make-nsis.sh Deleted

get_iplayer-2.82.tar.gz/plugins Deleted

get_iplayer-2.82.tar.gz/plugins/localfiles.plugin Deleted

@@ -1,281 +0,0 @@
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-################### Localfiles class #################
-package Programme::localfiles;
-
-use Env qw[@PATH];
-#use MP3::Info; # better eval this module
-use Fcntl;
-use HTML::Entities;
-use strict;
-use URI;
-use Cwd 'abs_path';
-use File::Basename;
-
-# Inherit from Programme class
-use base 'Programme';
-
-# Class vars
-# Global options
-my $opt;
-
-
-# Constructor
-# Usage: $prog{$pid} = Programme->new( 'pid' => $pid, 'name' => $name, <and so on> );
-sub new {
-	my $type = shift;
-	my %params = @_;
-	my $self = {};
-	for (keys %params) {
-		$self->{$_} = $params{$_};
-	}
-	# Ensure the subclass $opt var is pointing to the Superclass global optref
-	$opt = $Programme::optref;
-	bless $self, $type;
-}
-
-
-sub index_min { return 900001 }
-sub index_max { return 999999 }
-
-
-# Class cmdline Options
-sub opt_format {
-	return {
-		localfilesdirs		=> [ 0, "localfilesdirs=s", 'Config', '--localfilesdirs <dir>[,dir,]', "Directories/Folders to scan for new files"],
-		outputlocalfiles	=> [ 1, "outputlocalfiles=s", 'Output', '--outputlocalfiles <dir>', "Output directory for localfiles recordings"],
-	};
-}
-
-
-# Method to return optional list_entry format
-sub optional_list_entry_format {
-	my $prog = shift;
-	my @format;
-	for ( qw/ channel categories / ) {
-		push @format, $prog->{$_} if defined $prog->{$_};
-	}
-	return ', '.join ', ', @format;
-}
-
-
-# cache expiry in seconds
-sub expiry {
-	return ( 999999999999 ); # forever
-}
-
-
-# Returns the modes to try for this prog type
-sub modelist {
-	return 'localfiles';
-}
-
-
-
-# Recursive function to recursively find files in a directory
-sub find_matching_files {
-	my $dir = shift;
-	my $file_regex = shift || '.+';
-	$dir =~ s|\/+$||g;
-	my @filelist;
-	my ( $node, $lvl_counter, $list_length );
-	if ( opendir( DIR, $dir ) ) {
-		my @lines = grep !/^(\.\.|\.)\/?$/, readdir( DIR );
-		closedir( DIR );
-		for ( @lines ) {
-			$node = $dir.'/'.$_;
-			if( -d $node && ! -l $node ) {
-				push @filelist, find_matching_files( $node, $file_regex );
-				#main::logger "DEBUG: dir = $node\n";
-			} elsif ( $node =~ m{$file_regex}i ) {
-				push @filelist, $node;
-				#main::logger "DEBUG: file = $node\n";
-			}
-		}
-	}
-	return @filelist;
-}
-
-
-
-# Usage: Programme::localfiles->get_links( $progref, 'localfiles' );
-sub get_links {
-	shift; # ignore obj ref
-	my $progref = shift;
-	my $prog_type = shift;
-
-	# Check if we have MP3::Info
-	eval "use MP3::Info";
-	if ($@) {
-		main::logger "WARNING: Please install the MP3::Info perl module to use '$prog_type' plugin\n";
-		#main::logger "WARNING: Please download and run latest installer or install the MP3::Info perl module to use '$prog_type' plugin\n";
-		return 0;
-	};
-
-	# error if no dirs specified
-	if ( ! $opt->{localfilesdirs} ) {
-		main::logger "ERROR: Please set --localfilesdirs to point to your collection if using the '$prog_type' plugin\n";
-		return 1;
-	}
-
-	main::logger "INFO: Getting Local Files Index from $opt->{localfilesdirs}\n";
-
-	# Get mp3 file list
-	my @files;
-	my $ext = 'mp3';
-	for my $scandir ( split /,/, $opt->{localfilesdirs} ) {
-		main::logger "INFO: Scanning $scandir\n";
-		my @scan = find_matching_files( $scandir, '.+\.'.$ext.'$' );
-		main::logger "INFO: Got ".($#scan+1)." $ext files\n";
-		push @files, @scan;
-	}
-
-	for my $file ( @files ) {
-		chomp( $file );
-
-		my $pid = abs_path( $file );
-
-		# Read MP3 tags into a hash for file
-		my $info = get_mp3info( $file );
-		my $tag = get_mp3tag( $file, undef, undef, 1 );
-
-		# dump tags
-		#main::logger "TAG: $_=$tag->{$_}\n" for keys %{ $tag };
-
-		# Clean data - removes unicode :-(
-		#StringUtils::clean_utf8_and_whitespace( $tag->{$_} ) for keys %{ $tag };
-
-		# TAGS: YEAR,RIPPING TOOL,ARTIST,COMMENT,TITLE,ALBUM,RELEASE TYPE,GENRE,RIP DATE,TRACKNUM,TAGVERSION,SOURCE
-		# INFO: SIZE,OFFSET,MS,STEREO,SECS,PADDING,LAME,MM,COPYRIGHT,SS,LAYER,MODE,FREQUENCY,VBR,TIME,FRAMES,BITRATE,VBR_SCALE,VERSION,FRAME_LENGTH
-
-		# Skip if there is no track name
-		if ( ! ( $tag->{'TITLE'} && $tag->{'ALBUM'} && $tag->{'ARTIST'} ) ) {
-			## Maybe guess the metadata from the filename here?
-			#main::logger "WARNING: $pid has no title - skipping\n" if $opt->{verbose};
-			#next;
-			main::logger "WARNING: $pid has no title - guessing\n" if $opt->{verbose};
-			if ( basename( $file ) =~ m{^(\d*?)[\w\-]*?(.+?)\.(\w+)$} ) {
-				#$tag->{'TITLE'} = "$tag->{'TRACKNUM'}_$tag->{'ALBUM'}" if $tag->{'TRACKNUM'} && $tag->{'ALBUM'} && ! $tag->{'TITLE'};
-				$tag->{'TITLE'} = $tag->{'TITLE'} || $2;
-				$tag->{'ALBUM'} = $tag->{'ALBUM'} || $2;
-				$tag->{'ARTIST'} = $tag->{'ARTIST'} || $2;
-			}
-		}
-		main::logger '.';
-
-		my @category;
-		push @category, $tag->{'GENRE'};
-
-		my @description;
-		for ( "($info->{'BITRATE'}kbps/$info->{'FREQUENCY'}kHz)", $tag->{'COMMENT'}, $tag->{'RIPPING TOOL'} ) {
-			push @description, $_ if $_;
-		}
-
-		# Get thumbnail from header
-		my $thumbnail;
-		my $dir = dirname( $file );
-		# better to use opendir and regex search filename
-		for ( qw/ front.jpg cover.jpg AlbumArtSmall.jpg / ) {
-			$thumbnail = "file://${dir}/${_}" if -f "${dir}/${_}";
-		}
-
-		# Skip if this pid is a duplicate
-		if ( defined $progref->{$pid} ) {
-			main::logger "WARNING: '$pid, $progref->{$pid}->{name} - $progref->{$pid}->{episode}, $progref->{$pid}->{channel}' already exists (this channel = $_)\n" if $opt->{verbose};
-			next;
-		}
-
-		# build data structure
-		$progref->{$pid} = Programme::localfiles->new(
-			'pid'		=> $pid,
-			'name'		=> $tag->{'ALBUM'},
-			'versions'	=> 'default',
-			'episode'	=> $tag->{'TITLE'},
-			'desc'		=> join(', ', @description),
-			'available'	=> $tag->{'YEAR'} || $tag->{'RIP DATE'},
-			'duration'	=> $info->{'SECS'},
-			'thumbnail'	=> $thumbnail,
-			'channel'	=> $tag->{'ARTIST'},
-			'categories'	=> join(',', @category),
-			'type'		=> $prog_type,
-			'web'		=> "file://${file}",
-		);
-
-		# Sanitize element values
-		for ( values %{ $progref->{$pid} } ) {
-			s/[\n\r]/ /g;
-			s/(^[\s_,]+|[\s_,]+$)//g;
-		}
-	}
-
-	main::logger "\n";
-	return 0;
-}
-
-
-
-# Gets media streams data for this version pid
-# $media = file|undef
-sub get_stream_data {
-	my ( $prog, $verpid, $media ) = @_;
-	my $data = {};
-
-	$opt->{quiet} = 0 if $opt->{streaminfo};
-
-	$data->{localfiles}->{ext} = $prog->{web};
-	$data->{localfiles}->{ext} =~ s|^.*\.(\w+)$|$1|g;
-	$data->{localfiles}->{streamer} = 'filestreamonly';
-	$data->{localfiles}->{streamurl} = $prog->{web};
-	$data->{localfiles}->{type} = 'Local File stream';
-
-	# Return a hash with media => url if '' is specified - otherwise just the specified url
-	if ( ! $media ) {
-		return $data;
-	} else {
-		# Make sure this hash exists before we pass it back...
-		$data->{$media}->{exists} = 0 if not defined $data->{$media};
-		return $data->{$media};
-	}
-}
-
-
-
-sub download {
-	my ( $prog, $ua, $mode, $version, $version_pid ) = ( @_ );
-
-	# if subsonly required then skip
-	return 'skip' if $opt->{subsonly};
-
-	# Determine the correct filename and extension for this download
-	my $filename_orig = $prog->{pid};
-	$filename_orig =~ s|^.+/(.+?)\.\w+$|$1|g;
-	$prog->{ext} = $prog->{streams}->{$version}->{$mode}->{ext};
-
-	# Determine the correct filenames for this download
-	return 'skip' if $prog->generate_filenames( $ua, "<longname> - <episode> $filename_orig" );
-
-	# Create dir for prog if not streaming-only
-	if ( ( ! ( $opt->{stdout} && $opt->{nowrite} ) ) && ( ! $opt->{test} ) ) {
-		$prog->create_dir();
-	}
-
-	# Skip from here if we are only testing downloads
-	return 1 if $opt->{test};
-	# Instantiate new streamer based on streamdata
-	my $class = "Streamer::$prog->{streams}->{$version}->{$mode}->{streamer}";
-	my $stream = $class->new;
-	return $stream->get( $ua, $prog->{pid}, $prog );
-}
-
-1;

get_iplayer-2.82.tar.gz/plugins/plugin.template Deleted

@@ -1,407 +0,0 @@
-### This template is just a quick example of how to write you own plug-in for get_iplayer
-### Once written it can be tested by copying to <profile dir>/plugins/ (e.g. ~/.get_iplayer/plugins/)
-### The file must be named as <PROGTYPE>.plugin so that get_iplayer will recognise it (use 'get_iplayer --listplugins' to test it)
-### <PROGTYPE> must start with a letter and be lowercase
-### All the plugin help text in this file starts with '###'
-### This template is just a bunch of example methods stolen from different plugins - it wont work as-is
-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-################### Podcast class #################
-### Substitute PROGTYPE in the rest of this file to be the type of your plugin (e.g. podcast or hulu etc)
-package Programme::PROGTYPE;
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme';
-
-# Class vars
-# Global options
-my $opt;
-
-
-# Constructor
-# Usage: $prog{$pid} = Programme->new( 'pid' => $pid, 'name' => $name, <and so on> );
-sub new {
-	my $type = shift;
-	my %params = @_;
-	my $self = {};
-	for (keys %params) {
-		$self->{$_} = $params{$_};
-	}
-	## Ensure that all instances reference the same class global $optref var
-	# $self->{optref} = $Programme::optref;
-	# Ensure the subclass $opt var is pointing to the Superclass global optref
-	$opt = $Programme::optref;
-	bless $self, $type;
-}
-
-### Choose a min-max range of programme index numbers currently not used by other plugins
-### Required
-sub index_min { return 60001 }
-sub index_max { return 69999 }
-
-### Keep all you channel listings here if any... (see other plugins for examples)
-sub channels { return {}; }
-
-
-### Add any plugin specific options that you want get_iplayer to display in the help pages in the following format:
-### <option name> => [ <1=advance help | 0=normal help>, '<getopt format>', '<Help section>', 'Usage', 'help text'],
-### You then refer to the option as $opt->{<option name>}
-### The example line below will automatically allow users to specify the output dir for recordings for your PROGTYPE
-### Optional
-# Class cmdline Options
-sub opt_format {
-	return {
-		outputPROGTYPE	=> [ 1, "outputPROGTYPE=s", 'Output', '--outputPROGTYPE <dir>', "Output directory for PROGTYPE recordings"],
-	};
-}
-
-
-# Method to return optional list_entry format
-### This defines which programme fields should be displayed AFTER 
-### '${prefix}$prog->{index}:\t${prog_type}${name}$prog->{episode}' when 'get_iplayer --type=PROGTYPE' is used
-### Optional
-sub optional_list_entry_format {
-	my $prog = shift;
-	return ", $prog->{available}, $prog->{channel}, $prog->{categories}";
-}
-
-
-# Returns the modes to try for this prog type
-### Set this to the mode to be used for download - this can be the same as the PROGTYPE if only one type exists
-sub modelist {
-	return 'podcast';
-}
-
-
-### This method simply (!) gets an XML feed which lists all programme or scrapes a web page that gived overview info for each available programme.
-### Once you have the requisite information (you don't need all the fields) then you can create an object which will add it to the cache automatically for you. 
-### The example below does 'five' web page scraping but this code will very much depend on how you need to get the info
-### Just make sure you use '$progref->{$pid} = Programme::PROGTYPE->new()' to add a new prog object for each programme
-### The pid is a unique numeric or alphanumeric identifier used on the website or feed to identify that programme
-### The main::request_url_retry method should be used whenever downloading web pages or 
-### feeds (search for 'sub request_url_retry ' in the get_iplayer script for usage)
-# Usage: Programme::tv->get_links( \%prog, 'five' );
-# Uses: %{ channels() }, \%prog
-sub get_links {
-	shift; # ignore obj ref
-	my $progref = shift;
-	my $prog_type = shift;
-	my %channels = %{ channels() };
-
-	# page scraping here
-
-	my $xml;
-	my $feed_data;
-	my $res;
-	main::logger "INFO: Getting $prog_type Programmes List\n";
-
-	# Setup user agent with redirection enabled and cookie-jar disabled
-	# Disable cookie jar (otherwise it saves cookies that prevent further XML downloads for a prog)
-	my $ua = main::create_ua( undef, 1 );
-
-	my $baseurl = 'http://demand.five.tv';
-
-	my $url = $baseurl.'/SeriesAZ.aspx';
-	$xml = main::request_url_retry($ua, $url, 3, '.', "WARNING: Failed to get series list from from Demand Five site\n");
-
-	# Hash of <name> => <uri>;
-	my %names;
-	# class="episodeLink" href="Series.aspx?seriesBaseName=HiddenLives">Hidden Lives</a>
-	while ( $xml =~ m{class="episodeLink"\s+href="(.+?)">\s*(.+?)</a>}sg ) {
-		$names{$2} = "/$1";
-		main::logger "DEBUG: Series '$2', URI: /$1\n" if $opt->{debug};
-	}
-
-	# Download index feed
-	# Sort feeds so that category based feeds are done last - this makes sure that the channels get defined correctly if there are dups
-	for my $name ( keys %names ) {
-
-		my $url = $baseurl.$names{$name};
-		main::logger "DEBUG: Getting Episodes for $name\n" if $opt->{verbose};
-		$xml = main::request_url_retry($ua, $url, 3, '.', "WARNING: Failed to get programme index feed for $_ from Demand Five site\n");
-		decode_entities($xml);
-		StringUtils::clean_utf8_and_whitespace($xml);
-
-		# <div id="episode4" class="episodesOff">
-		# 	<div class="serepisodesdtls">
-		# 		<div class="fltlt">
-		# 			<a href="javascript:void(0);" class="episodeClose" onclick="toggleEpisode('episode4');">
-		# 				<img src="/images/ico_episode_close.gif" alt="View Details" vspace="2" border="0"  title="View Details" />
-		# 			</a>
-		# 			<a href="javascript:void(0);" class="episodeOpen" onclick="toggleEpisode('episode4');">
-		# 				<img src="/images/ico_episode_open.gif" alt="View Details" vspace="2" border="0"  title="View Details" />
-		# 			</a>
-		# 		</div>
-		#		<div class="serepiinfo">
-		#			<a href="javascript:void(0);" onclick="toggleEpisode('episode4');">episode 24 :</a> 
-		#			<a href="javascript:void(0);" onclick="toggleEpisode('episode4');" class="epititle"> I Want To Cook</a> 
-		#			
-		#			
-		#			
-		#			<br />
-		#			
-		#			<br />Avg Rating:
-		#			<div id="ctl00_MainContent_EpisodeList_EpisodeList_ctl03_AvgRatingStars" class="userRating" itemid="C5116040024">
-		#		<img id="ctl00_MainContent_EpisodeList_EpisodeList_ctl03_AvgRatingStars_AvgStars" src="images/avg_star_5.png" style="border-width:0px;" /><span id="ctl00_MainContent_EpisodeList_EpisodeList_ctl03_AvgRatingStars_Count" class="countLabel">(1 vote)</span>
-		#	</div>
-		#	
-		#	<br />
-		#	<div style="float:left;">
-		#		11 mins - 60.5 MB
-		#	</div>
-		#	
-		#	<div id="ctl00_MainContent_EpisodeList_EpisodeList_ctl03_ExpiresVisible" style="float:left;">
-		#		<img src="/images/ico_epi_expires.gif" alt="expires" width="14" height="12" hspace="5" />
-		#		<span class="expires">Available for another <strong>6</strong> days</span>
-		#	</div>
-		#</div>
-		#</div>
-		#<div id="ctl00_MainContent_EpisodeList_EpisodeList_ctl03_divPlayItem">
-		#	<div class="serepirent" >
-		#	<a href="Episode.aspx?episodeBaseName=C5116040024" class="PlayEpisodeItem" >
-		#		<img src="/images/btn_play.gif" alt="rent" border="0" align="top" title="play" />
-		#	</a> 
-		#</div>
-		#</div>
-		#<div class="seperator"><img src="/images/seperator.gif" alt="" title="" /></div>
-		#<div class="epimoreinfo">
-		#	<div class="moreinfort">
-		#		<img src="http://content.download.five.tv/bthttp/five/downloadstore/images/LittlePrincess_ESmall.png" alt="episode image"/>	
-		#	</div>
-		#	<div class="findmore">Little Princess is baking a cake.
-		#	<div>
-		#		<img src="/images/find_more.gif" alt="find more" width="12" height="12" align="top" title="find more" /> 
-		#		<a href="Episode.aspx?episodeBaseName=C5116040024"> find out more</a></div>
-		#	</div>
-		#</div>
-		#</div>
-
-		# Parse XML
-
-		# get list of entries within <entry> </entry> tags
-		my @entries = split /<div id="episode\d+"/, $xml;
-		# Discard first element == header
-		shift @entries;
-
-		main::logger "INFO: Got ".($#entries + 1)." episodes\n" if $opt->{verbose};
-
-		foreach my $entry (@entries) {
-			my ( $episode, $desc, $pid, $available, $expiry, $channel, $duration, $thumbnail, $versions, $guidance );
-
-			$entry =~ s/[\r\n]/ /g;
-			$entry =~ s/\s+/ /g;
-
-			# main::logger "DEBUG: Entry = $entry\n" if $opt->{debug};
-
-			# PID
-			# <a href="Episode.aspx?episodeBaseName=C5116040024">
-			$pid = $1 if $entry =~ m{Episode.aspx\?episodeBaseName=(C\d+)"}i;
-
-			# Episode
-			## <a href="javascript:void(0);" onclick="toggleEpisode('episode4');">episode 24 :</a>
-			# <a href="javascript:void(0);" onclick="toggleEpisode('episode4');" class="epititle"> I Want To Cook</a>
-			$episode = $1 if $entry =~ m{class="epititle">\s*(.+?)\s*</a>}i;
-
-			# Available
-			# <span class="expires">Available for another <strong>6</strong> days</span>
-			$available = $1 if $entry =~ m{<span class="expires">Available for another (.+?)</span>}i;
-			$available =~ s|<\/?.+?>||g;
-
-			# Duration
-			# 
-			# <br />
-			# <div style="float:left;">
-			#	11 mins - 60.5 MB
-			# </div>
-			$duration = $1 if $entry =~ m{FileSize\s*-->\s*<b.+?>\s*<div.+?>\s*(.+?)\s*</div>}i;
-
-			# Desc
-			# <div class="findmore">Little Princess is baking a cake.
-			# <div>
-			$desc = $1 if $entry =~ m{<div class="findmore">\s*(.+?)\s*<div>};
-			# Remove unwanted html tags and extra whitespace
-			$desc =~ s!</?(br|b|i|p|strong)\s*/?>!!gi;
-			$desc =~ s/\s+/ /g;
-
-			# <span class="channel">Channel 4</span>
-			#$channel =  $1 if $entry =~ m{<span\s+class="channel">\s*(.+?)\s*</span>}i;
-
-			# Merge and Skip if this pid is a duplicate
-			if ( defined $progref->{$pid} ) {
-				main::logger "WARNING: '$pid, $progref->{$pid}->{name} - $progref->{$pid}->{episode}, $progref->{$pid}->{channel}' already exists (this channel = $channel)\n" if $opt->{verbose};
-				next;
-			}
-
-			# Thumbnail
-			#	<div class="moreinfort">
-			#		<img src="http://content.download.five.tv/bthttp/five/downloadstore/images/LittlePrincess_ESmall.png" alt="episode image"/>	
-			#	</div>
-			$thumbnail = $1 if $entry =~ m{<div class="moreinfort">\s*<img src="(.+?)"};
-			main::logger "DEBUG: pid='$pid',name='$name', episode='$episode', duration='$duration', available='${available}'\n" if $opt->{debug};
-
-			# build data structure
-			$progref->{$pid} = main::progclass($prog_type)->new(
-				'pid'		=> $pid,
-				'name'		=> $name,
-				'versions'	=> 'default',
-				'episode'	=> $episode,
-				'desc'		=> $desc,
-				'guidance'	=> $guidance,
-				'available'	=> $available,
-				'duration'	=> $duration,
-				'thumbnail'	=> $thumbnail,
-				'channel'	=> 'five',
-				'categories'	=> 'tv',
-				'type'		=> $prog_type,
-				'web'		=> "http://demand.five.tv/Episode.aspx?episodeBaseName=${pid}",
-			);
-		}
-	}
-	main::logger "\n";
-	return 0;
-}
-
-
-
-### This method is called to get the URL or stream URI to enable get_iplayer to download it. (example from old 'five' plugin)
-### The $data{MODE}{streamer} value must refer to one of the Streamer::XXXXX classes in get_iplayer.
-### If you need to add a new one best contact the get_iplayer author.
-### The stream URL should be in $data{MODE}{streamurl}, other $data{MODE} parameters might need to be set depending on the Stremer class used
-### The $data{MODE}{ext} should reflect the filename extension of the finally recorded or streamed file. e.g. 'mp4' or 'mov'
-# Gets media streams data for this version pid
-sub get_stream_data {
-	my ( $prog, undef, $media ) = @_;
-	my %data;
-	my $entry;
-
-	# Setup user agent with redirection enabled and cookie-jar disabled
-	# Disable cookie jar by setting '1' (otherwise it saves cookies that prevent further XML downloads for a prog)
-	my $ua = main::create_ua( undef, 1 );
-	$opt->{quiet} = 0 if $opt->{streaminfo};
-
-	# Need to add temporary cookie with request of "handlerReferer=<pid>"
-	# e.g. Set-Cookie: handlerReferer=C5144920007; path=/; domain=.demand.five.tv;
-	$ua->default_header('Cookie' => "handlerReferer=$prog->{pid}; path=/;");
-	main::logger "DEBUG: Sending Cookie: Cookie: handlerReferer=$prog->{pid}; path=/;\n" if $opt->{debug};
-	# Get XML
-	my $prog_metadata_url = 'http://demand.five.tv/Handlers/FlashEpisode.ashx?baseName='; # + <pid>
-	$entry = main::request_url_retry($ua, "${prog_metadata_url}$prog->{pid}", 3 );
-
-	decode_entities($entry);
-	main::logger "DEBUG: ${prog_metadata_url}$prog->{pid}:\n$entry\n\n" if $opt->{debug};
-	# Flatten
-	$entry =~ s|[\r\n]||g;
-
-	my $stremuri;
-
-	#   <video>
-	#     <![CDATA[rtmpe://streamflv.download.five.tv/a800/o10/mp4:bthttp/five/downloadstore/secure/thegadgetshow/movies/The-Gadget-Show_S11_E7_Episode-7_FLVSTREAM.mp4?e=1241001311&h=62a13cc33a4f88fccbdef4baccc80c41]]>
-	# </video>
-
-	$stremuri = $1 if $entry =~ m{\[(rtmpe://.+?)\]};
-
-	# streams
-	my $mode = 'flashhigh';
-	$data{$mode}{ext} = 'mp4';
-	$data{$mode}{streamer} = 'rtmp';
-
-	$data{$mode}{type} = 'Flash RTMPE h264 stream';
-	$data{$mode}{streamurl} = $stremuri;
-	$data{$mode}{protocol} = 3;
-	main::logger "DEBUG: Found $mode: $data{$mode}{type}\n" if $opt->{debug};
-
-	# Return a hash with media => url if '' is specified - otherwise just the specified url
-	if ( ! $media ) {
-		return %data;
-	} else {
-		# Make sure this hash exists before we pass it back...
-		$data{$media}{exists} = 0 if not defined $data{$media};
-		return $data{$media};
-	}
-}
-
-
-
-### Finally, this method is called by get_iplayer when a --get is used (this example is from the old ch4 plugin)
-### This is where we check that the required download external progs exist (and fallback to a raw mode if required)
-### Get the detailed streamdata using %streamdata = %{ $prog->get_stream_data( undef, '<MODE>') };
-### You will need to set the correct $prog->{ext} from $prog->{streams}->{$version}->{$mode}->{ext} (taken from above method)
-### The filename generation can be tweaked using the usual <fields> when calling $prog->generate_filenames
-### Best keep the test step in there
-### Create the streamer instance
-### The final return $stream->get( $ua, $prog->{pid}, $prog ) calls the streamer/recorder with all your data
-sub download {
-	my ( $prog, $ua, $mode, $version, $version_pid ) = ( @_ );
-	my %streamdata;
-
-	# if subsonly required then skip
-	return 'skip' if $opt->{subsonly};
-
-	# if rtmpdump does not exist
-	if ( $mode =~ /^(rtmp|flash)/ && ! main::exists_in_path('rtmpdump')) {
-		main::logger "WARNING: Required program rtmpdump does not exist (see http://linuxcentre.net/getiplayer/installation and http://linuxcentre.net/getiplayer/download)\n";
-		return 'next';
-	}
-	# Force raw mode if ffmpeg is not installed
-	if ( $mode =~ /^(flash|rtmp)/ && ! main::exists_in_path('ffmpeg')) {
-		main::logger "\nWARNING: ffmpeg does not exist - not converting flv file\n";
-		$opt->{raw} = 1;
-	}
-
-	%streamdata = %{ $prog->get_stream_data( undef, 'flashnormal') };
-
-	# Get extension from streamdata if defined and raw not specified
-	$prog->{ext} = $prog->{streams}->{$version}->{$mode}->{ext};
-	$prog->{ext} = 'flv' if $opt->{raw};
-	
-	my $url = $prog->{streams}->{$version}->{$mode}->{streamurl};
-
-	if ( not $url ) {
-		main::logger "WARNING: No programme stream URL was found, skipping\n";
-		return 'skip';
-	}
-	
-	# Determine the correct filenames for this recording
-	return 'skip' if $prog->generate_filenames( $ua, "<name> <episode> <pid>" );
-
-	# Skip from here if we are only testing recording
-	return 'skip' if $opt->{test};
-
-	# Instantiate new streamer from streamdata
-	my $class = "Streamer::$prog->{streams}->{$version}->{$mode}->{streamer}";
-	my $stream = $class->new;
-
-	# Do the recording
-	return $stream->get( $ua, $prog->{streams}->{$version}->{$mode}->{streamurl}, $prog, %{ $prog->{streams}->{$version}->{$mode} } );
-}
-
-1;

get_iplayer-2.82.tar.gz/plugins/podcast.plugin Deleted

@@ -1,357 +0,0 @@
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-################### Podcast class #################
-package Programme::podcast;
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme';
-
-# Class vars
-# Global options
-my $opt;
-
-
-# Constructor
-# Usage: $prog{$pid} = Programme->new( 'pid' => $pid, 'name' => $name, <and so on> );
-sub new {
-	my $type = shift;
-	my %params = @_;
-	my $self = {};
-	for (keys %params) {
-		$self->{$_} = $params{$_};
-	}
-	# Ensure the subclass $opt var is pointing to the Superclass global optref
-	$opt = $Programme::optref;
-	bless $self, $type;
-}
-
-
-sub index_min { return 200001 }
-sub index_max { return 299999 }
-
-
-# Class cmdline Options
-sub opt_format {
-	return {
-		outputpodcast	=> [ 1, "outputpodcast=s", 'Output', '--outputpodcast <dir>', "Output directory for podcast recordings"],
-	};
-}
-
-
-# Method to return optional list_entry format
-sub optional_list_entry_format {
-	my $prog = shift;
-	my @format;
-	for ( qw/ available channel categories / ) {
-		push @format, $prog->{$_} if defined $prog->{$_};
-	}
-	return ', '.join ', ', @format;
-}
-
-
-# Returns the modes to try for this prog type
-sub modelist {
-	return 'podcast';
-}
-
-
-# Feed info:
-#	# Also see http://derivadow.com/2008/07/18/interesting-bbc-data-to-hack-with/
-#	# All podcasts menu (iphone)
-#	http://www.bbc.co.uk/radio/podcasts/ip/
-#	# All radio1 podcasts
-#	http://www.bbc.co.uk/radio/podcasts/ip/lists/radio1.sssi
-#	# All radio1 -> moyles podcasts
-#	http://www.bbc.co.uk/radio/podcasts/moyles/assets/iphone_keepnet.sssi
-#	# RSS Feed (indexed from?)
-#	http://downloads.bbc.co.uk/podcasts/radio1/moyles/rss.xml
-#	# aod by channel see http://docs.google.com/View?docid=d9sxx7p_38cfsmxfcq
-#	# http://www.bbc.co.uk/radio/aod/availability/<channel>.xml
-
-# Usage: Programme::podcast->get_links( $prog, 'podcast' );
-sub get_links {
-	shift; # ignore obj ref
-	my $prog = shift;
-	my $prog_type = shift;
-	my $podcast_index_feed_url = 'http://downloads.bbc.co.uk/podcasts/ppg.xml';
-
-	my $xml;
-	my $res;
-	main::logger "INFO: Getting podcast Index Feeds\n";
-	# Setup User agent
-	my $ua = main::create_ua('get_iplayer');
-	
-	# Method
-	# $podcast_index_feed_url (gets list of rss feeds for each podcast prog) =>
-	# http://downloads.bbc.co.uk/podcasts/$channel/$name/rss.xml =>
-	
-	# Download index feed
-	my $xmlindex = main::request_url_retry($ua, $podcast_index_feed_url, 3, '.', "WARNING: Failed to get prodcast index from site\n");
-	$xmlindex =~ s/\n/ /g;
-
-	# Every RSS feed has an extry like below (all in a text block - not formatted like below)
-	#  <program xmlns="" language="en-gb" typicalDuration="P30M" active="true" public="true" bbcFlavour="Programme Highlights" region="all" wwpid="0">
-	#    <title>Best of Chris Moyles</title>
-	#    <shortTitle>moyles</shortTitle>
-	#    <description>Weekly highlights from the award-winning Chris Moyles breakfast show, as broadcast by Chris and team every morning from 6.30am to 10am.</description>
-	#    <network id="radio1" name="BBC Radio 1" />
-	#    <image use="itunes" url="http://www.bbc.co.uk/radio/podcasts/moyles/assets/_300x300.jpg" />
-	#    <link target="homepage" url="http://www.bbc.co.uk/radio1/chrismoyles/" />
-	#    <link target="feed" url="http://downloads.bbc.co.uk/podcasts/radio1/moyles/rss.xml" />
-	#    <link target="currentItem" url="http://downloads.bbc.co.uk/podcasts/radio1/moyles/moyles_20080926-0630a.mp3">
-	#      <title>Moyles: Guestfest. 26 Sep 08</title>
-	#      <description>Rihanna, Ross Kemp, Jack Osbourne, John
-	#      Barrowman, Cheggars, the legend that is Roy Walker and more,
-	#      all join the team in a celeb laden bundle of mirth and
-	#      merriment. It&#226;&#8364;&#8482;s all the best bits of the
-	#      week from The Chris Moyles Show on BBC Radio 1.</description>
-	#      <publishDate>2008-09-26T06:30:00+01:00</publishDate>
-	#    </link>
-	#    <bbcGenre id="entertainment" name="Entertainment" />
-	#    <systemRef systemId="podcast" key="42" />
-	#    <systemRef systemId="pid.brand" key="b006wkqb" />
-	#    <feed mimeType="audio/mpeg" content="audio" audioCodec="mp3" audioProfile="cbr" />
-	#  </program>
-	for ( split /<program/, $xmlindex ) {
-		# Extract channel name, rss feed data
-		my ($channel, $url, $web);
-
-		# <network id="radio1" name="BBC Radio 1" />
-		$channel = $1 if m{<network\s+id=".*?"\s+name="(.*?)"\s*\/>};
-
-		# <link target="feed" url="http://downloads.bbc.co.uk/podcasts/radio1/moyles/rss.xml" />
-		$url = $1 if m{<link\s+target="feed"\s+url="(.*?)"\s*\/>};
-
-		# <link target="homepage" url="http://www.bbc.co.uk/radio1/chrismoyles/" />
-		$web = $1 if m{<link\s+target="homepage"\s+url="(.*?)"\s*\/>};
-
-		# Skip if there is no feed data for channel
-		next if ! ($channel || $url);
-
-		my ( $name, $episode, $desc, $pid, $available, $duration, $thumbnail );
-
-		# Get RSS feeds for each podcast programme
-		main::logger "DEBUG: Getting podcast feed $url\n" if $opt->{verbose};
-		$xml = main::request_url_retry($ua, $url, 3, '.', "WARNING: Failed to get podcast feed for $channel / $_ from iplayer site\n") if $opt->{verbose};
-		$xml = main::request_url_retry($ua, $url, 3, '.', '') if ! $opt->{verbose};
-		# skip if no data
-		next if ! $xml;
-
-		main::logger "INFO: Got ".(grep /<media:content/, split /<item>/, $xml)." programmes\n" if $opt->{verbose};
-		decode_entities($xml);
-	
-		# First entry is channel data
-		# <?xml version="1.0" encoding="utf-8"?>
-		#<rss xmlns:media="http://search.yahoo.com/mrss/"
-		#xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-		#version="2.0">
-		#  <channel>
-		#    <title>Stuart Maconie's Freak Zone</title>
-		#    <link>http://www.bbc.co.uk/6music/shows/freakzone/</link>
-		#    <description>Weekly highlights from Stuart Maconie's
-		#    ...podcast is only available in the UK.</description>
-		#    <itunes:summary>Weekly highlights from Stuart Maconie's
-		#    ...podcast is only available in the UK.</itunes:summary>
-		#    <itunes:author>BBC 6 Music</itunes:author>
-		#    <itunes:owner>
-		#      <itunes:name>BBC</itunes:name>
-		#      <itunes:email>podcast.support@bbc.co.uk</itunes:email>
-		#    </itunes:owner>
-		#    <language>en</language>
-		#    <ttl>720</ttl>
-		#    <image>
-		#      <url>
-		#      http://www.bbc.co.uk/radio/podcasts/freakzone/assets/_300x300.jpg</url>
-		#      <title>Stuart Maconie's Freak Zone</title>
-		#      <link>http://www.bbc.co.uk/6music/shows/freakzone/</link>
-		#    </image>
-		#    <itunes:image href="http://www.bbc.co.uk/radio/podcasts/freakzone/assets/_300x300.jpg" />
-		#    <copyright>(C) BBC 2008</copyright>
-		#    <pubDate>Sun, 06 Jul 2008 20:00:05 +0100</pubDate>
-		#    <itunes:category text="Music" />
-		#    <itunes:keywords>Stewart Maconie, Macconie, freekzone,
-		#    freakzone, macoonie</itunes:keywords>
-		#    <media:keywords>Stewart Maconie, Macconie, freekzone,
-		#    freakzone, macoonie</media:keywords>
-		#   <itunes:explicit>no</itunes:explicit>
-		#    <media:rating scheme="urn:simple">nonadult</media:rating>
-
-		# Parse XML
-
-		# get list of entries within <entry> </entry> tags
-		my @entries = split /<item>/, $xml;
-		# first element == <channel> header
-		my $header = shift @entries;
-
-		# Get podcast name
-		$name = $1 if $header =~ m{<title>\s*(.+?)\s*</title>};
-	
-		# Parse the categories into hash
-		# <itunes:category text="Music" />
-		my @category;
-		for my $line ( grep /<itunes:category/, (split /\n/, $header) ) {
-			push @category, $1 if $line =~ m{<itunes:category\s+text="\s*(.+?)\s*"};
-		}
-	
-		# Get thumbnail from header
-		# <itunes:image href="http://www.bbc.co.uk/radio/podcasts/freakzone/assets/_300x300.jpg" />
-		$thumbnail = $1 if $header =~ m{<itunes:image href="\s*(.+?)\s*"};
-
-		# Followed by items:
-		#    <item>
-		#      <title>FreakZone: C'est Stuart avec le Professeur Spear et le
-		#      pop francais?</title>
-		#      <description>Stuart and Justin discuss the sub-genre of
-		#      French 'cold wave' in this week's module.</description>
-		#      <itunes:subtitle>Stuart and Justin discuss the sub-genre of
-		#      French 'cold wave' in this week's
-		#      module....</itunes:subtitle>
-		#      <itunes:summary>Stuart and Justin discuss the sub-genre of
-		#      French 'cold wave' in this week's module.</itunes:summary>
-		#      <pubDate>Sun, 06 Jul 2008 20:00:00 +0100</pubDate>
-		#      <itunes:duration>14:23</itunes:duration>
-		#      <enclosure url="http://downloads.bbc.co.uk/podcasts/6music/freakzone/freakzone_20080706-2000.mp3"
-		#      length="13891916" type="audio/mpeg" />
-		#      <guid isPermaLink="false">
-		#      http://downloads.bbc.co.uk/podcasts/6music/freakzone/freakzone_20080706-2000.mp3</guid>
-		#      <link>
-		#      http://downloads.bbc.co.uk/podcasts/6music/freakzone/freakzone_20080706-2000.mp3</link>
-		#      <media:content url="http://downloads.bbc.co.uk/podcasts/6music/freakzone/freakzone_20080706-2000.mp3"
-		#      fileSize="13891916" type="audio/mpeg" medium="audio"
-		#      expression="full" duration="863" />
-		#      <itunes:author>BBC 6 Music</itunes:author>
-		#    </item>
-	
-		foreach my $entry (@entries) {
-
-			my $entry_flat = $entry;
-			$entry_flat =~ s/\n/ /g;
-	
-			# Use the link as a guid
-			# <link>   http://downloads.bbc.co.uk/podcasts/6music/freakzone/freakzone_20080706-2000.mp3</link>
-			$pid = $1 if $entry =~ m{<link>\s*(.+?)</link>};
-	
-			# Skip if this pid is a duplicate
-			if ( defined $prog->{$pid} ) {
-				main::logger "WARNING: '$pid, $prog->{$pid}->{name} - $prog->{$pid}->{episode}, $prog->{$pid}->{channel}' already exists (this channel = $_)\n" if $opt->{verbose};
-				next;
-			}
-	
-			# parse episode
-			# <title>FreakZone: C'est Stuart avec le Professeur Spear et le pop francais?</title>
-			$episode = $1 if $entry =~ m{<title>\s*(.*?)\s*</title>};
-	
-			# <pubDate>Sun, 06 Jul 2008 20:00:00 +0100</pubDate>
-			$available = $1 if $entry =~ m{<pubDate>\s*(.*?)\s*</pubDate>};
-	
-			# <description>Stuart and Justin discuss the sub-genre of French 'cold wave' in this week's module.</description>
-			$desc = $1 if $entry =~ m{<description>\s*(.*?)\s*</description>};
-	
-			# Duration
-			$duration = $1 if $entry =~ m{<itunes:duration>\s*(.*?)\s*</itunes:duration>};
-	
-			# build data structure
-			$prog->{$pid} = Programme::podcast->new(
-				'pid'		=> $pid,
-				'name'		=> $name,
-				'versions'	=> 'default',
-				'episode'	=> $episode,
-				'desc'		=> $desc,
-				'available'	=> $available,
-				'duration'	=> $duration,
-				'thumbnail'	=> $thumbnail,
-				'channel'	=> $channel,
-				'categories'	=> join(',', @category),
-				'type'		=> $prog_type,
-				'web'		=> $web,
-			);
-		}
-	}
-	main::logger "\n";
-	return 0;
-}
-
-
-
-# Gets media streams data for this version pid
-# $media = http|undef
-sub get_stream_data {
-	my ( $prog, $verpid, $media ) = @_;
-	my $data = {};
-
-	$opt->{quiet} = 0 if $opt->{streaminfo};
-
-	$data->{podcast}->{ext} = $prog->{pid};
-	$data->{podcast}->{ext} =~ s|^.*\.(\w+)$|$1|g;
-	$data->{podcast}->{streamer} = 'http';
-	$data->{podcast}->{streamurl} = $prog->{pid};
-	$data->{podcast}->{type} = 'Podcast stream';
-
-	# Return a hash with media => url if '' is specified - otherwise just the specified url
-	if ( ! $media ) {
-		return $data;
-	} else {
-		# Make sure this hash exists before we pass it back...
-		$data->{$media}->{exists} = 0 if not defined $data->{$media};
-		return $data->{$media};
-	}
-}
-
-
-
-sub download {
-	my ( $prog, $ua, $mode, $version, $version_pid ) = ( @_ );
-
-	# if subsonly required then skip
-	return 'skip' if $opt->{subsonly};
-
-	# Determine the correct filename and extension for this download
-	my $filename_orig = $prog->{pid};
-	$filename_orig =~ s|^.+/(.+?)\.\w+$|$1|g;
-	$prog->{ext} = $prog->{streams}->{$version}->{$mode}->{ext};
-
-	# Determine the correct filenames for this download
-	return 'skip' if $prog->generate_filenames( $ua, "<longname> - <episode> $filename_orig" );
-
-	# Create dir for prog if not streaming-only
-	if ( ( ! ( $opt->{stdout} && $opt->{nowrite} ) ) && ( ! $opt->{test} ) ) {
-		$prog->create_dir();
-	}
-
-	# Skip from here if we are only testing downloads
-	return 1 if $opt->{test};
-	# Instantiate new streamer based on streamdata
-	my $class = "Streamer::$prog->{streams}->{$version}->{$mode}->{streamer}";
-	my $stream = $class->new;
-	return $stream->get( $ua, $prog->{pid}, $prog );
-}
-
-1;

get_iplayer-2.82.tar.gz/web.sh Deleted

get_iplayer-2.82.tar.gz/windows Deleted

get_iplayer-2.82.tar.gz/windows/INSTALLER.md Deleted

@@ -1,538 +0,0 @@
-## get_player Windows installer
-
-This document contains instructions for building the `get_iplayer` Windows installer and provides additional notes for installer developers. The information below is current for version 4.3 of the installer.
-
-## Building the Installer
-
-### Prerequisites
-
-1. **Strawberry Perl**
-
-	Source: <http://strawberryperl.com>
-
-	Version: 5.12.3.0
-
-	The installer is built with the Strawberry Perl distribution that is in your system path.  If you are using a different version, you may need to uninstall it and temporarily install the appropriate version.  Note that Strawberry Perl 5.12+ provides a mechanism to switch between versions without uninstalling.
-
-2. **Perl Modules**
-
-	Additional modules must be installed into the Perl distribution used to build the installer:
-
-	* MP3::Info (1.13)    - Used in localfiles plugin
-	* MP3::Tag (1.24)     - Used to enhance MP3 tagging
-	* PAR::Packer (1.010) - Used to build installer
-
-	The modules may be installed with the CPAN client provided by Strawberry Perl.
-
-3. **NSIS**
-
-	Source: <http://nsis.sourceforge.net>
-
-	Version: 2.46
-
-	Select the **Full** installation option to install all components.
-
-4. **NSIS Plugins**
-
-	Source: <http://nsis.sourceforge.net/Category:Plugins>
-
-	The installer requires the following additional NSIS plugins:
-
-	* Inetc
-	* Locate
-	* Nsis7z
-	* ZipDLL
-
-	Information on installing NSIS plugins:
-	<http://nsis.sourceforge.net/How_can_I_install_a_plugin>
-
-5. **7-Zip**
-
-	Source:  <http://www.7-zip.org>
-
-	Version: 9.20 (select 32-bit .exe installer)
-
-	The installer build scripts use the command-line interface to 7-Zip to compress/expand archive files.  However, it is not necessary to install the separate statically-linked version of the 7-Zip (7za.exe).  The GUI version has its own command-line interface.
-
-### Build Setup
-
-In the instructions below, replace with `C:\installer` with an appropriate location for your system
-
-1. **Download get_player Source**
-
-	This can be a clone of the infradead git repository (<http://git.infradead.org/get_iplayer.git>) or a downloaded snapshot.
-
-	Location: `C:\installer\get_player`
-
-2. **Check Build Scripts**
-
-	The files below should be in `C:\installer\get_player\windows`:
-
-	* `get_iplayer_setup.nsi` - NSIS installer script
-	* `make-init.cmd`         - Common initialisation code for other scripts
-	* `make-installer.cmd`    - Main installer build script (calls make-perlfiles.cmd)
-	* `make-perlfiles.cmd`    - Builds archive of Perl support files for installer
-	* `make-perltgz.cmd`      - Create archive of Perl support files as tarball
-
-	There are other files in that directory, but they are primarily of use in development and testing of the installer and are not necessary to perform the default build.  See the [Developer Notes](#devnotes) and [Manifest](#manifest) below.
-
-3. **Check Build Configuration**
-
-	The script `make-init.cmd` sets the locations of Strawberry Perl, NSIS, and 7-Zip used for the build.  Edit the relevant values if necessary.
-
-4. **Check Installer Version**
-
-	If you are building a new installer to incorporate changes in `get_iplayer` or the installer script, be sure that the installer version number has been incremented.  The installer version number can be found in the `!define VERSION` statement near the top of `get_iplayer_setup.nsi`.
-
-5. **Create Build Folder**
-
-	Create an empty folder to use for building the installer:
-
-	`C:\>MKDIR C:\installer\build`
-
-### Installer Build
-
-1. Open a command prompt and make the build folder the current directory
-
-	`C:\>CD C:\installer\build`
-
-	The installer may be built in any directory, but the build folder must be the current directory for your command prompt.
-
-2. Run the installer build script
-
-	`C:\installer\build>C:\installer\get_iplayer\windows\make-installer`
-
-    The build script creates 4 files in the build directory:
-
-	* `get_iplayer_setup_4.3.exe` - `get_player` installer application
-	* `perlfiles.zip`             - Archive of Perl support files included in the installer
-	* `perlpar.exe`               - PAR (Perl ARchive) file used to create perlfiles.zip
-	* `make-installer.log`        - Log of output from build script
-
-	In the event of an error, the temporary folder used by the script (`make-installer.tmp`) will remain in the build directory.
-
-3. There is no step 3.  For deployment information, see [Deployment Notes](#deploy) below.
-
-#### Build Notes
-
-* `perlfiles.zip` will contain the Perl core libraries (as determined by PAR::Packer), plus the additional modules specified above.  However, `make-perlfiles.cmd` strips some large files from the "unicore" package in order to save space.  These files are input and test files for generation of Unicode character tables and are not required for `get_iplayer`.
-
-* The Perl XML parser modules listed below are forced into `perlfiles.zip` via the `pp` command line:
-
-    - XML::LibXML::SAX
-    - XML::LibXML::SAX::Parser
-    - XML::SAX::PurePerl
-    - XML::Parser
-
-* The use of the XML parser modules requires that the DLL files listed below (from the Strawberry Perl distribution) must also be included in `perlfiles.zip`:
-
-    - XML::LibXML::SAX
-
-        + %PERLDIST%\c\bin\libiconv*.dll
-        + %PERLDIST%\c\bin\libxml2*.dll
-        + %PERLDIST%\c\bin\libz*.dll
-
-    - XML::Parser
-
-        + %PERLDIST%\c\bin\libexpat*.dll
-
-* Subsequent invocations of `make-installer.cmd` will use an existing `perlfiles.zip` if it is found in the current directory.  To force the Perl support archive to be completely rebuilt, add `/makeperl` to the command:
-
-	`C:\installer\build>C:\installer\get_iplayer\windows\make-installer /makeperl`
-
-* `perlfiles.zip` must be generated in Windows in order for the proper Win32 modules to be included in the archive.  However, the archive may be used to build the installer on Linux/OSX (see below).  To that end, a separate script (`make-perlfiles.cmd`) may be used to generate only the Perl support archive.  It is also invoked by `make-installer.cmd` to build the archive.
-
-* Subsequent invocations of `make-perlfiles.cmd` will use an existing `perlpar.exe` if it is found in the current directory.  To force the Perl support archive to be complete rebuilt, add `/makepar` to the command:
-
-	`C:\installer\build>C:\installer\get_iplayer\windows\make-perlfiles /makepar`
-
-	Invoking `make-installer.cmd` with `/makeperl` will have the same effect.
-
-	In the event of an error, the temporary folder used by the script (`make-perlfiles.tmp`) will remain in the build directory.
-
-* See the [Script Reference](#scriptref) below for a full list of command-line options accepted by `make-installer.cmd` and `make-perlfiles.cmd`.
-
-#### Linux/OSX
-
-* A shell script (`get_iplayer/make-nsis.sh`) was written to build the `get_iplayer` Windows installer on Linux/OSX.  However, since tarball (.tar.gz) support is the de facto standard for Unix-based systems, the shell script expects to find the Perl support archive in that form.  If you should need to build the installer on Linux/OSX, you can create the tarball in Windows and transfer it to the other system.  After building the Perl support archive (see above), execute an additional script:
-
-	`C:\installer\build>C:\installer\get_iplayer\windows\make-perltgz`
-
-	The script creates `perlfiles.zip` in the current directory (if necessary) and copies its contents to `perlfiles.tar.gz`.
-
-* Building the installer on Linux/OSX is similar to building in Windows.  Assuming that you have the `get_iplayer` source in `$HOME/installer/get_iplayer` and are using `$HOME/installer/build` as your build folder:
-
-	1. Copy `perlfiles.tar.gz` into the build folder
-
-        `$ cp /path/to/perlfiles.tar.gz $HOME/installer/build`
-
-	2. Make the build folder your current directory:
-
-        `$ cd $HOME/installer/build`
-
-	3. Execute the build script:
-
-        `$ $HOME/installer/get_iplayer/make-nsis.sh`
-
-	The installer application will be copied into the current directory.  As in Windows, the installer may be built in any folder, but the build folder must be the current directory for your shell.
-
-<a id="deploy"/>
-## Deployment Notes
-
-### Download Location
-
-The installer application is deployed in the directory corresponding to `http://www.infradead.org/get_iplayer_win`.  The following steps are necessary to deploy a new installer (with placeholders for actual directory paths):
-
-1. Make deployment directory current
-
-    `$ cd $WEBROOT/get_iplayer_win`
-
-2. Copy the installer application (e.g., `get_iplayer_setup_4.3.exe`) into the directory
-
-    `$ cp $BUILDPATH/get_iplayer_setup_4.3.exe .`
-
-    **NOTE:** For installers version 4.2 and earlier, the application MUST be named in the form `get_iplayer_setup_N.N.exe` in order that it can be downloaded by those earlier installers.  Versions 4.3+ will download new installers via the symbolic link (below)
-
-3. Update the `get_iplayer_setup_latest.exe` symbolic link to refer to the new installer
-
-    `$ ln -sf get_iplayer_setup_4.3.exe get_iplayer_setup_latest.exe`
-
-4. Update the contents of the installer version file with the new version (e.g. 4.3)
-
-    `$ echo -n "4.3" > VERSION-get_iplayer-win-installer`
-
-    **NOTE:** For installers version 4.2 and earlier, the version file MUST NOT contain a trailing newline character after the version number (thus the `-n` option for `echo`).  A trailing newline character will break the installer update mechanism.  This is fixed in versions 4.3+.
-
-### Configuration File
-
-By default, the installer employs a configuration file (INI format) to retrieve the download URLs for the various helper applications.  The configuration file is downloaded whenever the installer is executed in order to look for updates.  If the configuration file cannot be retrieved, the version built into the installer will be used (though it may be out of date).
-
-The configuration file is named `get_iplayer_config.ini` and is found in the **windows** directory of the `get_iplayer` Git repository along with the other installer-related files.  The script is deployed in the directory corresponding to `http://www.infradead.org/get_iplayer_win/`.  Deployment is performed as follows (with placeholders for actual directory paths):
-
-1. Make deployment directory current
-
-    `$ cd $WEBROOT/get_iplayer_win`
-
-2. Copy the latest version of the configuration file into the directory
-
-    `$ cp $SOURCEPATH/get_iplayer_config.ini get_iplayer_config_20110828.ini`
-
-    **NOTE:** Use a file name in the form `get_iplayer_config_YYYYMMDD.ini` to distinguish the new version from previous versions.
-
-3. Update the `get_iplayer_config_latest.ini` symbolic link to refer to the new configuration file.
-
-    `$ ln -sf get_iplayer_config_20110828.ini get_iplayer_config_latest.ini`
-
-The configuration file only needs to be changed when the release version and/or download URL for a helper application changes.  The user will only receive an update notice in the installer if the version string changes.  See the [Auxiliary Files Reference](#auxref) below.
-
-### CGI Script
-
-Prior to version 4.3, the installer required the assistance of a CGI script to retrieve the download URLs for the various helper applications.  The CGI script would be accessed by the installer for every helper application selected for installation.  The former behaviour can be restored if the installer is built with /NOCONFIG (see [Useful Options](#useful) below).
-
-The CGI script is named `get_iplayer_setup.cgi` and is found in the **windows** directory of the `get_iplayer` Git repository along with the other installer-related files.  The script is deployed in the directory corresponding to `http://www.infradead.org/cgi-bin/`.  Deployment is performed as follows (with placeholders for actual directory paths):
-
-1. Make deployment directory current
-
-    `$ cd $WEBROOT/cgi-bin`
-
-2. Back up the existing CGI script
-
-    `$ cp get_iplayer_setup.cgi get_iplayer_setup_20110828.cgi`
-
-    **NOTE:** Use a file name in the form `get_iplayer_config_YYYYMMDD.ini` to distinguish the backup from previous backups.
-
-3. Copy the latest version of the CGI script into the directory
-
-    `$ cp $SOURCEPATH/get_iplayer_setup.cgi .`
-
-    **NOTE:** Installer version 4.2 and below used a CGI script named `get_iplayer.cgi`.  Versions 4.3+ will expect the script, if deployed, to be named `get_iplayer_setup.cgi`.
-
-The CGI script only needs to be changed when the download URL for a helper application changes.  See the [Auxiliary Files Reference](#auxref) below.
-
-<a id="devnotes"/>
-## Developer Notes
-
-The notes below provide additional information relevant to working with the installer as a developer.  This discussion uses the example directory structure described above.
-
-### Preparation
-
-#### Expand Perl Support Archive
-
-The installer script requires an expanded version of the Perl support archive (`perlfiles.zip`) in the build directory.  `make-installer.cmd` creates a temporary expanded archive, but for development work you should create a permanent version.  You can expand it using 7-Zip, or you can use `make-perlfiles`:
-
-`C:\installer\build>C:\installer\get_iplayer\windows\make-perlfiles /expand`
-
-In either case, the expanded archive should now be in `C:\installer\build\perlfiles`.
-
-#### Using Git
-
-Any changes to the installer source or build scripts should ultimately be propagated to the Git repository at infradead.org.  If you are developing on Windows, `msysgit` (<http://code.google.com/p/msysgit/>) is a good option for Git-based development workflows.  Useful installation instructions can be found here: [Git for Windows Developers](http://lostechies.com/jasonmeridth/2009/06/01/git-for-windows-developers-git-series-part-1/).
-
-### MakeNSISW
-
-Although the scripts described above may be used to build the installer during development, it is easier to use the *MakeNSISW* utility provided with NSIS.  To launch *MakeNSISW*, Open the "NSIS Menu" application via "NSIS" on the Start menu, then select "Compile NSI Scripts".
-
-#### Build Configuration
-
-The compilation of the installer script is controlled by global symbols defined by **/D** options for the *makensis.exe* command line (see script reference below) or in the *MakeNSISW* settings dialog - see the NSIS documentation.  The most important options are those that determine the location of files used in the build process:
-
-* `BUILDPATH`  - Location for compiled installer application (`C:\installer\build`)
-* `SOURCEPATH` - Location of `get_iplayer` source distribution (`C:\installer\get_iplayer`)
-* `PERLFILES`  - Location of expanded Perl support archive (default = `${BUILDPATH}\perlfiles`, but may be overridden)
-
-Invoke the *MakeNSISW* Settings dialog via "Tools->Settings" (Ctrl+S).  Enter the values for `BUILDPATH` and `SOURCEPATH` described above.  The settings will persist through multiple invocations of *MakeNSISW*.  Note that you can create sets of options that may be saved and reloaded.
-
-### Compiling
-
-You can open `get_iplayer_setup.nsi` via "File->Load Script..." (Ctrl+L).  There is also an option in the Windows Explorer context (right click) menu for `.nsi` files named "Compile NSIS Script", which will open and compile the script in *MakeNSISW*.  Once opened, the installer script can be compiled and tested from within *MakeNSISW* via the commands on the "Script" menu.
-
-### Esoterica
-
-<a id="useful"/>
-#### Useful Options
-
-There are a number of options available to compile the installer script in different configurations:
-
-* `WITHOUTPERL`   - This option omits the Perl support archive from the installer.  If your development machine has a fully-working Perl installation, it isn't necessary to include the Perl support archive in development builds (`get_iplayer` will use the system Perl).
-* `WITHSCRIPTS`   - This option will embed `get_iplayer.pl`, `get_iplayer.cgi`, and `plugins` into the installer and will prevent those files from being downloaded or updated from infradead.org.  This is useful for working with updated versions of those scripts that have not yet been released.
-* `NOCONFIG`      - Reverts to use of CGI script to retrieve helper application download URLs
-* `NOCHECK`       - This option will prevent the online check for a new installer version.  The online check is usually unnecessary during development.
-* `PRERELEASE`    - Configures a warning dialog that pops up when the installer runs telling the user that he is using a pre-release build of the installer.
-
-#### Standalone Build
-
-Additional options are available to create a "standalone" build of the installer.  Standalone builds have all dependencies embedded within the installer and do not download or update them from infradead.org.  These builds are intended to model a unitary installer that could be distributed without the need for external sources of dependencies.  Standalone builds are useful in working with portions of the installer related to the unpacking and configuration of helper applications since they don't incur the overhead of downloading archive files at run-time.  However, the compile time is longer and the resulting installer is much larger due to the inclusion of the helper application archives.
-
-* `STANDALONE`  - This option is a synonym for `WITHSCRIPTS` and `WITHHELPERS`
-* `WITHHELPERS` - This option will embed archived versions of all `get_iplayer` helper applications into the installer (see below).
-* `HELPERS`     - Location of helper application archives (default = `${BUILDPATH}\helpers`, but may be overridden).
-
-**Helper Applications**
-
-The contents of `${HELPERS}` must be as follows:
-
-* AtomicParsley.zip
-* FFmpeg.zip
-* LAME.zip
-* MPlayer.zip
-* RTMPDump.zip
-* VLC.zip
-
-Note that all files use the short name for the application (without version strings).  Note also that all the archives MUST have ".zip" as the file extension regardless of whether the file is in PKZIP, 7-Zip, or EXE format.  This scheme follows the way archives are named when downloaded by the installer.  The installer won't necessarily know if a downloaded file is in PKZIP, 7-ZIP, or EXE format, so ".zip" was adopted as the extension most likely to be useful in working with the files in Windows Explorer.  The installer doesn't need to know the file format beforehand - it will try all three.
-
-The `${HELPERS}` folder may be populated using a script:
-
-`C:\installer\build>C:\installer\get_iplayer\windows\make-helpers`
-
-This script will compile and run a small NSIS installer application that allows you to select a target folder and then downloads all the helper application archives into that folder and names them appropriately.  The default location used is `helpers` in the build folder (`C:\installer\build\helpers`).  The source for the NSIS application can be found in `C:\installer\get_iplayer\windows\make-helpers.nsi`.  The download URLs are embedded in the source, so they should be updated to match the URLs in `get_iplayer_config.ini` if required.
-
-#### Build Script Options
-
-All of the NSIS options described above may also be specified on the `make-installer.cmd` command line.  For example, adding the `/withscripts` parameter to the command line will translate into `/Dwithscripts` being added the the `makensis.exe` command line used in building the installer.  For the full list, see the script reference below.
-
-<a id="scriptref"/>
-## Script Reference
-
-As a reference for available parameters, the help screens for all build scripts are shown below.
-
-### make-installer
-
-    Generate NSIS installer for get_iplayer
-
-    Usage:
-      make-installer [/keeptmp] [/makeperl] [/withoutperl]
-        [/withscripts] [/withhelpers] [/standalone]
-        [/offline] [/prelease] [\path\to\perlfiles.zip]
-      make-installer /? - this message
-
-    Parameters:
-      /keeptmp       - retain contents of temp directory
-      /makeperl      - force rebuild of Perl support archive
-      /withoutperl   - omit Perl support from build
-      /withscripts   - embed get_iplayer Perl scripts in build
-      /withhelpers   - embed get_iplayer helper apps in build
-      /standalone    - /withscripts + /withhelpers
-      /noconfig      - use CGI script for download URLs instead of config file
-      /nocheck       - no installer update check (testing only)
-      /prerelease    - prerelease build with warning dialog at launch
-
-    Input (in current directory):
-      perlfiles     - expanded Perl support archive
-      OR (if expanded archive not found):
-      perlfiles.zip - Perl support archive file [output from make-perlfiles]
-        (override by specifying Perl archive file on command line)
-      helpers       - folder with helper app archives (/withhelpers only)
-
-    Output (in current directory):
-      get_iplayer_setup_N.N.exe - installer EXE
-        (N.N = installer version)
-
-### make-perlfiles
-
-    Generate archive of Perl support files for get_iplayer
-
-    Usage:
-      make-perlfiles [/keeptmp] [/makepar] [/expand] [\path\to\perlpar.exe]
-      make-perlfiles /? - this message
-
-    Parameters:
-      /keeptmp - retain contents of temp directory upon completion
-      /makepar - force rebuild of PAR file (re-run pp)
-      /expand  - expand Perl support archive in current directory
-
-    Input/Output (in current directory):
-      perlpar.exe - PAR file [output from pp]
-        (override by specifying PAR file on command line)
-
-    Output (in current directory):
-      perlfiles.zip - Perl support archive
-
-    Required Perl modules (install from CPAN):
-      MP3::Info   - localfiles plugin
-      MP3::Tag    - MP3 tagging
-      PAR::Packer - archive creation
-
-### make-perltgz
-
-    Generate tarball of Perl support archive (to build installer on Linux/OSX)
-
-    Usage:
-      make-perltgz [/keeptmp] [/makeperl] [\path\to\perlfiles.zip]
-      make-perltgz /? - this message
-
-    Parameters:
-      /keeptmp  - retain contents of temp directory
-      /makeperl - force rebuild of Perl support archive
-
-    Input (in current directory):
-      perlfiles     - expanded Perl support archive
-      OR (if expanded archive not found):
-      perlfiles.zip - Perl support archive file [output from make-perlfiles]
-        (override by specifying Perl archive file on command line)
-
-    Output (in current directory):
-      perlfiles.tar.gz - Perl support tarball
-
-### make-helpers
-
-    Generate and run NSIS installer to download get_iplayer helper applications
-
-    Usage:
-      make-helpers [/rebuild]
-      make-helpers /? - this message
-
-    Parameters:
-      /rebuild - force rebuild of installer
-
-<a id="auxref"/>
-## Auxiliary Files Reference
-
-### Configuration File
-
-The cofinguration file is in INI format, with a section defined for each of the `get_iplayer` helper applications, with the short name of the application used as the section name.  Within each section are 3 values:
-
-* `version` - Version string (required)
-* `url`     - Download URL (required)
-* `doc`     - Documentation URL (optional)
-
-Version strings must be changed in order for the installer to show an update notice to the user.  Version strings generally should reflect the release numbering used by the developers of the helper applications.  However, the version string can have any value.  So long as it is different from the installed version (or the application is not installed), the user will be notified.  This may be useful if a download file is changed by the developer without changing the associated version number.  For example, AtomicParsley's version string in the configuration might be changed from from "0.9.4" to "0.9.4-reinstall1" to signal the user that it should be re-installed, even though it is still at version 0.9.4.
-
-Example of `get_iplayer_config.ini`:
-
-    [MPlayer]
-    version=1.0-rc2
-    url=http://www8.mplayerhq.hu/MPlayer/releases/win32/MPlayer-mingw32-1.0rc2.zip
-    doc=http://www.mplayerhq.hu/DOCS/HTML/en/index.html
-    [LAME]
-    version=3.98.4
-    url=http://www.exe64.com/mirror/rarewares/lame3.98.4.zip
-    doc=http://lame.sourceforge.net/using.php
-    [FFmpeg]
-    version=0.8
-    url=http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-0.8-win32-static.7z
-    doc=http://ffmpeg.org/ffmpeg-doc.html
-    [VLC]
-    version=1.1.11
-    url=http://www.grangefields.co.uk/mirrors/videolan/vlc/1.1.11/win32/vlc-1.1.11-win32.7z
-    doc=http://wiki.videolan.org/Documentation:Documentation
-    [RTMPDump]
-    Version=2.4
-    url=http://rtmpdump.mplayerhq.hu/download/rtmpdump-20110723-git-b627335-win32.zip
-    doc=http://rtmpdump.mplayerhq.hu/
-    [AtomicParsley]
-    version=0.9.4
-    url=http://bitbucket.org/jonhedgerows/atomicparsley/downloads/AtomicParsley-0.9.4.zip
-    doc=http://atomicparsley.sourceforge.net/
-
-### CGI Script
-
-The CGI file is a UNIX shell script that responds to a fixed set of query string values by redirecting the requesting application to the download URL for the corresponding helper application.
-
-Example of `get_iplayer_setup.cgi`:
-
-    #!/bin/sh
-
-    # CGI script to support get_iplayer Windows installer
-    # Redirects to download URLs for Win32 helper applications
-    # corresponding to pre-defined keys passed as query string.
-    # This script must be available at:
-    #   http://www.infradead.org/cgi-bin/get_iplayer_setup.cgi
-    # Example:
-    #   Request : http://www.infradead.org/cgi-bin/get_iplayer_setup.cgi?lame
-    #   Redirect: http://www.exe64.com/mirror/rarewares/lame3.98.4.zip
-
-    TARGET=
-
-    case "$QUERY_STRING" in
-        mplayer)
-            TARGET="http://www8.mplayerhq.hu/MPlayer/releases/win32/MPlayer-mingw32-1.0rc2.zip"
-        ;;
-        lame)
-            TARGET="http://www.exe64.com/mirror/rarewares/lame3.98.4.zip"
-        ;;
-        ffmpeg)
-            TARGET="http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-0.8-win32-static.7z"
-        ;;
-        vlc)
-            TARGET="http://www.grangefields.co.uk/mirrors/videolan/vlc/1.1.11/win32/vlc-1.1.11-win32.7z"
-        ;;
-        rtmpdump)
-            TARGET="http://rtmpdump.mplayerhq.hu/download/rtmpdump-20110723-git-b627335-win32.zip"
-        ;;
-        atomicparsley)
-            TARGET="http://bitbucket.org/jonhedgerows/atomicparsley/downloads/AtomicParsley-0.9.4.zip"
-        ;;
-    esac
-
-    if [ "$TARGET" == "" ]; then
-        cat <<EOF
-    Content-Type: text/html
-
-    <HTML><TITLE>Error</TITLE></HEAD>
-    <BODY><H1>Error</H1>
-    You requested '$QUERY_STRING' but that isn't one of the known downloads.
-    EOF
-    fi
-
-    cat <<EOF
-    Location: $TARGET
-    Content-Type: text/plain
-
-    Redirecting to $TARGET
-    EOF
-
-<a id="manifest"/>
-## Manifest
-
-Below is a complete list of installer-related files located in the **windows** directory of the `get_iplayer` Git repository.
-
-* `INSTALLER.md`           - This document (Markdown format)
-* `get_iplayer_config.ini` - Configuration file for installer
-* `get_iplayer_setup.cgi`  - CGI script for installer
-* `get_iplayer_setup.nsi`  - NSIS installer script
-* `make_helpers.cmd`       - Builds and runs `make_helpers.nsi`
-* `make_helpers.nsi`       - NSIS application to download helper apps for testing
-* `make-init.cmd`          - Common initialisation code for other scripts
-* `make-installer.cmd`     - Main installer build script (calls make-perlfiles.cmd)
-* `make-perlfiles.cmd`     - Builds archive of Perl support files for installer
-* `make-perltgz.cmd`       - Create archive of Perl support files as tarball

get_iplayer-2.82.tar.gz/windows/get_iplayer Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer/get_iplayer.cgi.cmd Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer/get_iplayer.cmd Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer/iplayer_logo.ico Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer/pvr_manager.cmd Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer/update_get_iplayer.cmd Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer_config.ini Deleted

get_iplayer-2.82.tar.gz/windows/get_iplayer_setup.cgi Deleted

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-# CGI script to support get_iplayer Windows installer
-# Redirects to download URLs for Win32 helper applications
-# corresponding to pre-defined keys passed as query string.
-# This script must be available at:
-#   http://www.infradead.org/cgi-bin/get_iplayer_setup.cgi
-# Example:
-#   Request : http://www.infradead.org/cgi-bin/get_iplayer_setup.cgi?lame
-#   Redirect: http://www.exe64.com/mirror/rarewares/lame3.98.4.zip
-
-TARGET=
-
-case "$QUERY_STRING" in
-    mplayer)
-        TARGET="http://www8.mplayerhq.hu/MPlayer/releases/win32/MPlayer-mingw32-1.0rc2.zip"
-    ;;
-    lame)
-        TARGET="http://www.exe64.com/mirror/rarewares/lame3.98.4.zip"
-    ;;
-    ffmpeg)
-        TARGET="http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-0.8-win32-static.7z"
-    ;;
-    vlc)
-        TARGET="http://www.grangefields.co.uk/mirrors/videolan/vlc/1.1.11/win32/vlc-1.1.11-win32.7z"
-    ;;
-    rtmpdump)
-        TARGET="http://rtmpdump.mplayerhq.hu/download/rtmpdump-20110723-git-b627335-win32.zip"
-    ;;
-    atomicparsley)
-        TARGET="http://bitbucket.org/jonhedgerows/atomicparsley/downloads/AtomicParsley-0.9.4.zip"
-    ;;
-esac
-
-if [ "$TARGET" == "" ]; then
-    cat <<EOF
-Content-Type: text/html
-
-<HTML><TITLE>Error</TITLE></HEAD>
-<BODY><H1>Error</H1>
-You requested '$QUERY_STRING' but that isn't one of the known downloads.
-EOF
-fi
-
-cat <<EOF
-Location: $TARGET
-Content-Type: text/plain
-
-Redirecting to $TARGET
-EOF

get_iplayer-2.82.tar.gz/windows/get_iplayer_setup.nsi Deleted

@@ -1,1152 +0,0 @@
-;#######################################
-;# Product Info
-;#######################################
-
-!define PRODUCT "get_iplayer"
-!define VERSION "4.5"
-; VERSION where Perl support last changed
-!define PERLVER "4.4"
-
-;#######################################
-;# Build Setup
-;#######################################
-
-!ifndef BUILDPATH
-!define BUILDPATH "."
-!endif
-!ifndef SOURCEPATH
-!define SOURCEPATH ".."
-!endif
-!ifndef PERLFILES
-!define PERLFILES "${BUILDPATH}\perlfiles"
-!endif
-!ifndef HELPERS
-!define HELPERS "${BUILDPATH}\helpers"
-!endif
-!ifdef STANDALONE
-!ifndef WITHSCRIPTS
-!define WITHSCRIPTS
-!endif
-!ifndef WITHHELPERS
-!define WITHHELPERS
-!endif
-!ifndef NOCONFIG
-!define NOCONFIG
-!endif
-!endif
-
-;#######################################
-;# Configuration
-;#######################################
-
-Name "get_iplayer"
-SetCompressor /SOLID lzma
-OutFile "${BUILDPATH}\get_iplayer_setup_${VERSION}.exe"
-; default install location
-InstallDir "$PROGRAMFILES\${PRODUCT}\"
-; remember install folder
-InstallDirRegKey HKCU "Software\${PRODUCT}" ""
-
-;#######################################
-;# Includes
-;#######################################
-!include "MUI2.nsh"
-!include "Sections.nsh"
-!include "FileFunc.nsh"
-!include "StrFunc.nsh"
-!include "TextFunc.nsh"
-!include "Locate.nsh"
-; StrFunc functions must be declared before use
-${StrRep}
-${StrCase}
-${StrTrimNewLines}
-
-;#######################################
-;# Install Locations
-;#######################################
-
-; declare here for MUI_DIRECTORYPAGE_VARIABLE below
-Var RecDir
-
-;#######################################
-;# Pages
-;#######################################
-
-; show warning on cancel
-!define MUI_ABORTWARNING
-; define the setup EXE logo
-!define MUI_ICON "${SOURCEPATH}\windows\installer_files\iplayer_logo.ico"
-!define MUI_UNICON "${SOURCEPATH}\windows\installer_files\iplayer_uninst.ico"
-; welcome page
-!insertmacro MUI_PAGE_WELCOME
-; license page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE LicensePre
-!insertmacro MUI_PAGE_LICENSE "${SOURCEPATH}\windows\installer_files\LICENSE.txt"
-!ifndef NOCONFIG
-; updates page
-Page custom UpdatesPage
-!endif
-; components page
-;!define MUI_PAGE_CUSTOMFUNCTION_PRE ComponentsPre
-!define MUI_PAGE_HEADER_TEXT "Choose Components"
-!define MUI_PAGE_HEADER_SUBTEXT "Choose Components for Installation or Updating"
-!define MUI_COMPONENTSPAGE_TEXT_TOP "Check the components you want to install and uncheck the \
-  components you don't want to install. You can update a component to the latest recommended version by checking it."
-!insertmacro MUI_PAGE_COMPONENTS
-; install directory page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE DirectoryPre
-!define MUI_PAGE_HEADER_TEXT "Choose Install Destination"
-!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which ${PRODUCT} will be installed."
-!define MUI_DIRECTORYPAGE_TEXT_TOP "${PRODUCT} will be installed into the following folder.$\r$\n$\r$\n\
-    To use a different folder, click Browse and select another folder. Click Next to continue."
-!define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Destination Folder"
-!insertmacro MUI_PAGE_DIRECTORY
-; recordings directory page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE RecordingsDirectoryPre
-!define MUI_PAGE_HEADER_TEXT "Choose Recordings Location"
-!define MUI_PAGE_HEADER_SUBTEXT "Choose the folder in which ${PRODUCT} will save all the recordings."
-!define MUI_DIRECTORYPAGE_TEXT_TOP "${PRODUCT} will record all programmes into the following folder.$\r$\n$\r$\n\
-    To use a different folder, click Browse and select another folder. Click Next to continue."
-!define MUI_DIRECTORYPAGE_TEXT_DESTINATION "Recordings Folder"
-; use $RecDir to avoid overwriting $INSTDIR
-!define MUI_DIRECTORYPAGE_VARIABLE $RecDir
-!insertmacro MUI_PAGE_DIRECTORY
-; instfiles page
-!define MUI_PAGE_CUSTOMFUNCTION_PRE InstFilesPre
-!insertmacro MUI_PAGE_INSTFILES
-; finish page
-!insertmacro MUI_PAGE_FINISH
-; uninstall pages
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_COMPONENTS
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;#######################################
-;# Language
-;#######################################
-
-!insertmacro MUI_LANGUAGE "English"
-
-;#######################################
-;# get_iplayer host site
-;#######################################
-
-!define MOTHERSHIP "http://www.infradead.org"
-!define MOTHERSHIP_NAME "infradead.org"
-
-;#######################################
-;# Updates and Version Checks
-;#######################################
-
-Var UpdatedComponents
-
-; user agent strings for downloads
-!define USERAGENT "curl/7.21.7 (i386-pc-win32) libcurl/7.21.7 OpenSSL/0.9.8r zlib/1.2.5"
-!define SETUP_UA "get_iplayer windows installer v${VERSION}"
-; URLs and file names for updates and version checks
-!define SETUPVER "get_iplayer_setup-ver.txt"
-!define SETUPVER_CHECK "get_iplayer_setup-ver-check.txt"
-!define SETUPVER_URL "${MOTHERSHIP}/get_iplayer_win/VERSION-get_iplayer-win-installer"
-!define SETUP_URL "${MOTHERSHIP}/get_iplayer_win/get_iplayer_setup_latest.exe"
-!define GIPVER "get_iplayer-ver.txt"
-!define GIPVER_CHECK "get_iplayer-ver-check.txt"
-!define GIPVER_URL "${MOTHERSHIP}/get_iplayer/VERSION-get_iplayer"
-!define GIPPL_URL "${MOTHERSHIP}/get_iplayer/latest/get_iplayer"
-!define GIPCGI_URL "${MOTHERSHIP}/get_iplayer/latest/get_iplayer.cgi"
-!ifndef NOCONFIG
-!define CONFIG "get_iplayer_config.ini"
-!define CONFIG_CHECK "get_iplayer_config-check.ini"
-!define CONFIG_URL "${MOTHERSHIP}/get_iplayer_win/get_iplayer_config_latest.ini"
-
-; Checks for new version of helper app in config
-!macro _CheckHelperUpdate _name _id
-  ; old version
-  ReadINIStr $8 "$INSTDIR\${CONFIG}" "${_name}" "version"
-  ; new version
-  ClearErrors
-  ReadINIStr $9  "$INSTDIR\${CONFIG_CHECK}" "${_name}" "version"
-  IfErrors no_update_${_name}
-    StrCmp $9 "" no_update_${_name}
-      ; versions equal, no update
-      StrCmp $8 $9  no_update_${_name}
-        SectionSetFlags ${_id} ${SF_SELECTED}
-        ; add notice if versions different
-        StrCpy $UpdatedComponents "$UpdatedComponents$\r$\n${_name} ($8 -> $9)"
-  no_update_${_name}:
-!macroend
-!define CheckHelperUpdate '!insertmacro _CheckHelperUpdate'
-!endif
-
-;#######################################
-;# Helper Section Updates
-;#######################################
-
-!macro _UpdateHelperSection _name _id
-  ; special case from 4.2
-  StrCmp "${_name}" "${RTMPDUMP}" 0 +3
-    IfFileExists "$INSTDIR\${RTMPDUMP_OLD}\*.*" 0 +2
-      SectionSetFlags ${_id} 0
-  IfFileExists "$INSTDIR\${_name}\*.*" 0 +2
-    SectionSetFlags ${_id} 0
-!macroend
-!define UpdateHelperSection '!insertmacro _UpdateHelperSection'
-
-!macro _un.UpdateHelperSection _name _id
-  ; special case from 4.2
-  StrCmp "${_name}" "${RTMPDUMP}" 0 +3
-    IfFileExists "$INSTDIR\${RTMPDUMP_OLD}\*.*" 0 +2
-      SectionSetFlags ${_id} ${SF_SELECTED}
-  IfFileExists "$INSTDIR\${_name}\*.*" 0 +2
-    SectionSetFlags ${_id} ${SF_SELECTED}
-!macroend
-!define un.UpdateHelperSection '!insertmacro _un.UpdateHelperSection'
-
-;#######################################
-;# Helper Apps
-;#######################################
-
-Var HelperName
-Var HelperKey
-Var HelperFile
-Var HelperDir
-Var HelperExe
-Var HelperPath
-Var HelperVal
-Var HelperVer
-Var HelperUrl
-Var HelperDoc
-
-; for checking helper EXE binary type
-!define SCS_32BIT_BINARY 0
-!define SCS_64BIT_BINARY 6
-
-; helper app names for folder/file naming, UI text
-!define MPLAYER "MPlayer"
-!define LAME "LAME"
-!define FFMPEG "FFmpeg"
-!define VLC "VLC"
-!define RTMPDUMP "RTMPDump"
-!define ATOMICPARSLEY "AtomicParsley"
-
-; options file keys for helper apps
-!define MPLAYER_KEY "mplayer"
-!define LAME_KEY "lame"
-!define FFMPEG_KEY "ffmpeg"
-!define VLC_KEY "vlc"
-!define RTMPDUMP_KEY "flvstreamer"
-!define ATOMICPARSLEY_KEY "atomicparsley"
-
-; URLs for helper app downloads (only if config file not used)
-!define MPLAYER_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?mplayer"
-!define LAME_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?lame"
-!define FFMPEG_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?ffmpeg"
-!define VLC_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?vlc"
-!define RTMPDUMP_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?rtmpdump"
-!define ATOMICPARSLEY_URL "${MOTHERSHIP}/cgi-bin/get_iplayer_setup.cgi?atomicparsley"
-
-; documentation URLs for helper apps (only if config file not used)
-!define MPLAYER_DOC "http://www.mplayerhq.hu/DOCS/HTML/en/index.html"
-!define LAME_DOC "http://lame.sourceforge.net/using.php"
-!define FFMPEG_DOC "http://ffmpeg.org/ffmpeg-doc.html"
-!define VLC_DOC "http://wiki.videolan.org/Documentation:Documentation"
-!define RTMPDUMP_DOC "http://rtmpdump.mplayerhq.hu/"
-!define ATOMICPARSLEY_DOC "http://atomicparsley.sourceforge.net/"
-
-; common extension for downloaded helpers (may be ZIP or 7Z format, or EXE)
-!define HELPER_EXT "zip"
-
-; identifies old rtmpdump from 4.2 that doesn't conform to naming convention
-!define RTMPDUMP_OLD "rtmpdump-2.2d"
-
-; Wrapper macros for helper app install/uninstall
-!macro _InstallHelper _name _key _url _doc
-  StrCpy $HelperName "${_name}"
-  StrCpy $HelperKey "${_key}"
-  StrCpy $HelperFile "$INSTDIR\${_name}.${HELPER_EXT}"
-  StrCpy $HelperDir "$INSTDIR\${_name}"
-  StrCpy $HelperExe "${_name}.exe"
-  StrCpy $HelperPath ""
-  StrCpy $HelperVal ""
-!ifndef NOCONFIG
-  ; get install params from downloaded config file
-  ReadINIStr $HelperVer "$INSTDIR\${CONFIG_CHECK}" "${_name}" "version"
-  ReadINIStr $HelperUrl "$INSTDIR\${CONFIG_CHECK}" "${_name}" "url"
-  ReadINIStr $HelperDoc "$INSTDIR\${CONFIG_CHECK}" "${_name}" "doc"
-!else
-  StrCpy $HelperVer "unknown"
-  StrCpy $HelperUrl "${_url}"
-  StrCpy $HelperDoc "${_doc}"
-!endif
-  Call InstallHelper
-!macroend
-!define InstallHelper '!insertmacro _InstallHelper'
-
-!macro un._InstallHelper _name _key
-  StrCpy $HelperName "${_name}"
-  StrCpy $HelperKey "${_key}"
-  StrCpy $HelperFile "$INSTDIR\${_name}.${HELPER_EXT}"
-  StrCpy $HelperDir "$INSTDIR\${_name}"
-  Call un.InstallHelper
-!macroend
-!define un.InstallHelper '!insertmacro un._InstallHelper'
-
-; Macros for helper app doc install/uninstall
-!macro _InstallHelperDoc _name _doc
-  WriteIniStr "$INSTDIR\${_name}_docs.url" "InternetShortcut" "URL" "${_doc}"
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Help\${_name} Documentation.lnk" \
-    "$INSTDIR\${_name}_docs.url" "" "$SYSDIR\SHELL32.dll" 175
-!macroend
-!define InstallHelperDoc '!insertmacro _InstallHelperDoc'
-
-!macro un._InstallHelperDoc _name
-  Delete "$INSTDIR\${_name}_docs.url"
-  Delete "$SMPROGRAMS\get_iplayer\Help\${_name} Documentation.lnk"
-!macroend
-!define un.InstallHelperDoc '!insertmacro un._InstallHelperDoc'
-
-;#######################################
-;# Options File
-;#######################################
-
-Var OptionsDir
-Var OptionsFile
-Var OptionKey
-Var OptionVal
-
-; Wrapper macros for creating/deleting options file settings
-!macro _InstallOption _key _val
-  StrCpy $OptionKey "${_key}"
-  StrCpy $OptionVal "${_val}"
-  Call InstallOption
-!macroend
-!define InstallOption '!insertmacro _InstallOption'
-
-!macro un._InstallOption _key
-  StrCpy $OptionKey "${_key}"
-  Call un.InstallOption
-!macroend
-!define un.InstallOption '!insertmacro un._InstallOption'
-
-;#######################################
-;# Virtual Store-Aware Cleanup
-;#######################################
-
-; Remove all get_iplayer files for un/re-install
-!macro RemoveGetIPlayer _un
-Function ${_un}RemoveGetIPlayer
-  StrCpy $1 $INSTDIR
-  RMDir /r "$1\lib"
-  RMDir /r "$1\perl-license"
-  Delete "$1\*.dll"
-  Delete "$1\perl.exe"
-  Delete "$1\get_iplayer.cgi.cmd"
-  Delete "$1\get_iplayer.cmd"
-  Delete "$1\iplayer_logo.ico"
-  Delete "$1\pvr_manager.cmd"
-  Delete "$1\get_iplayer.cgi"
-  Delete "$1\get_iplayer.pl"
-  Delete "$1\get_iplayer.pl.old"
-  Delete "$1\get_iplayer--pvr.bat"
-  Delete "$1\run_pvr_scheduler.bat"
-  ; URLs
-  Delete "$1\command_examples.url"
-  Delete "$1\pvr_manager.url"
-  Delete "$1\strawberry_docs.url"
-  ; clean files in VirtualStore (Win7/Vista) that may have been updated directly by get_iplayer.pl
-  StrCpy $2 "$LOCALAPPDATA\VirtualStore\Program Files\get_iplayer"
-  Delete "$2\get_iplayer.pl"
-  Delete "$2\get_iplayer.pl.old"
-FunctionEnd
-!macroend
-!insertmacro RemoveGetIPlayer ""
-!insertmacro RemoveGetIPlayer "un."
-
-;#######################################
-;# Section Sizes/Descriptions
-;#######################################
-
-; section sizes - update descriptions below if changed
-!define MPLAYER_SIZE 26300
-!define LAME_SIZE 1200
-!define FFMPEG_SIZE 43500
-!define VLC_SIZE 81900
-!define RTMPDUMP_SIZE 1900
-!define ATOMICPARSLEY_SIZE 500
-
-; section descriptions
-!define GET_IPLAYER_DESC "Install get_iplayer and required Strawberry Perl - Required for all recordings. \
-  Also bundled with Web PVR Manager (~25.9MB)"
-!define MPLAYER_DESC "Download and install ${MPLAYER} - Used for RealAudio and MMS recording modes (~26.3MB)"
-!define LAME_DESC "Download and install ${LAME} - Used for transcoding RealAudio recordings to MP3 (~1.2MB)"
-!define FFMPEG_DESC "Download and install ${FFMPEG} - Used for losslessly converting Flash Video into useful \
-  video/audio files formats (~43.5MB)"
-!define VLC_DESC "Download and install ${VLC} - Required for playback of playlists and content from \
-    Web PVR Manager (~81.9MB)"
-!define RTMPDUMP_DESC "Download and install ${RTMPDUMP} - Used for recording Flash video modes (~1.9MB)"
-!define ATOMICPARSLEY_DESC "Download and install ${ATOMICPARSLEY} - Used for Tagging MP4 files (~0.5MB)"
-
-;#######################################
-;# Sections
-;#######################################
-
-Section "get_iplayer" section1
-  ; clear files before (re)install
-  Call RemoveGetIPlayer
-  ; copy files into place
-  File "${SOURCEPATH}\windows\get_iplayer\get_iplayer.cgi.cmd"
-  File "${SOURCEPATH}\windows\get_iplayer\get_iplayer.cmd"
-  File "${SOURCEPATH}\windows\get_iplayer\iplayer_logo.ico"
-  File "${SOURCEPATH}\windows\get_iplayer\pvr_manager.cmd"
-!ifndef WITHOUTPERL
-  File /r "${PERLFILES}\lib"
-  File /r "${PERLFILES}\perl-license"
-  File "${PERLFILES}\*.dll"
-  File "${PERLFILES}\perl.exe"
-!endif
-!ifdef WITHSCRIPTS
-  ; embedded main scripts
-  File "/oname=get_iplayer.pl" "${SOURCEPATH}\get_iplayer"
-  File "${SOURCEPATH}\get_iplayer.cgi"
-  ; embedded plugins
-  CreateDirectory "$PROFILE\.get_iplayer"
-  SetOutPath "$PROFILE\.get_iplayer"
-  File /r "${SOURCEPATH}\plugins"
-  SetOutPath $INSTDIR
-!else
-  ; download get_iplayer
-  download1:
-  inetc::get /USERAGENT "${USERAGENT}" "${GIPPL_URL}" "$INSTDIR\get_iplayer.pl" /END
-  Pop $R0
-  StrCmp $R0 "OK" install1
-     MessageBox MB_YESNO|MB_ICONQUESTION \
-     "Download of get_iplayer failed: $R0, Do you wish to try again?" \
-     IDYES download1
-     Return
-  install1:
-  ; update the plugins (with installer privs)
-  ExecWait 'perl.exe get_iplayer.pl --plugins-update'
-  ; download get_iplayer.cgi
-  download2:
-  inetc::get /USERAGENT "${USERAGENT}" "${GIPCGI_URL}" "$INSTDIR\get_iplayer.cgi" /END
-  Pop $R0
-  StrCmp $R0 "OK" install2
-     MessageBox MB_YESNO|MB_ICONQUESTION \
-     "Download of get_iplayer Web PVR Manager failed: $R0, Do you wish to try again?" \
-     IDYES download2
-     Return
-  install2:
-  IfFileExists "$INSTDIR\${GIPVER_CHECK}" got_gipver
-    ; another try to download get_iplayer version file
-    inetc::get /USERAGENT "${SETUP_UA}" /SILENT "${GIPVER_URL}" "$INSTDIR\${GIPVER_CHECK}" /END
-    Pop $R0
-    StrCmp $R0 "OK" 0 no_gipver
-  got_gipver:
-!ifndef NOCONFIG
-  ${LineRead} "$INSTDIR\${GIPVER_CHECK}" 1 $1
-  ${StrTrimNewLines} $1 $1
-  ; update config file
-  WriteINIStr "$INSTDIR\${CONFIG}" "get_iplayer" "version" $1
-  WriteINIStr "$INSTDIR\${CONFIG}" "perlfiles" "version" ${PERLVER}
-!else
-  CopyFiles "$INSTDIR\${GIPVER_CHECK}" "$INSTDIR\${GIPVER}"
-!endif
-  no_gipver:
-!endif
-  ; create recordings folder
-  CreateDirectory $RecDir
-  ; set default options
-  ${InstallOption} "output" $RecDir
-  ${InstallOption} "mmsnothread" "1"
-  ${InstallOption} "nopurge" "1"
-  ; create run_pvr_scheduler batch file
-  FileOpen $0 "$INSTDIR\run_pvr_scheduler.bat" "w"
-  FileWrite $0 "cd $INSTDIR$\r$\n"
-  FileWrite $0 "perl.exe get_iplayer.pl --pvrschedule 14400$\r$\n"
-  FileWrite $0 "$\r$\n"
-  FileClose $0
-  ; create Windows scheduler batch file
-  FileOpen $0 "$INSTDIR\get_iplayer--pvr.bat" "w"
-  FileWrite $0 "cd $INSTDIR$\r$\n"
-  FileWrite $0 "perl.exe get_iplayer.pl --pvr$\r$\n"
-  FileWrite $0 "$\r$\n"
-  FileClose $0
-  ; URLs
-  WriteINIStr "$INSTDIR\command_examples.url" "InternetShortcut" "URL" "http://wiki.github.com/jjl/get_iplayer/"
-  WriteINIStr "$INSTDIR\pvr_manager.url" "InternetShortcut" "URL" "http://127.0.0.1:1935"
-  WriteINIStr "$INSTDIR\strawberry_docs.url" "InternetShortcut" "URL" "http://strawberryperl.com/"
-  ; root start menu items
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Get_iPlayer.lnk" "$SYSDIR\cmd.exe" \
-    "/k get_iplayer.cmd --search dontshowanymatches && get_iplayer.cmd --help" "$INSTDIR\iplayer_logo.ico"
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Recordings Folder.lnk" "$RecDir"
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Web PVR Manager.lnk" "$SYSDIR\cmd.exe" \
-    "/c pvr_manager.cmd" "$INSTDIR\iplayer_logo.ico"
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Run PVR Scheduler Now.lnk" "$SYSDIR\cmd.exe" \
-    "/k run_pvr_scheduler.bat" "$INSTDIR\iplayer_logo.ico"
-  ; help start menu items
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Help\get_iplayer Example Commands.lnk" \
-    "$INSTDIR\command_examples.url" "" "$SYSDIR\SHELL32.dll" 175
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Help\Strawberry Perl Home.lnk" \
-    "$INSTDIR\strawberry_docs.url" "" "$SYSDIR\SHELL32.dll" 175
-SectionEnd
-
-Section "un.get_iplayer" un.section1
-  MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 \
-    "Remove User Preferences, PVR Searches, Presets and Recording History?" \
-    IDNO clean_files
-    ; delete the local user data
-    RMDir /r $PROFILE\.get_iplayer
-!ifndef NOCONFIG
-  ; update config file
-  DeleteINISec "$INSTDIR\${CONFIG}" "get_iplayer"
-  DeleteINISec "$INSTDIR\${CONFIG}" "perlfiles"
-!endif
-  clean_files:
-  ; clear files on uninstall
-  Call un.RemoveGetIPlayer
-  ; start menu items
-  Delete "$SMPROGRAMS\get_iplayer\Get_iPlayer.lnk"
-  Delete "$SMPROGRAMS\get_iplayer\Recordings Folder.lnk"
-  Delete "$SMPROGRAMS\get_iplayer\Web PVR Manager.lnk"
-  Delete "$SMPROGRAMS\get_iplayer\Run PVR Scheduler Now.lnk"
-  Delete "$SMPROGRAMS\get_iplayer\Help\get_iplayer Example Commands.lnk"
-  Delete "$SMPROGRAMS\get_iplayer\Help\Strawberry Perl Home.lnk"
-SectionEnd
-
-LangString DESC_Section1 ${LANG_ENGLISH} "${GET_IPLAYER_DESC}"
-
-Section ${MPLAYER} section2
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${MPLAYER}.${HELPER_EXT}"
-!endif
-  AddSize ${MPLAYER_SIZE}
-  ${InstallHelper} ${MPLAYER} ${MPLAYER_KEY} ${MPLAYER_URL} ${MPLAYER_DOC}
-SectionEnd
-
-Section "un.${MPLAYER}" un.section2
-  ${un.InstallHelper} ${MPLAYER} ${MPLAYER_KEY}
-SectionEnd
-
-LangString DESC_Section2 ${LANG_ENGLISH} "${MPLAYER_DESC}"
-
-Section ${LAME} section3
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${LAME}.${HELPER_EXT}"
-!endif
-  AddSize ${LAME_SIZE}
-  ${InstallHelper} ${LAME} ${LAME_KEY} ${LAME_URL} ${LAME_DOC}
-SectionEnd
-
-Section "un.${LAME}" un.section3
-  ${un.InstallHelper} ${LAME} ${LAME_KEY}
-SectionEnd
-
-LangString DESC_Section3 ${LANG_ENGLISH} "${LAME_DESC}"
-
-Section ${FFMPEG} section4
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${FFMPEG}.${HELPER_EXT}"
-!endif
-  AddSize ${FFMPEG_SIZE}
-  ${InstallHelper} ${FFMPEG} ${FFMPEG_KEY} ${FFMPEG_URL} ${FFMPEG_DOC}
-SectionEnd
-
-Section "un.${FFMPEG}" un.section4
-  ${un.InstallHelper} ${FFMPEG} ${FFMPEG_KEY}
-SectionEnd
-
-LangString DESC_Section4 ${LANG_ENGLISH} "${FFMPEG_DESC}"
-
-Section ${VLC} section5
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${VLC}.${HELPER_EXT}"
-!endif
-  AddSize ${VLC_SIZE}
-  ${InstallHelper} ${VLC} ${VLC_KEY} ${VLC_URL} ${VLC_DOC}
-  StrCmp $HelperPath "" done
-    ${StrRep} $1 $HelperPath ".exe" ".ico"
-    CreateShortCut "$SMPROGRAMS\${VLC} Media Player.lnk" $HelperPath "" $1
-  done:
-SectionEnd
-
-Section "un.${VLC}" un.section5
-  Delete "$SMPROGRAMS\${VLC} Media Player.lnk"
-  ${un.InstallHelper} ${VLC} ${VLC_KEY}
-SectionEnd
-
-LangString DESC_Section5 ${LANG_ENGLISH} "${VLC_DESC}"
-
-Section ${RTMPDUMP} section6
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${RTMPDUMP}.${HELPER_EXT}"
-!endif
-  AddSize ${RTMPDUMP_SIZE}
-  ${InstallHelper} ${RTMPDUMP} ${RTMPDUMP_KEY} ${RTMPDUMP_URL} ${RTMPDUMP_DOC}
-SectionEnd
-
-Section "un.${RTMPDUMP}" un.section6
-  ${un.InstallHelper} ${RTMPDUMP} ${RTMPDUMP_KEY}
-SectionEnd
-
-LangString DESC_Section6 ${LANG_ENGLISH} "${RTMPDUMP_DESC}"
-
-Section ${ATOMICPARSLEY} section7
-!ifdef WITHHELPERS
-  ; embedded helper file
-  File "${HELPERS}\${ATOMICPARSLEY}.${HELPER_EXT}"
-!endif
-  AddSize ${ATOMICPARSLEY_SIZE}
-  ${InstallHelper} ${ATOMICPARSLEY} ${ATOMICPARSLEY_KEY} ${ATOMICPARSLEY_URL} ${ATOMICPARSLEY_DOC}
-SectionEnd
-
-Section "un.${ATOMICPARSLEY}" un.section7
-  ${un.InstallHelper} ${ATOMICPARSLEY} ${ATOMICPARSLEY_KEY}
-SectionEnd
-
-LangString DESC_Section7 ${LANG_ENGLISH} "${ATOMICPARSLEY_DESC}"
-
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section1} $(DESC_Section1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section4} $(DESC_Section4)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section5} $(DESC_Section5)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section6} $(DESC_Section6)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Section7} $(DESC_Section7)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;#######################################
-;# Before Installation
-;#######################################
-
-
-Function .onInit
-  ; init recordings dir
-  StrCpy $RecDir "$DESKTOP\iPlayer Recordings\"
-!ifdef PRERELEASE
-  MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 \
-    "This is a pre-release build of get_iplayer ${VERSION} for Windows.$\r$\n$\r$\n \
-    It may not work properly, and some features may be incomplete.$\r$\n$\r$\n \
-    Are you sure you wish to proceed?" \
-    IDYES proceed
-      Quit
-  proceed:
-!endif
-!ifndef NOCHECK
-  ; check for newer installer
-  Delete "$TEMP\${SETUPVER_CHECK}"
-  ClearErrors
-  inetc::get /USERAGENT "${SETUP_UA}" /SILENT "${SETUPVER_URL}" "$TEMP\${SETUPVER_CHECK}" /END
-  Pop $R0
-  ; abort check and continue if not OK
-  StrCmp $R0 "OK" 0 no_new_setup
-    ClearErrors
-    ${LineRead} "$TEMP\${SETUPVER_CHECK}" 1 $1
-    IfErrors no_new_setup
-      ${StrTrimNewLines} $1 $1
-      Delete "$TEMP\${SETUPVER_CHECK}"
-      ; compare versions
-      StrCmp $1 ${VERSION} no_new_setup
-        MessageBox MB_YESNO|MB_ICONQUESTION \
-          "A newer installer version $1 is available. Do you wish to download and run it?" \
-          IDYES dl_setup IDNO no_new_setup
-  dl_setup:
-        ; download new installer
-        ClearErrors
-        inetc::get /USERAGENT "${SETUP_UA}" "${SETUP_URL}" "$DESKTOP\get_iplayer_setup_$1.exe" /END
-        Pop $R0
-        StrCmp $R0 "OK" new_setup
-          MessageBox MB_YESNO|MB_ICONQUESTION \
-          "Download of get_iplayer installer failed$\r$\n$\r$\nError: $R0$\r$\n$\r$\nDo you wish to try again?" \
-          IDYES dl_setup
-          Goto no_new_setup
-  new_setup:
-        ; notify user of new installer location
-        MessageBox MB_OK|MB_ICONINFORMATION "Installer version $1 has been downloaded to your desktop.  The new installer will now run."
-        Exec '"$DESKTOP\get_iplayer_setup_$1.exe"'
-        Quit
-  no_new_setup:
-!endif
-  ; default all sections selected
-  SectionSetFlags ${Section1} ${SF_SELECTED}
-  SectionSetFlags ${Section2} ${SF_SELECTED}
-  SectionSetFlags ${Section3} ${SF_SELECTED}
-  SectionSetFlags ${Section4} ${SF_SELECTED}
-  SectionSetFlags ${Section5} ${SF_SELECTED}
-  SectionSetFlags ${Section6} ${SF_SELECTED}
-  SectionSetFlags ${Section7} ${SF_SELECTED}
-  ; nothing more to do for fresh install
-  IfFileExists "$INSTDIR\*.*" +2
-    Return
-  ; proceed with re-install
-  SetOutPath $INSTDIR
-!ifndef NOCONFIG
-  ; ensure config file exists on re-install
-  ; InstFilesPre will create config file on fresh install
-  Call InitConfigFile
-!endif
-  ; set section 'get_iplayer' as unselected if already installed
-  IfFileExists "$INSTDIR\get_iplayer.pl" 0 +2
-    SectionSetFlags ${Section1} 0
-!ifndef WITHSCRIPTS
-  ; check for newer get_iplayer version
-!ifndef NOCONFIG
-  ; check perl support version from config file
-  ReadINIStr $2 "$INSTDIR\${CONFIG}" "perlfiles" "version"
-  StrCmp $2 ${PERLVER} no_new_perl
-    ; new perl means get_iplayer component should be updated
-    SectionSetFlags ${Section1} ${SF_SELECTED}
-    StrCpy $UpdatedComponents "$UpdatedComponents$\r$\nget_iplayer (Perl Support $2 -> ${PERLVER})"
-  no_new_perl:
-  ReadINIStr $3 "$INSTDIR\${CONFIG}" "get_iplayer" "version"
-!else
-  ${LineRead} "$INSTDIR\${GIPVER}" 1 $3
-  ${StrTrimNewLines} $3 $3
-!endif
-  Delete "$INSTDIR\${GIPVER_CHECK}"
-  inetc::get /USERAGENT "${SETUP_UA}" /SILENT "${GIPVER_URL}" "$INSTDIR\${GIPVER_CHECK}" /END
-  Pop $R0
-  ; abort checking new ver and continue if not OK
-  StrCmp $R0 "OK" 0 no_new_gip
-  ; read contents of version file and compare with current version
-  ClearErrors
-  ${LineRead} "$INSTDIR\${GIPVER_CHECK}" 1 $4
-  IfErrors no_new_gip
-    ${StrTrimNewLines} $4 $4
-    StrCmp $4 "" no_new_gip
-      StrCmp $3 $4 no_new_gip
-        SectionSetFlags ${Section1} ${SF_SELECTED}
-        ; add notice if versions different
-        StrCpy $UpdatedComponents "$UpdatedComponents$\r$\nget_iplayer (Main Script $3 -> $4)"
-  no_new_gip:
-!endif
-  ; set helper app sections as unselected if already installed
-  ${UpdateHelperSection} ${MPLAYER} ${section2}
-  ${UpdateHelperSection} ${LAME} ${section3}
-  ${UpdateHelperSection} ${FFMPEG} ${section4}
-  ${UpdateHelperSection} ${VLC} ${section5}
-  ${UpdateHelperSection} ${RTMPDUMP} ${section6}
-  ${UpdateHelperSection} ${ATOMICPARSLEY} ${section7}
-!ifndef WITHHELPERS
-!ifndef NOCONFIG
-  ; check for newer helper app versions
-  Delete "$INSTDIR\${CONFIG_CHECK}"
-  inetc::get /USERAGENT "${SETUP_UA}" /SILENT "${CONFIG_URL}" "$INSTDIR\${CONFIG_CHECK}" /END
-  Pop $R0
-  ; abort checking new ver and continue if not OK
-  StrCmp $R0 "OK" 0 no_new_config
-    ; check for helper updates
-    ${CheckHelperUpdate} ${MPLAYER} ${Section2}
-    ${CheckHelperUpdate} ${LAME} ${Section3}
-    ${CheckHelperUpdate} ${FFMPEG} ${Section4}
-    ${CheckHelperUpdate} ${VLC} ${Section5}
-    ${CheckHelperUpdate} ${RTMPDUMP} ${Section6}
-    ${CheckHelperUpdate} ${ATOMICPARSLEY} ${Section7}
-  no_new_config:
-!endif
-!endif
-FunctionEnd
-
-;#######################################
-;# After Successful Installation
-;#######################################
-
-Function .onInstSuccess
-  ; remove items obsolete in 4.3+
-  RMDir /r "$INSTDIR\Downloads"
-  Delete "$INSTDIR\linuxcentre.url"
-  Delete "$INSTDIR\get_iplayer_setup.nsi"
-  Delete "$INSTDIR\update_get_iplayer.cmd"
-  ; URLs
-  WriteINIStr "$INSTDIR\get_iplayer_home.url" "InternetShortcut" "URL" "${MOTHERSHIP}/get_iplayer/"
-  WriteINIStr "$INSTDIR\nsis_docs.url" "InternetShortcut" "URL" "http://nsis.sourceforge.net/"
-  WriteINIStr "$INSTDIR\download_latest_installer.url" "InternetShortcut" "URL" "${SETUP_URL}"
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Help\Get_iPlayer Home.lnk" "$INSTDIR\get_iplayer_home.url" "" "$SYSDIR\SHELL32.dll" 175
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Help\NSIS Installer Home.lnk" "$INSTDIR\nsis_docs.url" "" "$SYSDIR\SHELL32.dll" 175
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Updates\Download Latest Installer.lnk" "$INSTDIR\download_latest_installer.url" "" "$SYSDIR\SHELL32.dll" 220
-  ; put uninstall info in registry
-  CreateShortCut "$SMPROGRAMS\get_iplayer\Uninstall Components.lnk" "$INSTDIR\Uninst.exe" "" "$INSTDIR\Uninst.exe" 0
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "DisplayName" "${PRODUCT} ${VERSION}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "DisplayVersion" "${VERSION}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "URLInfoAbout" "${MOTHERSHIP}/get_iplayer/"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "Publisher" "${MOTHERSHIP_NAME}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "UninstallString" "$INSTDIR\Uninst.exe"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer" "DisplayIcon" "$INSTDIR\Uninst.exe"
-  WriteRegStr HKCU "Software\${PRODUCT}" "" "$INSTDIR"
-  WriteUninstaller "$INSTDIR\Uninst.exe"
-FunctionEnd
-
-;#######################################
-;# Before Uninstallation
-;#######################################
-
-Function un.onInit
-  ; ensure options file path is defined
-  Call un.CreateOptionsPaths
-!ifndef NOCONFIG
-  Call un.InitConfigFile
-!endif
-  ; default all components unselected
-  SectionSetFlags ${Section1} ${SF_RO}
-  SectionSetFlags ${Section2} ${SF_RO}
-  SectionSetFlags ${Section3} ${SF_RO}
-  SectionSetFlags ${Section4} ${SF_RO}
-  SectionSetFlags ${Section5} ${SF_RO}
-  SectionSetFlags ${Section6} ${SF_RO}
-  SectionSetFlags ${Section7} ${SF_RO}
-  ; set section 'get_iplayer' as selected if already installed
-  IfFileExists "$INSTDIR\get_iplayer.pl" 0 helper_sections
-  SectionSetFlags ${Section1} ${SF_SELECTED}
-  helper_sections:
-  ; set helper app sections as selected if already installed
-  ${un.UpdateHelperSection} ${MPLAYER} ${section2}
-  ${un.UpdateHelperSection} ${LAME} ${section3}
-  ${un.UpdateHelperSection} ${FFMPEG} ${section4}
-  ${un.UpdateHelperSection} ${VLC} ${section5}
-  ${un.UpdateHelperSection} ${RTMPDUMP} ${section6}
-  ${un.UpdateHelperSection} ${ATOMICPARSLEY} ${section7}
-FunctionEnd
-
-;#######################################
-;# After Successful Uninstallation
-;#######################################
-
-Function un.onUninstSuccess
-  IfFileExists "$INSTDIR\get_iplayer.pl" no_clean
-  IfFileExists "$INSTDIR\${MPLAYER}\*.*" no_clean
-  IfFileExists "$INSTDIR\${LAME}\*.*" no_clean
-  IfFileExists "$INSTDIR\${FFMPEG}\*.*" no_clean
-  IfFileExists "$INSTDIR\${VLC}\*.*" no_clean
-  IfFileExists "$INSTDIR\${RTMPDUMP}\*.*" no_clean
-  IfFileExists "$INSTDIR\${ATOMICPARSLEY}\*.*" no_clean
-    ; remove shortcuts
-    Delete "$INSTDIR\get_iplayer_home.url"
-    Delete "$INSTDIR\nsis_docs.url"
-    Delete "$INSTDIR\download_latest_installer.url"
-    ; remove start menu dirs and all contents
-    RMDir /r "$SMPROGRAMS\get_iplayer"
-    ; remove the global options file
-    Delete $OptionsFile
-    RMDir $OptionsDir
-    ; remove version files
-    Delete "$INSTDIR\${GIPVER}"
-    Delete "$INSTDIR\${GIPVER_CHECK}"
-!ifndef NOCONFIG
-    ; remove config files
-    Delete "$INSTDIR\${CONFIG}"
-    Delete "$INSTDIR\${CONFIG_CHECK}"
-!endif
-    ; remove installed status in registry
-    DeleteRegKey HKCU "SOFTWARE\get_iplayer"
-    DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\get_iplayer"
-    HideWindow
-    MessageBox MB_OK|MB_ICONINFORMATION "$(^Name) was successfully removed from your computer.."
-    ; remove uninstaller and install dir
-    Delete "$INSTDIR\Uninst.exe"
-    RMDir $INSTDIR
-    Return
-  no_clean:
-  HideWindow
-  MessageBox MB_OK|MB_ICONINFORMATION "$(^Name) selected components were successfully removed from your computer.."
-FunctionEnd
-
-;#######################################
-;# Custom Page Functions
-;#######################################
-
-Function LicensePre
-  ; read install dir from registry
-  ReadRegStr $1 HKCU "Software\${PRODUCT}" ""
-  ; skip license if already installed
-  StrCmp $1 "" done
-    Abort
-  done:
-FunctionEnd
-
-!ifndef NOCONFIG
-Function UpdatesPage
-  ; skip if no updated components
-  StrCmp $UpdatedComponents "" 0 +2
-    Abort
-  !insertmacro MUI_HEADER_TEXT "Updates Available" "Updates are available for ${PRODUCT} components."
-	nsDialogs::Create 1018
-	Pop $0
-	StrCmp $0 error 0 +2
-		Abort
-  nsDialogs::CreateControl EDIT ${DEFAULT_STYLES}|${ES_MULTILINE}|${ES_READONLY} 0 0 0 100% 100% \
-    "The updated components below have automatically been selected for installation. \
-    Updating is strongly recommended, but you may uncheck any components you do not wish to update on the following page.$\r$\n\
-    $UpdatedComponents"
-	Pop $0
-	StrCmp $0 error 0 +2
-		Abort
-	nsDialogs::Show
-FunctionEnd
-!endif
-
-Function DirectoryPre
-  ; read install dir from registry
-  ReadRegStr $1 HKCU "Software\${PRODUCT}" ""
-  ; skip destination selection if already installed
-  StrCmp $1 "" done
-    Abort
-  done:
-FunctionEnd
-
-Function RecordingsDirectoryPre
-  ; skip destination selection if get_iplayer is not a selected section
-  SectionGetFlags ${section1} $1
-  IntOp $1 $1 & ${SF_SELECTED}
-  IntCmp $1 ${SF_SELECTED} done
-    Abort
-  done:
-FunctionEnd
-
-Function InstFilesPre
-  SetOutPath $INSTDIR
-  ; start menu dirs
-  CreateDirectory "$SMPROGRAMS\get_iplayer\Updates"
-  CreateDirectory "$SMPROGRAMS\get_iplayer\Help"
-  ; ensure options file exists
-  Call CreateOptionsFile
-!ifndef NOCONFIG
-  ; ensure config files exist on fresh install
-  Call InitConfigFile
-  IfFileExists "$INSTDIR\${CONFIG_CHECK}" got_config_check
-    inetc::get /USERAGENT "${SETUP_UA}" /SILENT "${CONFIG_URL}" "$INSTDIR\${CONFIG_CHECK}" /END
-    Pop $R0
-    StrCmp $R0 "OK" got_config_check
-    ; use built-in config on error
-    File "/oname=${CONFIG_CHECK}" "${SOURCEPATH}\windows\${CONFIG}"
-  got_config_check:
-!endif
-FunctionEnd
-
-;#######################################
-;# Config File Functions
-;#######################################
-
-!ifndef NOCONFIG
-Function InitConfigFile
-  IfFileExists "$INSTDIR\${CONFIG}" got_config
-    FileOpen $0 "$INSTDIR\${CONFIG}" w
-    FileClose $0
-  got_config:
-  WriteINIStr "$INSTDIR\${CONFIG}" "get_iplayer_setup" "lastinstallversion" ${VERSION}
-  ${GetTime} "" "LS" $R0 $R1 $R2 $R3 $R4 $R5 $R6
-  WriteINIStr "$INSTDIR\${CONFIG}" "get_iplayer_setup" "lastinstalltime" "$R2-$R1-$R0T$R4:$R5:$R6Z"
-FunctionEnd
-
-Function un.InitConfigFile
-  ; skip if config file not found
-  IfFileExists "$INSTDIR\${CONFIG}" 0 no_config
-    WriteINIStr "$INSTDIR\${CONFIG}" "get_iplayer_setup" "lastuninstallversion" ${VERSION}
-    ${GetTime} "" "LS" $R0 $R1 $R2 $R3 $R4 $R5 $R6
-    WriteINIStr "$INSTDIR\${CONFIG}" "get_iplayer_setup" "lastuninstalltime" "$R2-$R1-$R0T$R4:$R5:$R6Z"
-  no_config:
-FunctionEnd
-!endif
-
-;#######################################
-;# Options File Functions
-;#######################################
-
-; Define paths to global options dir/file
-!macro CreateOptionsPaths _un
-Function ${_un}CreateOptionsPaths
-  ReadEnvStr $1 "ALLUSERSPROFILE"
-  StrCpy $OptionsDir "$1\get_iplayer"
-  StrCpy $OptionsFile "$OptionsDir\options"
- FunctionEnd
-!macroend
-!insertmacro CreateOptionsPaths ""
-!insertmacro CreateOptionsPaths "un."
-
-; Create global options file if necessary
-Function CreateOptionsFile
-  Call CreateOptionsPaths
-  ; create global options folder if needed
-  IfFileExists "$OptionsDir\*.*" check_file
-  ClearErrors
-  CreateDirectory $OptionsDir
-  IfErrors 0 check_file
-    MessageBox MB_OK|MB_ICONSTOP "Could not create global options directory:$\r$\n$\r$\n$OptionsDir$\r$\n$\r$\nAborting installation."
-    Abort
-  check_file:
-  ; create global options file if needed
-  IfFileExists $OptionsFile done
-    ClearErrors
-    FileOpen $0 $OptionsFile "w"
-    FileClose $0
-    IfErrors 0 done
-      MessageBox MB_OK|MB_ICONSTOP "Could not create global options file:$\r$\n$\r$\n$OptionsFile$\r$\n$\r$\nAborting installation."
-      Abort
-  done:
-  Push "OK"
-FunctionEnd
-
-; Write entry in global options file
-; Wrapped by _InstallOption
-Function InstallOption
-  ${ConfigWrite} $OptionsFile "$OptionKey " $OptionVal $0
-  Push $0
-FunctionEnd
-
-; Delete entry in global options file
-; Wrapped by un._InstallOption
-Function un.InstallOption
-  ${ConfigWrite} $OptionsFile "$OptionKey " "" $0
-  Push $0
-FunctionEnd
-
-;#######################################
-;# Helper App Utility Functions
-;#######################################
-
-!ifndef WITHHELPERS
-; Download $HelperUrl to $HelperFile
-Function DownloadHelper
-  download:
-  inetc::get /USERAGENT "${USERAGENT}" $HelperUrl $HelperFile /END
-  Pop $R0
-  StrCmp $R0 "OK" success
-    MessageBox MB_YESNO|MB_ICONQUESTION \
-      "Download failed: $HelperUrl$\r$\n$\r$\nError: $R0$\r$\n$\r$\nDo you wish to try again?" \
-      IDYES download
-    Push "EFAIL"
-    Return
-  success:
-  Push "OK"
-FunctionEnd
-!endif
-
-; Extract $HelperFile to $OUTDIR
-Function UnpackHelper
-  ; MUST try ZipDLL first regardless of file extension (Nsis7z doesn't return error code)
-  ; ZIP format file will be extracted, 7Z format file will error and fall through
-  ZipDLL::extractall $HelperFile $OUTDIR
-  Pop $R0
-  StrCmp $R0 "success" done
-    ; else fall through to Nsis7z
-    Nsis7z::ExtractWithDetails $HelperFile "Installing $HelperName %s..."
-  done:
-FunctionEnd
-
-;#######################################
-;# Helper App Install Functions
-;#######################################
-
-; Download and unpack helper app archive and locate EXE
-; Wrapped by _InstallHelper
-Function InstallHelper
-!ifndef WITHHELPERS
-  ; helper app archive to download
-  ; download helper app archive
-  StrCmp $HelperUrl "" 0 got_url
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Missing download URL$\r$\n$\r$\nSkipped installation: $HelperName"
-    Push "ENOURL"
-    Return
-  got_url:
-  Call DownloadHelper
-  Pop $R0
-  StrCmp $R0 "OK" create_dir
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Download failed$\r$\n$\r$\nSkipped installation: $HelperName"
-    Push "ENODL"
-    Return
-  create_dir:
-!endif
-  ; special case from 4.2
-  StrCmp $HelperName ${RTMPDUMP} 0 +3
-    IfFileExists "$INSTDIR\${RTMPDUMP_OLD}\*.*" 0 +2
-      RMDir /r "$INSTDIR\${RTMPDUMP_OLD}"
-  ; create target dir for helper app
-  RMDir /r $HelperDir
-  SetOutPath $HelperDir
-  ; unpack archive
-  Call UnpackHelper
-  ; restore $OUTDIR
-  SetOutPath $INSTDIR
-  ; check for empty dir
-  ${DirState} $HelperDir $R0
-  IntCmp $R0 1 delete_file
-    ; might be just EXE that was downloaded
-    StrCpy $R1 $HelperFile
-    System::Call "kernel32::GetBinaryType(t R1, *i .R2) i .R0"
-    ; rename and save if 32-bit EXE
-    IntCmp $R2 ${SCS_32BIT_BINARY} 0 not_exe
-    ; generate lower case EXE name
-    ${StrCase} $R0 $HelperName "L"
-    StrCpy $R1 "$HelperDir\$R0.exe"
-    Rename $HelperFile $R1
-    Goto got_exe
-    not_exe:
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Extract failed: $HelperFile$\r$\n$\r$\nSkipped installation: $HelperName"
-    RMDir /r $HelperDir
-    Delete $HelperFile
-    Push "ENOFILE"
-    Return
-  delete_file:
-  ; remove archive after unpacking
-  Delete $HelperFile
-  ; $R1 = helper EXE
-  StrCpy $R1 ""
-	${locate::Open} $HelperDir "/F=1 /D=0 /N=$HelperExe" $0
-	StrCmp $0 0 0 loop_locate
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not open $HelperDir for search$\r$\n$\r$\nSkipped installation: $HelperName"
-    ${locate::Close} $0
-    ${locate::Unload}
-    RMDir /r $HelperDir
-    Return
-	loop_locate:
-	${locate::Find} $0 $R9 $R8 $R7 $R6 $R5 $R4
-  StrCmp $R9 "" stop_locate
-    ; get binary type of located EXE
-    System::Call "kernel32::GetBinaryType(t R9, *i .R2) i .R0"
-    ; must be 32-bit Windows EXE
-    IntCmp $R2 ${SCS_32BIT_BINARY} 0 +2
-      ; save EXE path
-      StrCpy $R1 $R9
-    Goto loop_locate
-	stop_locate:
-	${locate::Close} $0
-	${locate::Unload}
-  StrCmp $R1 "" 0 got_exe
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Could not locate $HelperExe in $HelperDir$\r$\n$\r$\nSkipped installation: $HelperName"
-    RMDir /r $HelperDir
-    Push "ENOEXE"
-    Return
-  got_exe:
-  StrCpy $HelperPath $R1
-  ; use relative EXE path for options file
-  ${StrRep} $HelperVal $HelperPath $INSTDIR "."
-  ${InstallOption} $HelperKey $HelperVal
-  ; skip empty doc url
-  StrCmp $HelperDoc "" no_doc
-    ${InstallHelperDoc} $HelperName $HelperDoc
-  no_doc:
-!ifndef NOCONFIG
-  WriteINIStr "$INSTDIR\${CONFIG}" $HelperName "version" $HelperVer
-  WriteINIStr "$INSTDIR\${CONFIG}" $HelperName "url" $HelperUrl
-  WriteINIStr "$INSTDIR\${CONFIG}" $HelperName "doc" $HelperDoc
-!endif
-FunctionEnd
-
-; Remove helper app and option setting
-; Wrapped by un._InstallHelper
-Function un.InstallHelper
-!ifndef NOCONFIG
-  DeleteINISec "$INSTDIR\${CONFIG}" $HelperName
-!endif
-  ${un.InstallHelperDoc} $HelperName
-  ${un.InstallOption} $HelperKey
-  ; special case from 4.2
-  StrCmp $HelperName ${RTMPDUMP} 0 +3
-    IfFileExists "$INSTDIR\${RTMPDUMP_OLD}\*.*" 0 +2
-      RMDir /r "$INSTDIR\${RTMPDUMP_OLD}"
-  RMDir /r $HelperDir
-  Delete $HelperFile
-FunctionEnd

get_iplayer-2.82.tar.gz/windows/installer_files Deleted

get_iplayer-2.82.tar.gz/windows/installer_files/LICENSE.txt Deleted

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

get_iplayer-2.82.tar.gz/windows/installer_files/help.ico Deleted

get_iplayer-2.82.tar.gz/windows/installer_files/iplayer_logo.ico Deleted

get_iplayer-2.82.tar.gz/windows/installer_files/iplayer_uninst.ico Deleted

get_iplayer-2.82.tar.gz/windows/make-helpers.cmd Deleted

@@ -1,71 +0,0 @@
-@echo off
-REM Utility script to download get_iplayer helper applications
-setlocal EnableDelayedExpansion
-REM show help if requested
-echo.%1 | find "?" >NUL
-if not ERRORLEVEL 1 goto usage
-REM script location
-set CMDDIR=%~dp0
-set CMDNAME=%~n0
-REM perform common init
-call "%CMDDIR%\make-init"
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-init failed
-    goto die
-)
-call :log START %CMDNAME% %date% %time%
-REM process command line
-for %%A in (%*) do (
-    set FLAG=%%A
-    set FLAG=!FLAG:/D=!
-    set FLAG=!FLAG:/=!
-    set !FLAG!=/D!FLAG!
-)
-REM create clean temp dir
-if exist "%TMPDIR%" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-)
-md "%TMPDIR%"
-call :log Temp directory: %TMPDIR%
-REM rebuild if requested
-if not "%REBUILD%"=="" goto rebuild
-if not exist "%CD%\%CMDNAME%.exe" goto rebuild
-goto exeskip
-:rebuild
-REM build in temp dir
-call :log Building installer...
-"%MAKENSIS%" /NOCD /DBUILDPATH="%TMPDIR%" "%GIPDIR%\windows\%CMDNAME%.nsi" >> "%LOG%" 2>&1
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %MAKENSIS% failed
-    goto die
-)
-call :log ...Finished
-copy /y "%TMPDIR%\%CMDNAME%.exe" "%CD%" >> "%LOG%" 2>&1
-call :log Created: %CD%\%CMDNAME%.exe
-:exeskip
-call :log Running installer...
-call %CD%\%CMDNAME%.exe
-call :log ...Finished
-REM clean up
-rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-call :log FINISH %CMDNAME% %date% %time%
-:done
-exit /b
-:die
-echo Exiting - see %LOG%
-exit /b 1
-:log
-echo %*
-echo %* >> "%LOG%"
-goto :eof
-:usage
-echo.
-echo Generate and run NSIS installer to download get_iplayer helper applications
-echo.
-echo Usage:
-echo   %~n0 [/rebuild]
-echo   %~n0 /? - this message
-echo.
-echo Parameters:
-echo   /rebuild - force rebuild of installer
-echo.

get_iplayer-2.82.tar.gz/windows/make-helpers.nsi Deleted

@@ -1,74 +0,0 @@
-; CHANGE URLS TO MATCH CURRENT INSTALLER!
-
-!ifndef BUILDPATH
-!define BUILDPATH "."
-!endif
-
-Name "make-helpers"
-OutFile "${BUILDPATH}\make-helpers.exe"
-InstallDir "$EXEDIR\helpers"
-
-Page directory
-Page instfiles
-
-!define USERAGENT "curl/7.21.7 (i386-pc-win32) libcurl/7.21.7 OpenSSL/0.9.8r zlib/1.2.5"
-
-; Helper app names - used for folder/file naming, UI text
-!define MPLAYER "MPlayer"
-!define LAME "LAME"
-!define FFMPEG "FFmpeg"
-!define VLC "VLC"
-!define RTMPDUMP "RTMPDump"
-!define ATOMICPARSLEY "AtomicParsley"
-
-; TODO: finalise URLs
-; URLs for helper app downloads
-!define MPLAYER_URL "http://www8.mplayerhq.hu/MPlayer/releases/win32/MPlayer-mingw32-1.0rc2.zip"
-!define LAME_URL "http://www.exe64.com/mirror/rarewares/lame3.98.4.zip"
-!define FFMPEG_URL "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-0.8-win32-static.7z"
-!define VLC_URL "http://www.grangefields.co.uk/mirrors/videolan/vlc/1.1.11/win32/vlc-1.1.11-win32.7z"
-!define RTMPDUMP_URL "http://rtmpdump.mplayerhq.hu/download/rtmpdump-20110723-git-b627335-win32.zip"
-!define ATOMICPARSLEY_URL "http://bitbucket.org/jonhedgerows/atomicparsley/downloads/AtomicParsley-0.9.4.zip"
-
-; !define MPLAYER_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?mplayer"
-; !define LAME_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?lame"
-; !define FFMPEG_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?ffmpeg"
-; !define VLC_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?vlc"
-; !define RTMPDUMP_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?rtmpdump"
-; !define ATOMICPARSLEY_URL "http://www.infradead.org/cgi-bin/get_iplayer.cgi?atomicparsley"
-
-Section
-  SetOutPath $INSTDIR
-  Push ${MPLAYER}
-  Push ${MPLAYER_URL}
-  Call DownloadHelper
-  Push ${LAME}
-  Push ${LAME_URL}
-  Call DownloadHelper
-  Push ${FFMPEG}
-  Push ${FFMPEG_URL}
-  Call DownloadHelper
-  Push ${VLC}
-  Push ${VLC_URL}
-  Call DownloadHelper
-  Push ${RTMPDUMP}
-  Push ${RTMPDUMP_URL}
-  Call DownloadHelper
-  Push ${ATOMICPARSLEY}
-  Push ${ATOMICPARSLEY_URL}
-  Call DownloadHelper
-SectionEnd
-
-Function DownloadHelper
-  Pop $2
-  Pop $1
-  download:
-  inetc::get /USERAGENT "${USERAGENT}" $2 "$1.zip" /END
-  Pop $R0
-  StrCmp $R0 "OK" done
-    MessageBox MB_YESNO|MB_ICONQUESTION \
-      "Download of $2 failed$\n$\nError: $R0$\n$\nDo you wish to try again?" \
-      IDYES download
-    MessageBox MB_ICONEXCLAMATION "Download of $2 failed$\nSkipping $1"
-  done:
-FunctionEnd

get_iplayer-2.82.tar.gz/windows/make-init.cmd Deleted

@@ -1,72 +0,0 @@
-REM Common startup code for make-perlfiles and make-installer
-if not "%MAKEINIT%"=="" goto done
-set MAKEINIT=MAKEINIT
-REM init logfile
-set LOG=%CD%\%CMDNAME%.log
-echo Logging to file: %LOG%
-REM get base dir - assumes script in %BASEDIR%\get_iplayer\windows
-for %%D in (%CMDDIR%..\..) do (
-    set BASEDIR=%%~fD
-)
-REM location of get_iplayer source
-set GIPDIR=%BASEDIR%\get_iplayer
-REM perl support naming
-set PAREXE=perlpar.exe
-set GIPPFX=perlfiles
-set GIPEXE=%GIPPFX%.exe
-set GIPZIP=%GIPPFX%.zip
-REM location of installer script
-set NSIDIR=%GIPDIR%\windows
-set NSIPFX=get_iplayer_setup
-set NSIFILE=%NSIPFX%.nsi
-REM temp dir
-REM set TMPDIR=%TEMP%\%CMDNAME%%RANDOM%
-set TMPDIR=%CD%\%CMDNAME%.tmp
-REM location of NSIS installation
-set NSISDIR=C:\Program Files\NSIS
-set MAKENSIS=%NSISDIR%\makensis.exe
-REM location of 7-Zip utility
-set P7ZIP=C:\Program Files\7-Zip\7z.exe
-REM location of Strawberry Perl
-set PERLDIST=C:\strawberry
-REM get version numbers as sanity check
-set BADVER=0
-REM determine perl version
-set PERLVER=0.0.0
-for /f "usebackq tokens=1-3 delims=v." %%A in (`perl -e "print $^V;"`) do (
-    set PERLVER=%%A.%%B.%%C
-)
-if "%PERLVER%"=="0.0.0" (
-    call :log Could not determine Perl version
-    set BADVER=1
-)
-call :log Perl version: %PERLVER%
-REM extract get_iplayer version
-set GIPVER=0.00
-for /f "usebackq tokens=1" %%V in (`perl -nle "print $1 if /^\s*my\s+\$version\W+(\d+\.\d+)/; exit if $1;" "%GIPDIR%\get_iplayer"`) do (
-    set GIPVER=%%V
-)
-if "%GIPVER%"=="0.00" (
-    call :log Could not determine get_iplayer version
-    set BADVER=1
-)
-call :log get_iplayer version: %GIPVER%
-REM extract installer version
-set INSTVER=0.0
-for /f "usebackq tokens=1" %%V in (`perl -nle "print $1 if /^\s*\Wdefine\s+VERSION\W+(\d+\.\d+)/; exit if $1;" "%NSIDIR%\%NSIFILE%"`) do (
-    set INSTVER=%%V
-)
-if "%INSTVER%"=="0.0" (
-    call :log Could not determine installer version
-    set BADVER=1
-)
-call :log Installer version: %INSTVER%
-if %BADVER% equ 1 goto die
-:done
-exit /b
-:die
-exit /b 1
-:log
-echo %*
-echo %* >> "%LOG%"
-goto :eof

get_iplayer-2.82.tar.gz/windows/make-installer.cmd Deleted

@@ -1,147 +0,0 @@
-@echo off
-REM Build script for get_iplayer installer
-setlocal EnableDelayedExpansion
-REM show help if requested
-echo.%1 | find "?" >NUL
-if not ERRORLEVEL 1 goto usage
-REM script location
-set CMDDIR=%~dp0
-set CMDNAME=%~n0
-REM perform common init
-call "%CMDDIR%\make-init"
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-init failed
-    goto die
-)
-call :log START %CMDNAME% %date% %time%
-REM process command line
-for %%A in (%*) do (
-    if exist "%%A" (
-        set PERLARC=%%A
-    ) else (
-        set FLAG=%%A
-        set FLAG=!FLAG:/D=!
-        set FLAG=!FLAG:/=!
-        set !FLAG!=/D!FLAG!
-    )
-)
-REM create clean temp dir
-if exist "%TMPDIR%" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-)
-md "%TMPDIR%"
-call :log Temp directory: %TMPDIR%
-REM helper app archives folder in current dir
-set HELPERS=%CD%\helpers
-REM skip perl if requested
-if not "%WITHOUTPERL%"=="" (
-    call :log Skipping perl support
-    goto perldone
-)
-REM force makeperl if specified
-if not "%MAKEPERL%"=="" (
-    set PERLARC=%CD%\%GIPZIP%
-    goto makeperl
-)
-REM skip makeperl if perl archive specified
-if not "%PERLARC%"=="" (
-    call :log Using specified Perl archive: %PERLARC%
-    call :log Skipping makeperl...
-    goto perlskip
-)
-REM skip makeperl if expanded archive found in current dir
-if exist "%CD%\%GIPPFX%" (
-    call :log Using expanded Perl support archive: %CD%\%GIPPFX%
-    set PERLFILES=%CD%\%GIPPFX%
-    goto perldone
-)
-REM default perl support archive in current dir
-set PERLARC=%CD%\%GIPZIP%
-if exist "%PERLARC%" (
-    call :log Using default Perl support archive: %PERLARC%
-    goto perlskip
-)
-:makeperl
-set PERLARC=%CD%\%GIPZIP%
-REM rebuild perl support archive in current dir
-call :log Calling %CMDDIR%\make-perlfiles /makepar %KEEPTMP%
-call "%CMDDIR%\make-perlfiles" /makepar %KEEPTMP%
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-perlfiles failed
-    goto die
-)
-REM make sure that archive is available
-if not exist "%PERLARC%" (
-    call :log ERROR: Cannot find %PERLARC%
-    goto die
-)
-:perlskip
-REM perl support as expanded archive
-call :log Extracting Perl support files...
-set PERLFILES=%TMPDIR%\%GIPPFX%
-"%P7ZIP%" x "%PERLARC%" -o"%PERLFILES%" >> "%LOG%" 2>&1
-call :log ...Finished
-:perldone
-REM build in temp dir
-call :log Building installer...
-"%MAKENSIS%" /NOCD %WITHOUTPERL% %WITHSCRIPTS% %WITHHELPERS% %STANDALONE% %NOCONFIG% %NOCHECK% %PRERELEASE% ^
-    /DBUILDPATH="%TMPDIR%" /DSOURCEPATH="%GIPDIR%" /DPERLFILES="%PERLFILES%" /DHELPERS="%HELPERS%" ^
-    "%NSIDIR%\%NSIFILE%" >> "%LOG%" 2>&1
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %MAKENSIS% failed
-    goto die
-)
-call :log ...Finished
-REM copy output to current dir
-for %%A in ("%TMPDIR%\%NSIPFX%*.exe") do (
-    copy /y "%%A" "%CD%" >> "%LOG%" 2>&1
-    call :log Created: %CD%\%%~nxA
-)
-REM clean up
-if "%KEEPTMP%"=="" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-) else (
-    call :log /keeptmp specified - files available in %TMPDIR%
-)
-call :log FINISH %CMDNAME% %date% %time%
-:done
-exit /b
-:die
-echo Exiting - see %LOG%
-exit /b 1
-:log
-echo %*
-echo %* >> "%LOG%"
-goto :eof
-:usage
-echo.
-echo Generate NSIS installer for get_iplayer
-echo.
-echo Usage:
-echo   %~n0 [/keeptmp] [/makeperl] [/withoutperl]
-echo     [/withscripts] [/withhelpers] [/standalone]
-echo     [/offline] [/prelease] [\path\to\perlfiles.zip]
-echo   %~n0 /? - this message
-echo.
-echo Parameters:
-echo   /keeptmp     - retain contents of temp directory
-echo   /makeperl    - force rebuild of Perl support archive
-echo   /withoutperl - omit Perl support from build
-echo   /withscripts - embed get_iplayer Perl scripts in build
-echo   /withhelpers - embed get_iplayer helper apps in build
-echo   /standalone  - /withscripts + /withhelpers
-echo   /noconfig    - use CGI script for download URLs instead of config file
-echo   /nocheck     - no installer update check (testing only)
-echo   /prerelease  - prerelease build with warning dialog at launch
-echo.
-echo Input (in current directory):
-echo   perlfiles     - expanded Perl support archive
-echo   OR (if expanded archive not found):
-echo   perlfiles.zip - Perl support archive file [output from make-perlfiles]
-echo     (override by specifying Perl archive file on command line)
-echo   helpers       - folder with helper app archives (/withhelpers only)
-echo.
-echo Output (in current directory):
-echo   get_iplayer_setup_N.N.exe - installer EXE
-echo     (N.N = installer version)
-echo.

get_iplayer-2.82.tar.gz/windows/make-perlfiles.cmd Deleted

@@ -1,152 +0,0 @@
-@echo off
-REM Build script for get_iplayer Perl support files
-setlocal EnableDelayedExpansion
-REM show help if requested
-echo.%1 | find "?" >NUL
-if not ERRORLEVEL 1 goto usage
-REM script location
-set CMDDIR=%~dp0
-set CMDNAME=%~n0
-REM perform common init
-call "%CMDDIR%\make-init"
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-init failed
-    goto die
-)
-call :log START %CMDNAME% %date% %time%
-REM process command line
-for %%A in (%*) do (
-    if exist "%%A" (
-        set GIPPAR=%%A
-    ) else (
-        set FLAG=%%A
-        set FLAG=!FLAG:/D=!
-        set FLAG=!FLAG:/=!
-        set !FLAG!=/D!FLAG!
-    )
-)
-REM create clean temp dir
-if exist "%TMPDIR%" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-)
-md "%TMPDIR%" >> "%LOG%"
-call :log Temp directory: %TMPDIR%
-REM skip pp if PAR file specified
-if not "%GIPPAR%"=="" (
-    call :log Using specified PAR file: %GIPPAR%
-    call :log Skipping pp...
-    goto parskip
-)
-REM PAR file in current dir
-set GIPPAR=%CD%\%PAREXE%
-REM make PAR file if required/necessary
-if not "%MAKEPAR%"=="" goto makepar
-if not exist "%GIPPAR%" goto makepar
-REM use default PAR file
-if exist "%GIPPAR%" (
-    call :log Using default PAR file: %GIPPAR%
-    goto parskip
-)
-:makepar
-REM location of pp
-set PP=%PERLDIST%\perl\site\bin\pp
-REM include modules from CPAN - pp will check if present
-set PPMODS=-M MP3::Tag -M MP3::Info
-REM force XML parsers into PAR
-set PPMODS=%PPMODS% -M XML::LibXML::SAX -M XML::LibXML::SAX::Parser -M XML::SAX::PurePerl -M XML::Parser
-call :log Running pp...
-REM run pp
-call perl "%PP%" %PPMODS% -o "%TMPDIR%\%PAREXE%" "%GIPDIR%\get_iplayer" "%GIPDIR%\get_iplayer.cgi" >> "%LOG%" 2>&1
-REM check result
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %PP% failed
-    goto die
-)
-call :log ...Finished
-REM copy output to current dir
-copy /y "%TMPDIR%\%PAREXE%" "%GIPPAR%" >> "%LOG%" 2>&1
-call :log Created: %GIPPAR%
-REM make sure that PAR file is available
-if not exist "%GIPPAR%" (
-    call :log ERROR: Cannot find %GIPPAR%
-    goto die
-)
-:parskip
-REM unpack lib dir from PAR
-call :log Unpacking Perl library...
-REM filter out get_iplayer scripts and some unicore files
-"%P7ZIP%" x "%GIPPAR%" -o"%TMPDIR%" -aoa -xr^^!get_iplayer* -xr^^!lib\unicore\*.txt ^
-    -x^^!lib\unicore\mktables* -x^^!lib\unicore\TestProp.pl lib >> "%LOG%" 2>&1
-call :log ...Finished
-REM copy additional files from Strawberry Perl
-call :log Copying Perl support files...
-xcopy "%PERLDIST%\licenses\perl\*.*" "%TMPDIR%\perl-license" /e /i /r /y >> "%LOG%" 2>&1
-copy /y "%PERLDIST%\perl\bin\*.dll" "%TMPDIR%" >> "%LOG%" 2>&1
-copy /y "%PERLDIST%\perl\bin\perl.exe" "%TMPDIR%" >> "%LOG%" 2>&1
-REM XML parser support
-copy /y "%PERLDIST%\c\bin\libexpat*.dll" "%TMPDIR%" >> "%LOG%" 2>&1
-copy /y "%PERLDIST%\c\bin\libiconv*.dll" "%TMPDIR%" >> "%LOG%" 2>&1
-copy /y "%PERLDIST%\c\bin\libxml2*.dll" "%TMPDIR%" >> "%LOG%" 2>&1
-copy /y "%PERLDIST%\c\bin\libz*.dll" "%TMPDIR%" >> "%LOG%" 2>&1
-call :log ...Finished
-REM create archive in temp dir
-call :log Archiving Perl support files...
-pushd "%TMPDIR%"
-"%P7ZIP%" a "%TMPDIR%\%GIPZIP%" lib perl-license *.dll perl.exe >> "%LOG%" 2>&1
-popd
-call :log ...Finished
-REM copy output to current dir
-copy /y "%TMPDIR%\%GIPZIP%" "%CD%" >> "%LOG%" 2>&1
-call :log Created: %CD%\%GIPZIP%
-REM remove old expanded archive unconditionally
-call :log Deleting old expanded Perl support archive...
-rd /q /s "%CD%\%GIPPFX%" >> "%LOG%" 2>&1
-call :log ...Finished
-REM perl support as expanded archive
-if not "%EXPAND%"=="" (
-    call :log Extracting Perl support files...
-    "%P7ZIP%" x "%CD%\%GIPZIP%" -o"%CD%\%GIPPFX%" >> "%LOG%" 2>&1
-    call :log ...Finished
-    call :log Created: %CD%\%GIPPFX%
-)
-REM clean up
-if "%KEEPTMP%"=="" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-) else (
-    call :log /keeptmp specified - files available in %TMPDIR%
-)
-call :log FINISH %CMDNAME% %date% %time%
-:done
-exit /b
-:die
-echo Exiting - see %LOG%
-exit /b 1
-:log
-echo %*
-echo %* >> "%LOG%"
-goto :eof
-:usage
-echo.
-echo Generate archive of Perl support files for get_iplayer
-echo.
-echo Usage:
-echo   %~n0 [/keeptmp] [/makepar] [/expand] [\path\to\perlpar.exe]
-echo   %~n0 /? - this message
-echo.
-echo Parameters:
-echo   /keeptmp - retain contents of temp directory upon completion
-echo   /makepar - force rebuild of PAR file (re-run pp)
-echo   /expand  - expand Perl support archive in current directory
-echo.
-echo Input/Output (in current directory):
-echo   perlpar.exe - PAR file [output from pp]
-echo     (override by specifying PAR file on command line)
-echo.
-echo Output (in current directory):
-echo   perlfiles.zip - Perl support archive
-echo.
-echo Required Perl modules (install from CPAN):
-echo   MP3::Info   - localfiles plugin
-echo   MP3::Tag    - MP3 tagging
-echo   PAR::Packer - archive creation
-echo.

get_iplayer-2.82.tar.gz/windows/make-perltgz.cmd Deleted

@@ -1,120 +0,0 @@
-@echo off
-REM Make tarball get_iplayer Perl support files
-setlocal EnableDelayedExpansion
-REM show help if requested
-echo.%1 | find "?" >NUL
-if not ERRORLEVEL 1 goto usage
-REM script location
-set CMDDIR=%~dp0
-set CMDNAME=%~n0
-REM perform common init
-call "%CMDDIR%\make-init"
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-init failed
-    goto die
-)
-call :log START %CMDNAME% %date% %time%
-REM process command line
-for %%A in (%*) do (
-    if exist "%%A" (
-        set PERLARC=%%A
-    ) else (
-        set FLAG=%%A
-        set FLAG=!FLAG:/D=!
-        set FLAG=!FLAG:/=!
-        set !FLAG!=/D!FLAG!
-    )
-)
-REM create clean temp dir
-if exist "%TMPDIR%" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-)
-md "%TMPDIR%"
-call :log Temp directory: %TMPDIR%
-REM force makeperl if specified
-if not "%MAKEPERL%"=="" (
-    set PERLARC=%CD%\%GIPZIP%
-    goto makeperl
-)
-REM skip makeperl if perl archive specified
-if not "%PERLARC%"=="" (
-    call :log Using specified Perl archive: %PERLARC%
-    call :log Skipping makeperl...
-    goto perlskip
-)
-REM perl support as expanded archive in current dir
-if exist "%CD%\%GIPPFX%" (
-    call :log Using expanded Perl support archive: %CD%\%GIPPFX%
-    set PERLFILES=%CD%\%GIPPFX%
-    goto perldone
-)
-REM default perl support archive in current dir
-set PERLARC=%CD%\%GIPZIP%
-if exist "%PERLARC%" (
-    call :log Using default Perl support archive: %PERLARC%
-    goto perlskip
-)
-:makeperl
-REM rebuild perl support archive in current dir
-call :log Calling %CMDDIR%\make-perlfiles /makepar %KEEPTMP%
-call "%CMDDIR%\make-perlfiles" /makepar %KEEPTMP%
-if %ERRORLEVEL% neq 0 (
-    call :log ERROR: %CMDDIR%\make-perlfiles failed
-    goto die
-)
-REM make sure that archive is available
-if not exist "%PERLARC%" (
-    call :log ERROR: Cannot find %PERLARC%
-    goto die
-)
-:perlskip
-REM perl support as expanded archive
-call :log Extracting Perl support files...
-set PERLFILES=%TMPDIR%\%GIPPFX%
-"%P7ZIP%" x "%PERLARC%" -o"%PERLFILES%" >> "%LOG%" 2>&1
-call :log ...Finished
-:perldone
-call :log Building tarball...
-"%P7ZIP%" a "%TMPDIR%\%GIPPFX%.tar" -ttar "%PERLFILES%\*" >> "%LOG%" 2>&1
-"%P7ZIP%" a "%TMPDIR%\%GIPPFX%.tgz" -tgzip "%TMPDIR%\%GIPPFX%.tar" >> "%LOG%" 2>&1
-call :log ...Finished
-REM copy output to current dir
-copy /y "%TMPDIR%\%GIPPFX%.tgz" "%CD%\%GIPPFX%.tar.gz" >> "%LOG%" 2>&1
-call :log Created: %CD%\%GIPPFX%.tar.gz
-REM clean up
-if "%KEEPTMP%"=="" (
-    rd /q /s "%TMPDIR%" >> "%LOG%" 2>&1
-) else (
-    call :log /keeptmp specified - files available in %TMPDIR%
-)
-call :log FINISH %CMDNAME% %date% %time%
-:done
-exit /b
-:die
-echo Exiting - see %LOG%
-exit /b 1
-:log
-echo %*
-echo %* >> "%LOG%"
-goto :eof
-:usage
-echo.
-echo Generate tarball of Perl support archive (to build installer on Linux/OSX)
-echo.
-echo Usage:
-echo   %~n0 [/keeptmp] [/makeperl] [\path\to\perlfiles.zip]
-echo   %~n0 /? - this message
-echo.
-echo Parameters:
-echo   /keeptmp  - retain contents of temp directory
-echo   /makeperl - force rebuild of Perl support archive
-echo.
-echo Input (in current directory):
-echo   perlfiles     - expanded Perl support archive
-echo   OR (if expanded archive not found):
-echo   perlfiles.zip - Perl support archive file [output from make-perlfiles]
-echo     (override by specifying Perl archive file on command line)
-echo.
-echo Output (in current directory):
-echo   perlfiles.tar.gz - Perl support tarball
-echo.

get_iplayer-3.20.tar.gz/CHANGELOG.md Added

get_iplayer-3.20.tar.gz/CONTRIBUTING.md Added

get_iplayer-2.82.tar.gz/CONTRIBUTORS -> get_iplayer-3.20.tar.gz/CONTRIBUTORS Changed

get_iplayer-2.82.tar.gz/Makefile -> get_iplayer-3.20.tar.gz/Makefile Changed

@@ -2,19 +2,29 @@
 	@echo No need to make anything.
 
 ifdef VERSION
-tag:
+next_ver := $(shell echo $(VERSION) + 0.01 | bc)
+release:
 	@git update-index --refresh --unmerged
 	@if git diff-index --name-only HEAD | grep ^ ; then \
 		echo Uncommitted changes in above files; exit 1; fi
-	sed 's/^$my $$version = $.*/\1$(VERSION);/' -i get_iplayer
-	sed 's/^$my $$VERSION = $.*/\1$(VERSION);/' -i get_iplayer.cgi
-	@./get_iplayer --manpage get_iplayer.1
-	git diff --exit-code get_iplayer.1 > /dev/null || \
-		sed 's/$\.TH GET_IPLAYER "1" "$[^"]*"/\1$(shell date +"%B %Y")\"/' -i get_iplayer get_iplayer.1
-	sed 's/$The latest version is v$[0-9]\{1,\}\.[0-9]\{1,\}/\1$(VERSION)/' -i html/get_iplayer.html
-	@git log --format='%aN' |sort -u > CONTRIBUTORS; git add CONTRIBUTORS
-	@git commit -m "Tag version $(VERSION)" get_iplayer get_iplayer.1 html/get_iplayer.html CONTRIBUTORS get_iplayer.cgi
+	@git checkout master
+	@sed -i.bak -e 's/^$my $$version = $.*/\1$(VERSION);/' -e 's/^$my $$version_text$ = .*/\1;/' get_iplayer
+	@sed -i.bak -e 's/^$my $$VERSION = $.*/\1$(VERSION);/' -e 's/^$my $$VERSION_TEXT$ = .*/\1;/' get_iplayer.cgi
+	@rm -f get_iplayer.bak get_iplayer.cgi.bak
+	@./get_iplayer --nocopyright --manpage get_iplayer.1
+	@git diff --exit-code get_iplayer.1 > /dev/null || \
+		sed -i.bak -e 's/$\.TH GET_IPLAYER "1" "$[^"]*"/\1$(shell date +"%B %Y")\"/' get_iplayer get_iplayer.1
+	@rm -f get_iplayer.bak get_iplayer.1.bak
+	@git log --format='%aN' | sort -u > CONTRIBUTORS; git add CONTRIBUTORS
+	@git commit -m "Release $(VERSION)" get_iplayer get_iplayer.cgi get_iplayer.1 CONTRIBUTORS
 	@git tag v$(VERSION)
+	@git checkout contribute
+	@git merge master
+	@sed -i.bak -e 's/^$my $$version_text$;/\1 = "$(next_ver)-dev";/' get_iplayer
+	@sed -i.bak -e 's/^$my $$VERSION_TEXT$;/\1 = "$(next_ver)-dev";/' get_iplayer.cgi
+	@rm -f get_iplayer.bak get_iplayer.cgi.bak
+	@git commit -m "bump dev version" get_iplayer get_iplayer.cgi
+	@git checkout master
 
 tarball:
 	@git update-index --refresh --unmerged

get_iplayer-3.20.tar.gz/README.md Added

@@ -0,0 +1,139 @@
+## get_iplayer: BBC iPlayer Indexing Tool and PVR
+
+## Features
+
+* Downloads TV and radio programmes from BBC iPlayer
+* Allows multiple programmes to be downloaded using a single command
+* Indexing of most available iPlayer catch-up programmes from previous 30 days (not BBC Three, Red Button or iPlayer Exclusive)
+* Caching of programme index with automatic updating
+* Regex search on programme name 
+* Regex search on programme description and episode title
+* Filter search results by channel
+* Direct download via programme ID or URL
+* PVR capability (may be used with cron or Task Scheduler)
+* HTTP proxy support
+* Perl 5.10.1+ required, plus LWP, LWP::Protocol::https, XML::LibXML and Mojolicious modules
+* Requires ffmpeg for conversion to MP4 and AtomicParsley for metadata tagging
+* Runs on Linux/BSD (Ubuntu, Fedora, OpenBSD and others), macOS (10.10+), Windows (7/8/10 - XP/Vista not supported)
+
+**NOTE:** 
+
+- **get_iplayer can only search for programmes that were scheduled for broadcast on BBC linear services within the previous 30 days, even if some are available for more than 30 days on the iPlayer site. It may be possible to download other content directly via PID or URL, but such use is not supported.**
+- **get_iplayer does not support downloading news/sport videos, other embedded media, archive sites, special collections, educational material, programme clips or any content other than whole episodes of programmes broadcast on BBC linear services within the previous 30 days, plus episodes of BBC Three programmes posted within the same period. It may be possible to download other content directly via PID or URL, but such use is not supported.**
+
+## Documentation
+
+<https://github.com/get-iplayer/get_iplayer/wiki>
+	
+## Support
+
+<https://squarepenguin.co.uk/forums/>
+
+## Installation
+
+<https://github.com/get-iplayer/get_iplayer/wiki/installation>
+
+## Usage 
+  
+	get_iplayer --help
+	get_iplayer --basic-help
+	get_iplayer --long-help
+
+## Examples
+
+* List all TV programmes (`--type=tv` set by default):
+
+	`get_iplayer ".*"`
+
+	Search output appears in this format:
+
+		...
+		208:  Doctor Who: Series 7 Part 2 - 1. The Bells of Saint John, BBC One, b01rryzz
+		209:  Doctor Who: Series 7 Part 2 - 2. The Rings Of Akhaten, BBC One, b01rx0lj
+		210:  Doctor Who: Series 7 Part 2 - 3. Cold War, BBC One, b01s1cz7
+		...
+
+	Format = `<index>: <name> - <episode>, <channel>, <pid>`
+  
+* List all TV programmes with long descriptions:
+
+	`get_iplayer --long ".*"`
+
+* List all radio programmes:
+
+	`get_iplayer --type=radio ".*"`
+
+* List all TV programmes with "doctor who" in the name (matching is case-insensitive):
+
+	`get_iplayer "doctor who"`
+
+* List all TV and radio programmes with "doctor who" in the name:
+
+	`get_iplayer --type tv,radio "doctor who"`
+
+* List all BBC One programmes:
+
+	`get_iplayer --channel="BBC One" ".*"`
+
+* List Radio 4 and Radio 4 Extra programmes with "Book at Bedtime" in the title:
+
+	`get_iplayer --type=radio --channel="Radio 4" "Book at Bedtime"`
+	
+* List only Radio 4 programmes with "Book at Bedtime" in the title:
+
+	`get_iplayer --type=radio --channel="Radio 4$" "Book at Bedtime"`
+
+	*(The `$` regular expression metacharacter matches "Radio 4" only at the end of the channel name, thus avoiding matches against "Radio 4 Extra")*
+
+* Record TV programme number 208 (index from search results) in HD, with SD fallback if HD not available:
+
+	`get_iplayer --get 208` [default is to download best available]
+	
+	OR	
+
+	`get_iplayer --get 208 --tvmode=best`
+
+* Record TV programme number 208 with lower resolution (704x396):
+
+	`get_iplayer --get 208 --tvmode=good`
+
+* Record TV programme number 208 and download subtitles in SubRip (SRT) format:
+
+	`get_iplayer --get 208 --subtitles`
+
+* Record multiple TV programmes (using index numbers from search results): 
+
+	`get_iplayer --get 208 209 210`
+
+* Record a TV programme using its iPlayer URL:
+
+	`get_iplayer http://www.bbc.co.uk/iplayer/episode/b01sc0wf/Doctors_Series_15_Perfect/`
+
+* Record a TV programme using the PID (b01sc0wf) from its iPlayer URL:
+
+	`get_iplayer --pid=b01sc0wf`
+	
+* Record a radio programme using its iPlayer URL:
+
+    `get_iplayer http://www.bbc.co.uk/programmes/b07gcv34`	
+* Record a radio programme using the PID (b07gcv34) from its iPlayer URL in highest quality (320k), with fallback to lower quality if not available:
+
+	`get_iplayer --pid=b07gcv34` [default is to download best available]
+	
+	OR	
+
+	`get_iplayer --pid=b07gcv34 --radiomode=best`
+
+* Record a radio programme using the PID (b07gcv34) from its iPlayer URL with lower bit rate (96k):
+
+	`get_iplayer --pid=b07gcv34 --radiomode=good`
+
+* Record multiple radio programmes (using PIDs from iPlayer URLs): 
+
+	`get_iplayer --pid=b07gcv34,b07h60ld` [comma-separated list]
+
+	OR	
+
+	`get_iplayer --pid=b07gcv34 --pid=b07h60ld` [multiple arguments]
+
+NOTE: Sometimes you may not be able to download a listed programme immediately after broadcast (usually available within 24hrs of airing). Some BBC programmes may not be available from iPlayer.

get_iplayer-2.82.tar.gz/get_iplayer -> get_iplayer-3.20.tar.gz/get_iplayer Changed

@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
-# get_iplayer - Lists, Records and Streams BBC iPlayer TV and Radio programmes + other Programmes via 3rd-party plugins
+# get_iplayer - Lists and records BBC iPlayer TV and radio programmes
 #
 #    Copyright (C) 2008-2010 Phil Lewis
 #
@@ -15,40 +15,29 @@
 #    GNU General Public License for more details.
 #
 #    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 # Author: Phil Lewis
 # Email: iplayer2 (at sign) linuxcentre.net
-# Web: http://linuxcentre.net/iplayer
+# Web: https://github.com/get-iplayer/get_iplayer/wiki
 # License: GPLv3 (see LICENSE.txt)
 #
 #
 package main;
-my $version = 2.82;
+my $version = 3.20;
+my $version_text;
+$version_text = sprintf("v%.2f", $version) unless $version_text;
 #
 # Help:
 #	./get_iplayer --help | --longhelp
 #
-# Changelog:
-# 	http://linuxcentre.net/get_iplayer/CHANGELOG.txt
+# Release notes:
+# 	https://github.com/get-iplayer/get_iplayer/wiki/releasenotes
 #
-# Example Usage and Documentation:
-# 	http://linuxcentre.net/getiplayer/documentation
-#
-# Todo:
-# * Fix non-uk detection - iphone auth?
-# * Index/Record live radio streams w/schedule feeds to assist timing
-# * Remove all rtsp/mplayer/lame/tee dross when realaudio streams become obselete (not quite yet)
-# ** all global vars into a class???
-# ** Cut down 'use' clauses in each class
-# * stdout streaming with mms
-# * Add podcast links to web pvr manager
-# * Add PVR search src to recording history
-# * Fix unicode / wide chars in rdf
-#
-# Known Issues:
-# * CAVEAT: The filenames and modes in the history are comma-separated if there was a multimode download. For now it just uses the first one.
+# Documentation:
+# 	https://github.com/get-iplayer/get_iplayer/wiki/documentation
 #
+use Encode qw(:DEFAULT :fallback_all);
 use Env qw[@PATH];
 use Fcntl;
 use File::Copy;
@@ -61,53 +50,27 @@
 use HTTP::Headers;
 use IO::Seekable;
 use IO::Socket;
+use IPC::Open3;
 use LWP::ConnCache;
 use LWP::UserAgent;
-use POSIX qw(mkfifo);
+use open IN => ':crlf:utf8', OUT => ':utf8';
+use PerlIO::encoding;
+use POSIX qw(strftime);
 use POSIX qw(:termios_h);
 use strict;
 #use warnings;
 use Time::Local;
+use Unicode::Normalize;
 use URI;
-my %SIGORIG;
+use constant DIVIDER => "-==-" x 20;
+use constant FB_EMPTY => sub { '' };
+$PerlIO::encoding::fallback = XMLCREF;
+
 # Save default SIG actions
+my %SIGORIG;
 $SIGORIG{$_} = $SIG{$_} for keys %SIG;
-$|=1;
-
-# Hash of where plugin files were found so that the correct ones can be updated
-my %plugin_files;
-
-# Hash of all prog types => Programme class
-# Add an entry here if another Programme class is added
-my %prog_types = (
-	tv		=> 'Programme::tv',
-	radio		=> 'Programme::radio',
-	liveradio	=> 'Programme::liveradio',
-	livetv		=> 'Programme::livetv',
-);
-
-
-# Programme instance data
-# $prog{$pid} = Programme->new (
-#	'index'		=> <index number>,
-#	'name'		=> <programme short name>,
-#	'episode'	=> <Episode info>,
-#	'desc'		=> <Long Description>,
-#	'available'	=> <Date/Time made available or remaining>,
-#	'duration'	=> <duration in free text form>
-#	'versions'	=> <comma separated list of versions, e.g default, signed, audiodescribed>
-#	'thumbnail'	=> <programme thumbnail url>
-#	'channel	=> <channel>
-#	'categories'	=> <Comma separated list of categories>
-# 	'type'		=> <prog_type>
-#	'timeadded'	=> <timestamp when programme was added to cache>
-#	'version'	=> <selected version e.g default, signed, audiodescribed, etc - only set before recording>
-#	'filename'	=> <Path and Filename of saved file - set only while recording>
-#	'dir'		=> <Filename Directory of saved file - set only while recording>
-#	'fileprefix'	=> <Filename Prefix of saved file - set only while recording>
-#	'ext'		=> <Filename Extension of saved file - set only while recording>
-#);
-
+STDOUT->autoflush(1);
+STDERR->autoflush(1);
 
 # Define general 'option names' => ( <help mask>, <option help section>, <option cmdline format>, <usage text>, <option help> )
 # <help mask>: 0 for normal help, 1 for advanced help, 2 for basic help
@@ -115,152 +78,160 @@
 # Entries with keys starting with '_' are not parsed only displayed as help and in man pages.
 my $opt_format = {
 	# Recording
-	attempts	=> [ 1, "attempts=n", 'Recording', '--attempts <number>', "Number of attempts to make or resume a failed connection"],
-	force		=> [ 1, "force|force-download!", 'Recording', '--force', "Ignore programme history (unsets --hide option also). Forces a script update if used with -u"],
-	get		=> [ 2, "get|record|g!", 'Recording', '--get, -g', "Start recording matching programmes. Search terms required unless --pid specified. Use  --search=.* to force download of all available programmes."],
+	attempts	=> [ 1, "attempts=n", 'Recording', '--attempts <number>', "Number of attempts to make or resume a failed connection.  --attempts is applied per-stream, per-mode.  Many modes have two or more streams available."],
+	audioonly		=> [ 1, "audioonly|audio-only!", 'Recording', '--audio-only', "Only download audio stream for TV programme. 'hls' recording modes are not supported and ignored. Produces .m4a file. Implies --force."],
+	downloadabortonfail	=> [ 1, "downloadabortonfail|download-abortonfail!", 'Recording', '--download-abortonfail', "Exit immediately if stream for any recording mode fails to download. Use to avoid repeated failed download attempts if connection is dropped or access is blocked."],
+	excludesupplier	=> [ 1, "excludesupplier|exclude-supplier=s", 'Recording', '--exclude-supplier <supplier>,<supplier>,...', "Comma-separated list of media stream suppliers to skip.  Possible values: akamai,limelight,bidi"],
+	force		=> [ 1, "force|force-download!", 'Recording', '--force', "Ignore programme history (unsets --hide option also)."],
+	fps25		=> [ 1, "fps25!", 'Recording', '--fps25', "Use only 25fps streams for TV programmes (HD video not available)."],
+	get		=> [ 2, "get|record|g!", 'Recording', '--get, -g', "Start recording matching programmes. Search terms required."],
+	includesupplier	=> [ 1, "includesupplier|include-supplier=s", 'Recording', '--include-supplier <supplier>,<supplier>,...', "Comma-separated list of media stream suppliers to use if not included by default.  Possible values: akamai,limelight,bidi"],
 	hash		=> [ 1, "hash!", 'Recording', '--hash', "Show recording progress as hashes"],
-	metadataonly	=> [ 1, "metadataonly|metadata-only!", 'Recording', '--metadata-only', "Create specified metadata info file without any recording or streaming (can also be used with thumbnail option)."],
-	mmsnothread	=> [ 1, "mmsnothread!", 'Recording', '--mmsnothread', "Disable parallel threaded recording for mms"],
-	modes		=> [ 0, "modes=s", 'Recording', '--modes <mode>,<mode>,...', "Recording modes: flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma.  Use --modes=best to automatically select highest quality available."],
-	multimode	=> [ 1, "multimode!", 'Recording', '--multimode', "Allow the recording of more than one mode for the same programme - WARNING: will record all specified/default modes!!"],
+	hlslqaudio	=> [ 1, "hlslqaudio|hls-lq-audio!", 'Recording', '--hls-lq-audio', "Use default lower-quality audio for 'hvf' modes (TV only). Instead of 320k audio, output file will contain 128k or 96k audio, depending on the stream downloaded."],
+	logprogress		=> [ 1, "log-progress|logprogress!", 'Recording', '--log-progress', "Force HLS/DASH download progress display to be captured when screen output is redirected to file.  Progress display is normally omitted unless writing to terminal."],
+	markdownloaded	=> [ 1, "markdownloaded|mark-downloaded!", 'Recording', '--mark-downloaded', "Mark programmes in search results or specified with --pid/--url as downloaded by inserting records in download history."],
+	modes		=> [ 0, "modes=s", 'Recording', '--modes <mode>,<mode>,...', "Recording modes.  See --tvmode and --radiomode (with --long-help) for available modes and defaults.  Shortcuts: tvbest,tvbetter,tvgood,tvworst,radiobest,radiobetter,radiogood,radioworst (default=default for programme type)."],
+	nomergeversions	=> [ 1, "nomergeversions|no-merge-versions!", 'Recording', '--no-merge-versions', "Do not merge programme versions with same name and duration."],
+	noproxy	=> [ 1, "noproxy|no-proxy!", 'Recording', '--no-proxy', "Ignore --proxy setting in preferences and/or http_proxy environment variable."],
 	overwrite	=> [ 1, "overwrite|over-write!", 'Recording', '--overwrite', "Overwrite recordings if they already exist"],
-	partialproxy	=> [ 1, "partial-proxy!", 'Recording', '--partial-proxy', "Only uses web proxy where absolutely required (try this extra option if your proxy fails)"],
-	_url		=> [ 2, "", 'Recording', '--url "<url>"', "Record the embedded media player in the specified URL. Use with --type=<type>."],
-	pid		=> [ 2, "pid|url=s", 'Recording', '--pid <pid>', "Record an arbitrary pid that does not necessarily appear in the index."],
-	pidrecursive	=> [ 1, "pidrecursive|pid-recursive!", 'Recording', '--pid-recursive', "When used with --pid record all the embedded pids if the pid is a series or brand pid."],
-	proxy		=> [ 0, "proxy|p=s", 'Recording', '--proxy, -p <url>', "Web proxy URL e.g. 'http://USERNAME:PASSWORD\@SERVER:PORT' or 'http://SERVER:PORT'"],
-	raw		=> [ 0, "raw!", 'Recording', '--raw', "Don't transcode or change the recording/stream in any way (i.e. radio/realaudio, rtmp/flv)"],
-	start		=> [ 1, "start=s", 'Recording', '--start <secs>', "Recording/streaming start offset (rtmp and realaudio only)"],
-	stop		=> [ 1, "stop=s", 'Recording', '--stop <secs>', "Recording/streaming stop offset (can be used to limit live rtmp recording length) rtmp and realaudio only"],
-	suboffset	=> [ 1, "suboffset=n", 'Recording', '--suboffset <offset>', "Offset the subtitle timestamps by the specified number of milliseconds"],
-	subtitles	=> [ 2, "subtitles|subs!", 'Recording', '--subtitles', "Download subtitles into srt/SubRip format if available and supported"],
-	subsonly	=> [ 1, "subtitlesonly|subsonly|subtitles-only|subs-only!", 'Recording', '--subtitles-only', "Only download the subtitles, not the programme"],
-	subsraw		=> [ 1, "subsraw!", 'Recording', '--subsraw', "Additionally save the raw subtitles file"],
-	tagonly		=> [ 1, "tagonly|tag-only!", 'Recording', '--tag-only', "Only update the programme tag and not download the programme (can also be used with --history)"],
-	test		=> [ 1, "test|t!", 'Recording', '--test, -t', "Test only - no recording (will show programme type)"],
-	thumb		=> [ 1, "thumb|thumbnail!", 'Recording', '--thumb', "Download Thumbnail image if available"],
-	thumbonly	=> [ 1, "thumbonly|thumbnailonly|thumbnail-only|thumb-only!", 'Recording', '--thumbnail-only', "Only Download Thumbnail image if available, not the programme"],
-	aactomp3	=> [ 1, "aactomp3", 'Recording', '--aactomp3', "Transcode AAC audio to MP3 with ffmpeg (CBR 128k unless --mp3vbr is specified)"],
-	mp3vbr		=> [ 1, "mp3vbr=n", 'Recording', '--mp3vbr', "Set LAME VBR mode to N (0 to 9) for AAC transcoding. 0 = target bitrate 245 Kbit/s, 9 = target bitrate 65 Kbit/s (requires --aactomp3)"],
+	partialproxy	=> [ 1, "partial-proxy!", 'Recording', '--partial-proxy', "Only uses web proxy where absolutely required (try this extra option if your proxy fails)."],
+	_url		=> [ 2, "", 'Recording', '--url <url>,<url>,...', "Record the PIDs contained in the specified iPlayer episode URLs."],
+	pid		=> [ 2, "pid|url=s@", 'Recording', '--pid <pid>,<pid>,...', "Record arbitrary PIDs that do not necessarily appear in the index."],
+	pidindex	=> [ 1, "pidrefresh|pid-refresh|pidindex|pid-index!", 'Recording', '--pid-index', "Update (if necessary) and use programme index cache with --pid. Cache is not searched for programme by default with --pid. Synonym: --pid-refresh."],
+	pidrecursive	=> [ 1, "pidrecursive|pid-recursive!", 'Recording', '--pid-recursive', "Record all related episodes if value of --pid is a series or brand PID.  Requires --pid."],
+	pidrecursivelist	=> [ 1, "pidrecursivelist|pid-recursive-list!", 'Recording', '--pid-recursive-list', "If value of --pid is a series or brand PID, list available episodes but do not download. Implies --pid-recursive. Requires --pid."],
+	proxy		=> [ 0, "proxy|p=s", 'Recording', '--proxy, -p <url>', "Web proxy URL, e.g., http://username:password\@server:port or http://server:port.  Value of http_proxy environment variable (if present) will be used unless --proxy is specified. Used for both HTTP and HTTPS. Overridden by --no-proxy."],
+	start		=> [ 1, "start=s", 'Recording', '--start <secs|hh:mm:ss>', "Recording/streaming start offset (actual start may be several seconds earlier for HLS and DASH streams)"],
+	stop		=> [ 1, "stop=s", 'Recording', '--stop <secs|hh:mm:ss>', "Recording/streaming stop offset (actual stop may be several seconds later for HLS and DASH streams)"],
+	subsrequired	=> [ 1, "subsrequired|subtitlesrequired|subs-required|subtitles-required!", 'Recording', '--subtitles-required', "Do not download TV programme if subtitles are not available."],
+	test		=> [ 1, "test|t!", 'Recording', '--test, -t', "Test only - no recording (only shows search results with --pvr and --pid-recursive)"],
+	versionlist	=> [ 1, "versionlist|versions|version-list=s", 'Recording', '--versions <versions>', "Version of programme to record. List is processed from left to right and first version found is downloaded.  Example: '--versions=audiodescribed,default' will prefer audiodescribed programmes if available."],
 
 	# Search
-	before		=> [ 1, "before=n", 'Search', '--before', "Limit search to programmes added to the cache before N hours ago"],
-	category 	=> [ 0, "category=s", 'Search', '--category <string>', "Narrow search to matched categories (regex or comma separated values)"],
-	channel		=> [ 0, "channel=s", 'Search', '--channel <string>', "Narrow search to matched channel(s) (regex or comma separated values)"],
-	exclude		=> [ 0, "exclude=s", 'Search', '--exclude <string>', "Narrow search to exclude matched programme names (regex or comma separated values)"],
-	excludecategory	=> [ 0, "xcat|exclude-category=s", 'Search', '--exclude-category <string>', "Narrow search to exclude matched categories (regex or comma separated values)"],
-	excludechannel	=> [ 0, "xchan|exclude-channel=s", 'Search', '--exclude-channel <string>', "Narrow search to exclude matched channel(s) (regex or comma separated values)"],
-	fields		=> [ 0, "fields=s", 'Search', '--fields <field1>,<field2>,..', "Searches only in the specified comma separated fields"],
-	future		=> [ 1, "future!", 'Search', '--future', "Search future programme schedule if it has been indexed (refresh cache with: --refresh --refresh-future)."],
+	availablebefore		=> [ 1, "availablebefore|available-before=n", 'Search', '--available-before <hours>', "Limit search to programmes that became available before <hours> hours ago"],
+	availablesince		=> [ 0, "availablesince|available-since=n", 'Search', '--available-since <hours>', "Limit search to programmes that have become available in the last <hours> hours"],
+	before		=> [ 1, "before=n", 'Search', '--before <hours>', "Limit search to programmes added to the cache before <hours> hours ago"],
+	category 	=> [ 0, "category=s", 'Search', '--category <string>', "Narrow search to matched categories (comma-separated regex list).  Defaults to substring match.  Only works with --history."],
+	channel		=> [ 0, "channel=s", 'Search', '--channel <string>', "Narrow search to matched channel(s) (comma-separated regex list).  Defaults to substring match."],
+	exclude		=> [ 0, "exclude=s", 'Search', '--exclude <string>', "Narrow search to exclude matched programme names (comma-separated regex list).  Defaults to substring match."],
+	excludecategory	=> [ 0, "xcat|exclude-category=s", 'Search', '--exclude-category <string>', "Narrow search to exclude matched categories (comma-separated regex list).  Defaults to substring match.  Only works with --history."],
+	excludechannel	=> [ 0, "xchan|exclude-channel=s", 'Search', '--exclude-channel <string>', "Narrow search to exclude matched channel(s) (comma-separated regex list).  Defaults to substring match."],
+	expiresafter		=> [ 1, "expiresafter|expires-after=n", 'Search', '--expires-after <hours>', "Limit search to programmes that will expire after <hours> hours from now"],
+	expiresbefore		=> [ 1, "expiresbefore|expires-before=n", 'Search', '--expires-before <hours>', "Limit search to programmes that will expire before <hours> hours from now"],
+	fields		=> [ 0, "fields=s", 'Search', '--fields <field1>,<field2>,...', "Searches only in the specified fields. The fields are concatenated with spaces in the order specified and the search term is applied to the resulting string."],
+	future		=> [ 1, "future!", 'Search', '--future', "Additionally search future programme schedule if it has been indexed (refresh cache with: --refresh --refresh-future)."],
 	long		=> [ 0, "long|l!", 'Search', '--long, -l', "Additionally search in programme descriptions and episode names (same as --fields=name,episode,desc )"],
 	search		=> [ 1, "search=s", 'Search', '--search <search term>', "GetOpt compliant way of specifying search args"],
-	history		=> [ 1, "history!", 'Search', '--history', "Search/show recordings history"],
-	since		=> [ 0, "since=n", 'Search', '--since', "Limit search to programmes added to the cache in the last N hours"],
-	type		=> [ 2, "type=s", 'Search', '--type <type>', "Only search in these types of programmes: ".join(',', keys %prog_types).",all (tv is default)"],
-	versionlist	=> [ 1, "versionlist|versions|version-list=s", 'Search', '--versions <versions>', "Version of programme to search or record.  List is processed from left to right and first version found is downloaded.  Example: '--versions signed,audiodescribed,default' will prefer signed and audiodescribed programmes if available.  Default: 'default'"],
+	history		=> [ 1, "history!", 'Search', '--history', "Search recordings history (requires search term)"],
+	since		=> [ 0, "since=n", 'Search', '--since <hours>', "Limit search to programmes added to the cache in the last <hours> hours"],
+	type		=> [ 2, "type=s", 'Search', '--type <type>,<type>,...', "Only search in these types of programmes: ".join(',', progclass()).",all (tv is default)"],
 
 	# Output
-	command		=> [ 1, "c|command=s", 'Output', '--command, -c <command>', "Run user command after successful recording using args such as <pid>, <name> etc"],
-	email		=> [ 1, "email=s", 'Output', '--email <address>', "Email HTML index of matching programmes to specified address"],
-	emailsmtp	=> [ 1, "emailsmtpserver|email-smtp=s", 'Output', '--email-smtp <hostname>', "SMTP server IP address to use to send email (default: localhost)"],
-	emailsender	=> [ 1, "emailsender|email-sender=s", 'Output', '--email-sender <address>', "Optional email sender address"],
-	fatfilename	=> [ 1, "fatfilenames|fatfilename!", 'Output', '--fatfilename', "Omit characters forbidden by FAT filesystems from filenames but keep whitespace"],
-	fileprefix	=> [ 1, "file-prefix|fileprefix=s", 'Output', '--file-prefix <format>', "The filename prefix (excluding dir and extension) using formatting fields. e.g. '<name>-<episode>-<pid>'"],
-	fxd		=> [ 1, "fxd=s", 'Output', '--fxd <file>', "Create Freevo FXD XML of matching programmes in specified file"],
-	html		=> [ 1, "html=s", 'Output', '--html <file>', "Create basic HTML index of matching programmes in specified file"],
-	isodate		=> [ 1, "isodate!",  'Output', '--isodate', "Use ISO8601 dates (YYYY-MM-DD) in filenames"],
-	metadata	=> [ 1, "metadata=s", 'Output', '--metadata <type>', "Create metadata info file after recording. Valid types are: xbmc, xbmc_movie, freevo, generic"],
-	mkv			=> [ 1, "mkv", 'Output', '--mkv', "Output video in MKV container instead of MP4. Currently no tagging supported from get_iplayer for MKV output"],
-	mythtv		=> [ 1, "mythtv=s", 'Output', '--mythtv <file>', "Create Mythtv streams XML of matching programmes in specified file"],
-	nowrite		=> [ 1, "no-write|nowrite|n!", 'Output', '--nowrite, -n', "No writing of file to disk (use with -x to prevent a copy being stored on disk)"],
+	command		=> [ 1, "c|command=s", 'Output', '--command, -c <command>', "User command to run after successful recording of programme. Use substitution parameters in command string (see docs for list)."],
+	credits		=> [ 1, "credits!", 'Output', '--credits', "Download programme credits, if available."],
+	creditsonly		=> [ 1, "creditsonly|credits-only!", 'Output', '--credits-only', "Only download programme credits (if available), not programme."],
+	fileprefix	=> [ 1, "file-prefix|fileprefix=s", 'Output', '--file-prefix <format>', "The filename prefix template (excluding dir and extension). Use substitution parameters in template (see docs for list). Default: <name> - <episode> <pid> <version>"],
+	limitprefixlength => [ 1, "limit-prefix-length|limitprefixlength=n", "Output", '--limitprefixlength <length>', "The maximum length for a file prefix.  Defaults to 240 to allow space within standard 256 limit."],
+	metadata	=> [ 1, "metadata:s", 'Output', '--metadata', "Create metadata info file after recording."],
+	metadataonly	=> [ 1, "metadataonly|metadata-only!", 'Output', '--metadata-only', "Create specified metadata info file without any recording or streaming."],
+	nometadata	=> [ 1, "nometadata|no-metadata!", 'Output', '--no-metadata', "Do not create metadata info file after recording (overrides --metadata)."],
+	nosanitise	=> [ 1, "nosanitize|nosanitise|no-sanitize|no-sanitise!", 'Output', '--no-sanitise', "Do not sanitise output file and directory names. Implies --whitespace. Invalid characters for Windows (\"*:<>?|) and macOS (:) will be removed."],
 	output		=> [ 2, "output|o=s", 'Output', '--output, -o <dir>', "Recording output directory"],
-	player		=> [ 0, "player=s", 'Output', "--player \'<command> <options>\'", "Use specified command to directly play the stream"],
-	stdout		=> [ 1, "stdout|x", 'Output', '--stdout, -x', "Additionally stream to STDOUT (so you can pipe output to a player)"],
-	stream		=> [ 0, "stream!", 'Output', '--stream', "Stream to STDOUT (so you can pipe output to a player)"],
-	subdir		=> [ 1, "subdirs|subdir|s!", 'Output', '--subdir, -s', "Put Recorded files into Programme name subdirectory"],
-	subdirformat	=> [ 1, "subdirformat|subdirsformat|subdir-format=s", 'Output', '--subdir-format <format>', "The format to be used for the subdirectory naming using formatting fields. e.g. '<nameshort>-<seriesnum>'"],
-	symlink		=> [ 1, "symlink|freevo=s", 'Output', '--symlink <file>', "Create symlink to <file> once we have the header of the recording"],
+	raw		=> [ 0, "raw!", 'Output', '--raw', "Don't remux or change the recording in any way.  Saves output file in native container format (HLS->MPEG-TS, DASH->MP4)"],
+	subdir		=> [ 1, "subdirs|subdir|s!", 'Output', '--subdir, -s', "Save recorded files into subdirectory of output directory.  Default: same name as programme (see --subdir-format)."],
+	subdirformat	=> [ 1, "subdirformat|subdirsformat|subdirs-format|subdir-format=s", 'Output', '--subdir-format <format>', "The format to be used for subdirectory naming.  Use substitution parameters in format string (see docs for list)."],
+	suboffset	=> [ 1, "suboffset=n", 'Output', '--suboffset <offset>', "Offset the subtitle timestamps by the specified number of milliseconds.  Requires --subtitles."],
+	subsembed	=> [ 1, "subtitlesembed|subsembed|subtitles-embed|subs-embed!", 'Output', '--subs-embed', "Embed soft subtitles in MP4 output file. Ignored with --audio-only and --ffmpeg-obsolete. Requires --subtitles."],
+	subsmono	=> [ 1, "subtitlesmono|subsmono|subtitles-mono|subs-mono!", 'Output', '--subs-mono', "Create monochrome titles, with leading hyphen used to denote change of speaker. Requires --subtitles."],
+	subsonly	=> [ 1, "subtitlesonly|subsonly|subtitles-only|subs-only!", 'Output', '--subtitles-only', "Only download the subtitles, not the programme"],
+	subsraw		=> [ 1, "subtitlesraw|subsraw|subtitles-raw|subs-raw!", 'Output', '--subs-raw', "Additionally save the raw subtitles file.  Requires --subtitles."],
+	subtitles	=> [ 2, "subtitles|subs!", 'Output', '--subtitles', "Download subtitles into srt/SubRip format if available and supported"],
+	tagonly		=> [ 1, "tagonly|tag-only!", 'Output', '--tag-only', "Only update the programme metadata tag and not download the programme. Use with --history or --tag-only-filename."],
+	tagonlyfilename		=> [ 1, "tagonlyfilename|tag-only-filename=s", 'Output', '--tag-only-filename <filename>', "Add metadata tags to specified file (ignored unless used with --tag-only)"],
+	thumb		=> [ 1, "thumb|thumbnail!", 'Output', '--thumb', "Download thumbnail image if available"],
 	thumbext	=> [ 1, "thumbext|thumb-ext=s", 'Output', '--thumb-ext <ext>', "Thumbnail filename extension to use"],
-	thumbsizecache	=> [ 1, "thumbsizecache=n", 'Output', '--thumbsizecache <index|width>', "Default thumbnail size/index to use when building cache and index (see --info for thumbnailN: to get size/index)"],
-	thumbsize	=> [ 1, "thumbsize|thumbsizemeta=n", 'Output', '--thumbsize <index|width>', "Default thumbnail size/index to use for the current recording and metadata (see --info for thumbnailN: to get size/index)"],
-	whitespace	=> [ 1, "whitespace|ws|w!", 'Output', '--whitespace, -w', "Keep whitespace (and escape chars) in filenames"],
-	xmlchannels	=> [ 1, "xml-channels|fxd-channels!", 'Output', '--xml-channels', "Create freevo/Mythtv menu of channels -> programme names -> episodes"],
-	xmlnames	=> [ 1, "xml-names|fxd-names!", 'Output', '--xml-names', "Create freevo/Mythtv menu of programme names -> episodes"],
-	xmlalpha	=> [ 1, "xml-alpha|fxd-alpha!", 'Output', '--xml-alpha', "Create freevo/Mythtv menu sorted alphabetically by programme name"],
+	thumbonly	=> [ 1, "thumbonly|thumbnailonly|thumbnail-only|thumb-only!", 'Output', '--thumbnail-only', "Only download thumbnail image if available, not the programme"],
+	thumbseries	=> [ 1, "thumbseries|thumbnailseries|thumb-series|thumbnail-series!", 'Output', '--thumbnail-series', "Force use of series/brand thumbnail (series preferred) instead of episode thumbnail"],
+	thumbsize	=> [ 1, "thumbsize|thumb-size|thumbsizemeta|thumbnailsize|thumbnail-size=n", 'Output', '--thumbnail-size <width>', "Thumbnail size to use for the current recording and metadata. Specify width: 192,256,384,448,512,640,704,832,960,1280,1920. Invalid values will be mapped to nearest available. Default: 192"],
+	thumbsquare	=> [ 1, "thumbsquare|thumbnailsquare|thumb-square|thumbnail-square!", 'Output', '--thumbnail-square', "Download square version of thumbnail image."],
+	tracklist		=> [ 1, "tracklist!", 'Output', '--tracklist', "Download track list of music played in programme, if available. Track times and durations may be missing or incorrect."],
+	tracklistonly		=> [ 1, "tracklistonly|tracklist-only!", 'Output', '--tracklist-only', "Only download track list of music played in programme (if available), not programme."],
+	whitespace	=> [ 1, "whitespace|ws|w!", 'Output', '--whitespace, -w', "Keep whitespace in file and directory names.  Default behaviour is to replace whitespace with underscores."],
 
 	# Config
+	cacherebuild	=> [ 1, "rebuildcache|rebuild-cache|cacherebuild|cache-rebuild!", 'Config', '--cache-rebuild', "Rebuild cache with full 30-day programme index. Use --refresh-limit to restrict cache window."],
 	expiry		=> [ 1, "expiry|e=n", 'Config', '--expiry, -e <secs>', "Cache expiry in seconds (default 4hrs)"],
-	refresh		=> [ 2, "refresh|flush|f!", 'Config', '--refresh, --flush, -f', "Refresh cache"],
 	limitmatches	=> [ 1, "limitmatches|limit-matches=n", 'Config', '--limit-matches <number>', "Limits the number of matching results for any search (and for every PVR search)"],
-	nopurge		=> [ 1, "no-purge|nopurge!", 'Config', '--nopurge', "Don't ask to delete programmes recorded over 30 days ago"],	
-	packagemanager	=> [ 1, "packagemanager=s", 'Config', '--packagemanager <string>', "Tell the updater that we were installed using a package manager and don't update (use either: apt,rpm,deb,yum,disable)"],
-	pluginsupdate	=> [ 1, "pluginsupdate|plugins-update!", 'Config', '--plugins-update', "Update get_iplayer plugins to the latest"],
+	nopurge		=> [ 1, "no-purge|nopurge!", 'Config', '--nopurge', "Don't show warning about programmes recorded over 30 days ago"],
 	prefsadd	=> [ 0, "addprefs|add-prefs|prefsadd|prefs-add!", 'Config', '--prefs-add', "Add/Change specified saved user or preset options"],
 	prefsdel	=> [ 0, "del-prefs|delprefs|prefsdel|prefs-del!", 'Config', '--prefs-del', "Remove specified saved user or preset options"],
 	prefsclear	=> [ 0, "clear-prefs|clearprefs|prefsclear|prefs-clear!", 'Config', '--prefs-clear', "Remove *ALL* saved user or preset options"],
 	prefsshow	=> [ 0, "showprefs|show-prefs|prefsshow|prefs-show!", 'Config', '--prefs-show', "Show saved user or preset options"],
 	preset		=> [ 1, "preset|z=s", 'Config', '--preset, -z <name>', "Use specified user options preset"],
 	presetlist	=> [ 1, "listpresets|list-presets|presetlist|preset-list!", 'Config', '--preset-list', "Show all valid presets"],
-	profiledir	=> [ 1, "profiledir|profile-dir=s", 'Config', '--profile-dir <dir>', "Override the user profile directory/folder"],
-	refreshinclude	=> [ 1, "refreshinclude|refresh-include=s", 'Config', '--refresh-include <string>', "Include matched channel(s) when refreshing cache (regex or comma separated values)"],
-	refreshexclude	=> [ 1, "refreshexclude|refresh-exclude|ignorechannels=s", 'Config', '--refresh-exclude <string>', "Exclude matched channel(s) when refreshing cache (regex or comma separated values)"],
-	refreshfuture	=> [ 1, "refreshfuture|refresh-future!", 'Config', '--refresh-future', "Obtain future programme schedule when refreshing cache (between 7-14 days)"],
-	skipdeleted	=> [ 1, "skipdeleted!", 'Config', "--skipdeleted", "Skip the download of metadata/thumbs/subs if the media file no longer exists. Use with --history & --metadataonly/subsonly/thumbonly."],
-	update		=> [ 2, "update|u!", 'Config', '--update, -u', "Update get_iplayer if a newer one exists"],
+	profiledir	=> [ 1, "profiledir|profile-dir=s", 'Config', '--profile-dir <dir>', "Override the user profile directory"],
+	refresh		=> [ 2, "refresh|flush|f!", 'Config', '--refresh, --flush, -f', "Refresh cache"],
+	refreshabortonerror	=> [ 1, "refreshabortonerror|refresh-abortonerror!", 'Config', '--refresh-abortonerror', "Abort cache refresh for programme type if data for any channel fails to download.  Use --refresh-exclude to temporarily skip failing channels."],
+	refreshinclude	=> [ 1, "refreshinclude|refresh-include=s", 'Config', '--refresh-include <channel>,<channel>,...', "Include matched channel(s) when refreshing cache (comma-separated regex list).  Defaults to substring match.  Overrides --refresh-exclude-groups[-{tv,radio}] status for specified channel(s)"],
+	refreshexclude	=> [ 1, "refreshexclude|refresh-exclude|ignorechannels=s", 'Config', '--refresh-exclude <channel>,<channel>,...', "Exclude matched channel(s) when refreshing cache (comma-separated regex list).  Defaults to substring match.  Overrides --refresh-include-groups[-{tv,radio}] status for specified channel(s)"],
+	refreshexcludegroups	=> [ 1, "refreshexcludegroups|refresh-exclude-groups=s", 'Config', '--refresh-exclude-groups <group>,<group>,...', "Exclude channel groups when refreshing radio or TV cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshexcludegroupsradio	=> [ 1, "refreshexcludegroupsradio|refresh-exclude-groups-radio=s", 'Config', '--refresh-exclude-groups-radio <group>,<group>,...', "Exclude channel groups when refreshing radio cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshexcludegroupstv	=> [ 1, "refreshexcludegroupstv|refresh-exclude-groups-tv=s", 'Config', '--refresh-exclude-groups-tv <group>,<group>,...', "Exclude channel groups when refreshing TV cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshfuture	=> [ 1, "refreshfuture|refresh-future!", 'Config', '--refresh-future', "Obtain future programme schedule when refreshing cache"],
+	refreshincludegroups	=> [ 1, "refreshincludegroups|refresh-include-groups=s", 'Config', '--refresh-include-groups <group>,<group>,...', "Include channel groups when refreshing radio or TV cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshincludegroupsradio	=> [ 1, "refreshincludegroupsradio|refresh-include-groups-radio=s", 'Config', '--refresh-include-groups-radio <group>,<group>,...', "Include channel groups when refreshing radio cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshincludegroupstv	=> [ 1, "refreshincludegroupstv|refresh-include-groups-tv=s", 'Config', '--refresh-include-groups-tv <group>,<group>,...', "Include channel groups when refreshing TV cache (comma-separated values).  Valid values: 'national', 'regional', 'local'"],
+	refreshlimit	=> [ 1, "refreshlimit|refresh-limit=n", 'Config', '--refresh-limit <days>', "Minimum number of days of programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30"],
+	refreshlimitradio	=> [ 1, "refreshlimitradio|refresh-limit-radio=n", 'Config', '--refresh-limit-radio <days>', "Number of days of radio programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30"],
+	refreshlimittv	=> [ 1, "refreshlimittv|refresh-limit-tv=n", 'Config', '--refresh-limit-tv <days>', "Number of days of TV programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30"],
+	skipdeleted	=> [ 1, "skipdeleted!", 'Config', "--skipdeleted", "Skip the download of metadata/thumbs/subs if the media file no longer exists.  Use with --history & --metadataonly/subsonly/thumbonly."],
 	webrequest	=> [ 1, "webrequest=s", 'Config', '--webrequest <urlencoded string>', 'Specify all options as a urlencoded string of "name=val&name=val&..."' ],
 
 	# Display
 	conditions	=> [ 1, "conditions!", 'Display', '--conditions', 'Shows GPLv3 conditions'],
-	debug		=> [ 1, "debug!", 'Display', '--debug', "Debug output"],
-	dumpoptions	=> [ 1, "dumpoptions|dumpopts|dump-options!", 'Display', '--dump-options', 'Dumps all options with their internal option key names'],
+	debug		=> [ 1, "debug!", 'Display', '--debug', "Debug output (very verbose and rarely useful)"],
+	dumpoptions	=> [ 1, "dumpoptions|dumpopts|dump-options|dump-opts!", 'Display', '--dump-options', 'Dumps all options with their internal option key names'],
 	helpbasic	=> [ 2, "help-basic|usage|bh|hb|helpbasic|basichelp|basic-help!", 'Display', '--helpbasic, --usage', "Basic help text"],
 	help		=> [ 2, "help|h!", 'Display', '--help, -h', "Intermediate help text"],
 	helplong	=> [ 2, "help-long|advanced|long-help|longhelp|lh|hl|helplong!", 'Display', '--helplong', "Advanced help text"],
 	hide		=> [ 1, "hide!", 'Display', '--hide', "Hide previously recorded programmes"],
-	info		=> [ 2, "i|info!", 'Display', '--info, -i', "Show full programme metadata and availability of modes and subtitles (max 50 matches)"],
-	list		=> [ 1, "list=s", 'Display', '--list <categories|channel>', "Show a list of available categories/channels for the selected type and exit"],
-	listformat	=> [ 1, "listformat=s", 'Display', '--listformat <format>', "Display programme data based on a user-defined format string (such as <pid>, <name> etc)"],
-	listplugins	=> [ 1, "listplugins!", 'Display', '--listplugins', "Display a list of currently available plugins or programme types"],
-	_long		=> [ 0, "", 'Display', '--long, -l', "Show long programme info"],
+	info		=> [ 2, "i|info!", 'Display', '--info, -i', "Show full programme metadata and availability of modes and subtitles (max 40 matches)"],
+	list		=> [ 1, "list=s", 'Display', '--list <element>', "Show a list of distinct element values (with counts) for the selected programme type(s) and exit.  Valid elements are: 'channel'"],
+	listformat	=> [ 1, "listformat|list-format=s", 'Display', '--listformat <format>', "Display search results with a custom format. Use substitution parameters in format string (see docs for list)."],
+	_long		=> [ 0, "", 'Display', '--long, -l', "Show extended programme info"],
 	manpage		=> [ 1, "manpage=s", 'Display', '--manpage <file>', "Create man page based on current help text"],
-	nocopyright	=> [ 1, "nocopyright!", 'Display', '--nocopyright', "Don't display copyright header"],
+	nocopyright	=> [ 1, "no-copyright|nocopyright!", 'Display', '--nocopyright', "Don't display copyright header"],
 	page		=> [ 1, "page=n", 'Display', '--page <number>', "Page number to display for multipage output"],
 	pagesize	=> [ 1, "pagesize=n", 'Display', '--pagesize <number>', "Number of matches displayed on a page for multipage output"],
-	quiet		=> [ 1, "q|quiet|silent!", 'Display', '--quiet, -q', "No logging output"],
-	series		=> [ 1, "series!", 'Display', '--series', "Display Programme series names only with number of episodes"],
-	showcacheage	=> [ 1, "showcacheage|show-cache-age!", 'Display', '--show-cache-age', "Displays the age of the selected programme caches then exit"],
-	showoptions	=> [ 1, "showoptions|showopts|show-options!", 'Display', '--show-options', 'Shows options which are set and where they are defined'],
-	sortmatches	=> [ 1, "sortmatches|sort=s", 'Display', '--sort <fieldname>', "Field to use to sort displayed matches"],
-	sortreverse	=> [ 1, "sortreverse!", 'Display', '--sortreverse', "Reverse order of sorted matches"],
-	streaminfo	=> [ 1, "streaminfo!", 'Display', '--streaminfo', "Returns all of the media stream urls of the programme(s)"],
-	terse		=> [ 0, "terse!", 'Display', '--terse', "Only show terse programme info (does not affect searching)"],
-	tree		=> [ 0, "tree!", 'Display', '--tree', "Display Programme listings in a tree view"],
-	verbose		=> [ 1, "verbose|v!", 'Display', '--verbose, -v', "Verbose"],
+	quiet		=> [ 1, "q|quiet!", 'Display', '--quiet, -q', "Reduce logging output"],
+	series		=> [ 1, "series!", 'Display', '--series', "Display programme series names only with number of episodes"],
+	showcacheage	=> [ 1, "showcacheage|show-cache-age!", 'Display', '--show-cache-age', "Display the age of the selected programme caches then exit"],
+	showoptions	=> [ 1, "showoptions|showopts|show-options!", 'Display', '--show-options', 'Show options which are set and where they are defined'],
 	showver		=> [ 1, "V!", 'Display', '-V', "Show get_iplayer version and exit."],
+	silent		=> [ 1, "silent!", 'Display', '--silent', "No logging output except PVR download report.  Cannot be saved in preferences or PVR searches."],
+	sortmatches	=> [ 1, "sort-matches|sortmatches|sort=s", 'Display', '--sort <fieldname>', "Field to use to sort displayed matches"],
+	sortreverse	=> [ 1, "sort-reverse|sortreverse!", 'Display', '--sortreverse', "Reverse order of sorted matches"],
+	streaminfo	=> [ 1, "stream-info|streaminfo!", 'Display', '--streaminfo', "Returns all of the media stream URLs of the programme(s)"],
+	terse		=> [ 0, "terse!", 'Display', '--terse', "Only show terse programme info (does not affect searching)"],
+	tree		=> [ 0, "tree!", 'Display', '--tree', "Display programme listings in a tree view"],
+	verbose		=> [ 1, "verbose|v!", 'Display', '--verbose, -v', "Show additional output (useful for diagnosing problems)"],
 	warranty	=> [ 1, "warranty!", 'Display', '--warranty', 'Displays warranty section of GPLv3'],
 
 	# External Program
-	atomicparsley	=> [ 1, "atomicparsley|atomic-parsley=s", 'External Program', '--atomicparsley <path>', "Location of AtomicParsley tagger binary"],
-	id3v2		=> [ 1, "id3tag|id3v2=s", 'External Program', '--id3v2 <path>', "Location of id3v2 or id3tag binary"],
-	mplayer		=> [ 1, "mplayer=s", 'External Program', '--mplayer <path>', "Location of mplayer binary"],
-
-	# Tagging
-	notag => [ 1, "notag|no-tag!", 'Tagging', '--no-tag', "Do not tag downloaded programmes"],
-	tag_cnid => [ 1, "tagcnid|tag-cnid!", 'Tagging', '--tag-cnid', "AtomicParsley supports --cnID argument to add catalog ID used for combining HD and SD versions in iTunes"],
-	tag_fulltitle => [ 1, "tagfulltitle|tag-fulltitle!", 'Tagging', '--tag-fulltitle', "Use complete title (including series) instead of shorter episode title"],
-	tag_hdvideo => [ 1, "taghdvideo|tag-hdvideo!", 'Tagging', '--tag-hdvideo', "AtomicParsley supports --hdvideo argument for HD video flag"],
-	tag_longdesc => [ 1, "taglongdesc|tag-longdesc!", 'Tagging', '--tag-longdesc', "AtomicParsley supports --longdesc argument for long description text"],
-	tag_longdescription => [ 1, "taglongdescription|tag-longdescription!", 'Tagging', '--tag-longdescription', "AtomicParsley supports --longDescription argument for long description text"],
-	tag_podcast => [ 1, "tagpodcast|tag-podcast!", 'Tagging', '--tag-podcast', "Tag downloaded radio and tv programmes as iTunes podcasts (requires MP3::Tag module for AAC/MP3 files)"],
-	tag_podcast_radio => [ 1, "tagpodcastradio|tag-podcast-radio!", 'Tagging', '--tag-podcast-radio', "Tag only downloaded radio programmes as iTunes podcasts (requires MP3::Tag module for AAC/MP3 files)"],
-	tag_podcast_tv => [ 1, "tagpodcasttv|tag-podcast-tv!", 'Tagging', '--tag-podcast-tv', "Tag only downloaded tv programmes as iTunes podcasts"],
-	tag_utf8 => [ 1, "tagutf8|tag-utf8!", 'Tagging', '--tag-utf8', "AtomicParsley accepts UTF-8 input"],
 
-	# Deprecated
+	# Misc
+	encodingconsolein	=> [ 1, "encodingconsolein|encoding-console-in=s", 'Misc', '--encoding-console-in <name>', "Character encoding for standard input (currently unused).  Encoding name must be known to Perl Encode module.  Default (only if auto-detect fails): Linux/Unix/OSX = UTF-8, Windows = cp850"],
+	encodingconsoleout	=> [ 1, "encodingconsoleout|encoding-console-out=s", 'Misc', '--encoding-console-out <name>', "Character encoding used to encode search results and other output.  Encoding name must be known to Perl Encode module.  Default (only if auto-detect fails): Linux/Unix/OSX = UTF-8, Windows = cp850"],
+	encodinglocale	=> [ 1, "encodinglocale|encoding-locale=s", 'Misc', '--encoding-locale <name>', "Character encoding used to decode command-line arguments.  Encoding name must be known to Perl Encode module.  Default (only if auto-detect fails): Linux/Unix/OSX = UTF-8, Windows = cp1252"],
+	encodinglocalefs	=> [ 1, "encodinglocalefs|encoding-locale-fs=s", 'Misc', '--encoding-locale-fs <name>', "Character encoding used to encode file and directory names.  Encoding name must be known to Perl Encode module.  Default (only if auto-detect fails): Linux/Unix/OSX = UTF-8, Windows = cp1252"],
+	indexmaxconn	=> [ 1, "indexmaxconn|index-maxconn=n", 'Misc', '--index-maxconn <number>', "Maximum number of connections to use for concurrent programme indexing.  Default: 5 Min: 1 Max: 10"],
+	noindexconcurrent	=> [ 1, "noindexconcurrent|no-index-concurrent!", 'Deprecated', '--no-index-concurrent', "Do not use concurrent indexing to update programme cache.  Cache updates will be very slow."],
+	purgefiles	=> [ 1, "purgefiles|purge-files!", 'Misc', '--purge-files', "Delete downloaded programmes more than 30 days old"],
+	throttle	=> [ 1, "bw|throttle=f", 'Misc', '--throttle <Mb/s>', "Bandwidth limit (in Mb/s) for media file download. Default: unlimited. Synonym: --bw"],
+	trimhistory	=> [ 1, "trimhistory|trim-history=s", 'Misc', '--trim-history <# days to retain>', "Remove download history entries older than number of days specified in option value.  Cannot specify 0 - use 'all' to completely delete download history"],
 
 };
 
-
 # Pre-processed options instance
 my $opt_pre = Options->new();
 # Final options instance
@@ -288,9 +259,9 @@
 sub logger(@) {
 	my $msg = shift || '';
 	# Make sure quiet can be overridden by verbose and debug options
-	if ( $opt->{verbose} || $opt->{debug} || ! $opt->{quiet} ) {
-		# Only send messages to STDERR if pvr or stdout options are being used.
-		if ( $opt->{stdout} || $opt->{pvr} || $opt->{stderr} || $opt->{stream} ) {
+	if ( $opt->{verbose} || $opt->{debug} || ! $opt->{silent} ) {
+		# Only send messages to STDERR if pvr
+		if ( $opt->{pvr} || $opt->{stderr} ) {
 			print STDERR $msg;
 		} else {
 			print STDOUT $msg;
@@ -298,19 +269,52 @@
 	}
 }
 
+# fallback encodings
+$opt->{encodinglocale} = $opt->{encodinglocalefs} = default_encodinglocale();
+$opt->{encodingconsoleout} = $opt->{encodingconsolein} = default_encodingconsoleout();
+# attempt to automatically determine encodings
+eval {
+	require Encode::Locale;
+};
+if (!$@) {
+	# set encodings unless already set by PERL_UNICODE or perl -C
+	$opt->{encodinglocale} = $Encode::Locale::ENCODING_LOCALE unless (${^UNICODE} & 32);
+	$opt->{encodinglocalefs} = $Encode::Locale::ENCODING_LOCALE_FS unless (${^UNICODE} & 32);
+	$opt->{encodingconsoleout} = $Encode::Locale::ENCODING_CONSOLE_OUT unless (${^UNICODE} & 6);
+	$opt->{encodingconsolein} = $Encode::Locale::ENCODING_CONSOLE_IN unless (${^UNICODE} & 1);
+}
 
 # Pre-Parse the cmdline using the opt_format hash so that we know some of the options before we properly parse them later
-# Parse options with passthru mode (i.e. ignore unknown options at this stage) 
+# Parse options with passthru mode (i.e. ignore unknown options at this stage)
 # need to save and restore @ARGV to allow later processing)
 my @argv_save = @ARGV;
 $opt_pre->parse( 1 );
 @ARGV = @argv_save;
+
+# set encodings ASAP
+my @encoding_opts = ('encodinglocale', 'encodinglocalefs', 'encodingconsoleout', 'encodingconsolein');
+foreach ( @encoding_opts ) {
+	$opt->{$_} = $opt_pre->{$_} if $opt_pre->{$_};
+}
+binmode(STDOUT, ":encoding($opt->{encodingconsoleout})");
+binmode(STDERR, ":encoding($opt->{encodingconsoleout})");
+binmode(STDIN, ":encoding($opt->{encodingconsolein})");
+
+# decode @ARGV unless already decoded by PERL_UNICODE or perl -C
+unless ( ${^UNICODE} & 32 ) {
+	@ARGV = map { decode($opt->{encodinglocale}, $_) } @ARGV;
+}
+# compose UTF-8 args if necessary
+if ( $opt->{encodinglocale} =~ /UTF-?8/i ) {
+	@ARGV = map { NFKC($_) } @ARGV;
+}
+
 # Copy a few options over to opt so that logger works
 $opt->{debug} = $opt->{verbose} = 1 if $opt_pre->{debug};
 $opt->{verbose} = 1 if $opt_pre->{verbose};
+$opt->{silent} = $opt->{quiet} = 1 if $opt_pre->{silent};
 $opt->{quiet} = 1 if $opt_pre->{quiet};
 $opt->{pvr} = 1 if $opt_pre->{pvr};
-$opt->{stdout} = 1 if $opt_pre->{stdout} || $opt_pre->{stream};
 
 # show version and exit
 if ( $opt_pre->{showver} ) {
@@ -320,101 +324,106 @@
 
 # This is where all profile data/caches/cookies etc goes
 my $profile_dir;
-# This is where system-wide default options are specified
-my $optfile_system;
-
+$ENV{GETIPLAYER_PROFILE} ||= $ENV{GETIPLAYERUSERPREFS};
 # Options directories specified by env vars
-if ( defined $ENV{GETIPLAYERUSERPREFS} && $ENV{GETIPLAYERSYSPREFS} ) {
-	$profile_dir = $opt_pre->{profiledir} || $ENV{GETIPLAYERUSERPREFS};
-	$optfile_system = $ENV{GETIPLAYERSYSPREFS};
-
+if ( $ENV{GETIPLAYER_PROFILE} ) {
+	$profile_dir = $opt_pre->{profiledir} || $ENV{GETIPLAYER_PROFILE};
 # Otherwise look for windows style file locations
-} elsif ( defined $ENV{USERPROFILE} ) {
-	$profile_dir = $opt_pre->{profiledir} || $ENV{USERPROFILE}.'/.get_iplayer';
-	$optfile_system = $ENV{ALLUSERSPROFILE}.'/get_iplayer/options';
-
+} elsif ( $ENV{USERPROFILE} && $^O eq "MSWin32" ) {
+	$profile_dir = $opt_pre->{profiledir} || File::Spec->catfile($ENV{USERPROFILE}, '.get_iplayer');
 # Options on unix-like systems
-} elsif ( defined $ENV{HOME} ) {
-	$profile_dir = $opt_pre->{profiledir} || $ENV{HOME}.'/.get_iplayer';
+} elsif ( $ENV{HOME} ) {
+	$profile_dir = $opt_pre->{profiledir} || File::Spec->catfile($ENV{HOME}, '.get_iplayer');
+}
+# This is where user options are specified
+my $optfile_default = File::Spec->catfile($profile_dir, 'options');
+
+# This is where system-wide default options are specified
+my $optfile_system;
+$ENV{GETIPLAYER_DEFAULTS} ||= $ENV{GETIPLAYERSYSPREFS};
+# System options file specified by env var
+if ( $ENV{GETIPLAYER_DEFAULTS} ) {
+	$optfile_system = $ENV{GETIPLAYER_DEFAULTS};
+# Otherwise look for windows style file locations
+} elsif ( $ENV{ALLUSERSPROFILE} && $^O eq "MSWin32" ) {
+	$optfile_system = File::Spec->catfile($ENV{ALLUSERSPROFILE}, 'get_iplayer', 'options');
+# System options on unix-like systems
+} else {
 	$optfile_system = '/etc/get_iplayer/options';
-	# Show warning if this deprecated location exists and is not a symlink
-	if ( -f '/var/lib/get_iplayer/options' && ! -l '/var/lib/get_iplayer/options' ) {
-		logger "WARNING: System-wide options file /var/lib/get_iplayer/options will be deprecated in future, please use /etc/get_iplayer/options instead\n";
-	}
 }
-# Make profile dir if it doesnt exist
+# Make profile dir if it doesn't exist
 mkpath $profile_dir if ! -d $profile_dir;
 
-
-# get list of additional user plugins and load plugin
-my $plugin_dir_system = '/usr/share/get_iplayer/plugins';
-my $plugin_dir_user = "$profile_dir/plugins";
-for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
-	if ( opendir( DIR, $plugin_dir ) ) {
-		#logger "INFO: Checking for plugins in $plugin_dir\n";
-		my @plugin_file_list = grep /^.+\.plugin$/, readdir DIR;
-		closedir DIR;
-		for ( @plugin_file_list ) {
-			#logger "INFO: Got $_\n";
-			chomp();
-			$_ = "$plugin_dir/$_";
-			m{^.*\/(.+?).plugin$};
-			# keep in a hash for update
-			$plugin_files{$_} = $1.'.plugin';
-			# Skip if we have this plugin already
-			next if (! $1) || $prog_types{$1};
-			# Register the plugin
-			$prog_types{$1} = "Programme::$1";
-			#logger "INFO: Loading $_\n";
-			require $_;
-			# Kludge: Create dummy instance (without a single instance, none of the bound options work)
-			$prog_types{$1}->new();
+$ENV{GETIPLAYER_OUTPUT} ||= $ENV{IPLAYER_OUTDIR};
+# default output directory on desktop for Windows/macOS
+if ( ! $ENV{GETIPLAYER_OUTPUT} ) {
+	my $desktop;
+	if ( $^O eq "MSWin32" ) {
+		eval 'use Win32 qw(CSIDL_DESKTOPDIRECTORY); $desktop = Win32::GetFolderPath(CSIDL_DESKTOPDIRECTORY);';
+		if ( $@ ) {
+			undef $desktop
 		}
+	} elsif ( $^O eq "darwin" ) {
+		$desktop = File::Spec->catfile($ENV{HOME}, "Desktop")
+	}
+	if ( $desktop && -d $desktop) {
+		$ENV{GETIPLAYER_OUTPUT} = File::Spec->catfile($desktop, "iPlayer Recordings");
 	}
 }
 
-
-# Set the personal options according to the specified preset
-my $optfile_default = "${profile_dir}/options";
-my $optfile_preset;
-if ( $opt_pre->{preset} ) {
-	# create dir if it does not exist
-	mkpath "${profile_dir}/presets/" if ! -d "${profile_dir}/presets/";
-        # Sanitize preset file name
-	my $presetname = StringUtils::sanitize_path( $opt_pre->{preset} );
-	$optfile_preset = "${profile_dir}/presets/${presetname}";
-	logger "INFO: Using user options preset '${presetname}'\n";
-}
-logger "DEBUG: User Preset Options File: $optfile_preset\n" if defined $optfile_preset && $opt->{debug};
-
-
 # Parse cmdline opts definitions from each Programme class/subclass
-Options->get_class_options( $_ ) for qw( Streamer Programme Pvr );
+Options->get_class_options( $_ ) for qw( Streamer Programme Programme::bbciplayer Pvr Tagger );
 Options->get_class_options( progclass($_) ) for progclass();
-Options->get_class_options( "Streamer::$_" ) for qw( mms rtmp rtsp iphone mms 3gp http );
-
+Options->get_class_options( "Streamer::$_" ) for qw( hls );
 
 # Parse the cmdline using the opt_format hash
 Options->usage( 0 ) if not $opt_cmdline->parse();
 
+# process --start and --stop if necessary
+foreach ('start', 'stop') {
+	if ($opt_cmdline->{$_} && $opt_cmdline->{$_} =~ /(\d\d):(\d\d)(:(\d\d))?/) {
+		$opt_cmdline->{$_} = $1 * 3600 + $2 * 60 + $4;
+	}
+}
+
+# ensure --metadata value
+if ( defined $opt_cmdline->{metadata} ) {
+	$opt_cmdline->{metadata} = "generic";
+}
+
+# Set the personal options according to the specified preset
+my $optfile_preset;
+my $presets_dir;
+if ( $opt_cmdline->{preset} ) {
+	# create dir if it does not exist
+	$presets_dir = File::Spec->catfile($profile_dir, 'presets');
+	mkpath $presets_dir if ! -d $presets_dir;
+	if ( $opt_cmdline->{preset} !~ m{[\w\-\+]+} || $opt_cmdline->{preset} =~ m{^\-+} ) {
+		main::logger "ERROR: Invalid preset name '$opt_cmdline->{preset}'\n";
+		exit 1;
+	}
+	# Sanitize preset file name
+	my $presetname = StringUtils::sanitize_path( $opt_cmdline->{preset}, 0, 1 );
+	$optfile_preset = File::Spec->catfile($presets_dir, $presetname);
+	logger "INFO: Using user options preset '${presetname}'\n";
+}
+logger "DEBUG: User preset options file: $optfile_preset\n" if defined $optfile_preset && $opt->{debug};
 
 # Parse options if we're not saving/adding/deleting options (system-wide options are overridden by personal options)
 if ( ! ( $opt_pre->{prefsadd} || $opt_pre->{prefsdel} || $opt_pre->{prefsclear} ) ) {
 	# Load options from files into $opt_file
-	# system, Default, './.get_iplayer/options' and Preset options in that order should they exist
-	$opt_file->load( $opt, '/var/lib/get_iplayer/options', $optfile_system, $optfile_default, './.get_iplayer/options', $optfile_preset );
+	# system, default and preset options in that order should they exist
+	$opt_file->load( $opt, $optfile_system, $optfile_default, $optfile_preset );
 	# Copy these loaded options into $opt
 	$opt->copy_set_options_from( $opt_file );
 }
 
-
-# Copy to $opt from opt_cmdline those options which are actually set 
+# Copy to $opt from opt_cmdline those options which are actually set
 $opt->copy_set_options_from( $opt_cmdline );
 
-
 # Update or show user opts file (or preset if defined) if required
 if ( $opt_cmdline->{presetlist} ) {
-	$opt->preset_list( "${profile_dir}/presets/" );
+	$opt->preset_list( $presets_dir );
 	exit 0;
 } elsif ( $opt_cmdline->{prefsadd} ) {
 	$opt->add( $opt_cmdline, $optfile_preset || $optfile_default, @ARGV );
@@ -430,20 +439,20 @@
 	exit 0;
 }
 
-
-# List all valid programme type plugins (and built-ins)
-if ( $opt->{listplugins} ) {
-	main::logger join(',', keys %prog_types)."\n";
-	exit 0;
-}
-
 # Show copyright notice
 logger Options->copyright_notice if not $opt->{nocopyright};
 
-# Display prefs dirs if required
-main::logger "INFO: User prefs dir: $profile_dir\n" if $opt->{verbose};
-main::logger "INFO: System options dir: $optfile_system\n" if $opt->{verbose};
-
+if ( $opt->{verbose} ) {
+	my $ct = time();
+	logger "INFO: Start: ".(strftime('%Y-%m-%dT%H:%M:%S', localtime($ct)))." ($ct)\n";
+	# show encodings in use
+	logger "INFO: $_ = $opt->{$_}\n" for @encoding_opts;
+	logger "INFO: \${^UNICODE} = ${^UNICODE}\n" if $opt->{verbose};
+	# Display prefs dirs if required
+	main::logger "INFO: Profile dir: $profile_dir\n";
+	main::logger "INFO: User options file: $optfile_default\n";
+	main::logger "INFO: System options file: $optfile_system\n";
+}
 
 # Display Usage
 Options->usage( 2 ) if $opt_cmdline->{helpbasic};
@@ -459,25 +468,15 @@
 # Display GPLv3 stuff
 if ( $opt_cmdline->{warranty} || $opt_cmdline->{conditions}) {
 	# Get license from GNU
-	logger request_url_retry( create_ua( 'get_iplayer', 1 ), 'http://www.gnu.org/licenses/gpl-3.0.txt'."\n", 1);
+	logger request_url_retry( create_ua( 'get_iplayer', 1 ), "https://www.gnu.org/licenses/gpl-3.0.txt"."\n", 1);
 	exit 1;
 }
 
-# Force plugins update if no plugins found
-if ( ! keys %plugin_files && ! $opt->{packagemanager}) {
-	logger "WARNING: Running the updater again to obtain plugins.\n";
-	$opt->{pluginsupdate} = 1;
-}
-# Update this script if required
-update_script() if $opt->{update} || $opt->{pluginsupdate};
-
-
-
 ########## Global vars ###########
 
 #my @cache_format = qw/index type name pid available episode versions duration desc channel categories thumbnail timeadded guidance web/;
 my @history_format = qw/pid name episode type timeadded mode filename versions duration desc channel categories thumbnail guidance web episodenum seriesnum/;
-# Ranges of numbers used in the indicies for each programme type
+# Ranges of numbers used in the indices for each programme type
 my $max_index = 0;
 for ( progclass() ) {
 	# Set maximum index number
@@ -487,18 +486,17 @@
 # Setup signal handlers
 $SIG{INT} = $SIG{PIPE} = \&cleanup;
 
-# Other Non option-dependant vars
-my $historyfile		= "${profile_dir}/download_history";
-my $cookiejar		= "${profile_dir}/cookies.";
-my $namedpipe 		= "${profile_dir}/namedpipe.$$";
+# Other Non option-dependent vars
+my $historyfile		= encode_fs(File::Spec->catfile($profile_dir, "download_history"));
+my $cookiejar		= encode_fs(File::Spec->catfile($profile_dir, "cookies."));
 my $lwp_request_timeout	= 20;
 my $info_limit		= 40;
 my $proxy_save;
 
-# Option dependant var definitions
+# Option dependent var definitions
 my $bin;
 my $binopts;
-my @search_args = @ARGV;
+my @search_args = map { $_ eq "*" ? ".*" : $_ } @ARGV;
 my $memcache = {};
 
 ########### Main processing ###########
@@ -508,8 +506,8 @@
 	# parse GET args
 	my @webopts = split /[\&\?]/, $opt->{webrequest};
 	for (@webopts) {
-		# URL decode it
-		$_ = main::url_decode( $_ );
+		# URL decode it (value should then be decoded as UTF-8)
+		$_ = decode($opt->{encodinglocale}, main::url_decode( $_ ), FB_EMPTY);
 		my ( $optname, $value );
 		# opt val pair
 		if ( m{^\s*([\w\-]+?)[\s=](.+)$} ) {
@@ -536,6 +534,7 @@
 
 # Add --search option to @search_args if specified
 if ( defined $opt->{search} ) {
+	$opt->{search} = ".*" if $opt->{search} eq "*";
 	push @search_args, $opt->{search};
 	# Remove this option now we've processed it
 	delete $opt->{search};
@@ -543,17 +542,31 @@
 }
 # check if no search term(s) specified
 my $no_search_args = $#search_args < 0;
-# Assume search term is '.*' if nothing is specified - i.e. lists all programmes
-push @search_args, '.*' if ! $search_args[0] && ! $opt->{pid};
 
-# Auto-detect http:// url or <type>:http:// in a search term and set it as a --pid option (disable if --fields is used).
-if ( $search_args[0] =~ m{^(\w+:)?http://} && ( ! $opt->{pid} ) && ( ! $opt->{fields} ) ) {
-	$opt->{pid} = $search_args[0];
+# Auto-detect http://, <type>:http:// or bbc-ipd: in a search term and set it as a --pid option (disable if --fields is used).
+if ( ! $opt->{pid} && ! $opt->{fields} ) {
+	if ( $search_args[0] =~ m{^(\w+:)?https?://} ) {
+		$opt->{pid} = $search_args[0];
+	}
+	elsif ( $search_args[0] =~ m{^bbc-ipd:/*download/(\w+)/\w+/(\w+)/} ) {
+		$opt->{pid} = $1;
+		$opt->{modes} ||= "best" if $2 eq "hd";
+	}
+}
+
+if ( $opt->{pid} ) {
+	my @search_pids;
+	if ( ref($opt->{pid}) eq 'ARRAY' ) {
+		push @search_pids, @{$opt->{pid}};
+	} else {
+		push @search_pids, $opt->{pid};
+	}
+	$opt->{pid} = join( ',', @search_pids );
+	$opt_cmdline->{pid} = $opt->{pid};
 }
 
 # PVR Lockfile location (keep global so that cleanup sub can unlink it)
-my $lockfile;
-$lockfile = $profile_dir.'/pvr_lock' if $opt->{pvr} || $opt->{pvrsingle} || $opt->{pvrscheduler};
+my $lockfile = encode_fs(File::Spec->catfile($profile_dir, 'pvr_lock'));
 
 # Delete cookies each session
 unlink($cookiejar.'desktop');
@@ -564,12 +577,72 @@
 # $pvr->{searchname}->{<option>} = <value>;
 my $pvr = Pvr->new();
 # Set some class-wide values
-$pvr->setvar('pvr_dir', "${profile_dir}/pvr/" );
+$pvr->setvar('pvr_dir', File::Spec->catfile($profile_dir, "pvr"));
 
+my $retcode = 0;
+# Trim history
+if ( defined($opt->{trimhistory}) ) {
+	my $hist = History->new();
+	$hist->trim();
+# purge files
+} elsif ( $opt->{purgefiles} ) {
+	my $hist = History->new();
+	purge_downloaded_files( $hist, 30 );
+# mark downloaded
+} elsif ( $opt->{markdownloaded} ) {
+	if ( ! $opt->{pid} && $no_search_args ) {
+		main::logger "ERROR: Search term(s) or --pid or --url required with --mark-downloaded\n";
+		exit 1;
+	}
+	my $hist = History->new();
+	my @eps;
+	if ( $opt->{pid} ) {
+		my @pids = split( /,/, $opt->{pid} );
+		@eps = find_pid_matches( $hist, @pids );
+	} else {
+		my @bad = grep !/\w/, @search_args;
+		if ( @bad ) {
+			main::logger "ERROR: '".(join "','", @bad)."' not permitted as search term(s) with --mark-downloaded\n";
+			exit 1;
+		}
+		@eps = find_matches( $hist, @search_args );
+	}
+	if ( @eps ) {
+		main::logger "INFO: Test only - download history will not be updated\n" if $opt->{test};
+		for my $ep ( @eps ) {
+			next if $hist->check( $ep->{pid} );
+			main::logger "INFO: Mark downloaded $ep->{type}: '$ep->{name} - $ep->{episode} ($ep->{pid})'\n";
+			$hist->add( $ep ) unless $opt->{test};
+		}
+	}
 # PVR functions
-if ( $opt->{pvradd} ) {
+} elsif ( $opt->{pvrseries} ) {
+	if ( $no_search_args ) {
+		main::logger "ERROR: Search term(s) required with --pvr-series\n";
+		exit 1;
+	}
+	my @bad = grep !/\w/, @search_args;
+	if ( @bad ) {
+		main::logger "ERROR: '".(join "','", @bad)."' not permitted as search term(s) with --pvr-series\n";
+		exit 1;
+	}
+	my $hist = History->new();
+	my @matches = find_matches( $hist, @search_args );
+	my %seen;
+	for my $this ( @matches ) {
+		next if $seen{$this->{name}};
+		$seen{$this->{name}} = 1;
+		(my $pvr_search = $this->{name}) =~ s/([\\\^\$\.\|\?\*\+\[\]])/\\$1/g;;
+		$pvr_search = "^${pvr_search}\$";
+		(my $pvr_name = $pvr_search) =~ s/[^\w]+/_/g;
+		$pvr_name .= "_name_$this->{type}";
+		$opt_cmdline->{type} = $this->{type};
+		$pvr->add( $pvr_name, $pvr_search );
+	}
+
+} elsif ( $opt->{pvradd} ) {
 	if ( ! $opt->{pid} && $no_search_args ) {
-		main::logger "ERROR: Search term(s) or PID required for recording\n";
+		main::logger "ERROR: Search term(s) or --pid or --url required with --pvr-add\n";
 		exit 1;
 	}
 	$pvr->add( $opt->{pvradd}, @search_args );
@@ -588,7 +661,7 @@
 
 } elsif ( $opt->{pvrqueue} ) {
 	if ( ! $opt->{pid} && $no_search_args ) {
-		main::logger "ERROR: Search term(s) or PID required for recording\n";
+		main::logger "ERROR: Search term(s) or --pid or --url required with --pvr-queue\n";
 		exit 1;
 	}
 	$pvr->queue( @search_args );
@@ -606,19 +679,21 @@
 } elsif ( $opt->{pvr} ) {
 	# PVR Lockfile detection (with 12 hrs stale lockfile check)
 	lockfile( 43200 ) if ! $opt->{test};
-	$pvr->run( @search_args );
+	$retcode = $pvr->run( @search_args );
 	unlink $lockfile;
 
 } elsif ( $opt->{pvrsingle} ) {
 	# PVR Lockfile detection (with 12 hrs stale lockfile check)
 	lockfile( 43200 ) if ! $opt->{test};
-	$pvr->run( '^'.$opt->{pvrsingle}.'$' );
+	$retcode = $pvr->run( '^'.$opt->{pvrsingle}.'$' );
 	unlink $lockfile;
 
 # Record prog specified by --pid option
 } elsif ( $opt->{pid} ) {
 	my $hist = History->new();
-	find_pid_matches( $hist );
+	my @pids = split( /,/, $opt->{pid} );
+	$retcode = download_pid_matches( $hist, find_pid_matches( $hist, @pids ) );
+	purge_warning( $hist, 30 );
 
 # Show history
 } elsif ( $opt->{history} ) {
@@ -632,14 +707,23 @@
 		exit 1;
 	}
 	my $hist = History->new();
-	download_matches( $hist, find_matches( $hist, @search_args ) );
-	purge_downloaded_files( $hist, 30 );
+	$retcode = download_matches( $hist, find_matches( $hist, @search_args ) );
+	purge_warning( $hist, 30 );
 }
-exit 0;
-
+exit $retcode;
 
+sub print_divider {
+	main::logger $opt->{verbose} ? "${\DIVIDER}\n" : "\n";
+}
 
 sub init_search {
+	my @search_args = @_;
+	print_divider;
+
+	if ( $opt->{nosanitise} ) {
+		$opt->{whitespace} = 1;
+	}
+
 	# Set --subtitles if --subsonly is used
 	if ( $opt->{subsonly} ) {
 		$opt->{subtitles} = 1;
@@ -650,22 +734,44 @@
 		$opt->{thumb} = 1;
 	}
 
+	# Set --tracklist if --tracklist-only is used
+	if ( $opt->{tracklistonly} ) {
+		$opt->{tracklist} = 1;
+	}
+
+	# Set --credits if --credits-only is used
+	if ( $opt->{creditsonly} ) {
+		$opt->{credits} = 1;
+	}
+
+	# Set --metadata if --metadata-only is used
+	if ( defined $opt->{metadata} || $opt->{metadataonly} ) {
+		$opt->{metadata} = "generic";
+	}
+	
+	if ( $opt->{nometadata} && ! $opt->{metadataonly} ) {
+		delete $opt->{metadata};
+	}
+
+	# Set --pid-recursive if --pid-recursive-list is used
+	if ( $opt->{pidrecursivelist} ) {
+		$opt->{pidrecursive} = 1;
+	}
+
 	# Ensure lowercase types
-	$opt->{type} = lc( $opt->{type} );
+	$opt->{type} = lc( $opt->{type} ) if $opt->{type};
 	# Expand 'all' type to comma separated list all prog types
 	$opt->{type} = join( ',', progclass() ) if $opt->{type} =~ /(all|any)/i;
 
-	# --stream is the same as --stdout --nowrite
-	if ( $opt->{stream} ) {
-		$opt->{nowrite} = 1;
-		$opt->{stdout} = 1;
-		delete $opt->{stream};
-	}
-
 	# Force nowrite if metadata/subs/thumb-only
-	if ( $opt->{metadataonly} || $opt->{subsonly} || $opt->{thumbonly} || $opt->{tagonly} ) {
+	if ( $opt->{metadataonly} || $opt->{subsonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{creditsonly} || $opt->{tagonly} ) {
 		$opt->{nowrite} = 1;
 	}
+	
+	# use --force with --audio-only so audio stream for previous download can be retrieved
+	if ( $opt->{audioonly} ) {
+		$opt->{force} = 1;
+	}
 
 	# List all options and where they are set from then exit
 	if ( $opt_cmdline->{showoptions} ) {
@@ -677,23 +783,14 @@
 	}
 
 	# Web proxy
-	$opt->{proxy} = $ENV{HTTP_PROXY} || $ENV{http_proxy} if not $opt->{proxy};
-	logger "INFO: Using Proxy $opt->{proxy}\n" if $opt->{proxy};
-
-	# Set --get && --nowrite if --metadataonly is used
-	if ( $opt->{metadataonly} ) {
-		if ( ! $opt->{metadata} ) {
-			main::logger "ERROR: Please specify metadata type using --metadata=<type>\n";
-			exit 2;
-		}
-	}
-
-	# Sanity check some conflicting options
-	if ( $opt->{nowrite} && ! $opt->{stdout} ) {
-		if ( ! ( $opt->{metadataonly} || $opt->{subsonly} || $opt->{thumbonly} || $opt->{tagonly} ) ) {
-			logger "ERROR: Cannot record to nowhere\n";
-			exit 1;
+	if ( $opt->{noproxy} ) {
+		delete $opt->{proxy};
+	} else {
+		unless ( $opt->{proxy} ) {
+			$opt->{proxy} = $ENV{HTTP_PROXY} || $ENV{http_proxy};
+			delete $opt->{proxy} unless defined $opt->{proxy};
 		}
+		logger "INFO: Using proxy: $opt->{proxy}\n" if $opt->{proxy};
 	}
 
 	# hash of prog types specified
@@ -705,7 +802,7 @@
 
 	# Sanity check valid --type specified
 	for (keys %{ $type }) {
-		if ( not progclass($_) ) {
+		if ( not is_prog_type($_) ) {
 			logger "ERROR: Invalid type '$_' specified. Valid types are: ".( join ',', progclass() )."\n";
 			exit 3;
 		}
@@ -717,12 +814,17 @@
 	# Display the ages of the selected caches in seconds
 	if ( $opt->{showcacheage} ) {
 		for ( keys %{ $type } ) {
-			my $cachefile = "${profile_dir}/${_}.cache";
+			my $cachefile = File::Spec->catfile($profile_dir, "${_}.cache");;
 			main::logger "INFO: $_ cache age: ".( time() - stat($cachefile)->mtime )." secs\n" if -f $cachefile;
 		}
 		exit 0;
 	}
 
+	if ( defined $opt->{indexmaxconn} ) {
+		$opt->{indexmaxconn} = 10 if $opt->{indexmaxconn} > 10;
+		$opt->{indexmaxconn} = 1 if $opt->{indexmaxconn} < 1;
+	}
+
 	# Show options
 	$opt->display('Current options') if $opt->{verbose};
 	# $prog->{pid}->object hash
@@ -731,190 +833,88 @@
 	my $index_prog = {};
 	logger "INFO: Search args: '".(join "','", @search_args)."'\n" if $opt->{verbose};
 
-	# External Binaries
-	$bin->{mplayer}		= $opt->{mplayer} || 'mplayer';
-	delete $binopts->{mplayer};
-	push @{ $binopts->{mplayer} }, '-nolirc';
-	push @{ $binopts->{mplayer} }, '-v' if $opt->{debug};
-	push @{ $binopts->{mplayer} }, '-really-quiet' if $opt->{quiet};
-
-	$bin->{ffmpeg}		= $opt->{ffmpeg} || 'ffmpeg';
-
-	$bin->{lame}		= $opt->{lame} || 'lame';
-	delete $binopts->{lame};
-	$binopts->{lame}	= '-f';
-	$binopts->{lame}	.= ' --quiet ' if $opt->{quiet};
-
-	$bin->{vlc}		= $opt->{vlc} || 'cvlc';
-	delete $binopts->{vlc};
-	push @{ $binopts->{vlc} }, '-vv' if $opt->{debug};
-
-	$bin->{id3v2}		= $opt->{id3v2} || 'id3v2';
-	$bin->{atomicparsley}	= $opt->{atomicparsley} || 'AtomicParsley';
-
-	$bin->{tee}		= 'tee';
-
-	$bin->{flvstreamer}	= $opt->{flvstreamer} || 'rtmpdump';
-	if (! main::exists_in_path('flvstreamer') ) {
-		$bin->{flvstreamer} = 'flvstreamer';
-	}
-
-	delete $binopts->{flvstreamer};
-	push @{ $binopts->{flvstreamer} }, ( '--timeout', 10 );
-	push @{ $binopts->{flvstreamer}	}, '--quiet' if $opt->{quiet};
-	push @{ $binopts->{flvstreamer}	}, '--verbose' if $opt->{verbose};
-	push @{ $binopts->{flvstreamer}	}, '--debug' if $opt->{debug};
-
-	# quote binaries which allows for spaces in the path (only required if used via a shell)
-	for ( $bin->{lame}, $bin->{tee} ) {
-		s!^(.+)$!"$1"!g;
-	}
-	
-	# Redirect STDOUT to player command if one is specified
-	if ( $opt->{player} && $opt->{nowrite} && $opt->{stdout} ) {
-		open (STDOUT, "| $opt->{player}") || die "ERROR: Cannot open player command\n";
-		STDOUT->autoflush(1);
-		binmode STDOUT;
-	}
-
 	return ( $type, $prog, $index_prog );
 }
 
-
-
 sub find_pid_matches {
 	my $hist = shift;
-	my @search_args = @_;
-	my ( $type, $prog, $index_prog ) = init_search( @search_args );
-
-	# Get prog by arbitrary '<type>:<pid>' or just '<pid>' (using the specified types)(then exit)
-	my @try_types;
-	my $pid;
-
-	# If $opt->{pid} is in the form of '<type>:<pid>' and <type> is a valid type
-	if ( $opt->{pid} =~ m{^(.+?)\:(.+?)$} && progclass(lc($1)) ) {
-		my $prog_type;
-		( $prog_type, $pid )= ( lc($1), $2 );
-		# Only try to recording using this prog type
-		@try_types = ($prog_type);
-			
-	# $opt->{pid} is in the form of '<pid>'
-	} else {
-		$pid = $opt->{pid};
-		@try_types = (keys %{ $type });
-	}
-	logger "INFO: Will try prog types: ".(join ',', @try_types)."\n" if $opt->{verbose};
-	return 0 if ( ! ( $opt->{multimode} || $opt->{metadataonly} || $opt->{info} || $opt->{thumbonly} || $opt->{tagonly} || $opt->{subsonly} ) ) && $hist->check( $pid );	
-
-	# Maybe we don't want to populate caches - this slows down --pid recordings ...
-	# Populate cache with all specified prog types (strange perl bug?? - @try_types is empty after these calls if done in a $_ 'for' loop!!)
-	# only get links and possibly refresh caches if > 1 type is specified
-	# else only load cached data from file if it exists.
-	my $load_from_file_only;
-	$load_from_file_only = 1 if $#try_types == 0;
-	for my $t ( @try_types ) {
-		get_links( $prog, $index_prog, $t, $load_from_file_only );
-	}
-
-	# Simply record pid if we find it in the caches
-	if ( $prog->{$pid}->{pid} ) {
-		return download_pid_in_cache( $hist, $prog->{$pid} );
-	}
-
-	my $totalretcode = 1;
-	my $quit_attempt = 0;
-	my %done_pids;
-	for my $prog_type ( @try_types ) {
-		last if $quit_attempt;
-	
+	my @opt_pids = @_;
+	my @match_list;
+	my @ep_list;
+	my %ep_seen;
+	my %ep_types;
+	my ( $type, $prog, $index_prog ) = init_search();
+	my $now = time();
+	for my $opt_pid ( @opt_pids ) {
+		my $opt_type = "tv";
+		# If $pid is in the form of '<type>:<pid>' and <type> is a valid type
+		if ( $opt_pid =~ m{^(.+?)\:(.+?)$} && is_prog_type(lc($1)) ) {
+			($opt_type, $opt_pid) = ( lc($1), $2 );
+		}
 		# See if the specified pid has other episode pids embedded - results in another list of pids.
-		my $dummy = progclass($prog_type)->new( 'pid' => $pid, 'type' => $prog_type );
-		my @pids = $dummy->get_pids_recursive();
-
-		# Try to get pid using each speficied prog type
-		# process all pids in @pids
-		for my $pid ( @pids ) {
-			# skip this pid if we have already completed it
-			next if $done_pids{$pid};
-			main::logger "INFO: Trying pid: $pid using type: $prog_type\n";
-			my $retcode;
-			if ( not $prog->{$pid}->{pid} ) {
-				$retcode = download_pid_not_in_cache( $hist, $pid, $prog_type );
-				# don't try again for other types because it was recorded successfully
-				$done_pids{$pid} = 1 if ! $retcode;
+		my $dummy = progclass($opt_type)->new( pid => $opt_pid, type => $opt_type );
+		my $eps = $dummy->get_episodes_recursive();
+		next unless ( $eps && @$eps );
+		for my $ep ( @$eps ) {
+			next if $ep_seen{$ep->{pid}};
+			$ep_seen{$ep->{pid}} = 1;
+			next if ( $opt->{hide} && ! $opt->{force} && $hist->check( $ep->{pid}, 1 ) );
+			$ep_types{$ep->{type}} = 1 unless $ep_types{$ep->{type}};
+			push @ep_list, $ep;
+		}
+	}
+	if ( $opt->{pidindex} ) {
+		for my $t ( keys %ep_types ) {
+			get_links( $prog, $index_prog, $t, 0, $now );
+		}
+	}
+	for my $ep ( @ep_list ) {
+			my $this;
+			if ( $prog->{$ep->{pid}}->{pid} ) {
+				$this = $prog->{$ep->{pid}};
 			} else {
-				$retcode = download_pid_in_cache( $hist, $prog->{$pid} );
-				# if it's in the cache then there is no need to try this pid for other types
-				$done_pids{$pid} = 1;
+				$this = $ep;
 			}
-			$totalretcode += $retcode;
+			push @match_list, $this;
+	}
+	if ( @match_list ) {
+		my $show_type = keys %ep_types > 1;
+		if ( $opt->{sortreverse} ) {
+			@match_list = reverse @match_list;
+		}
+		main::logger "Episodes:\n";
+		for my $ep ( @match_list ) {
+			my $ep_desc = " - $ep->{desc}" if $opt->{long} && $ep->{desc};
+			my $ep_type = "$ep->{type}, " if $show_type;
+			main::logger "${ep_type}$ep->{name} - $ep->{episode}, $ep->{channel}, $ep->{pid}${ep_desc}\n";
 		}
 	}
-
-	# return zero on success of all pid recordings (used for PVR queue)
-	return $totalretcode;
-}
-
-
-
-sub download_pid_not_in_cache {
-	my $hist = shift;
-	my $pid = shift;
-	my $prog_type = shift;
-	my $retcode;
-
-	# Force prog type and create new prog instance if it doesn't exist
-	my $this;
-	logger "INFO Trying to stream pid using type $prog_type\n";
-	logger "INFO: pid not found in $prog_type cache\n";
-	$this = progclass($prog_type)->new( 'pid' => $pid, 'type' => $prog_type );
-	# if only one type is specified then we can clean up the pid which might actually be a url
-	#if ( $#try_types == 0 ) {
-		logger "INFO: Cleaning pid Old: '$this->{pid}', " if $opt->{verbose};
-		$this->clean_pid;
-		logger " New: '$this->{pid}'\n" if $opt->{verbose};
-	#}
-	# Display pid match for recording
-	if ( $opt->{history} ) {
-		$hist->list_progs( 'pid:'.$pid );
-	}
-	# Don't do a pid recording if metadataonly or thumbonly were specified
-	if ( !( $opt->{metadataonly} || $opt->{thumbonly} || $opt->{subsonly} ) ) {
-		return $this->download_retry_loop( $hist );
+	main::logger "INFO: ".(scalar @match_list)." total programmes\n";
+	# return empty list if not downloading
+	if ( $opt->{pidrecursivelist} ) {
+		return;
 	}
+	return @match_list;
 }
 
-
-
-sub download_pid_in_cache {
+sub download_pid_matches {
 	my $hist = shift;
-	my $this = shift;
-	my $retcode;
-
-	# Prune future scheduled match if not specified
-	if ( (! $opt->{future}) && Programme::get_time_string( $this->{available} ) > time() ) {
-		# If the prog object exists with pid in history delete it from the prog list
-		logger "INFO: Ignoring Future Prog: '$this->{index}: $this->{name} - $this->{episode} - $this->{available}'\n" if $opt->{verbose};
-		# Don't attempt to download
-		return 1;
-	}
-	logger "INFO Trying to stream pid using type $this->{type}\n";
-	logger "INFO: pid found in cache\n";
-	# Display pid match for recording
-	if ( $opt->{history} ) {
-		$hist->list_progs( 'pid:'.$this->{pid} );
-	} else {
-		list_progs( { $this->{type} => 1 }, $this );
-	}
-	# Don't do a pid recording if metadataonly or thumbonly were specified
-	if ( !( $opt->{metadataonly} || $opt->{thumbonly} || $opt->{subsonly} ) ) {
-		$retcode = $this->download_retry_loop( $hist );
+	my @match_list = @_;
+	my $failcount = 0;
+	if ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{creditsonly} || $opt->{subsonly} || $opt->{tagonly} || $opt->{streaminfo} ) {
+		download_other( $hist, @match_list );
+	} elsif ( ! ( ( $opt->{pidrecursive} || $opt->{pvr} || $opt->{pvrsingle} || $opt->{pvrscheduler} ) && $opt->{test} ) ) {
+		for my $this (@match_list) {
+			print_divider;
+			if ( $this->{available} && (! $opt->{future}) && Programme::get_time_string( $this->{available} ) > time() ) {
+				logger "WARNING: Future programme may not yet be available ($this->{pid}): '$this->{index}: $this->{name} - $this->{episode} - $this->{available}'\n";
+			}
+			$failcount += $this->download_retry_loop( $hist );
+		}
 	}
-	return $retcode;
+	return $failcount;
 }
 
-
-
 # Use the specified options to process the matches in specified array
 # Usage: find_matches( $pids_history_ref, @search_args )
 # Returns: array of objects to be downloaded
@@ -923,6 +923,7 @@
 	my $hist = shift;
 	my @search_args = @_;
 	my ( $type, $prog, $index_prog ) = init_search( @search_args );
+	my $now = time();
 
 	# We don't actually need to get the links first for the specifiied type(s) if we have only index number specified (and not --list)
 	my %got_cache;
@@ -936,16 +937,24 @@
 			}
 		}
 	}
-
+	$need_get_links = 1 if ! @search_args && ( $opt->{refresh} || $opt->{cacherebuild} );
 	# Pre-populate caches if --list option used or there was a non-index specified
 	if ( $need_get_links || $opt->{list} ) {
 		# Get stream links from web site or from cache (also populates all hashes) specified in --type option
-		for my $t ( keys %{ $type } ) {
-			get_links( $prog, $index_prog, $t );
+		for my $t ( reverse sort keys %{ $type } ) {
+			get_links( $prog, $index_prog, $t, 0, $now );
 			$got_cache{ $t } = 1;
 		}
 	}
 
+	unless ( @search_args ) {
+		if ( !( $opt->{refresh} || $opt->{cacherebuild} ) && grep(/^(exclude|category|excludecategory|channel|excludechannel|availablesince|expiresbefore|since|before|list|tree|fields|future|long|type)$/, keys %{$opt}) ) {
+			# force to stderr for web pvr
+			print STDERR "ERROR: Search term(s) required. To list all programmes, use \".*\" (incl. quotes)\n";
+		}
+		return;
+	}
+	
 	# Parse remaining args
 	my @match_list;
 	my @index_search_args;
@@ -972,12 +981,12 @@
 			}
 
 		# Else assume this is a programme name regex
-		} else {
+		} elsif ( $_ ) {
 			logger "INFO: Search term '$_' is a substring\n" if $opt->{verbose};
 			push @match_list, get_regex_matches( $prog, $_ );
 		}
 	}
-	
+
 	# List elements (i.e. 'channel' 'categories') if required and exit
 	if ( $opt->{list} ) {
 		list_unique_element_counts( $type, $opt->{list}, @match_list );
@@ -995,7 +1004,7 @@
 				# Add new prog types to the type list
 				$type->{$prog_type} = 1;
 				# Get $prog_type stream links
-				get_links( $prog, $index_prog, $prog_type );
+				get_links( $prog, $index_prog, $prog_type, 0, $now );
 				$got_cache{$prog_type} = 1;
 			}
 		}
@@ -1010,12 +1019,12 @@
 	# De-dup matches and retain order
 	@match_list = main::make_array_unique_ordered( @match_list );
 
-	# Prune out pids already recorded if opt{hide} is specified (cannot hide for multimode)
-	if ( $opt->{hide} && ( not $opt->{force} ) && ( not $opt->{multimode} ) ) {
+	# Prune out pids already recorded if opt{hide} is specified
+	if ( $opt->{hide} && ( not $opt->{force} ) ) {
 		my @pruned;
 		for my $this (@match_list) {
 			# If the prog object exists with pid in history delete it from the prog list
-			if ( $hist->check( $this->{pid}, undef, 1 ) ) {
+			if ( $hist->check( $this->{pid}, 1 ) ) {
 				logger "DEBUG: Ignoring Prog: '$this->{index}: $this->{name} - $this->{episode}'\n" if $opt->{debug};
 			} else {
 				push @pruned, $this;
@@ -1028,18 +1037,25 @@
 	if ( ! $opt->{future} ) {
 		my $now = time();
 		my @pruned;
+		my $ignored;
+		my $no_future_warn = $opt->{pvr} || $opt->{pvrsingle} || $opt->{pvrscheduler};
 		for my $this (@match_list) {
 			# If the prog object exists with pid in history delete it from the prog list
 			my $available = Programme::get_time_string( $this->{available} );
-			if ( $available && $available > $now ) {
-				logger "DEBUG: Ignoring Future Prog: '$this->{index}: $this->{name} - $this->{episode} - $this->{available}'\n" if $opt->{debug};
+			if ( $available && ( $available > $now ) ) {
+				logger "WARNING: Ignoring future programme ($this->{pid}): '$this->{index}: $this->{name} - $this->{episode} - $this->{available}'\n" unless $no_future_warn;
+				$ignored = 1;
 			} else {
 				push @pruned, $this;
 			}
 		}
-		@match_list = @pruned;		
+		@match_list = @pruned;
+		logger "WARNING: Use --future to download future programmes that are already available from iPlayer\n" if $ignored && ! $no_future_warn;
 	}
-		
+
+	# apply sort
+	@match_list = sort_matches(@match_list);
+
 	# Truncate the array of matches if --limit-matches is specified
 	if ( $opt->{limitmatches} && $#match_list > $opt->{limitmatches} - 1 ) {
 		$#match_list = $opt->{limitmatches} - 1;
@@ -1049,53 +1065,89 @@
 	# Display list for recording
 	list_progs( $type, @match_list );
 
-	# Write HTML and XML files if required (with search options applied)
-	create_html_file( @match_list ) if $opt->{html};
-	create_html_email( (join ' ', @search_args), @match_list ) if $opt->{email};
-	create_xml( $opt->{fxd}, @match_list ) if $opt->{fxd};
-	create_xml( $opt->{mythtv}, @match_list ) if $opt->{mythtv};
-
 	return @match_list;
 }
 
-
-
 sub download_matches {
 	my $hist = shift;
 	my @match_list = @_;
-
-	# Do the recordings based on list of index numbers if required
-	my $failcount;
-	if ( $opt->{get} || $opt->{stdout} ) {
+	my $failcount = 0;
+	if ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{creditsonly} || $opt->{subsonly} || $opt->{tagonly} || $opt->{streaminfo} ) {
+		download_other( $hist, @match_list );
+	} elsif ( $opt->{get} && ! ( ( $opt->{pvr} || $opt->{pvrsingle} || $opt->{pvrscheduler} ) && $opt->{test} ) ) {
 		for my $this (@match_list) {
+			print_divider;
 			$failcount += $this->download_retry_loop( $hist );
 		}
 	}
-
 	return $failcount;
 }
 
-
-
-# Usage: list_progs( \%type, @prog_refs )
-# Lists progs given an array of index numbers
-sub list_progs {
-	my $typeref = shift;
-	# Use a rogue value if undefined
-	my $number_of_types = keys %{$typeref} || 2;
+sub download_other {
+	my $hist = shift;
+	my @match_list = @_;
 	my $ua = create_ua( 'desktop', 1 );
-	my %names;
-	my ( @matches ) = ( @_ );
-	
-
-	# Setup user agent for a persistent connection to get programme metadata
-	if ( $opt->{info} ) {
-		# Truncate array if were lisiting info and > $info_limit entries are requested - be nice to the beeb!
-		if ( $#matches >= $info_limit ) {
-			$#matches = $info_limit - 1;
-			logger "WARNING: Only processing the first $info_limit matches\n";
+	for my $this ( @match_list ) {
+		print_divider;
+		main::logger "INFO: Processing $this->{type}: '$this->{name} - $this->{episode} ($this->{pid})'\n";
+		$this->get_metadata_general();
+		if ( $this->get_metadata( $ua ) ) {
+			main::logger "ERROR: Could not get programme metadata\n" if $opt->{verbose};
+			next;
 		}
+		# Search versions for versionlist versions
+		my @versions = $this->generate_version_list;
+		# Use first version in list if a version list is not specified
+		$this->{version} = $versions[0] || 'default';
+		$this->generate_filenames( $ua, $this->file_prefix_format() );
+		# info
+		$this->display_metadata( sort keys %{ $this } ) if $opt->{info};
+		# metadata
+		if ( $opt->{metadataonly} ) {
+			$this->create_dir();
+			$this->create_metadata_file;
+		}
+		# thumbnail
+		if ( $opt->{thumbonly} && $this->{thumbnail} ) {
+			$this->create_dir();
+			$this->download_thumbnail();
+		}
+		# tracklist
+		if ( $opt->{tracklistonly} && $this->{tracklist} ) {
+			$this->create_dir();
+			$this->download_tracklist();
+		}
+		# credits
+		if ( $opt->{creditsonly} && $this->{credits} ) {
+			$this->create_dir();
+			$this->download_credits();
+		}
+		# tag
+		if ( $opt->{tagonly} && ! $opt->{notag} ) {
+			$this->create_dir();
+			$this->tag_file;
+		}
+		# subs (only for tv)
+		if ( $opt->{subsonly} && $this->{type} eq 'tv') {
+			$this->create_dir();
+			unless ( $this->download_subtitles( $ua, $this->{subspart}, \@versions ) ) {
+				# Rename the subtitle file accordingly if the stream get was successful
+				move($this->{subspart}, $this->{subsfile}) if -f $this->{subspart};
+			}
+		}
+		# streaminfo
+		if ( $opt->{streaminfo} ) {
+			main::display_stream_info( $this, $this->{verpids}->{$this->{version}}, $this->{version} );
+		}
+		# remove offending metadata
+		delete $this->{filename};
+		delete $this->{filepart};
+		delete $this->{ext};
 	}
+}
+
+sub sort_matches {
+	my @matches = @_;
 
 	# Sort array by specified field
 	if ( $opt->{sortmatches} ) {
@@ -1107,6 +1159,7 @@
 			index		=> 1,
 			duration	=> 1,
 			timeadded	=> 1,
+			expires => 1,
 		);
 		my $sort_prog;
 		for my $this ( @matches ) {
@@ -1132,6 +1185,28 @@
 		@matches = @tmp;
 	}
 
+	return @matches;
+}
+
+# Usage: list_progs( \%type, @prog_refs )
+# Lists progs given an array of index numbers
+sub list_progs {
+	my $typeref = shift;
+	# Use a rogue value if undefined
+	my $number_of_types = keys %{$typeref} || 2;
+	my $ua = create_ua( 'desktop', 1 );
+	my %names;
+	my ( @matches ) = ( @_ );
+
+	# Setup user agent for a persistent connection to get programme metadata
+	if ( $opt->{info} ) {
+		# Truncate array if were lisiting info and > $info_limit entries are requested - be nice to the beeb!
+		if ( $#matches >= $info_limit ) {
+			$#matches = $info_limit - 1;
+			logger "WARNING: Only processing the first $info_limit matches\n";
+		}
+	}
+
 	# Determine number of episodes for each name
 	my %episodes;
 	my $episode_width;
@@ -1143,7 +1218,6 @@
 	}
 
 	# Sort display order by field (won't work in tree mode)
-	
 
 	# Calculate page sizes etc if required
 	my $items = $#matches+1;
@@ -1183,63 +1257,16 @@
 					}
 				# Normal mode
 				} else {
-					$this->list_entry( '', 0, $number_of_types );
+					$this->list_entry( '', 0, $number_of_types ) if ( $this->{name} );
 				}
 			}
 		}
-		# Get info, create metadata, subtitles, tag and/or thumbnail file (i.e. don't stream/record)
-		if ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{subsonly} || $opt->{tagonly} || $opt->{streaminfo} ) {
-			$this->get_metadata_general();
-			if ( $this->get_metadata( $ua ) ) {
-				main::logger "ERROR: Could not get programme metadata\n" if $opt->{verbose};
-				next;
-			}
-			# Search versions for versionlist versions
-			my @versions = $this->generate_version_list;
-
-			# Use first version in list if a version list is not specified
-			$this->{version} = $versions[0] || 'default';
-			$this->generate_filenames( $ua, $this->file_prefix_format() );
-			# info
-			$this->display_metadata( sort keys %{ $this } ) if $opt->{info};
-			# subs (only for tv)
-			if ( $opt->{subsonly} && $this->{type} eq 'tv') {
-				$this->create_dir();
-				$this->download_subtitles( $ua, "$this->{dir}/$this->{fileprefix}.srt" );
-			}
-			# metadata
-			if ( $opt->{metadataonly} ) {
-				$this->create_dir();
-				$this->create_metadata_file;
-			}
-			# thumbnail
-			if ( $opt->{thumbonly} && $this->{thumbnail} ) {
-				$this->create_dir();
-				$this->download_thumbnail();
-			}
-			# tag
-			if ( $opt->{tagonly} && ! $opt->{notag} ) {
-				# this probably needs to be initialised earlier - needed for tagging
-				$bin->{atomicparsley} = $opt->{atomicparsley} || 'AtomicParsley';
-				$this->create_dir();
-				$this->tag_file;
-			}
-			# streaminfo
-			if ( $opt->{streaminfo} ) {
-				main::display_stream_info( $this, $this->{verpids}->{$this->{version}}, $this->{version} );
-				$opt->{quiet} = 0;
-			}
-			# remove offending metadata
-			delete $this->{filename};
-			delete $this->{filepart};
-			delete $this->{ext};
-		}
 	}
-	logger "\nINFO: ".($#matches + 1)." Matching Programmes\n" if ( $opt->{pvr} && $#matches >= 0 ) || ! $opt->{pvr};
+	# PID not in cache
+	@matches = () if $#matches == 0 && ! $matches[0]->{index};
+	logger "INFO: ".($#matches + 1)." matching programmes\n" if ( $opt->{pvr} && $#matches >= 0 ) || ! $opt->{pvr};
 }
 
-
-
 # Returns matching programme objects using supplied regex
 # Usage: get_regex_matches ( \%prog, $regex )
 sub get_regex_matches {
@@ -1259,11 +1286,6 @@
 	} else {
 		$category_regex = '.*';
 	}
-	if ( $opt->{versionlist} ) {
-		$versions_regex = '('.(join '|', ( split /,/, $opt->{versionlist} ) ).')';
-	} else {
-		$versions_regex = '.*';
-	}
 	if ( $opt->{excludechannel} ) {
 		$channel_exclude_regex = '('.(join '|', ( split /,/, $opt->{excludechannel} ) ).')';
 	} else {
@@ -1279,22 +1301,30 @@
 	} else {
 		$exclude_regex = '^ROGUE$';
 	}
-	my $since = $opt->{since} || 999999;
-	my $before = $opt->{before} || -999999;
 	my $now = time();
+	my $since = $now - ($opt->{since} * 3600) if defined $opt->{since};
+	my $before = $now - ($opt->{before} * 3600) if defined $opt->{before};
+	my $available_since = strftime('%Y-%m-%dT%H:%M:%S', gmtime($now - ($opt->{availablesince} * 3600))) if defined $opt->{availablesince};
+	my $available_before = strftime('%Y-%m-%dT%H:%M:%S', gmtime($now - ($opt->{availablebefore} * 3600))) if defined $opt->{availablebefore};
+	my $expires_after = $now + ($opt->{expiresafter} * 3600) if defined $opt->{expiresafter};
+	my $expires_before = $now + ($opt->{expiresbefore} * 3600) if defined $opt->{expiresbefore};
 
 	if ( $opt->{verbose} ) {
 		main::logger "DEBUG: Search download_regex = $download_regex\n";
 		main::logger "DEBUG: Search channel_regex = $channel_regex\n";
 		main::logger "DEBUG: Search category_regex = $category_regex\n";
-		main::logger "DEBUG: Search versions_regex = $versions_regex\n";
 		main::logger "DEBUG: Search exclude_regex = $exclude_regex\n";
 		main::logger "DEBUG: Search channel_exclude_regex = $channel_exclude_regex\n";
 		main::logger "DEBUG: Search category_exclude_regex = $category_exclude_regex\n";
 		main::logger "DEBUG: Search since = $since\n";
 		main::logger "DEBUG: Search before = $before\n";
+		main::logger "DEBUG: Search available_since = $available_since\n";
+		main::logger "DEBUG: Search available_before = $available_before\n";
+		main::logger "DEBUG: Search expires_after = $expires_after\n";
+		main::logger "DEBUG: Search expires_before = $expires_before\n";
+		main::logger "\n";
 	}
-	
+
 	# Determine fields to search
 	my @searchfields;
 	# User-defined fields list
@@ -1312,12 +1342,15 @@
 	for my $this ( values %{ $prog } ) {
 		# Only include programmes matching channels and category regexes
 		if ( $this->{channel} =~ /$channel_regex/i
-		  && $this->{categories} =~ /$category_regex/i
-		  && ( ( not defined $this->{versions} ) || $this->{versions} =~ /$versions_regex/i )
-		  && $this->{channel} !~ /$channel_exclude_regex/i
-		  && $this->{categories} !~ /$category_exclude_regex/i
-		  && ( ( not defined $this->{timeadded} ) || $this->{timeadded} >= $now - ($since * 3600) )
-		  && ( ( not defined $this->{timeadded} ) || $this->{timeadded} < $now - ($before * 3600) )
+			&& $this->{categories} =~ /$category_regex/i
+			&& $this->{channel} !~ /$channel_exclude_regex/i
+			&& $this->{categories} !~ /$category_exclude_regex/i
+			&& ( ( not defined $since ) || ( not $this->{timeadded} ) || $this->{timeadded} >= $since )
+			&& ( ( not defined $before ) || ( not $this->{timeadded} ) || $this->{timeadded} < $before )
+			&& ( ( not defined $available_since ) || ( not $this->{available} ) || $this->{available} ge $available_since )
+			&& ( ( not defined $available_before ) || ( not $this->{available} ) || $this->{available} lt $available_before )
+			&& ( ( not defined $expires_after ) || ( not $this->{expires} ) || $this->{expires} >= $expires_after )
+			&& ( ( not defined $expires_before ) || ( not $this->{expires} ) || $this->{expires} < $expires_before )
 		) {
 			# Add included matches
 			my @compund_fields;
@@ -1341,8 +1374,6 @@
 	return @match_list;
 }
 
-
-
 # Usage: sort_index( \%prog, \%index_prog, [$prog_type], [sortfield] )
 # Populates the index if the prog hash as well as creating the %index_prog hash
 # Should be run after any number of get_links methods
@@ -1352,11 +1383,13 @@
 	my $prog_type = shift;
 	my $sortfield = shift || 'name';
 	my $counter = 1;
+	my $max_index = 0;
 	my @sort_key;
-	
+
 	# Add index field based on alphabetical sorting by $sortfield
 	# Start index counter at 'min' for this prog type
 	$counter = progclass($prog_type)->index_min if defined $prog_type;
+	$max_index = progclass($prog_type)->index_max if defined $prog_type;
 
 	# Create unique array of '<$sortfield|pid>' for this prog type
 	for my $pid ( keys %{$prog} ) {
@@ -1364,7 +1397,7 @@
 		next if defined $prog_type && $prog->{$pid}->{type} ne $prog_type;
 		push @sort_key, "$prog->{$pid}->{$sortfield}|$pid";
 	}
-	# Sort by $sortfield and index 
+	# Sort by $sortfield and index
 	for (sort @sort_key) {
 		# Extract pid
 		my $pid = (split /\|/)[1];
@@ -1377,12 +1410,14 @@
 
 		# Increment the index counter for this prog type
 		$counter++;
+		if ( $max_index && $counter >= $max_index ) {
+			main::logger "WARNING: $prog_type cache index numbers exceeded the maximum supported value ($max_index). Please alert the developer.\n";
+			$max_index = 0;
+		}
 	}
 	return 0;
 }
 
-
-
 sub make_array_unique_ordered {
 	# De-dup array and retain order (don't ask!)
 	my ( @array ) = ( @_ );
@@ -1391,8 +1426,6 @@
 	return @unique;
 }
 
-
-
 # User Agents
 # Uses global $ua_cache
 my $ua_cache = {};
@@ -1401,40 +1434,21 @@
 
 	# Create user agents lists
 	my $user_agent = {
-		update		=> [ "get_iplayer updater (v${version} - $^O - $^V)" ],
 		get_iplayer	=> [ "get_iplayer/$version $^O/$^V" ],
 		desktop		=> [
-				'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 2.0.50<RAND>; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30<RAND>; InfoPath.1)',
-				'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; YPC 3.2.0; SLCC1; .NET CLR 2.0.50<RAND>; .NET CLR 3.0.04<RAND>)',
-				'Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50<RAND>; .NET CLR 3.5.30<RAND>; .NET CLR 3.0.30<RAND>; Media Center PC 6.0; InfoPath.2; MS-RTC LM 8)',
-				'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/<RAND>.8 (KHTML, like Gecko) Chrome/2.0.178.0 Safari/<RAND>.8',
-				'Mozilla/5.0 (compatible; MSIE 7.0; Windows NT 6.0; SLCC1; .NET CLR 2.0.50<RAND>; Media Center PC 5.0; c .NET CLR 3.0.0<RAND>6; .NET CLR 3.5.30<RAND>; InfoPath.1; el-GR)',
-				'Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; tr) AppleWebKit/<RAND>.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/<RAND>.11.2',
-				'Mozilla/6.0 (Windows; U; Windows NT 7.0; en-US; rv:1.9.0.8) Gecko/2009032609 Firefox/3.0.9 (.NET CLR 3.5.30<RAND>)',
-				'Opera/9.64 (X11; Linux i686; U; en) Presto/2.1.1',
-				],
-		safari		=> [
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_0 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5A345 Safari/525.20',
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_0_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5B108 Safari/525.20',
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16',
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A400 Safari/528.16',
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16',
-				'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_3 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7E18 Safari/528.16',
-				],
-		coremedia	=> [
-				'Apple iPhone v1.1.4 CoreMedia v1.0.0.4A102',
-				'Apple iPhone v1.1.5 CoreMedia v1.0.0.4B1',
-				'Apple iPhone OS v2.0 CoreMedia v1.0.0.5A347',
-				'Apple iPhone OS v2.0.1 CoreMedia v1.0.0.5B108',
-				'Apple iPhone OS v2.1 CoreMedia v1.0.0.5F136',
-				'Apple iPhone OS v2.1 CoreMedia v1.0.0.5F137',
-				'Apple iPhone OS v2.1.1 CoreMedia v1.0.0.5F138',
-				'Apple iPhone OS v2.2 CoreMedia v1.0.0.5G77',
-				'Apple iPhone OS v2.2 CoreMedia v1.0.0.5G77a',
-				'Apple iPhone OS v2.2.1 CoreMedia v1.0.0.5H11',
-				'Apple iPhone OS v3.0 CoreMedia v1.0.0.7A341',
-				'Apple iPhone OS v3.1.2 CoreMedia v1.0.0.7D11',
-				],
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36',
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:53.0) Gecko/20100101 Firefox/53.0',
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36 OPR/42.0.2393.94',
+				'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.1 Safari/603.1.30',
+				'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36',
+				'Mozilla/5.0 (Windows NT 6.1; rv:53.0) Gecko/20100101 Firefox/53.0',
+				'Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko',
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36',
+				'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0',
+				'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393',
+				'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:53.0) Gecko/20100101 Firefox/53.0',
+				'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.81 Safari/537.36',
+			],
 	};
 
 	# Remember the ua string for the entire session
@@ -1451,63 +1465,31 @@
 	return $uas || '';
 }
 
-
-
 # Returns classname for prog type or if not specified, an array of all prog types
 sub progclass {
 	my $prog_type = shift;
-	if ( $prog_type ) {
-		return $prog_types{$prog_type};
-	} elsif ( not defined $prog_type ) {
-		return keys %prog_types;
+	if ( not defined $prog_type ) {
+		return ('tv', 'radio');
+	} elsif ( $prog_type =~ /^(tv|radio)$/ ) {
+		return "Programme::$prog_type";
 	} else {
-		main::logger "ERROR: Programe Type '$prog_type' does not exist. Try using --refresh\n";
+		main::logger "ERROR: Programme type '$prog_type' does not exist\n";
 		exit 3;
 	}
 }
 
-
-
-# Returns classname for prog type or if not specified, an array of all prog types
+# return true if valid prog type
 sub is_prog_type {
 	my $prog_type = shift;
-	return 1 if defined $prog_types{$prog_type};
+	return 1 if $prog_type =~ /^(tv|radio)$/;
 	return 0;
 }
 
-
-
 # Feed Info:
-#	# aod index
-#	http://www.bbc.co.uk/radio/aod/index_noframes.shtml
-# 	# schedule feeds
-#	http://www.bbc.co.uk/bbcthree/programmes/schedules.xml
-#	# These need drill-down to get episodes:
-#	# TV schedules by date
-#	http://www.bbc.co.uk/iplayer/widget/schedule/service/cbeebies/date/20080704
-#	# TV schedules in JSON, Yaml or XML
-#	http://www.bbc.co.uk/<channel>/programmes/schedules.(json|yaml|xml)
-#	# prog schedules by channel / date
-#	http://www.bbc.co.uk/<channel>/programmes/schedules/(this_week|next_week|last_week|yesterday|today|tomorrow).(json|yaml|xml)
-#	http://www.bbc.co.uk/<channel>/programmes/schedules/<year>/<month>/<day>[/ataglance].(json|yaml|xml)
-#	http://www.bbc.co.uk/<channel>/programmes/schedules/<year>/<week>.(json|yaml|xml)
-#	# TV index on programmes tv
-#	http://www.bbc.co.uk/tv/programmes/a-z/by/*/player
-#	# TV + Radio
-#	http://www.bbc.co.uk/programmes/a-z/by/*/player
-#	# All TV (limit has effect of limiting to 2.? times number entries kB??)
-#	# seems that only around 50% of progs are available here compared to programmes site:
-#	http://feeds.bbc.co.uk/iplayer/categories/tv/list/limit/200
-#	# Search feed
-#	http://feeds.bbc.co.uk/iplayer/<channel>/<searchword>/list
-#	# All Radio
-#	http://feeds.bbc.co.uk/iplayer/categories/radio/list/limit/999
-#	# New:
-#	# iCal feeds see: http://www.bbc.co.uk/blogs/radiolabs/2008/07/some_ical_views_onto_programme.shtml
-#	http://bbc.co.uk/programmes/b0079cmw/episodes/player.ics
-#	# Other data
-#	http://www.bbc.co.uk/cbbc/programmes/genres/childrens/player
-#	http://www.bbc.co.uk/programmes/genres/childrens/schedules/upcoming.ics
+# # schedule feeds
+#	https://www.bbc.co.uk/radio4/programmes/schedules/this_week
+#	https://www.bbc.co.uk/radio4/programmes/schedules/next_week
+#	https://www.bbc.co.uk/radio4/programmes/schedules/w23
 #
 # Usage: get_links( \%prog, \%index_prog, <prog_type>, <only load from file flag> )
 # Globals: $memcache
@@ -1516,11 +1498,11 @@
 	my $index_prog = shift;
 	my $prog_type = shift;
 	my $only_load_from_cache = shift;
+	my $now = shift || time();
 	# Define cache file format (this is overridden by the header line of the cache file)
-	my @cache_format = qw/index type name pid available episode seriesnum episodenum versions duration desc channel categories thumbnail timeadded guidance web/;
+	my @cache_format = qw/index type name episode seriesnum episodenum pid channel available expires duration desc web thumbnail timeadded/;
 
-	my $now = time();
-	my $cachefile = "${profile_dir}/${prog_type}.cache";
+	my $cachefile = File::Spec->catfile($profile_dir, "${prog_type}.cache");
 
 	# Read cache into $pid_old and $index_prog_old hashes if cache exists
 	my $prog_old = {};
@@ -1540,6 +1522,7 @@
 		return 0;
 	}
 
+	my $mra = 0;
 	# Open cache file (need to verify we can even read this)
 	if ( -f $cachefile && open(CACHE, "< $cachefile") ) {
 		my @cache_format_old = @cache_format;
@@ -1563,9 +1546,17 @@
 			$record_entries->{$_} = shift @record for @cache_format_old;
 			$prog_old->{ $record_entries->{pid} } = $record_entries;
 			# Copy pid into index_prog_old hash
-			$index_prog_old->{ $record_entries->{index} }  = $record_entries->{pid};
+			$index_prog_old->{ $record_entries->{index} } = $record_entries->{pid};
+			if ( ! $opt->{cacherebuild} && $record_entries->{timeadded} > $mra )
+			{
+				$mra = $record_entries->{timeadded};
+			}
 		}
 		close (CACHE);
+		if ( $opt->{verbose} ) {
+			my $mra_str = strftime('%Y-%m-%dT%H:%M:%S+00:00', gmtime($mra));
+			logger "INFO: Most recent addition ($prog_type) = $mra_str ($mra)\n";
+		}
 		logger "INFO: Got ".(keys %{ $prog_old })." file cache entries for $prog_type\n" if $opt->{verbose};
 
 	# Else no mem or file cache
@@ -1573,30 +1564,47 @@
 		logger "INFO: No file cache exists for $prog_type\n" if $opt->{verbose};
 	}
 
-
 	# Do we need to refresh the cache ?
 	# if a cache file doesn't exist/corrupted/empty, refresh option is specified or original file is older than $cache_sec then download new data
 	my $cache_secs = $opt->{expiry} || main::progclass( $prog_type )->expiry() || 14400;
-	main::logger "DEBUG: Cache expiry time for $prog_type is ${cache_secs} secs - refresh in ".( stat($cachefile)->mtime + $cache_secs - $now )." secs\n" if $opt->{debug} && -f $cachefile && ! $opt->{refresh};
-	if ( (! $only_load_from_cache) && 
-		( (! keys %{ $prog_old } ) || (! -f $cachefile) || $opt->{refresh} || ($now >= ( stat($cachefile)->mtime + $cache_secs )) )
+	main::logger "DEBUG: Cache expiry time for $prog_type is ${cache_secs} secs - refresh in ".( stat($cachefile)->mtime + $cache_secs - $now )." secs\n" if $opt->{verbose} && -f $cachefile && ! $opt->{refresh};
+	if ( (! $only_load_from_cache) &&
+		( (! keys %{ $prog_old } ) || (! -f $cachefile) || $opt->{refresh} || ($now >= ( $mra + $cache_secs )) || ($now >= ( stat($cachefile)->mtime + $cache_secs )) || $opt->{cacherebuild} )
 	) {
 
-		# Get links for specific type of programme class into %prog 
-		if ( progclass( $prog_type )->get_links( $prog, $prog_type ) != 0 ) {
+		# Get links for specific type of programme class into %prog
+		if ( progclass( $prog_type )->get_links( $prog, $prog_type, $mra, $now ) != 0 ) {
 			# failed - leave cache unchanged
-			main::logger "ERROR: Failed to retrieve programmes for $prog_type - skipping\n";
+			main::logger "\nERROR: Errors encountered when indexing $prog_type programmes - skipping\n";
 			return 0;
 		}
 
+		# Back up cache file before write
+		my $oldcachefile = "${cachefile}.old";
+		if ( -e $cachefile && ! copy($cachefile, $oldcachefile) ) {
+			die "ERROR: Cannot copy $cachefile to $oldcachefile: $!\n";
+		}
+		if ( ! $opt->{cacherebuild} && $prog_type =~ /^(radio|tv)$/ ) {
+			my $min_timeadded = $now - (30 * 86400);
+			# Retain old cache entries that are not expired or superseded
+			for my $pid ( keys %{$prog_old} ) {
+				if ( ! $prog_old->{$pid}->{expires} || $prog_old->{$pid}->{expires} < $now || $prog_old->{$pid}->{timeadded} < $min_timeadded ) {
+					main::logger "DEBUG: Expired: $prog_type - $pid - $prog_old->{$pid}->{name} - $prog_old->{$pid}->{episode} expires=$prog_old->{$pid}->{expires} timeadded=$prog_old->{$pid}->{timeadded} now=$now\n" if $opt->{debug};
+				}
+				elsif ( ! $prog->{$pid} && $prog_old->{$pid} ) {
+					$prog->{$pid} = main::progclass($prog_type)->new(%{$prog_old->{$pid}});
+				}
+			}
+		}
+
 		# Sort index for this prog type from cache file
 		# sorts and references %prog objects into %index_prog
 		sort_index( $prog, $index_prog, $prog_type );
 
 		# Open cache file for writing
 		unlink $cachefile;
-		my $now = time();
 		if ( open(CACHE, "> $cachefile") ) {
+			my $added = 0;
 			print CACHE "#".(join '|', @cache_format)."\n";
 			# loop through all progs just obtained through get_links above (in numerical index order)
 			for my $index ( sort {$a <=> $b} keys %{$index_prog} ) {
@@ -1605,13 +1613,23 @@
 				# Only write entries for correct prog type
 				if ( $this->{type} eq $prog_type ) {
 					# Merge old and new data to retain timestamps
+					if ( $prog_old->{ $this->{pid} }->{available} ) {
+						$this->{available} = $prog_old->{ $this->{pid} }->{available};
+					}
 					# if the entry was in old cache then retain timestamp from old entry
 					if ( $prog_old->{ $this->{pid} }->{timeadded} ) {
-						$this->{timeadded} = $prog_old->{ $this->{pid} }->{timeadded};
+						my $ta = $prog_old->{ $this->{pid} }->{timeadded};
+						my $available = Programme::get_time_string( $this->{available} );
+						if ( $ta <= $available && $available <= $now ) {
+							$this->{timeadded} = $now;
+						} else {
+							$this->{timeadded} = $ta;
+						}
 					# Else this is a new entry
 					} else {
 						$this->{timeadded} = $now;
-						$this->list_entry( 'Added: ' );
+						$this->list_entry( 'Added: ' ) if $opt->{verbose};
+						$added++;
 					}
 					# Write each field into cache line
 					print CACHE $this->{$_}.'|' for @cache_format;
@@ -1619,6 +1637,7 @@
 				}
 			}
 			close (CACHE);
+			main::logger "INFO: Added $added $prog_type programmes to cache\n";
 		} else {
 			logger "WARNING: Couldn't open cache file '$cachefile' for writing\n";
 		}
@@ -1638,7 +1657,6 @@
 			}
 		}
 
-
 	# Else copy data from existing cache file into new prog instances and memcache
 	} else {
 		for my $pid ( keys %{ $prog_old } ) {
@@ -1661,15 +1679,15 @@
 	return 0;
 }
 
-
-
 # Generic
 # Returns an offset timestamp given an srt begin or end timestamp and offset in ms
+# returns undef if timestamp < 0 or < --start or > --stop
 sub subtitle_offset {
-	my ( $timestamp, $offset ) = @_;
+	my ( $timestamp, $offset, $start, $stop ) = @_;
 	my ( $hr, $min, $sec, $ms ) = split /[:,\.]/, $timestamp;
 	# split into hrs, mins, secs, ms
-	my $ts = $ms + $sec*1000 + $min*60*1000 + $hr*60*60*1000 + $offset;
+	my $ts = $ms + $sec*1000 + $min*60*1000 + $hr*60*60*1000 + $offset - $start;
+	return undef if $ts < 0 || ( $stop && $ts > $stop + $offset - $start );
 	$hr = int( $ts/(60*60*1000) );
 	$ts -= $hr*60*60*1000;
 	$min = int( $ts/(60*1000) );
@@ -1680,8 +1698,6 @@
 	return sprintf( '%02d:%02d:%02d,%03d', $hr, $min, $sec, $ms );
 }
 
-
-
 # Generic
 sub display_stream_info {
 	my ($prog, $verpid, $version) = (@_);
@@ -1690,220 +1706,37 @@
 	# Get stream data if not defined
 	if ( not defined $prog->{streams}->{$version} ) {
 		logger "INFO: Getting media stream metadata for $prog->{name} - $prog->{episode}, $verpid ($version)\n" if $prog->{pid};
-		$prog->{streams}->{$version} = $prog->get_stream_data( $verpid );
+		$prog->{streams}->{$version} = $prog->get_stream_data( $verpid, undef, $version );
 	}
-	for my $prog_type ( sort keys %{ $prog->{streams}->{$version} } ) {
-		logger "stream:     $prog_type\n";
-		for my $entry ( sort keys %{ $prog->{streams}->{$version}->{$prog_type} } ) {
-			logger sprintf("%-11s %s\n", $entry.':', $prog->{streams}->{$version}->{$prog_type}->{$entry} );
+	for my $mode ( sort Programme::cmp_modes keys %{ $prog->{streams}->{$version} } ) {	
+		logger sprintf("%-14s %s\n", 'stream:', $mode );
+		for my $key ( sort keys %{ $prog->{streams}->{$version}->{$mode} } ) {
+			my $val = $prog->{streams}->{$version}->{$mode}->{$key};
+			unless ( ref $val || not defined $val ) {
+				$val =~ s/^\s+//;
+				logger sprintf("%-14s %s\n", $key.':', $val );
+			}
 		}
 		logger "\n";
 	}
 	return 0;
 }
 
-
-
 sub proxy_disable {
 	my $ua = shift;
-	$ua->proxy( ['http'] => undef );
+	$ua->proxy( ['http', 'https'] => undef );
 	$proxy_save = $opt->{proxy};
 	delete $opt->{proxy};
 	main::logger "INFO: Disabled proxy: $proxy_save\n" if $opt->{verbose};
 }
 
-
-
 sub proxy_enable {
 	my $ua = shift;
-	$ua->proxy( ['http'] => $opt->{proxy} ) if $opt->{proxy} && $opt->{proxy} !~ /^prepend:/;
+	$ua->proxy( ['http', 'https'] => $opt->{proxy} ) if $opt->{proxy} && $opt->{proxy} !~ /^prepend:/;
 	$opt->{proxy} = $proxy_save;
 	main::logger "INFO: Restored proxy to $opt->{proxy}\n" if $opt->{verbose};
 }
 
-
-
-# Generic
-# Usage download_block($file, $url_2, $ua, $start, $end, $file_len, $fh);
-#  ensure filehandle $fh is open in append mode
-# or, $content = download_block(undef, $url_2, $ua, $start, $end, $file_len);
-# Called in 4 ways:
-# 1) write to real file			=> download_block($file, $url_2, $ua, $start, $end, $file_len, $fh);
-# 2) write to real file + STDOUT	=> download_block($file, $url_2, $ua, $start, $end, $file_len, $fh); + $opt->{stdout}==true
-# 3) write to STDOUT only		=> download_block($file, $url_2, $ua, $start, $end, $file_len, $fh); + $opt->{stdout}==true + $opt->{nowrite}==false
-# 4) write to memory (and return data)  => download_block(undef, $url_2, $ua, $start, $end, $file_len, undef);
-# 4) write to memory (and return data)  => download_block(undef, $url_2, $ua, $start, $end);
-sub download_block {
-
-	my ($file, $url, $ua, $start, $end, $file_len, $fh) = @_;
-	my $orig_length;
-	my $buffer;
-	my $lastpercent = 0;
-	my $now = time();
-	
-	# If this is an 'append to file' mode call
-	if ( defined $file && $fh && (!$opt->{nowrite}) ) {
-		# Stage 3b: Record File
-		$orig_length = tell $fh;
-		logger "INFO: Appending to $file\n" if $opt->{verbose};
-	}
-
-	# Setup request headers
-	my $h = new HTTP::Headers(
-		'User-Agent'	=> main::user_agent( 'coremedia' ),
-		'Accept'	=> '*/*',
-		'Range'        => "bytes=${start}-${end}",
-	);
-
-	# Use url prepend if required
-	if ( defined $opt->{proxy} && $opt->{proxy} =~ /^prepend:/ ) {
-		$url = $opt->{proxy}.main::url_encode( $url );
-		$url =~ s/^prepend://g;
-	}
-
-	my $req = HTTP::Request->new ('GET', $url, $h);
-
-	# Set time to use for download rate calculation
-	# Define callback sub that gets called during download request
-	# This sub actually writes to the open output file and reports on progress
-	my $callback = sub {
-		my ($data, $res, undef) = @_;
-		# Don't write the output to the file if there is no content-length header
-		return 0 if ( ! $res->header("Content-Length") );
-		# If we don't know file length in advanced then set to size reported reported from server upon download
-		$file_len = $res->header("Content-Length") + $start if ! defined $file_len;
-		# Write output
-		print $fh $data if ! $opt->{nowrite};
-		print STDOUT $data if $opt->{stdout};
-		# return if streaming to stdout - no need for progress
-		return if $opt->{stdout} && $opt->{nowrite};
-		return if $opt->{quiet};
-		# current file size
-		my $size = tell $fh;
-		# Download percent
-		my $percent = 100.0 * $size / $file_len;
-		# Don't update display if we haven't dowloaded at least another 0.1%
-		if ( not $opt->{hash} ) {
-			return if ($percent - $lastpercent) < 0.1;
-		} else {
-			return if ($percent - $lastpercent) < 1;
-		}
-		$lastpercent = $percent;
-		if ( $opt->{hash} ) {
-			logger '#';
-		} else {
-			# download rates in bytes per second and time remaining
-			my $rate_bps;
-			my $rate;
-			my $time;
-			my $timecalled = time();
-			if ($timecalled - $now < 1) {
-				$rate = '-----kbps';
-				$time = '--:--:--';
-			} else {
-				$rate_bps = ($size - $orig_length) / ($timecalled - $now);
-				$rate = sprintf("%5.0fkbps", (8.0 / 1024.0) * $rate_bps);
-				$time = sprintf("%02d:%02d:%02d", ( gmtime( ($file_len - $size) / $rate_bps ) )[2,1,0] );
-			}
-			logger sprintf "%8.2fMB / %.2fMB %s %5.1f%%, %s remaining         \r", 
-				$size / 1024.0 / 1024.0, 
-				$file_len / 1024.0 / 1024.0,
-				$rate,
-				$percent,
-				$time,
-			;
-		}
-	};
-
-	my $callback_memory = sub {
-		my ($data, $res, undef) = @_;
-		# append output to buffer
-		$buffer .= $data;
-		return if $opt->{quiet};
-		# current buffer size
-		my $size = length($buffer);
-		# download rates in bytes per second
-		my $timecalled = time();
-		my $rate_bps;
-		my $rate;
-		my $time;
-		my $percent;
-		# If we can get Content_length then display full progress
-		if ($res->header("Content-Length")) {
-			$file_len = $res->header("Content-Length") if ! defined $file_len;
-			# Download percent
-			$percent = 100.0 * $size / $file_len;
-			if ( not $opt->{hash} ) {
-				return if ($percent - $lastpercent) < 0.1;
-			} else {
-				return if ($percent - $lastpercent) < 1;
-			}
-			$lastpercent = $percent;
-			if ( $opt->{hash} ) {
-				logger '#';
-			} else {
-				# Block length
-				$file_len = $res->header("Content-Length");
-				if ($timecalled - $now < 0.1) {
-					$rate = '-----kbps';
-					$time = '--:--:--';
-				} else {
-					$rate_bps = $size / ($timecalled - $now);
-					$rate = sprintf("%5.0fkbps", (8.0 / 1024.0) * $rate_bps );
-					$time = sprintf("%02d:%02d:%02d", ( gmtime( ($file_len - $size) / $rate_bps ) )[2,1,0] );
-				}
-				# time remaining
-				logger sprintf "%8.2fMB / %.2fMB %s %5.1f%%, %s remaining         \r", 
-					$size / 1024.0 / 1024.0,
-					$file_len / 1024.0 / 1024.0,
-					$rate,
-					$percent,
-					$time,
-				;
-			}
-		# Just used simple for if we cannot determine content length
-		} else {
-			if ($timecalled - $now < 0.1) {
-				$rate = '-----kbps';
-			} else {
-				$rate = sprintf("%5.0fkbps", (8.0 / 1024.0) * $size / ($timecalled - $now) );
-			}
-			logger sprintf "%8.2fMB %s         \r", $size / 1024.0 / 1024.0, $rate;
-		}
-	};
-
-	# send request
-	logger "\nINFO: Downloading range ${start}-${end}\n" if $opt->{verbose};
-	logger "\r                              \r" if not $opt->{hash};
-	my $res;
-
-	# If $fh undefined then get block to memory (fh always defined for stdout or file d/load)
-	if (defined $fh) {
-		logger "DEBUG: writing stream to stdout, Range: $start - $end of $url\n" if $opt->{verbose} && $opt->{stdout};
-		logger "DEBUG: writing stream to $file, Range: $start - $end of $url\n" if $opt->{verbose} && !$opt->{nowrite};
-		$res = $ua->request($req, $callback);
-		if (  (! $res->is_success) || (! $res->header("Content-Length")) ) {
-			logger "ERROR: Failed to Download block\n\n";
-			return 5;
-		}
-                logger "INFO: Content-Length = ".$res->header("Content-Length")."                               \n" if $opt->{verbose};
-		return 0;
-		   
-	# Memory Block
-	} else {
-		logger "DEBUG: writing stream to memory, Range: $start - $end of $url\n" if $opt->{debug};
-		$res = $ua->request($req, $callback_memory);
-		if ( (! $res->is_success) ) {
-			logger "ERROR: Failed to Download block\n\n";
-			return '';
-		} else {
-			return $buffer;
-		}
-	}
-}
-
-
-
 # Generic
 # create_ua( <agentname>|'', [<cookie mode>] )
 # cookie mode:	0: retain cookies
@@ -1916,7 +1749,7 @@
 	my $agent = main::user_agent( $id ) || main::user_agent( 'desktop' );
 	my $ua = LWP::UserAgent->new;
 	$ua->timeout( $lwp_request_timeout );
-	$ua->proxy( ['http'] => $opt->{proxy} ) if $opt->{proxy} && $opt->{proxy} !~ /^prepend:/;
+	$ua->proxy( ['http', 'https'] => $opt->{proxy} ) if $opt->{proxy} && $opt->{proxy} !~ /^prepend:/;
 	$ua->agent( $agent );
 	# Using this slows down stco parsing!!
 	#$ua->default_header( 'Accept-Encoding', 'gzip,deflate' );
@@ -1926,568 +1759,21 @@
 	$ua->cookie_jar( HTTP::Cookies->new( file => $cookiejar.$id, autosave => 1 ) ) if $nocookiejar == 2;
 	main::logger "DEBUG: Using ".($nocookiejar ? "NoCookies " : "cookies.$id " )."user-agent '$agent'\n" if $opt->{debug};
 	return $ua;
-};	
-
-
-
-# Generic
-# Converts a string of chars to it's HEX representation
-sub get_hex {
-        my $buf = shift || '';
-        my $ret = '';
-        for (my $i=0; $i<length($buf); $i++) {
-                $ret .= " ".sprintf("%02lx", ord substr($buf, $i, 1) );
-        }
-	logger "DEBUG: HEX string value = $ret\n" if $opt->{verbose};
-        return $ret;
-}
-
-
-
-# Generic
-# version of unix tee
-# Usage tee ($infile, $outfile)
-# If $outfile is undef then just cat file to STDOUT
-sub tee {
-	my ( $infile, $outfile ) = @_;
-	# Open $outfile for writing, $infile for reading
-	if ( $outfile) {
-		if ( ! open( OUT, "> $outfile" ) ) {
-			logger "ERROR: Could not open $outfile for writing\n";
-			return 1;
-		} else {
-			logger "INFO: Opened $outfile for writing\n" if $opt->{verbose};
-		}
-	}
-	if ( ! open( IN, "< $infile" ) ) {
-		logger "ERROR: Could not open $infile for reading\n";
-		return 2;
-	} else {
-		logger "INFO: Opened $infile for reading\n" if $opt->{verbose};
-	}
-	# Read and redirect IN
-	while ( <IN> ) {
-		print $_;
-		print OUT $_ if $outfile;
-	}
-	# Close output file
-	close OUT if $outfile;
-	close IN;
-	return 0;
-}
-
-
-
-# Generic
-# Usage: $fh = open_file_append($filename);
-sub open_file_append {
-	local *FH;
-	my $file = shift;
-	# Just in case we actually write to the file - make this /dev/null
-	$file = '/dev/null' if $opt->{nowrite};
-	if ($file) {
-		if ( ! open(FH, ">> $file") ) {
-			logger "ERROR: Cannot write or append to $file\n\n";
-			exit 1;
-		}
-	}
-	# Fix for binary - needed for Windows
-	binmode FH;
-	return *FH;
-}
-
-
-
-# Generic
-# Updates and overwrites this script - makes backup as <this file>.old
-# Update logic:
-# If the get_iplayer script is unwritable then quit - makes it harder for deb/rpm installed scripts to be overwritten
-# If any available plugins in $plugin_dir_system are not writable then abort
-# If all available plugins in $plugin_dir_system are writable then:
-#	if any available plugins in $plugin_dir_user are not writable then abort
-#	if all available plugins in $plugin_dir_user are writable then:
-#		update script
-#		update matching plugins in $plugin_dir_system
-#		update matching plugins in $plugin_dir_user
-#		warn of any plugins that are not in $plugin_dir_system or $plugin_dir_user and not available
-sub update_script {
-	my $version_url	= 'http://www.infradead.org/get_iplayer/VERSION-get_iplayer';
-	my $update_url	= 'http://www.infradead.org/get_iplayer/';
-	my $changelog_url = 'http://www.infradead.org/get_iplayer/CHANGELOG-get_iplayer';
-	my $latest_ver;
-	# Get version URL
-	my $script_file = $0;
-	my $script_url;
-	my %plugin_url;
-	my $ua = create_ua( 'update', 1 );
-
-	# Are we flagged as installed using a pkg manager?
-	if ( $opt->{packagemanager} ) {
-		if ( $opt->{packagemanager} =~ /installer/i ) {
-			logger "ERROR: get_iplayer should only be updated using the Windows installer: http://www.infradead.org/get_iplayer_win/get_iplayer_setup_latest.exe\n";
-		} elsif ( $opt->{packagemanager} =~ /disable/i ) {
-			logger "ERROR: get_iplayer should only be updated using your local package management system.  Please refer to your system documentation.\n";
-		} else {
-			logger "ERROR: get_iplayer was installed using the '$opt->{packagemanager}' package manager.  Please refer to the package manager documentation.\n";
-		}
-		exit 1;
-	} 
-
-	# If the get_iplayer script is unwritable then quit - makes it harder for deb/rpm installed scripts to be overwritten
-	if ( ! -w $script_file ) {
-		logger "ERROR: $script_file is not writable - aborting update (maybe a package manager was used to install get_iplayer?)\n";
-		exit 1;
-	}
-
-	# Force update if no plugins dir
-	if ( ! -d "$profile_dir/plugins" ) {
-		mkpath "$profile_dir/plugins";
-		if ( ! -d "$profile_dir/plugins" ) {
-			logger "ERROR: Cannot create '$profile_dir/plugins' - no plugins will be downloaded.\n";
-			return 1;
-		}
-		$opt->{pluginsupdate} = 1;
-	}
-
-	logger "INFO: Current version is ".(sprintf '%.2f', $version)."\n";
-	logger "INFO: Checking for latest version from www.infradead.org\n";
-	if ( $latest_ver = request_url_retry($ua, $version_url, 3 ) ) {
-		chomp($latest_ver);
-		# Compare version numbers
-		if ( $latest_ver > $version || $opt->{force} || $opt->{pluginsupdate} ) {
-			# reformat version number
-			$latest_ver = sprintf('%.2f', $latest_ver);
-			logger "INFO: Newer version $latest_ver available\n" if $latest_ver > $version;
-			
-			# Get the manifest of files to be updated
-			my $base_url = "${update_url}/${latest_ver}";
-			my $res;
-			if ( not $res = request_url_retry($ua, "${update_url}/MANIFEST.v${latest_ver}", 3 ) ) {
-				logger "ERROR: Failed to obtain update file manifest - Update aborted\n";
-				exit 3;
-			}
-
-			# get a list of plugins etc from the manifest
-			for ( split /\n/, $res ) {
-				chomp();
-				my ( $type, $url) = split /\s/;
-				if ( $type eq 'bin' ) {
-					$script_url =  $url;
-				} elsif ( $type eq 'plugins' ) {
-					my $filename = $url;
-					$filename =~ s|^.+/(.+?)$|$1|g;
-					$plugin_url{$filename} = $url;
-				}
-			}
-
-			# Now decide whether to update based on write permissions
-			# %plugin_files:      contains hash of current full_path_to_plugin_file -> plugin_filename
-			# %plugin_url:      contains a hash of plugin_filename -> update_url for available plugins from the update site
-
-			# If any available plugins in $plugin_dir_system are not writable then abort
-			# if any available plugins in $plugin_dir_user are not writable then abort
-
-			# loop through each currently installed plugin
-			for my $path ( keys %plugin_files ) {
-				my $file = $plugin_files{$path};
-				# If this in the list of available plugins
-				if ( $plugin_url{$file} ) {
-					if ( ! -w $path ) {
-						logger "ERROR: Cannot write plugin $path - aborting update\n";
-						exit 1;
-					}
-				# warn of any plugins that are not in $plugin_dir_system or $plugin_dir_user and not available
-				} else {
-					logger "WARNING: Plugin $path is not managed - not updating this plugin\n";
-				}
-			}
-
-			# All available plugins in all plugin dirs are writable:
-			# update script if required
-			if ( $latest_ver > $version || $opt->{force} ) {
-				logger "INFO: Updating $script_file (from $version to $latest_ver)\n";
-				update_file( $ua, $script_url, $script_file ) if ! $opt->{test};
-			}
-			for my $path ( keys %plugin_files ) {
-				my $file = $plugin_files{$path};
-				# If there is an update available for this plugin file...
-				if ( $plugin_url{$file} ) {
-					logger "INFO: Updating $path\n";
-					# update matching plugin
-					update_file( $ua, $plugin_url{$file}, $path ) if ! $opt->{test};
-				}
-			}
-
-			# Install plugins which are currently not installed
-			for my $file ( keys %plugin_url ) {
-				# Not found in either system or user plugins dir
-				if ( ( ! -f "$plugin_dir_system/$file" ) && ( ! -f "$plugin_dir_user/$file" ) ) {
-					logger "INFO: Found new plugin $file\n";
-					# Is the system plugin dir writable?
-					if ( -d $plugin_dir_system && -w $plugin_dir_system ) {
-						logger "INFO: Installing $file in $plugin_dir_system\n";
-						update_file( $ua, $plugin_url{$file}, "$plugin_dir_system/$file" ) if ! $opt->{test};
-					} elsif ( -d $plugin_dir_user && -w $plugin_dir_user ) {
-						logger "INFO: Installing $file in $plugin_dir_user\n";
-						update_file( $ua, $plugin_url{$file}, "$plugin_dir_user/$file" ) if ! $opt->{test};
-					} else {
-						logger "INFO: Cannot install $file, plugin dirs are not writable\n";
-					}
-				}
-			}
-
-			# Show changelog since last version if this is an upgrade
-			if ( $version < $latest_ver ) {
-				logger "INFO: Change Log: ${changelog_url}\n";
-				my $changelog = request_url_retry($ua, $changelog_url, 3 );
-				my $current_ver = sprintf('%.2f', $version);
-				$changelog =~ s|^(.*)Version\s+$current_ver.+$|$1|s;
-				logger "INFO: Changes since version $current_ver:\n\n$changelog\n";
-			}
-
-		} else {
-			logger "INFO: No update is necessary (latest version = $latest_ver)\n";
-		}
-				
-	} else {
-		logger "ERROR: Failed to connect to update site - Update aborted\n";
-		exit 2;
-	}
-
-	exit 0;
-}
-
-
-
-# Updates a file:
-# Usage: update_file( <ua>, <url>, <dest filename> )
-sub update_file {
-	my $ua = shift;
-	my $url = shift;
-	my $dest_file = shift;
-	my $res;
-	# Download the file
-	if ( not $res = request_url_retry($ua, $url, 3) ) {
-		logger "ERROR: Could not download update for ${dest_file} - Update aborted\n";
-		exit 1;
-	}
-	# If the download was successful then copy over this file and make executable after making a backup of this script
-	if ( -f $dest_file ) {
-		if ( ! copy($dest_file, $dest_file.'.old') ) {
-			logger "ERROR: Could not create backup file ${dest_file}.old - Update aborted\n";
-			exit 1;
-		}
-	}
-	# Check if file is writable
-	if ( not open( FILE, "> $dest_file" ) ) {
-		logger "ERROR: $dest_file is not writable by the current user - Update aborted\n";
-		exit 1;
-	}
-	# Windows needs this
-	binmode FILE;
-	# Write contents to file
-	print FILE $res;
-	close FILE;
-	chmod 0755, $dest_file;
-	logger "INFO: Downloaded $dest_file\n";
-}
-
-
-
-# Usage: create_xml( @prog_objects )
-# Creates the Freevo FXD or MythTV Streams meta data (and pre-downloads graphics - todo)
-sub create_xml {
-	my $xmlfile = shift;
-
-	if ( ! open(XML, "> $xmlfile") ) {
-		logger "ERROR: Couldn't open xml file $xmlfile for writing\n";
-		return 1;
-	}
-	print XML "<?xml version=\"1.0\" ?>\n";
-	print XML "<freevo>\n" if $opt->{fxd};
-	print XML "<MediaStreams>\n" if $opt->{mythtv};
-
-	if ( $opt->{xmlnames} ) {
-		# containers sorted by prog names
-		print XML "\t<container title=\"Programmes by Name\">\n" if $opt->{fxd};
-		my %program_index;
-		my %program_count;
-		# create hash of programme_name -> index
-	        for my $this (@_) {
-	        	$program_index{ $this->{name} } = $_;
-			$program_count{ $this->{name} }++;
-		}
-		for my $name ( sort keys %program_index ) {
-			print XML "\t\t<container title=\"".encode_entities( $name )." ($program_count{$name})\">\n" if $opt->{fxd};
-			print XML "\t<Streams>\n" if $opt->{mythtv};
-			print XML "\t\t<Name>".encode_entities( $name )."</Name>\n" if $opt->{mythtv};
-			for my $this (@_) {
-				my $pid = $this->{pid};
-				# loop through and find matches for each progname
-				if ( $this->{name} eq $name ) {
-					my $episode = encode_entities( $this->{episode} );
-					my $desc = encode_entities( $this->{desc} );
-					my $title = "${episode}";
-					$title .= " ($this->{available})" if $this->{available} !~ /^(unknown|)$/i;
-					if ( $opt->{fxd} ) {
-						print XML "\t\t\t<movie title=\"${title}\">\n";
-						print XML "\t\t\t\t<video>\n";
-						print XML "\t\t\t\t\t<url id=\"p1\">${pid}.mov<playlist/></url>\n";
-						print XML "\t\t\t\t</video>\n";
-						print XML "\t\t\t\t<info>\n";
-						print XML "\t\t\t\t\t<description>${desc}</description>\n";
-						print XML "\t\t\t\t</info>\n";
-						print XML "\t\t\t</movie>\n";
-					} elsif ( $opt->{mythtv} ) {
-						print XML "\t\t<Stream>\n";
-						print XML "\t\t\t<Name>${title}</Name>\n";
-						print XML "\t\t\t<type>$this->{type}</type>\n";
-						print XML "\t\t\t<index>$this->{index}</index>\n";
-						print XML "\t\t\t<url>${pid}.mov</url>\n";
-						print XML "\t\t\t<Subtitle></Subtitle>\n";
-						print XML "\t\t\t<Synopsis>${desc}</Synopsis>\n";
-						print XML "\t\t\t<StreamImage>$this->{thumbnail}</StreamImage>\n";
-						print XML "\t\t</Stream>\n";
-					}
-				}
-			}			
-			print XML "\t\t</container>\n" if $opt->{fxd};
-			print XML "\t</Streams>\n" if $opt->{mythtv};
-		}
-		print XML "\t</container>\n" if $opt->{fxd};
-	}
-
-
-	if ( $opt->{xmlchannels} ) {
-		# containers for prog names sorted by channel
-		print XML "\t<container title=\"Programmes by Channel\">\n" if $opt->{fxd};
-		my %program_index;
-		my %program_count;
-		my %channels;
-		# create hash of unique channel names and hash of programme_name -> index
-	        for my $this (@_) {
-	        	$program_index{ $this->{name} } = $_;
-			$program_count{ $this->{name} }++;
-			push @{ $channels{ $this->{channel} } }, $this->{name};
-		}
-		for my $channel ( sort keys %channels ) {
-			print XML "\t\t<container title=\"".encode_entities( $channel )."\">\n" if $opt->{fxd};
-			print XML
-				"\t<Feed>\n".
-				"\t\t<Name>".encode_entities( $channel )."</Name>\n".
-				"\t\t<Provider>BBC</Provider>\n".
-				"\t\t<Streams>\n" if $opt->{mythtv};
-			for my $name ( sort keys %program_index ) {
-				# Do we have any of this prog $name on this $channel?
-				my $match;
-				for ( @{ $channels{$channel} } ) {
-					$match = 1 if $_ eq $name;
-				}
-				if ( $match ) {
-					print XML "\t\t\t<container title=\"".encode_entities( $name )." ($program_count{$name})\">\n" if $opt->{fxd};
-					#print XML "\t\t<Stream>\n" if $opt->{mythtv};
-					for my $this (@_) {
-						# loop through and find matches for each progname for this channel
-						my $pid = $this->{pid};
-						if ( $this->{channel} eq $channel && $this->{name} eq $name ) {
-							my $episode = encode_entities( $this->{episode} );
-							my $desc = encode_entities( $this->{desc} );
-							my $title = "${episode} ($this->{available})";
-							if ( $opt->{fxd} ) {
-								print XML
-									"\t\t\t\t<movie title=\"${title}\">\n".
-									"\t\t\t\t\t<video>\n".
-									"\t\t\t\t\t\t<url id=\"p1\">${pid}.mov<playlist/></url>\n".
-									"\t\t\t\t\t</video>\n".
-									"\t\t\t\t\t<info>\n".
-									"\t\t\t\t\t\t<description>${desc}</description>\n".
-									"\t\t\t\t\t</info>\n".
-									"\t\t\t\t</movie>\n";
-							} elsif ( $opt->{mythtv} ) {
-								print XML 
-									"\t\t\t<Stream>\n".
-									"\t\t\t\t<Name>".encode_entities( $name )."</Name>\n".
-									"\t\t\t\t<index>$this->{index}</index>\n".
-									"\t\t\t\t<type>$this->{type}</type>\n".
-									"\t\t\t\t<Url>${pid}.mov</Url>\n".
-									"\t\t\t\t<StreamImage>$this->{thumbnail}</StreamImage>\n".
-									"\t\t\t\t<Subtitle>${episode}</Subtitle>\n".
-									"\t\t\t\t<Synopsis>${desc}</Synopsis>\n".
-									"\t\t\t</Stream>\n";
-							}
-						}
-					}
-					print XML "\t\t\t</container>\n" if $opt->{fxd};
-				}
-			}
-			print XML "\t\t</container>\n" if $opt->{fxd};
-			print XML "\t\t</Streams>\n\t</Feed>\n" if $opt->{mythtv};
-		}
-		print XML "\t</container>\n" if $opt->{fxd};
-	}
-
-
-	if ( $opt->{xmlalpha} ) {
-		my %table = (
-			'A-C' => '[abc]',
-			'D-F' => '[def]',
-			'G-I' => '[ghi]',
-			'J-L' => '[jkl]',
-			'M-N' => '[mn]',
-			'O-P' => '[op]',
-			'Q-R' => '[qt]',
-			'S-T' => '[st]',
-			'U-V' => '[uv]',
-			'W-Z' => '[wxyz]',
-			'0-9' => '[\d]',
-		);
-		print XML "\t<container title=\"Programmes A-Z\">\n";
-		for my $folder (sort keys %table) {
-			print XML "\t\t<container title=\"$folder\">\n";
-			for my $this (@_) {
-				my $pid = $this->{pid};
-				my $name = encode_entities( $this->{name} );
-				my $episode = encode_entities( $this->{episode} );
-				my $desc = encode_entities( $this->{desc} );
-				my $title = "${name} - ${episode} ($this->{available})";
-				my $regex = $table{$folder};
-				if ( $name =~ /^$regex/i ) {
-					if ( $opt->{fxd} ) {
-						print XML
-							"\t\t\t<movie title=\"${title}\">\n".
-							"\t\t\t\t<video>\n".
-							"\t\t\t\t\t<url id=\"p1\">${pid}.mov<playlist/></url>\n".
-							"\t\t\t\t</video>\n".
-							"\t\t\t\t<info>\n".
-							"\t\t\t\t\t<description>${desc}</description>\n".
-							"\t\t\t\t</info>\n".
-							"\t\t\t</movie>\n";
-					} elsif ( $opt->{mythtv} ) {
-						print XML
-							"\t\t\t<Stream>\n".
-							"\t\t\t\t<Name>${title}</Name>\n".
-							"\t\t\t\t<index>$this->{index}</index>\n".
-							"\t\t\t\t<type>$this->{type}</type>\n".
-							"\t\t\t\t<Url>${pid}.mov</Url>\n".
-							"\t\t\t\t<StreamImage>$this->{thumbnail}</StreamImage>\n".
-							"\t\t\t\t<Subtitle>${episode}</Subtitle>\n".
-							"\t\t\t\t<Synopsis>${desc}</Synopsis>\n".
-							"\t\t\t</Stream>\n";
-					}
-				}
-			}
-			print XML "\t\t</container>\n";
-		}
-		print XML "\t</container>\n";
-	}
-
-	print XML '</freevo>' if $opt->{fxd};
-	print XML '</MediaStreams>' if $opt->{mythtv};
-	close XML;
-}
-
-
-
-# Usage: create_html_file( @prog_objects )
-sub create_html_file {
-	# Create local web page
-	if ( open(HTML, "> $opt->{html}") ) {
-		print HTML create_html( @_ );
-		close (HTML);
-	} else {
-		logger "WARNING: Couldn't open html file $opt->{html} for writing\n";
-	}
-}
-
-
-
-# Usage: create_email( @prog_objects )
-# Reference: http://sial.org/howto/perl/Net-SMTP/
-# Credit: Network Ned, andy <AT SIGN> networkned.co.uk, http://networkned.co.uk
-sub create_html_email {
-	# Check if we have Net::SMTP installed - might not be for the windows installer
-	eval "use Net::SMTP";
-	if ($@) {
-		main::logger "WARNING: Please download and run latest installer or install the Net::SMTP perl module to use --email options\n";
-		return 0;
-	};
-	my $search_args = shift;
-	my $recipient = $opt->{email};
-	my $sender = $opt->{emailsender} || 'get_iplayer <>';
-	my $smtphost = $opt->{emailsmtp} || 'localhost';
-	my @mail_failure;
-	my @subject;
-	# Set the subject using the currently set cmdline options
-	push @subject, "get_iplayer Search Results for: $search_args ( ";
-	for my $optkey ( grep !/^email.*/, sort keys %{ $opt_cmdline } ) {
-		push @subject, "$optkey='$opt_cmdline->{$optkey}' " if $opt_cmdline->{$optkey};
-	}
-	push @subject, " )";
-
-	my $message = "MIME-Version: 1.0\n"
-		."Content-Type: text/html\n"
-		."From: $sender\n"
-		."To: $recipient\n"
-		."Subject: @subject\n\n\n"
-		.create_html( @_ )."\n";
-	main::logger "DEBUG: Email message to $recipient:\n$message\n\n" if $opt->{debug};
-
-	my $smtp = Net::SMTP->new($smtphost);
-	if ( ! $smtp ) {
-		main::logger "ERROR: Could not find or connect to specified SMTP server\n";
-		return 1;
-	};
-
-	$smtp->mail( $sender ) || push @mail_failure, "MAIL FROM: $sender";
-	$smtp->to( $recipient ) || push @mail_failure, "RCPT TO: $recipient";
-	$smtp->data() || push @mail_failure, 'DATA';
-	$smtp->datasend( $message ) || push @mail_failure, 'Message Data';
-	$smtp->dataend() || push @mail_failure, 'End of DATA';
-	$smtp->quit() || push @mail_failure, 'QUIT';
-
-	if ( @mail_failure ) {
-		main::logger "ERROR: Sending of email failed with $mail_failure[0]\n";
-	}
-	return 0;
-}
-
-
-
-# Usage: create_html( @prog_objects )
-sub create_html {
-	my @html;
-	my %name_channel;
-	# Create local web page
-	push @html, '<html><head></head><body><table border=1>';
-	for my $this ( @_ ) {
-		# Skip if pid isn't in index
-		my $pid = $this->{pid} || next;
-		# Skip if already recorded and --hide option is specified
-		if (! defined $name_channel{ "$this->{name}|$this->{channel}" }) {
-			push @html, $this->list_entry_html();
-		} else {
-			push @html, $this->list_entry_html( 1 );
-		}
-		$name_channel{ "$this->{name}|$this->{channel}" } = 1;
-	}
-	push @html, '</table></body>';
-	return join "\n", @html;
-}
-
-
+};
 
 # Generic
 # Gets the contents of a URL and retries if it fails, returns '' if no page could be retrieved
-# Usage <content> = request_url_retry(<ua>, <url>, <retries>, <succeed message>, [<fail message>], <1=mustproxy> );
+# Usage <content> = request_url_retry(<ua>, <url>, <retries>, <succeed message>, [<fail message>], <1=mustproxy>, [<fail_content>] );
 sub request_url_retry {
 
 	my %OPTS = @LWP::Protocol::http::EXTRA_SOCK_OPTS;
 	$OPTS{SendTE} = 0;
 	@LWP::Protocol::http::EXTRA_SOCK_OPTS = %OPTS;
-	
-	my ($ua, $url, $retries, $succeedmsg, $failmsg, $mustproxy) = @_;
-	my $res;
 
+	my ($ua, $url, $retries, $succeedmsg, $failmsg, $mustproxy, $fail_content, $ok404) = @_;
+	$failmsg ||= "Failed to download URL";
+	$fail_content ||= '';
+	my $res;
 
 	# Use url prepend if required
 	if ( defined $opt->{proxy} && $opt->{proxy} =~ /^prepend:/ ) {
@@ -2496,7 +1782,7 @@
 	}
 
 	# Malformed URL check
-	if ( $url !~ m{^\s*http\:\/\/}i ) {
+	if ( $url !~ m{^\s*https?\:\/\/}i ) {
 		logger "ERROR: Malformed URL: '$url'\n";
 		return '';
 	}
@@ -2504,11 +1790,22 @@
 	# Disable proxy unless mustproxy is flagged
 	main::proxy_disable($ua) if $opt->{partialproxy} && ! $mustproxy;
 	my $i;
-	logger "INFO: Getting page $url\n" if $opt->{verbose};
-	for ($i = 0; $i < $retries; $i++) {
+	for ($i = 1; $i <= $retries; $i++) {
+		logger "\nINFO: Downloading URL ($i/$retries): $url\n" if $opt->{verbose};
 		$res = $ua->request( HTTP::Request->new( GET => $url ) );
 		if ( ! $res->is_success ) {
-			logger $failmsg;
+			if ( $i < $retries ) {
+				if ( $opt->{verbose} ) {
+					logger "\nWARNING: $failmsg ($i/$retries): $url\n";
+					logger "WARNING: Response: ${\$res->code()} ${\$res->message()}\n";
+				}
+			} else {
+				if ( $opt->{verbose} || ! ( $res->code() == 404 && $ok404 ) ) {
+					logger "\nERROR: $failmsg ($i/$retries): $url\n";
+					logger "ERROR: Response: ${\$res->code()} ${\$res->message()}\n";
+					logger "ERROR: Ignore this error if programme download is successful\n";
+				}
+			}
 		} else {
 			logger $succeedmsg;
 			last;
@@ -2516,18 +1813,27 @@
 	}
 	# Re-enable proxy unless mustproxy is flagged
 	main::proxy_enable($ua) if $opt->{partialproxy} && ! $mustproxy;
-	# Return empty string if we failed
-	return '' if $i == $retries;
+	# Return empty string if we failed and content not required
+	if ( $i > $retries ) {
+		if ( wantarray ) {
+			return ($fail_content, $res);
+		} else {
+			return $fail_content;
+		}
+	}
 
 	# Only return decoded content if gzip is used - otherwise this severely slows down stco scanning! Perl bug?
 	main::logger "DEBUG: ".($res->header('Content-Encoding') || 'No')." Encoding used on $url\n" if $opt->{debug};
-	return $res->decoded_content if defined $res->header('Content-Encoding') && $res->header('Content-Encoding') eq 'gzip';
-
-	return $res->content;
+	# this appears to be obsolete
+	# return $res->decoded_content if defined $res->header('Content-Encoding') && $res->header('Content-Encoding') eq 'gzip';
+	# return $res->content;
+	if ( wantarray ) {
+		return ($res->decoded_content, $res);
+	} else {
+		return $res->decoded_content;
+	}
 }
 
-
-
 # Generic
 # Checks if a particular program exists (or program.exe) in the $ENV{PATH} or if it has a path already check for existence of file
 sub exists_in_path {
@@ -2539,13 +1845,12 @@
 	return 1 if $bin =~ /[\/\\]/ && (-x ${bin} || -x "${bin}.exe");
 	# Search PATH
 	for (@PATH) {
-		return 1 if -x "${_}/${bin}" || -x "${_}/${bin}.exe";
+		my $bin_path = File::Spec->catfile($_, $bin);
+		return 1 if -x $bin_path || -x "${bin_path}.exe";
 	}
 	return 0;
 }
 
-
-
 # Generic
 # Checks history for files that are over 30 days old and asks user if they should be deleted
 # "$prog->{pid}|$prog->{name}|$prog->{episode}|$prog->{type}|".time()."|$prog->{mode}|$prog->{filename}\n";
@@ -2554,10 +1859,7 @@
 	my @delete;
 	my @proglist;
 	my $days = shift;
-			
-	# Return if disabled or running in a typically non-interactive mode
-	return 0 if $opt->{nopurge} || $opt->{stdout} || $opt->{nowrite} || $opt->{quiet};
-	
+
 	for my $pid ( $hist->get_pids() ) {
 		my $record = $hist->get_record( $pid );
 		if ( $record->{timeadded} < (time() - $days*86400) && $record->{filename} && -f $record->{filename} ) {
@@ -2567,9 +1869,9 @@
 			push @delete, $record->{filename};
 		}
 	}
-	
+
 	if ( @delete ) {
-		main::logger "\nThese programmes should be deleted:\n";
+		main::logger "\nThese programmes are over 30 days old and should be deleted:\n";
 		main::logger "-----------------------------------\n";
 		main::logger join "\n", @proglist;
 		main::logger "\n-----------------------------------\n";
@@ -2585,11 +1887,31 @@
 			main::logger "No Programmes deleted\n";
 		}
 	}
-	
+
 	return 0;
 }
 
-
+sub purge_warning {
+	my $hist = shift;
+	my $days = shift;
+	my $overdue;
+	return 0 if $opt->{nopurge} || $opt->{nowrite};
+	for my $pid ( $hist->get_pids() ) {
+		my $record = $hist->get_record( $pid );
+		if ( $record->{timeadded} < (time() - $days*86400) && $record->{filename} && -f $record->{filename} ) {
+			$overdue = 1;
+			last;
+		}
+	}
+	if ( $overdue ) {
+		print STDOUT "WARNING: You have programmes over 30 days old that should be deleted.\n";
+		print STDOUT "WARNING: Find them with 'get_iplayer --history --before=720 \".*\"'\n";
+		print STDOUT "WARNING: or use the 'Recordings' tab in the Web PVR Manager.\n";
+		print STDOUT "WARNING: Use 'get_iplayer --purge-files' to delete all programmes over 30 days old.\n";
+		print STDOUT "WARNING: Use 'get_iplayer --prefs-add --no-purge' to suppress this warning.\n";
+	}
+	return 0;
+}
 
 # Returns url decoded string
 sub url_decode {
@@ -2598,8 +1920,6 @@
 	return $str;
 }
 
-
-
 # Returns url encoded string
 sub url_encode {
 	my $str = shift;
@@ -2607,8 +1927,6 @@
 	return $str;
 }
 
-
-
 # list_unique_element_counts( \%type, $element_name, @matchlist);
 # Show channels for currently specified types in @matchlist - an array of progs
 sub list_unique_element_counts {
@@ -2635,91 +1953,89 @@
 	return 0;
 }
 
-
-
 # Invokes command in @args as a system call (hopefully) without using a shell
-#  Can also redirect all stdout and stderr to either: STDOUT, STDERR or unchanged
+# Can also redirect all stdout and stderr to either: STDOUT, STDERR or unchanged
 # Usage: run_cmd( <normal|STDERR|STDOUT>, @args )
 # Returns: exit code
 sub run_cmd {
 	my $mode = shift;
 	my @cmd = ( @_ );
 	my $rtn;
-	my $USE_SYSTEM = 0;
-	#my $system_suffix;
+	local *DEVNULL;
 
-	main::logger "\n\nINFO: Command: ".(join ' ', @cmd)."\n\n" if $opt->{verbose};
+	my $log_str;
+	my @log_cmd = @cmd;
+	if ( $#log_cmd > 0 ) {
+		$log_str = (join ' ', map {s/\"/\\\"/g; "\"$_\"";} @log_cmd)
+	} else {
+		$log_str = $log_cmd[0]
+	}
+	main::logger "INFO: Command: $log_str\n" if $opt->{verbose};
 
 	# Define what to do with STDOUT and STDERR of the child process
 	my $fh_child_out = ">&STDOUT";
 	my $fh_child_err = ">&STDERR";
 
+	$mode = 'QUIET' if ( $opt->{quiet} || $opt->{silent} ) && ! ($opt->{debug} || $opt->{verbose});
+
 	if ( $mode eq 'STDOUT' ) {
 		$fh_child_out = $fh_child_err = ">&STDOUT";
 		#$system_suffix = '2>&1';
 	} elsif ( $mode eq 'STDERR' ) {
 		$fh_child_out = $fh_child_err = ">&STDERR";
 		#$system_suffix = '1>&2';
+	} elsif ( $mode =~ /^QUIET/ ) {
+		open(DEVNULL, ">", File::Spec->devnull()) || die "ERROR: Cannot open null device\n";
+		if ( $mode eq 'QUIET_STDOUT' ) {
+			$fh_child_out = ">&DEVNULL";
+		} elsif ( $mode eq 'QUIET_STDERR' ) {
+			$fh_child_err = ">&DEVNULL";
+		} else {
+			$fh_child_out = $fh_child_err = ">&DEVNULL";
+		}
 	}
 
-	# Check if we have IPC::Open3 otherwise fallback on system()
-	eval "use IPC::Open3";
-
-	# use system(); - probably only likely in win32
-	if ($@) {
-		main::logger "WARNING: Please download and run latest installer - 'IPC::Open3' is not available\n";
-		#push @cmd, $system_suffix;
-		my $rtn = system( @cmd );
-
-	# use system() regardless
-	} elsif ( $USE_SYSTEM ) {
-		#push @cmd, $system_suffix;
-		my $rtn = system( @cmd );
-
-	# Use open3()
-	} else {
-
-		my $procid;
-		# Don't create zombies - unfortunately causes open3 to return -1 exit code regardless!
-		##### local $SIG{CHLD} = 'IGNORE';
-		# Setup signal handler for SIGTERM/INT/KILL - kill, kill, killlllll
-		$SIG{TERM} = $SIG{PIPE} = $SIG{INT} = sub {
-			my $signal = shift;
-			main::logger "\nINFO: Cleaning up (signal = $signal), killing PID=$procid:";
-			for my $sig ( qw/INT TERM KILL/ ) {
-				# Kill process with SIGs (try to allow proper handling of kill by child process)
-				if ( $opt->{verbose} ) {
-					main::logger "\nINFO: $$ killing cmd PID=$procid with SIG${sig}";
-				} else {
-					main::logger '.';
-				}
-				kill $sig, $procid;
-				sleep 1;
-				if ( ! kill 0, $procid ) {
-					main::logger "\nINFO: $$ killed cmd PID=$procid\n";
-					last;
-				}
-				sleep 1;
+	my $procid;
+	# Don't create zombies - unfortunately causes open3 to return -1 exit code regardless!
+	##### local $SIG{CHLD} = 'IGNORE';
+	# Setup signal handler for SIGTERM/INT/KILL - kill, kill, killlllll
+	$SIG{TERM} = $SIG{PIPE} = $SIG{INT} = sub {
+		my $signal = shift;
+		main::logger "\nINFO: Cleaning up (signal = $signal), killing PID=$procid:";
+		for my $sig ( qw/INT TERM KILL/ ) {
+			# Kill process with SIGs (try to allow proper handling of kill by child process)
+			if ( $opt->{verbose} ) {
+				main::logger "\nINFO: $$ killing cmd PID=$procid with SIG${sig}";
+			} else {
+				main::logger '.';
 			}
-			main::logger "\n";
-			exit 0;
-		};
-
-		# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
-		$procid = open3( 0, $fh_child_out, $fh_child_err, @cmd );
+			kill $sig, $procid;
+			sleep 1;
+			if ( ! kill 0, $procid ) {
+				main::logger "\nINFO: $$ killed cmd PID=$procid\n";
+				last;
+			}
+			sleep 1;
+		}
+		main::logger "\n";
+		exit 0;
+	};
 
-		# Wait for child to complete
-		waitpid( $procid, 0 );
-		$rtn = $?;
+	# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
+	$procid = open3( 0, $fh_child_out, $fh_child_err, @cmd );
 
-		# Restore old signal handlers
-		$SIG{TERM} = $SIGORIG{TERM};
-		$SIG{PIPE} = $SIGORIG{PIPE};
-		$SIG{INT} = $SIGORIG{INT};
-		#$SIG{CHLD} = $SIGORIG{CHLD};
-	}
+	# Wait for child to complete
+	waitpid( $procid, 0 );
+	$rtn = $?;
+
+	# Restore old signal handlers
+	$SIG{TERM} = $SIGORIG{TERM};
+	$SIG{PIPE} = $SIGORIG{PIPE};
+	$SIG{INT} = $SIGORIG{INT};
+	#$SIG{CHLD} = $SIGORIG{CHLD};
+	close(DEVNULL);
 
-	# Interpret return code	and force return code 2 upon error      
+	# Interpret return code	and force return code 2 upon error
 	my $return = $rtn >> 8;
 	if ( $rtn == -1 ) {
 		main::logger "ERROR: Command failed to execute: $!\n" if $opt->{verbose};
@@ -2735,8 +2051,6 @@
 	return $return;
 }
 
-
-
 # Generic
 # Escape chars in string for shell use
 sub StringUtils::esc_chars {
@@ -2744,8 +2058,6 @@
 	$_[0] =~ s/([;<>\*\|&\$!#\[\]\{\}:'"])/\\$1/g;
 }
 
-
-
 sub StringUtils::clean_utf8_and_whitespace {
 	# Remove non utf8
 	$_[0] =~ s/[^\x{21}-\x{7E}\s\t\n\r]//g;
@@ -2754,44 +2066,83 @@
 	$_[0] =~ s/(^\s+|\s+$)//g;
 }
 
+# Remove diacritical marks
+sub StringUtils::remove_marks {
+	my $string = shift;
+	$string = NFKD($string);
+	$string =~ s/\pM//g;
+	return $string;
+}
 
+# Convert unwanted punctuation to ASCII
+sub StringUtils::convert_punctuation {
+	my $string = shift;
+	# die smart quotes die
+	$string =~ s/[\x{0060}\x{00B4}\x{2018}\x{2019}\x{201A}\x{2039}\x{203A}]/'/g;
+	$string =~ s/[\x{201C}\x{201D}\x{201E}]/"/g;
+	$string =~ s/[\x{2013}\x{2014}]/-/g;
+	$string =~ s/[\x{2026}]/.../g;
+	return $string;
+}
+
+# Generic
+# Make a filename/path sane
+sub StringUtils::sanitize_path {
+	my $string = shift;
+	my $is_path = shift || 0;
+	my $force_default = shift || 0;
+	my $punct_bad = '[!"#$%&\'()*+,:;<=>?@[\]^`{|}~]';
+	my $win_bad = '["*:<>?|]';
+	my $mac_bad = '[:]';
+	# Replace forward slashes with underscore if not path
+	$string =~ s|\/|_|g unless $is_path;
+	# Replace backslashes with underscore if not Windows path
+	$string =~ s|\\|_|g unless $^O eq "MSWin32" && $is_path;
+	# Do not sanitise if specified
+	if ( $opt->{nosanitise} && ! $force_default ) {
+		# Remove invalid chars for Windows
+		$string =~ s/$win_bad//g if $^O eq "MSWin32";
+		# Remove invalid chars for macOS
+		$string =~ s/$mac_bad//g if $^O eq "darwin";
+	} else {
+		# use ISO8601 dates
+		$string =~ s|(\d\d)[/_](\d\d)[/_](20\d\d)|$3-$2-$1|g;
+		# ASCII-fy some punctuation
+		$string = StringUtils::convert_punctuation($string);
+		# Remove diacritical marks
+		$string = StringUtils::remove_marks($string);
+		# Remove non-ASCII chars
+		$string =~ s/[^\x{20}-\x{7e}]//g;
+		# Truncate duplicate colon/semi-colon/comma
+		$string =~ s/([:;,])(\1)+/$1/g;
+		# Add whitespace behind colon/semi-colon/comma if not present
+		$string =~ s/([:;,])(\S)/$1 $2/g;
+		# Remove most punctuation chars
+		# Includes invalid chars for Windows and macOS
+		$string =~ s/$punct_bad//g;
+		# Replace ellipsis
+		$string =~ s/^\.{3,}/_/g;
+		$string =~ s/\.{3,}/ /g;
+		# Remove extra/leading/trailing whitespace
+		$string =~ s/\s+/ /g;
+		$string =~ s/(^\s+|\s+$)//g;
+		# Replace whitespace with underscore unless --whitespace
+		$string =~ s/\s/_/g unless ( $opt->{whitespace} && ! $force_default );
+	}
+	return $string;
+}
 
 # Generic
 # Signal handler to clean up after a ctrl-c or kill
 sub cleanup {
 	my $signal = shift;
 	logger "\nINFO: Cleaning up $0 (got signal $signal)\n"; # if $opt->{verbose};
-	unlink $namedpipe;
 	unlink $lockfile;
 	# Execute default signal handler
-	$SIGORIG{$signal}->() if $SIGORIG{$signal};
+	$SIGORIG{$signal}->() if ref($SIGORIG{$signal}) eq 'CODE';
 	exit 1;
 }
 
-
-
-# Generic
-# Make a filename/path sane (optionally allow fwd slashes)
-sub StringUtils::sanitize_path {
-	my $string = shift;
-	my $allow_fwd_slash = shift || 0;
-
-	# Remove fwd slash if reqd
-	$string =~ s/\//_/g if ! $allow_fwd_slash;
-
-	# Replace backslashes with _ regardless
-	$string =~ s/\\/_/g;
-	# Sanitize by default
-	$string =~ s/\s+/_/g if (! $opt->{whitespace}) && (! $allow_fwd_slash);
-	$string =~ s/[^\w_\-\.\/\s]//gi if ! $opt->{whitespace};
-	$string =~ s/[\|\\\?\*\<\"\:\>\+\[\]\/]//gi if $opt->{fatfilename};
-	# Truncate multiple '_'
-	$string =~ s/_+/_/g;
-	return $string;
-}
-
-
-
 # Uses: global $lockfile
 # Lock file detection (<stale_secs>)
 # Global $lockfile
@@ -2828,8 +2179,6 @@
 	return 0;
 }
 
-
-
 sub expand_list {
 	my $list = shift;
 	my $search = shift;
@@ -2838,92 +2187,9 @@
 	for (@elements) {
 		$_ = $replace if $_ eq $search;
 	}
-	return join ',', @elements;	
+	return join ',', @elements;
 }
 
-
-
-sub get_playlist_url {
-	my $ua = shift;
-	my $url = shift;
-	my $filter = shift;
-	# Don't recurse more than 5 times
-	my $depth = 5;
-
-	# Resolve the MMS url if it is an http ref
-	while ( $url =~ /^http/i && $depth ) {
-		my $content = main::request_url_retry($ua, $url, 2, '', '');
-		# Reference list
-		if ( $content =~ m{\[reference\]}i ) {
-			my @urls;
-			# [Reference]
-			# Ref1=http://wm.bbc.co.uk/wms/england/radioberkshire/aod/andrewpeach_thu.wma?MSWMExt=.asf
-			# Ref2=http://wm.bbc.co.uk/wms/england/radioberkshire/aod/andrewpeach_thu.wma?MSWMExt=.asf
-			for ( split /ref\d*=/i, $content ) {
-				#main::logger "DEBUG: LINE: $_\n" if $opt->{debug};
-				s/[\s]//g;
-				# Rename http:// to mms:// - don't really know why but this seems to be necessary with such playlists
-				s|http://|mms://|g;
-				push @urls, $_ if m{^(http|mms|rtsp)://};
-				main::logger "DEBUG: Got Reference URL: $_\n" if $opt->{debug};
-			}
-			# use first URL for now??
-			$url = $urls[0];
-
-		# ASX XML based playlist
-		} elsif ( $content =~ m{<asx}i ) {
-			my @urls;
-			# <ASX version="3.0">
-			#  <ABSTRACT>http://www.bbc.co.uk/</ABSTRACT>
-			#  <TITLE>BBC support</TITLE>
-			#  <AUTHOR>BBC</AUTHOR>
-			#  <COPYRIGHT>(c) British Broadcasting Corporation</COPYRIGHT>
-			#  <MoreInfo href="http://www.bbc.co.uk/" />
-			#  <Entry>
-			#    <ref href="rtsp://wm.bbc.co.uk/wms/england/radioberkshire/aod/andrewpeach_thu.wma" />
-			#    <ref href="http://wm.bbc.co.uk/wms/england/radioberkshire/aod/andrewpeach_thu.wma" />
-			#    <ref href="rtsp://wm.bbc.co.uk/wms2/england/radioberkshire/aod/andrewpeach_thu.wma" />
-			#    <ref href="http://wm.bbc.co.uk/wms2/england/radioberkshire/aod/andrewpeach_thu.wma" />
-			#    <MoreInfo href="http://www.bbc.co.uk/" />
-			#    <Abstract>BBC</Abstract>
-			#  </Entry>
-			# </ASX>
-			for ( split /</i, $content ) {
-				#main::logger "DEBUG: LINE: $_\n" if $opt->{debug};
-				# Ignore anything except mms or http from this playlist
-				push @urls, $1 if m{ref\s+href=\"((http|$filter)://.+?)\"}i;
-			}
-			for ( @urls ) {
-				main::logger "DEBUG: Got ASX URL: $_\n" if $opt->{debug};
-			}
-			# use first URL for now??
-			$url = $urls[0];
-
-		# RAM format urls
-		} elsif ( $content =~ m{rtsp://}i ) {
-			my @urls;
-			for ( split /[\n\r\s]/i, $content ) {
-				main::logger "DEBUG: LINE: $_\n" if $opt->{debug};
-				# Ignore anything except $filter or http from this playlist
-				push @urls, $1 if m{((http|$filter)://.+?)[\n\r\s]?$}i;
-			}
-			for ( @urls ) {
-				main::logger "DEBUG: Got RAM URL: $_\n" if $opt->{debug};
-			}
-			# use first URL for now??
-			$url = $urls[0];			
-
-		} else {	
-			chomp( $url = $content );
-		}
-		$depth--;
-	}
-
-	return $url;
-}
-
-
-
 # Converts any number words (or numbers) 0 - 99 to a number
 sub convert_words_to_number {
 	my $text = shift;
@@ -2981,8 +2247,6 @@
 	return $number;
 }
 
-
-
 # Returns a regex string that matches all number words (or numbers) 0 - 99
 sub regex_numbers {
 	my $regex_units = '(zero|one|two|three|four|five|six|seven|eight|nine)';
@@ -2991,11 +2255,36 @@
 	return '(\d+|'.$regex_units.'|'.$regex_ten_to_nineteen.'|'.$regex_tens.'((\s+|\-|)'.$regex_units.')?)';
 }
 
+sub default_encodinglocale {
+	return 'UTF-8' if (${^UNICODE} & 32);
+	return ($^O eq "MSWin32" ? 'cp1252' : 'UTF-8');
+}
 
+sub default_encodingconsoleout {
+	return 'UTF-8' if (${^UNICODE} & 6);
+	return ($^O eq "MSWin32" ? 'cp850' : 'UTF-8');
+}
+
+sub encode_fs {
+	my $string = shift;
+	return $string if $opt->{encodinglocalefs} =~ /UTF-?8/i;
+	return encode($opt->{encodinglocalefs}, $string, FB_EMPTY);
+}
+
+sub hide_progress {
+	unless ( $opt->{logprogress} || $opt->{debug} ) {
+		if ( $opt->{pvr} || $opt->{stderr} ) {
+			return ! -t STDERR;
+		} else {
+			return ! -t STDOUT;
+		}
+	}
+	return 0;
+}
 
 ############## OO ################
 
-############## Options default class ################
+############## Options class ################
 package Options;
 
 use Env qw[@PATH];
@@ -3021,14 +2310,12 @@
 	bless $self, $type;
 }
 
-
 # Use to bind a new options ref to the class global $opt_format_ref var
 sub add_opt_format_object {
 	my $self = shift;
 	$Options::opt_format_ref = shift;
 }
 
-
 # Parse cmdline opts using supplied hash
 # If passthru flag is set then no error will result if there are unrecognised options etc
 # Usage: $opt_cmdline->parse( [passthru] );
@@ -3051,17 +2338,15 @@
 	} else {
 		Getopt::Long::Configure("no_pass_through");
 	}
-	
+
 	# cmdline opts take precedence
 	# get options
 	return GetOptions(%get_opts);
 }
 
-
-
 sub copyright_notice {
 	shift;
-	my $text = sprintf "get_iplayer v%.2f, ", $version;
+	my $text = "get_iplayer $version_text, ";
 	$text .= <<'EOF';
 Copyright (C) 2008-2010 Phil Lewis
   This program comes with ABSOLUTELY NO WARRANTY; for details use --warranty.
@@ -3072,8 +2357,6 @@
 	return $text;
 }
 
-
-
 # Usage: $opt_cmdline->usage( <helplevel>, <manpage>, <dump> );
 sub usage {
 	my $this = shift;
@@ -3084,54 +2367,50 @@
 	my $opt_format_ref = $Options::opt_format_ref;
 	my %section_name;
 	my %name_syntax;
+	my %name_args;
 	my %name_desc;
 	my @usage;
 	my @man;
 	my @dump;
-	push @man, 
-		'.TH GET_IPLAYER "1" "June 2012" "Phil Lewis" "get_iplayer Manual"',
-		'.SH NAME', 'get_iplayer - Stream Recording tool and PVR for BBC iPlayer, BBC Podcasts and more',
+	my @negate = (
+		'Boolean options can be negated by adding a "no-" prefix, e.g., --no-subtitles or --no-whitespace.',
+		'This applies even if the base option name already begins with "no-", e.g., --no-no-tag or --no-no-artwork',
+	);
+	push @man,
+		'.TH GET_IPLAYER "1" "February 2019" "Phil Lewis" "get_iplayer Manual"',
+		'.SH NAME', 'get_iplayer - Stream Recording tool and PVR for BBC iPlayer',
 		'.SH SYNOPSIS',
 		'\fBget_iplayer\fR [<options>] [<regex|index> ...]',
 		'.PP',
 		'\fBget_iplayer\fR \fB--get\fR [<options>] <regex|index> ...',
-		'.br',
-		'\fBget_iplayer\fR <url> \fB--type\fR=<type> [<options>]',
 		'.PP',
-		'\fBget_iplayer\fR <pid|url> [\fB--type\fR=<type> <options>]',
+		'\fBget_iplayer\fR <url> [\fB--type\fR=<type> <options>]',
 		'.PP',
-		'\fBget_iplayer\fR \fB--stream\fR [<options>] <regex|index> | mplayer \fB-cache\fR 3072 -',
+		'\fBget_iplayer\fR <pid> [\fB--type\fR=<type> <options>]',
 		'.PP',
-		'\fBget_iplayer\fR \fB--stream\fR [<options>] \fB--type\fR=<type> <pid|url> | mplayer \fB-cache\fR 3072 -',
-		'.PP',
-		'\fBget_iplayer\fR \fB--stream\fR [<options>] \fB--type\fR=livetv,liveradio <regex|index> \fB--player\fR="mplayer -cache 128 -"',
-		'.PP',
-		'\fBget_iplayer\fR \fB--refresh\fR',
+		'\fBget_iplayer\fR \fB--refresh\fR [\fB--type\fR=<type> <options>]',
 		'.SH DESCRIPTION',
-		'\fBget_iplayer\fR lists, searches and records BBC iPlayer TV/Radio, BBC Podcast programmes. Other 3rd-Party plugins may be available.',
+		'\fBget_iplayer\fR lists, searches and records BBC iPlayer TV and radio programmes.',
+		'.PP',
+		'\fBget_iplayer\fR has two modes: recording a complete programme for later playback, and as a Personal Video Recorder (PVR), subscribing to',
+		'search terms and recording programmes automatically.',
 		'.PP',
-		'\fBget_iplayer\fR has three modes: recording a complete programme for later playback, streaming a programme',
-		'directly to a playback application, such as mplayer; and as a Personal Video Recorder (PVR), subscribing to',
-		'search terms and recording programmes automatically. It can also stream or record live BBC iPlayer output',
+		'If given the regex ".*" (incl. quotes), \fBget_iplayer\fR updates and displays the list of currently available TV programmes.',
+		'Use --type=radio for radio programmes. Each available programme has an alphanumeric identifier (\fBPID\fR).',
 		'.PP',
-		'If given no arguments, \fBget_iplayer\fR updates and displays the list of currently available programmes.',
-		'Each available programme has a numerical identifier, \fBpid\fR.',
-		'\fBget_iplayer\fR utilises the \fBrtmpdump\fR tool to record BBC iPlayer programmes from RTMP flash streams at various qualities.',
+		'In PVR mode, \fBget_iplayer\fR can be called from cron to record programmes on a schedule.',
+		'.SH "OPTIONS"',
 		'.PP',
-		'In PVR mode, \fBget_iplayer\fR can be called from cron to record programmes to a schedule.',
-		'.SH "OPTIONS"' if $manpage;
-	push @usage, 'Usage ( Also see http://linuxcentre.net/getiplayer/documentation ):';
-	push @usage, ' List All Programmes:            get_iplayer [--type=<TYPE>]';
-	push @usage, ' Search Programmes:              get_iplayer <REGEX>';
-	push @usage, ' Record Programmes by Search:    get_iplayer <REGEX> --get';
+		@negate if $manpage;
+	push @usage, 'Usage ( Also see https://github.com/get-iplayer/get_iplayer/wiki/documentation ):';
+	push @usage, ' List All Programmes:            get_iplayer [--type=<TYPE>] ".*"';
+	push @usage, ' Search Programmes:              get_iplayer [--type=<TYPE>] <REGEX>';
+	push @usage, ' Record Programmes by Search:    get_iplayer [--type=<TYPE>] <REGEX> --get';
 	push @usage, ' Record Programmes by Index:     get_iplayer <INDEX> --get';
-	push @usage, ' Record Programmes by URL:       get_iplayer [--type=<TYPE>] "<URL>"';
-	push @usage, ' Record Programmes by PID:       get_iplayer [--type=<TYPE>] --pid=<PID>';
-	push @usage, ' Stream Programme to Player:     get_iplayer --stream <INDEX> | mplayer -cache 3072 -' if $helplevel == 1;
-	push @usage, ' Stream BBC Embedded Media URL:  get_iplayer --stream --type=<TYPE> "<URL>" | mplayer -cache 128 -' if $helplevel != 2;
-	push @usage, ' Stream Live iPlayer Programme:  get_iplayer --stream --type=livetv,liveradio <REGEX|INDEX> --player="mplayer -cache 128 -"' if $helplevel != 2;
+	push @usage, ' Record Programmes by URL:       get_iplayer "<URL>"';
+	push @usage, ' Record Programmes by PID:       get_iplayer --pid=<PID>';
 	push @usage, '';
-	push @usage, ' Update get_iplayer cache:       get_iplayer --refresh [--force]';
+	push @usage, ' Update get_iplayer cache:       get_iplayer --refresh [--type=<TYPE>]';
 	push @usage, '';
 	push @usage, ' Basic Help:                     get_iplayer --basic-help' if $helplevel != 2;
 	push @usage, ' Intermediate Help:              get_iplayer --help' if $helplevel == 2;
@@ -3146,12 +2425,18 @@
 		next if $helpmask != 2 && $helplevel == 2;
 		push @{$section_name{$section}}, $name if $syntax;
 		$name_syntax{$name} = $syntax;
+		if ( $format =~ /!$/ ) {
+			$name_args{$name} = "1";
+		} elsif ( $syntax =~ / (<.*)$/ ) {
+			$name_args{$name} = $1;
+		}
 		$name_desc{$name} = $desc;
 	}
 
+	push @dump, "    ".join(" ", @negate);
 	# Build the help usage text
 	# Each section
-	for my $section ( 'Search', 'Display', 'Recording', 'Download', 'Output', 'PVR', 'Config', 'External Program', 'Tagging', 'Misc' ) {
+	for my $section ( 'Search', 'Display', 'Recording', 'Download', 'Output', 'PVR', 'Config', 'External Program', 'Tagging', 'Misc', 'Deprecated' ) {
 		next if not defined $section_name{$section};
 		my @lines;
 		my @manlines;
@@ -3159,16 +2444,21 @@
 		#Runs the PVR using all saved PVR searches (intended to be run every hour from cron etc)
 		push @man, ".SS \"$section Options:\"" if $manpage;
 		push @dump, '', "$section Options:" if $dumpopts;
-		push @usage, '', "$section Options:";
+		push @usage, '', "$section Options:" if $section ne 'Deprecated' or $helplevel == 1;
 		# Each name in this section array
+		my $xo = Options->excludeopts;
 		for my $name ( sort @{ $section_name{$section} } ) {
 			push @manlines, '.TP'."\n".'\fB'.$name_syntax{$name}."\n".$name_desc{$name} if $manpage;
 			my $dumpname = $name;
-			$dumpname =~ s/^_//g;
-			push @dumplines, sprintf(" %-20s %-32s %s", $dumpname, $name_syntax{$name}, $name_desc{$name} ) if $dumpopts;
-			push @lines, sprintf(" %-32s %s", $name_syntax{$name}, $name_desc{$name} );
+			$dumpname = undef if $dumpname =~ /$xo/;
+			if ( $dumpname ) {
+				$dumpname =~ s/^_//g;
+				$dumpname .= " $name_args{$name}" if $name_args{$name};
+			}
+			push @dumplines, sprintf(" %-51s %-46s %s", $name_syntax{$name}, $dumpname, $name_desc{$name} ) if $dumpopts;
+			push @lines, sprintf(" %-51s %s", $name_syntax{$name}, $name_desc{$name} );
 		}
-		push @usage, sort @lines;
+		push @usage, sort @lines if $section ne 'Deprecated' or $helplevel == 1;;
 		push @man, sort @manlines;
 		push @dump, sort @dumplines;
 	}
@@ -3177,7 +2467,7 @@
 	if ( $manpage ) {
 		push @man,
 			'.SH AUTHOR',
-			'get_iplayer was written by Phil Lewis <iplayer2 (at sign) linuxcentre.net> and is now maintained by the contributors at http://www.infradead.org/get_iplayer/html/get_iplayer.html',
+			'get_iplayer was written by Phil Lewis <iplayer2 (at sign) linuxcentre.net> and is now maintained by the contributors at https://github.com/get-iplayer/get_iplayer',
 			'.PP',
 			'This manual page was originally written by Jonathan Wiltshire <jmw@debian.org> for the Debian project (but may be used by others).',
 			'.SH COPYRIGHT NOTICE';
@@ -3197,7 +2487,7 @@
 	# Print options dump and quit
 	} elsif ( $dumpopts ) {
 		main::logger join "\n", @dump, "\n";
-	
+
 	# Print usage and quit
 	} else {
 		main::logger join "\n", @usage, "\n";
@@ -3206,7 +2496,6 @@
 	exit 0;
 }
 
-
 # Add all the options into supplied hash from specified class
 # Usage: Options->get_class_options( 'Programme:tv' );
 sub get_class_options {
@@ -3218,12 +2507,11 @@
 	if ( ! $@ ) {
 		my %tmpopt = %{ $classname->opt_format() };
 		for my $thisopt ( keys %tmpopt ) {
-			$opt_format_ref->{$thisopt} = $tmpopt{$thisopt}; 
-		}	
+			$opt_format_ref->{$thisopt} = $tmpopt{$thisopt};
+		}
 	}
 }
 
-
 # Copies values in one instance to another only if they are set with a value/defined
 # Usage: $opt->copy_set_options_from( $opt_cmdline );
 sub copy_set_options_from {
@@ -3235,20 +2523,18 @@
 	}
 }
 
-
-
 # specify regex of options that cannot be saved
 sub excludeopts {
-	return '^(help|debug|get|pvr|prefs|preset|warranty|conditions)';
+	return '^(cache|profiledir|encoding|silent|help|debug|get|pvr|prefs|preset|warranty|conditions|dumpoptions|comment|purge|markdownloaded)';
 }
 
-
 # List all available presets in the specified dir
 sub preset_list {
 	my $opt = shift;
 	my $dir = shift;
 	main::logger "INFO: Valid presets: ";
-	if ( opendir( DIR, "${profile_dir}/presets/" ) ) {
+	my $presets_dir = File::Spec->catfile($profile_dir, "presets");
+	if ( opendir( DIR, $presets_dir ) ) {
 		my @preset_list = grep !/(^\.|~$)/, readdir DIR;
 		closedir DIR;
 		main::logger join ',', @preset_list;
@@ -3256,7 +2542,6 @@
 	main::logger "\n";
 }
 
-
 # Clears all option entries for a particular preset (i.e. deletes the file)
 sub clear {
 	my $opt = shift;
@@ -3266,7 +2551,6 @@
 	main::logger "INFO: Removed all above options from $prefsfile\n";
 }
 
-
 # $opt->add( $opt_cmdline, $optfile, @search_args )
 # Add/change cmdline-only options to file
 sub add {
@@ -3279,8 +2563,23 @@
 	my $entry = get( $opt, $optfile );
 
 	# Add search args to opts
+	if ( defined $this_cmdline->{search} ) {
+		push @search_args, $this_cmdline->{search};
+	}
 	$this_cmdline->{search} = '('.(join '|', @search_args).')' if @search_args;
 
+	# ignore certain opts in default options file
+	if ( $optfile eq $optfile_default ) {
+		for my $key ( 'search', 'force', 'overwrite' ) {
+			if ( defined $this_cmdline->{$key}  ) {
+				main::logger "WARNING: '$key' option is not allowed in default options file: $optfile\n";
+				main::logger "WARNING: '$key = $this_cmdline->{$key}' will be ignored\n";
+				main::logger "WARNING: Use a preset instead\n";
+				delete $this_cmdline->{$key};
+			}
+		}
+	}
+
 	# Merge all cmdline opts into $entry except for these
 	my $regex = $opt->excludeopts;
 	for ( grep !/$regex/, keys %{ $this_cmdline } ) {
@@ -3296,8 +2595,6 @@
 	put( $opt, $entry, $optfile );
 }
 
-
-
 # $opt->add( $opt_cmdline, $optfile )
 # Add/change cmdline-only options to file
 sub del {
@@ -3316,7 +2613,7 @@
 	# Merge all cmdline opts into $entry except for these
 	my $regex = $opt->excludeopts;
 	for ( grep !/$regex/, keys %{ $this_cmdline } ) {
-		main::logger "INFO: Deleted option '$_' = '$this_cmdline->{$_}'\n" if defined $this_cmdline->{$_} && defined $entry->{$_};
+		main::logger "INFO: Deleted option '$_' = '$entry->{$_}'\n" if defined $this_cmdline->{$_} && defined $entry->{$_};
 		delete $entry->{$_} if defined $this_cmdline->{$_};
 	}
 
@@ -3324,8 +2621,6 @@
 	put( $opt, $entry, $optfile );
 }
 
-
-
 # $opt->show( $optfile )
 # show options from file
 sub show {
@@ -3334,7 +2629,7 @@
 	return 0 if ! -f $optfile;
 
 	# Load opts file
-	my $entry = get( $opt, $optfile );
+	my $entry = get( $opt, $optfile, 1 );
 
 	# Merge all cmdline opts into $entry except for these
 	main::logger "Options in '$optfile'\n";
@@ -3344,8 +2639,6 @@
 	}
 }
 
-
-
 # $opt->save( $opt_cmdline, $optfile )
 # Save cmdline-only options to file
 sub put {
@@ -3368,8 +2661,6 @@
 	return;
 }
 
-
-
 # Returns a hashref of 'optname => internal_opt_name' for all options
 sub get_opt_map {
 	my $opt_format_ref = $Options::opt_format_ref;
@@ -3386,7 +2677,7 @@
 			#main::logger "INFO: Opt '$_' -> '$optint'\n";
 			if ( defined $optname->{$_} ) {
 				main::logger "ERROR: Duplicate Option defined '$_' -> '$optint' and '$optname->{$_}'\n";
-				exit 11;
+				exit 12;
 			}
 			$optname->{$_} = $optint;
 		}
@@ -3397,47 +2688,68 @@
 	return $optname;
 }
 
-
 # $entry = get( $opt, $optfile )
 # get all options from file into $entry ($opt is used just to get access to general options like debug)
 sub get {
 	my $opt = shift;
 	my $optfile = shift;
+	my $suppress_warnings = shift;
 	my $opt_format_ref = $Options::opt_format_ref;
 	my $entry;
 	return $entry if ( ! defined $optfile ) || ( ! -f $optfile );
 
 	my $optname = get_opt_map();
 
+	my (@ignored, @deprecated);
 	# Load opts
 	main::logger "DEBUG: Parsing options from $optfile:\n" if $opt->{debug};
-	open (OPT, "< $optfile") || die ("ERROR: Cannot read options file $optfile\n");
+	open (OPT, "< $optfile") || die ("ERROR: Cannot read options file: $optfile\n");
 	while(<OPT>) {
-		/^\s*([\w\-_]+)\s+(.*)\s*$/;
-		next if not defined $1;
+		next unless (/^\s*([\w\-_]+)\s+(.*)\s*$/);
 		# Error if the option is not valid
 		if ( not defined $optname->{$1} ) {
-			# Force error to go to STDERR (prevents PVR runs getting STDOUT warnings)
-			$opt->{stderr} = 1;
-			main::logger "WARNING: Ignoring invalid option in $optfile: '$1 = $2'\n";
-			main::logger "INFO: Please remove and use 'get_iplayer --dump-options' to display all valid options\n";
-			delete $opt->{stderr};
+			push @ignored, "$1 = $2";
 			next;
 		}
+		# Warn if it is listed as an ignored internal option name
+		if ( defined @{ $opt_format_ref->{$1} }[2] ) {
+			if ( @{ $opt_format_ref->{$1} }[2] eq 'Ignored' ) {
+				push @ignored, "$1 = $2";
+			}
+		}
 		# Warn if it is listed as a deprecated internal option name
-		if ( defined @{ $opt_format_ref->{$1} }[2] && @{ $opt_format_ref->{$1} }[2] eq 'Deprecated' ) {
-			main::logger "WARNING: Deprecated option in $optfile: '$1 = $2'\n";
-			main::logger "INFO: Use --dump-opts to display all valid options\n";
+		if ( defined @{ $opt_format_ref->{$1} }[2] ) {
+			if ( @{ $opt_format_ref->{$1} }[2] eq 'Deprecated' ) {
+				push @deprecated, "$1 = $2";
+			}
 		}
 		chomp( $entry->{ $optname->{$1} } = $2 );
 		main::logger "DEBUG: Loaded option $1 ($optname->{$1}) = $2\n" if $opt->{debug};
 	}
 	close OPT;
+	unless ( $suppress_warnings ) {
+		# Force error to go to STDERR (prevents PVR runs getting STDOUT warnings)
+		$opt->{stderr} = 1;
+		if ( @ignored ) {
+			main::logger "WARNING: Ignoring invalid option(s) in $optfile:\n";
+			for my $ignored ( @ignored ) {
+				main::logger "WARNING: $ignored\n";
+			}
+			main::logger "WARNING: Please remove invalid options from $optfile\n";
+		}
+		if ( @deprecated ) {
+			main::logger "WARNING: Deprecated option(s) found in $optfile:\n";
+			for my $deprecated ( @deprecated ) {
+				main::logger "WARNING: $deprecated\n";
+			}
+			main::logger "WARNING: Deprecated options will be removed in a future release\n";
+		}
+		main::logger "INFO: Use --dump-options to display all valid options\n" if @deprecated or @ignored;
+		delete $opt->{stderr};
+	}
 	return $entry;
 }
 
-
-
 # $opt_file->load( $opt, $optfile )
 # Load default options from file(s) into instance
 sub load {
@@ -3449,6 +2761,16 @@
 	for my $optfile ( @optfiles ) {
 		# Load opts
 		my $entry = get( $opt, $optfile );
+		# ignore certain opts in default options file
+		if ( $optfile eq $optfile_default ) {
+			for my $key ( 'search', 'force', 'overwrite' ) {
+				if ( defined $entry->{$key}  ) {
+					main::logger "WARNING: '$key' option is invalid in default options file: $optfile\n";
+					main::logger "WARNING: '$key = $entry->{$key}' will be ignored\n";
+					delete $entry->{$key};
+				}
+			}
+		}
 		# Copy to $this_file instance
 		$this_file->copy_set_options_from( $entry );
 	}
@@ -3456,8 +2778,6 @@
 	return;
 }
 
-
-
 # Usage: $opt_file->display( [<exclude regex>], [<title>] );
 # Display options
 sub display {
@@ -3466,21 +2786,23 @@
 	my $excluderegex = shift || 'ROGUEVALUE';
 	my $regex = $this->excludeopts;
 	main::logger "$title:\n";
-	for ( grep !/$regex/i, sort keys %{$this} ) {
-		main::logger "\t$_ = $this->{$_}\n" if defined $this->{$_} && $this->{$_};
+	for ( sort keys %{$this} ) {
+		if ( defined $this->{$_} && $this->{$_} ) {
+			if ( ref($this->{$_}) eq 'ARRAY' ) {
+				main::logger "\t$_ = ".(join(',', @{$this->{$_}}))."\n";
+			} else {
+				main::logger "\t$_ = $this->{$_}\n";
+			}
+		}
 	}
 	main::logger "\n";
 	return 0;
 }
 
-
-
-
-########################################################
-
-################ History default class #################
+################ History class #################
 package History;
 
+use Encode;
 use Env qw[@PATH];
 use Fcntl;
 use File::Copy;
@@ -3505,7 +2827,6 @@
 	bless $self, $type;
 }
 
-
 # $opt->{<option>} access method
 sub opt {
 	my $self = shift;
@@ -3513,13 +2834,60 @@
 	return $opt->{$optname};
 }
 
-
 # Use to bind a new options ref to the class global $opt_ref var
 sub add_opt_object {
 	my $self = shift;
 	$History::optref = shift;
 }
 
+sub trim {
+	my $oldhistoryfile = "$historyfile.old";
+	my $newhistoryfile = "$historyfile.new";
+	if ( $opt->{trimhistory} =~ /^all$/i ) {
+		if ( ! copy($historyfile, $oldhistoryfile) ) {
+			die "ERROR: Cannot copy $historyfile to $oldhistoryfile: $!\n";
+		}
+		if ( ! unlink($historyfile) ) {
+			die "ERROR: Cannot delete $historyfile: $! \n";
+		}
+		main::logger "INFO: Deleted all entries from download history\n";
+		return;
+	}
+	if ( $opt->{trimhistory} !~ /^\d+$/ ) {
+		die "ERROR: --trim-history option must have a positive integer value, or use 'all' to completely delete download history.\n";
+	}
+	if ( $opt->{trimhistory} =~ /^0+$/ ) {
+		die "ERROR: Cannot specify 0 for --trim-history option.  Use 'all' to completely delete download history.\n";
+	}
+	if ( ! open(HIST, "< $historyfile") ) {
+		die "ERROR: Cannot read from $historyfile\n";
+	}
+	if ( ! open(NEWHIST, "> $newhistoryfile") ) {
+		die "ERROR: Cannot write to $newhistoryfile\n";
+	}
+	my $trim_limit = time() - ($opt->{trimhistory} * 86400);
+	my $deleted_count = 0;
+	while (<HIST>) {
+		chomp();
+		next if /^[\#\s]/;
+		my @record = split /\|/;
+		my $timeadded = $record[4];
+		if ( $timeadded >= $trim_limit ) {
+			print NEWHIST "$_\n";
+		} else {
+			$deleted_count++;
+		}
+	}
+	close HIST;
+	close NEWHIST;
+	if ( ! copy($historyfile, $oldhistoryfile) ) {
+		die "ERROR: Cannot copy $historyfile to $oldhistoryfile: $!\n";
+	}
+	if ( ! move($newhistoryfile, $historyfile) ) {
+		die "ERROR: Cannot move $newhistoryfile to $historyfile: $!\n";
+	}
+	main::logger "INFO: Deleted $deleted_count entries from download history\n";
+}
 
 # Uses global @history_format
 # Adds prog to history file (with a timestamp) so that it is not rerecorded after deletion
@@ -3533,7 +2901,7 @@
 	return 0 if $opt->{nowrite};
 
 	# Add to history
-	if ( ! open(HIST, ">>:utf8", $historyfile) ) {
+	if ( ! open(HIST, ">> $historyfile") ) {
 		main::logger "ERROR: Cannot write or append to $historyfile\n";
 		exit 11;
 	}
@@ -3551,22 +2919,20 @@
 	return 0;
 }
 
-
-
 # Uses global @history_format
 # returns, for all the pids in the history file, $history->{pid}->{key} = value
 sub load {
 	my $hist = shift;
 
-	# Return if force option specified or stdout streaming only
-	return 0 if ( $opt->{force} && ! $opt->{pid} ) || $opt->{stdout} || $opt->{nowrite};
+	# Return if force option specified
+	return 0 if ! $opt->{history} && ( $opt->{force} || $opt->{nowrite} );
 
 	# clear first
 	$hist->clear();
 
 	main::logger "INFO: Loading recordings history\n" if $opt->{verbose};
 	if ( ! open(HIST, "< $historyfile") ) {
-		main::logger "WARNING: Cannot read $historyfile\n\n" if $opt->{verbose} && -f $historyfile;
+		main::logger "WARNING: Cannot read $historyfile\n" if $opt->{verbose} && -f $historyfile;
 		return 0;
 	}
 
@@ -3582,11 +2948,14 @@
 		# Update fields in %history hash for $pid
 		for ( @history_format ) {
 			$record_entries->{$_} = ( shift @record ) || '';
+			if ( /^filename$/ ) {
+				$record_entries->{$_} = main::encode_fs($record_entries->{$_});
+			}
 		}
 		# Create new history entry
 		if ( defined $hist->{ $record_entries->{pid} } ) {
- 			main::logger "WARNING: duplicate pid $record_entries->{pid} in history\n" if $opt->{debug};
-			# Append filename and modes - could be a multimode entry
+			main::logger "WARNING: duplicate pid $record_entries->{pid} in history\n" if $opt->{debug};
+			# Append filename and modes
 			$hist->{ $record_entries->{pid} }->{mode} .= ','.$record_entries->{mode} if defined $record_entries->{mode};
 			$hist->{ $record_entries->{pid} }->{filename} .= ','.$record_entries->{filename} if defined $record_entries->{filename};
 			main::logger "DEBUG: Loaded and merged '$record_entries->{pid}' = '$record_entries->{name} - $record_entries->{episode}' from history\n" if $opt->{debug};
@@ -3602,18 +2971,14 @@
 	return 0;
 }
 
-
-
 # Clear the history in %{$hist}
 sub clear {
 	my $hist = shift;
 	# There is probably a faster way
-	delete $hist->{$_} for keys %{ $pvr };
+	delete $hist->{$_} for keys %{ $hist };
 	return 0;
 }
 
-
-
 # Loads hist from file if required
 sub conditional_load {
 	my $hist = shift;
@@ -3626,8 +2991,6 @@
 	return 0;
 }
 
-
-
 # Returns a history pid instance ref
 sub get_record {
 	my $hist = shift;
@@ -3639,8 +3002,6 @@
 	return undef;
 }
 
-
-
 # Returns a list of current history pids
 sub get_pids {
 	my $hist = shift;
@@ -3648,8 +3009,6 @@
 	return keys %{ $hist };
 }
 
-
-
 # Lists current history items
 # Requires a load()
 sub list_progs {
@@ -3736,61 +3095,48 @@
 		@match_list = @pruned;
 	}
 
+	# apply sort
+	@match_list = main::sort_matches(@match_list);
+
 	# De-dup matches and retain order then list matching programmes in history
-	main::list_progs( undef, main::make_array_unique_ordered( @match_list ) );
+	@match_list = main::make_array_unique_ordered( @match_list );
+	main::list_progs( undef, @match_list );
 
+	if ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{creditsonly} || $opt->{subsonly} || $opt->{tagonly} || $opt->{streaminfo} ) {
+		main::download_other( $hist, @match_list );
+	}
 	return 0;
 }
 
-
-
 # Generic
 # Checks history for previous download of this pid
 sub check {
 	my $hist = shift;
 	my $pid = shift;
-	my $mode = shift;
 	my $silent = shift;
 	return 0 if ! $pid;
 
-	# Return if force option specified or stdout streaming only
-	return 0 if $opt->{force} || $opt->{stdout} || $opt->{nowrite};
+	# Return if force option specified
+	return 0 if $opt->{force} || $opt->{nowrite};
 
 	# Load if empty
 	$hist->conditional_load();
 
 	if ( defined $hist->{ $pid } ) {
 		my ( $name, $episode, $histmode ) = ( $hist->{$pid}->{name}, $hist->{$pid}->{episode}, $hist->{$pid}->{mode} );
-		main::main::logger "DEBUG: Found PID='$pid' with MODE='$histmode' in history\n" if $opt->{debug};
-		if ( $opt->{multimode} ) {
-			# Strip any number off the end of the mode names for the comparison
-			$mode =~ s/\d+$//g;
-			# Check against all modes in the comma separated list
-			my @hmodes = split /,/, $histmode;
-			for ( @hmodes ) {
-				s/\d+$//g;
-				if ( $mode eq $_ ) {
-					main::logger "INFO: $name - $episode ($pid / $mode) Already in history ($historyfile) - use --force to override\n" if ! $silent;
-					return 1;
-				}
-			}
-		} else {
-			main::logger "INFO: $name - $episode ($pid) Already in history ($historyfile) - use --force to override\n" if ! $silent;
-			return 1;
-		}
+		main::logger "DEBUG: Found PID='$pid' with MODE='$histmode' in history\n" if $opt->{debug};
+		main::logger "INFO: '$name - $episode ($pid)' already in history ($historyfile) - use --force to override\n" if ! $silent;
+		return 1;
 	}
 
 	main::logger "INFO: Programme not in history\n" if $opt->{verbose} && ! $silent;
 	return 0;
 }
 
-
-
-
 #################### Programme class ###################
-
 package Programme;
 
+use Cwd 'abs_path';
 use Encode;
 use Env qw[@PATH];
 use Fcntl;
@@ -3800,17 +3146,19 @@
 use File::Spec;
 use File::stat;
 use HTML::Entities;
+use HTML::Parser 3.71;
 use HTTP::Cookies;
 use HTTP::Headers;
 use IO::Seekable;
 use IO::Socket;
+use JSON::PP;
 use LWP::ConnCache;
 use LWP::UserAgent;
-use POSIX qw(mkfifo);
+use POSIX qw(strftime);
 use strict;
 use Time::Local;
 use URI;
-use Cwd 'abs_path';
+use XML::LibXML 1.91;
 
 # Class vars
 # Global options
@@ -3827,64 +3175,79 @@
 	};
 }
 
-
 # Filter channel names matched with options --refreshexclude/--refreshinclude
 sub channels_filtered {
 	my $prog = shift;
-	my $channelsref = shift;
-	my %channels = %{ $channelsref };
+	my $channel_groups = shift;
+	# assume class method call
+	(my $prog_type = $prog) =~ s/Programme:://;
+	my $exclude_groups = $opt->{'refreshexcludegroups'.$prog_type} || $opt->{'refreshexcludegroups'};
+	my $include_groups = $opt->{'refreshincludegroups'.$prog_type} || $opt->{'refreshincludegroups'};
+	my %channels;
+	my %group_channels;
 	# include/exclude matching channels as required
 	my $include_regex = '.*';
-	my $exclude_regex = '^ROUGEVALUE$';
+	my $exclude_regex = '^ROGUEVALUE$';
 	# Create a regex from any comma separated values
 	$exclude_regex = '('.(join '|', ( split /,/, $opt->{refreshexclude} ) ).')' if $opt->{refreshexclude};
 	$include_regex = '('.(join '|', ( split /,/, $opt->{refreshinclude} ) ).')' if $opt->{refreshinclude};
+	for my $group ( keys %{$channel_groups} ) {
+		my %channel_group = %{$channel_groups->{$group}};
+		@channels{ keys %channel_group } = values %channel_group;
+		if ( ( $exclude_groups && $exclude_groups !~ /\b$group\b/ ) || ( $include_groups && $include_groups =~ /\b$group\b/ ) ) {
+			@group_channels{ keys %channel_group } = values %channel_group;
+		}
+	}
+	my $use_group_channels = scalar keys %group_channels;
+	$use_group_channels = 1 if ! $use_group_channels && $exclude_groups;
 	for my $channel ( keys %channels ) {
-		if ( $channels{$channel} !~ /$exclude_regex/i && $channels{$channel} =~ /$include_regex/i ) {
-			main::logger "INFO: Will refresh channel $channels{$channel}\n" if $opt->{verbose};
-		} else {
+		if ( $use_group_channels ) {
+			if ( $exclude_regex ne '^ROGUEVALUE$' && $group_channels{$channel} =~ /$exclude_regex/i ) {
+				delete $group_channels{$channel};
+			}
+			if ( $include_regex ne '.*' && $channels{$channel} =~ /$include_regex/i ) {
+				$group_channels{$channel} = $channels{$channel} unless $group_channels{$channel};
+			}
+		}
+		unless ( $channels{$channel} !~ /$exclude_regex/i && $channels{$channel} =~ /$include_regex/i ) {
 			delete $channels{$channel};
 		}
+		if ( $use_group_channels ) {
+			delete $channels{$channel} if ( $channels{$channel} && ! $group_channels{$channel} );
+			$channels{$channel} = $group_channels{$channel} if ( ! $channels{$channel} && $group_channels{$channel} );
+		}
+	}
+	if ( $opt->{verbose} ) {
+		main::logger "INFO: Will refresh channel $_\n" for sort values %channels;
 	}
 	return \%channels;
 }
 
-
-sub channels {
-	return {};
-}
-
-
 sub channels_schedule {
-        return {};
+	return {};
 }
 
-
 # Method to return optional list_entry format
 sub optional_list_entry_format {
 	my $prog = shift;
 	return '';
 }
 
-
 # Returns the modes to try for this prog type
 sub modelist {
 	return '';
 }
 
-
 # Default minimum expected download size for a programme type
 sub min_download_size {
 	return 1024000;
 }
 
-
 # Default cache expiry in seconds
 sub expiry {
 	return 14400;
 }
 
-
 # Constructor
 # Usage: $prog{$pid} = Programme->new( 'pid' => $pid, 'name' => $name, <and so on> );
 sub new {
@@ -3901,46 +3264,40 @@
 	bless $self, $type;
 }
 
-
 # Use to bind a new options ref to the class global $optref var
 sub add_opt_object {
 	my $self = shift;
 	$Programme::optref = shift;
 }
 
-
 # $opt->{<option>} access method
 sub opt {
 	my $self = shift;
 	my $optname = shift;
 	return $opt->{$optname};
 
-	#return $Programme::optref->{$optname};	
+	#return $Programme::optref->{$optname};
 	#my $opt = $self->{optref};
 	#return $self->{optref}->{$optname};
 }
 
-
-# Cleans up a pid and removes url parts that might be specified
-sub clean_pid {
-}
-
-
 # This gets run before the download retry loop if this class type is selected
 sub init {
 }
 
-
 # Create dir if it does not exist
 sub create_dir {
 	my $prog = shift;
 	if ( (! -d "$prog->{dir}") && (! $opt->{test}) ) {
 		main::logger "INFO: Creating dir '$prog->{dir}'\n" if $opt->{verbose};
-		mkpath("$prog->{dir}");
+		eval { mkpath("$prog->{dir}") };
+		if ( $@ ) {
+			main::logger "ERROR: Could not create dir '$prog->{dir}': $@";
+			exit 1;
+		}
 	}
 }
 
-
 # Return metadata of the prog
 sub get_metadata {
 	my $prog = shift;
@@ -3948,7 +3305,7 @@
 	$prog->{modes}->{default} = $prog->modelist();
 	if ( keys %{ $prog->{verpids} } == 0 ) {
 		if ( $prog->get_verpids( $ua ) ) {
-			main::logger "ERROR: Could not get version pid metadata\n" if $opt->{verbose};
+			main::logger "ERROR: Could not get version PID metadata\n" if $opt->{verbose};
 			return 1;
 		}
 	}
@@ -3956,7 +3313,6 @@
 	return 0;
 }
 
-
 # Return metadata which is generic such as time and date
 sub get_metadata_general {
 	my $prog = shift;
@@ -3978,7 +3334,6 @@
 	return 0;
 }
 
-
 # Displays specified metadata from supplied object
 # Usage: $prog->display_metadata( <array of elements to display> )
 sub display_metadata {
@@ -3986,13 +3341,22 @@
 	shift;
 	my @keys = @_;
 	@keys = keys %data if $#_ < 0;
+	my $now = time();
 	main::logger "\n";
 	for (@keys) {
 		# Format timeadded field nicely
 		if ( /^timeadded$/ ) {
 			if ( $data{$_} ) {
-				my @t = gmtime( time() - $data{$_} );
-				main::logger sprintf "%-15s %s\n", $_.':', "$t[7] days $t[2] hours ago ($data{$_})";
+				my @t = gmtime( $now - $data{$_} );
+				my $ts = strftime('%Y-%m-%dT%H:%M:%S+00:00', gmtime($data{$_}));
+				main::logger sprintf "%-16s %s\n", $_.':', "$t[7] days $t[2] hours ago ($ts)";
+			}
+		} elsif ( /^expires$/ ) {
+			if ( $data{$_} && $data{$_} > $now ) {
+				my @t = gmtime( $data{$_} - $now );
+				my $years = ($t[5]-70)."y " if ($t[5]-70) > 0;
+				my $ts = strftime('%Y-%m-%dT%H:%M:%S+00:00', gmtime($data{$_}));
+				main::logger sprintf "%-16s %s\n", $_.':', "in ${years}$t[7] days $t[2] hours ($ts)";
 			}
 		# Streams data
 		} elsif ( /^streams$/ ) {
@@ -4000,34 +3364,37 @@
 		# If hash then list keys
 		} elsif ( ref$data{$_} eq 'HASH' ) {
 			for my $key ( sort keys %{$data{$_}} ) {
-				main::logger sprintf "%-15s ", $_.':';
+				main::logger sprintf "%-16s ", $_.':';
 				if ( ref$data{$_}->{$key} ne 'HASH' ) {
 					main::logger "$key: $data{$_}->{$key}";
+					main::logger " [estimated sizes only]" if $_ eq "modesizes";
 				# This is the same as 'modes' list
 				#} else {
 				#	main::logger "$key: ".(join ',', sort keys %{ $data{$_}->{$key} } );
 				}
 				main::logger "\n";
 			}
+		} elsif ( /^desclong$/ ) {
+			# strip line breaks
+			if ( $data{$_} ) {
+				(my $data_out = $data{$_}) =~ s|[\n\r]| |g;
+				main::logger sprintf "%-16s %s\n", $_.':', $data_out;
+			}
 		# else just print out key value pair
 		} else {
-			main::logger sprintf "%-15s %s\n", $_.':', $data{$_} if $data{$_};		
+			main::logger sprintf "%-16s %s\n", $_.':', $data{$_} if $data{$_};
 		}
 	}
 	main::logger "\n";
 	return 0;
 }
 
-
-
 # Return a list of episode pids from the given contents page/pid
 sub get_pids_recursive {
 	my $prog = shift;
 	return '';
 }
 
-
-
 # Return hash of version => verpid given a pid
 # Also put verpids in $prog->{verpids}->{<version>} = <verpid>
 sub get_verpids {
@@ -4036,25 +3403,38 @@
 	return 0;
 }
 
-
-
 # Download Subtitles, convert to srt(SubRip) format and apply time offset
 sub download_subtitles {
 	# return failed...
 	return 1;
 }
 
-
-
 # Usage: generate_version_list ($prog)
 # Returns sorted array of versions
 sub generate_version_list {
 	my $prog = shift;
-	
 	# Default Order with which to search for programme versions (can be overridden by --versionlist option)
-	my @version_search_order = qw/ default original signed audiodescribed opensubtitled shortened lengthened other /;
-	@version_search_order = split /,/, $opt->{versionlist} if $opt->{versionlist};
-
+	my @default_version_list = qw/original iplayer technical editorial lengthened shortened opensubtitles/;
+	# append any unknown versions found with programme
+	for my $key ( keys %{$prog->{verpids}} ) {
+		next if $key =~ /(audiodescribed|signed|podcast)/;
+		$key =~ s/\s+.*$//;
+		if ( ! grep /^${key}$/i, @default_version_list ) {
+			push @default_version_list, lc($key);
+		}
+	}
+	# podcast version has lowest priority
+	push @default_version_list, "podcast";
+	my @version_search_order = @default_version_list;
+	# override with --versionlist
+	if ( $opt->{versionlist} ) {
+		@version_search_order = map { /^default$/i ? @default_version_list : $_ } split /,/, $opt->{versionlist};
+		# ignore audiodescribed/signed for radio programmes
+		if ( $prog->{type} eq "radio" ) {
+			@version_search_order = grep !/(audiodescribed|signed)/, @version_search_order;
+			@version_search_order = @default_version_list unless @version_search_order;
+		}
+	}
 	# check here for no matching verpids for specified version search list???
 	my $got = 0;
 	my @version_list;
@@ -4064,16 +3444,62 @@
 			push @version_list, $version;
 		}
 	}
+	# prioritise versions with subtitles if --subtitles specified
+	my @subs_versions;
+	my @nosubs_versions;
+	if ( $opt->{subtitles} && $prog->{type} eq 'tv' ) {
+		for my $version ( @version_list ) {
+			if ( $prog->subtitles_available( [ $version ] ) ) {
+				push @subs_versions, $version;
+			} else {
+				push @nosubs_versions, $version;
+			}
+		}
+		@version_list = ( @subs_versions, @nosubs_versions );
+	}
 
 	if ( $got == 0 ) {
-		main::logger "INFO: No versions of this programme were selected (".(join ',', sort keys %{ $prog->{verpids} })." are available)\n";
+		main::logger "INFO: No versions of this programme were selected (available versions: ".(keys %{ $prog->{verpids} } == 0 ? "none" : join ',', sort keys %{ $prog->{verpids} } ).")\n";
 	} else {
-		main::logger "INFO: Will search for versions: ".(join ',', @version_list)."\n" if $opt->{verbose};
+		main::logger "INFO: Searching for versions: ".(join ',', @version_list)."\n" if $opt->{verbose};
 	}
 	return @version_list;
 }
 
-
+sub cmp_modes($$) {
+	my ($x, $y) = @_;
+	my %ranks = (
+		'hd(\d+)?' => 1000,
+		'[^x]sd(\d+)?' => 2000,
+		'xsd(\d+)?' => 3000,
+		'[^vx]high(\d+)?' => 4000,
+		'xhigh(\d+)?' => 5000,
+		'[^x]std(\d+)?' => 6000,
+		'xstd(\d+)?' => 7000,
+		'med(\d+)?' => 8000,
+		'low(\d+)?' => 9000,
+		'subtitles(\d+)?' => 10000,
+	);
+	my %ranks2 = (
+		'^haf' => 10,
+		'^hla' => 20,
+		'^hvf' => 30,
+		'^hls' => 40,
+		'^daf' => 50,
+		'^dvf' => 60,
+		'^subtitle' => 70,
+	);
+	my ($rank_x, $rank_y);
+	for my $k ( keys %ranks ) {
+		$rank_x = $ranks{$k} + $1 if $x =~ /$k/;
+		$rank_y = $ranks{$k} + $1 if $y =~ /$k/;
+	}
+	for my $k ( keys %ranks2 ) {
+		$rank_x += $ranks2{$k} if $x =~ /$k/;
+		$rank_y += $ranks2{$k} if $y =~ /$k/;
+	}
+	$rank_x <=> $rank_y;
+}
 
 # Retry the recording of a programme
 # Usage: download_retry_loop ( $prog )
@@ -4084,8 +3510,8 @@
 	# Run the type init
 	$prog->init();
 
-	# If already downloaded then return (unless its for multimode)
-	return 0 if ( ! $opt->{multimode} ) && $hist->check( $prog->{pid} );
+	# If already downloaded then return
+	return 0 if $hist->check( $prog->{pid} );
 
 	# Skip and warn if there is no pid
 	if ( ! $prog->{pid} ) {
@@ -4096,26 +3522,23 @@
 	# Setup user-agent
 	my $ua = main::create_ua( 'desktop' );
 
-	# This pre-gets all the metadata - not entirely necessary but it does help - maybe only have when --metadata or --command is used
-	# Also need full metadata for AtomicParsley or if --fileprefix is used
+	# This pre-gets all the metadata - necessary to avoid get_verpids() below if possible
 	$prog->get_metadata_general();
-	if ( $opt->{fileprefix} || $opt->{metadata} || $opt->{command} || main::exists_in_path( 'atomicparsley' ) ) {
-		if ( $prog->get_metadata( $ua ) ) {
-			main::logger "ERROR: Could not get programme metadata\n" if $opt->{verbose};
-			return 1;
-		}
+	if ( $prog->get_metadata( $ua ) ) {
+		main::logger "ERROR: Could not get programme metadata\n" if $opt->{verbose};
+		return 1;
 	}
 
 	# Look up version pids for this prog - this does nothing if above get_metadata has alredy completed
 	if ( keys %{ $prog->{verpids} } == 0 ) {
 		if ( $prog->get_verpids( $ua ) ) {
-			main::logger "ERROR: Could not get version pid metadata\n" if $opt->{verbose};
+			main::logger "ERROR: Could not get version PID metadata\n" if $opt->{verbose};
 			return 1;
 		}
 	}
 
 	# Re-check history because get_verpids() can update the pid (e.g. BBC /programmes/ URLs)
-	return 0 if ( ! $opt->{multimode} ) && $hist->check( $prog->{pid} );
+	return 0 if ( $hist->check( $prog->{pid} ) );
 
 	# if %{ $prog->{verpids} } is empty then skip this programme recording attempt
 	if ( (keys %{ $prog->{verpids} }) == 0 ) {
@@ -4123,27 +3546,34 @@
 		return 1;
 	}
 
-
 	my @version_search_list = $prog->generate_version_list;
 	return 1 if $#version_search_list < 0;
 
+	if ( $prog->{type} eq "tv" && ! $opt->{nowarntvlicence} ) {
+		$opt->{nowarntvlicence} = 1;
+		main::logger "WARNING: A UK TV licence is required to access BBC iPlayer TV content legally\n";
+	}
+
 	# Get all possible (or user overridden) modes for this prog recording
-	my $modelist = $prog->modelist;
+	my $modelist = $prog->modelist();
 	main::logger "INFO: Mode list: $modelist\n" if $opt->{verbose};
 
 	######## version loop #######
 	# Do this for each version tried in this order (if they appeared in the content)
 	for my $version ( @version_search_list ) {
 		my $retcode = 1;
-		main::logger "DEBUG: Trying version '$version'\n" if $opt->{debug};
+		main::logger "INFO: Searching for version: '$version'\n" if $opt->{verbose};
 		if ( $prog->{verpids}->{$version} ) {
-			main::logger "INFO: Checking existence of $version version\n";
+			if ( $prog->{version} ne $version ) {
+				undef $prog->{filename};
+				main::logger "INFO: Regenerate filename for version change: $prog->{version} -> $version\n" if ( $prog->{version} && $opt->{verbose} );
+			}
 			$prog->{version} = $version;
-			main::logger "INFO: Version = $prog->{version}\n" if $opt->{verbose};
+			main::logger "INFO: Found version: '$prog->{version}'\n" if $opt->{verbose};
 
 			# Try to get stream data for this version if not already populated
 			if ( not defined $prog->{streams}->{$version} ) {
-				$prog->{streams}->{$version} = $prog->get_stream_data( $prog->{verpids}->{$version} );
+				$prog->{streams}->{$version} = $prog->get_stream_data( $prog->{verpids}->{$version}, undef, $version );
 			}
 
 			########## mode loop ########
@@ -4153,57 +3583,77 @@
 			my @modes;
 			my @available_modes = sort keys %{ $prog->{streams}->{$version} };
 			for my $modename ( split /,/, $modelist ) {
+				next if $opt->{audioonly} && $prog->{type} eq "tv" && $modename =~ /^hls/;
 				# find all numbered modes starting with this modename
 				push @modes, sort { $a cmp $b } grep /^$modename(\d+)?$/, @available_modes;
 			}
+			main::logger "INFO: Modes to try for '$version' version: ".join(',', @modes)."\n" if $opt->{verbose};
 
+			main::logger "INFO: Downloading $prog->{type}: '$prog->{name} - $prog->{episode} ($prog->{pid}) [$version]'\n";
 			# Check for no applicable modes - report which ones are available if none are specified
 			if ($#modes < 0) {
 				my %available_modes_short;
 				# Strip the number from the end of the mode name and make a unique array
-				for ( @available_modes ) {
-					my $modename = $_;
+				for my $modename ( @available_modes ) {
+					next if $opt->{audioonly} && $prog->{type} eq "tv" && $modename =~ /^hls/;
+					next if $modename =~ /subtitle/;
 					$modename =~ s/\d+$//g;
 					$available_modes_short{$modename}++;
 				}
-				main::logger "INFO: No specified modes ($modelist) available for this programme with version '$version' (try using --modes=".(join ',', sort keys %available_modes_short).")\n";
+				my $msg = "No supported modes";
+				if ( $opt->{$prog->{type}."mode"} || $opt->{modes} ) {
+					$msg = "No specified modes";
+				}
+				main::logger "INFO: $msg ".($modelist ? "($modelist) " : "")."available for this programme with version '$version'\n";
+				if ( keys %available_modes_short ) {
+					main::logger "INFO: Available modes: ".(join ',', sort Programme::cmp_modes keys %available_modes_short)."\n";
+				} else {
+					main::logger "INFO: No other modes are available\n";
+					main::logger "INFO: The programme may no longer be available - check the iPlayer site\n";
+					main::logger "INFO: The programme may only be available in an unsupported format (e.g., Flash) - check the iPlayer site\n";
+					main::logger "INFO: If you use a VPN/VPS/Smart DNS/web proxy, check with the provider to find out if it has been blocked\n";
+				}
 				next;
 			}
-			main::logger "INFO: ".join(',', @modes)." modes will be tried for version $version\n";
 
 			# Expand the modes into a loop
 			for my $mode ( @modes ) {
 				chomp( $mode );
+				(my $modeshort = $mode) =~ s/\d+$//g;
+				# force regeneration of file name if mode changed
+				if ( $prog->{modeshort} ne $modeshort ) {
+					undef $prog->{filename};
+					main::logger "INFO: Regenerate filename for mode change: $prog->{modeshort} -> $modeshort\n" if ( $prog->{modeshort} && $opt->{verbose} );
+				}
 				$prog->{mode} = $mode;
 				# Keep short mode name for substitutions
-				$prog->{modeshort} = $mode;
-				$prog->{modeshort} =~ s/\d+$//g;
-
-				# If multimode is used, skip only modes which are in the history
-				next if $opt->{multimode} && $hist->check( $prog->{pid}, $mode );
-
-				main::logger "INFO: Trying $mode mode to record $prog->{type}: $prog->{name} - $prog->{episode}\n";
+				$prog->{modeshort} = $modeshort;
 
 				# try the recording for this mode (rtn==0 -> success, rtn==1 -> next mode, rtn==2 -> next prog)
 				$retcode = mode_ver_download_retry_loop( $prog, $hist, $ua, $mode, $version, $prog->{verpids}->{$version} );
 				main::logger "DEBUG: mode_ver_download_retry_loop retcode = $retcode\n" if $opt->{debug};
 
-				# quit if successful or skip (unless --multimode selected)
-				last if ( $retcode == 0 || $retcode == 2 ) && ! $opt->{multimode};
+				if ( $opt->{downloadabortonfail} && $retcode == 1 ) {
+					main::logger "ERROR: Failed to download '$prog->{mode}' stream and --download-abortonfail specified - exiting\n";
+					unlink $lockfile;
+					exit 7;
+				}
+				# quit if successful or skip or stop
+				last if ( $retcode == 0 || $retcode == 2 || $retcode == 3 );
 			}
 		}
+		# stop condition
+		last if $retcode == 3;
 		# Break out of loop if we have a successful recording for this version and mode
 		return 0 if not $retcode;
 	}
 
 	if (! $opt->{test}) {
-		main::logger "ERROR: Failed to record '$prog->{name} - $prog->{episode} ($prog->{pid})'\n";
+		main::logger "ERROR: Failed $prog->{type}: '$prog->{name} - $prog->{episode} ($prog->{pid})'\n" if $opt->{verbose};
 	}
 	return 1;
 }
 
-
-
 # returns 1 on fail, 0 on success
 sub mode_ver_download_retry_loop {
 	my ( $prog, $hist, $ua, $mode, $version, $version_pid ) = ( @_ );
@@ -4211,179 +3661,133 @@
 	my $count = 0;
 	my $retcode;
 
-	# Use different number of retries for flash modes
-	$retries = $opt->{attempts} || 50 if $mode =~ /^flash/;
-
 	# Retry loop
 	for ($count = 1; $count <= $retries; $count++) {
-		main::logger "INFO: Attempt number: $count / $retries\n" if $opt->{verbose};
+		main::logger "INFO: Trying '$mode' mode: attempt $count / $retries\n" if $opt->{verbose};
 
 		$retcode = $prog->download( $ua, $mode, $version, $version_pid );
-		main::logger "DEBUG: Record using $mode mode return code: '$retcode'\n" if $opt->{verbose};
 
 		# Exit
 		if ( $retcode eq 'abort' ) {
-			main::logger "ERROR: aborting get_iplayer\n";
+			main::logger "ERROR: Aborting get_iplayer\n";
 			exit 1;
 
-		# Try Next prog
+		# don't try any more prog versions
+		} elsif ( $retcode eq 'stop' ) {
+			main::logger "INFO: Skipping all versions of this programme\n";
+			return 3;
+
+		# Try Next version
 		} elsif ( $retcode eq 'skip' ) {
-			main::logger "INFO: skipping this programme\n";
+			main::logger "INFO: Skipping '$version' version\n";
 			return 2;
 
 		# Try Next mode
 		} elsif ( $retcode eq 'next' ) {
 			# break out of this retry loop
-			main::logger "INFO: skipping $mode mode\n";
+			main::logger "INFO: Skipping '$mode' mode\n";
 			last;
 
 		# Success
 		} elsif ( $retcode eq '0' ) {
-			# No need to do all these post-tasks if its streaming-only
-			if ( $opt->{stdout} ) {
-				# Run user command if streaming-only or a stream was writtem
-				$prog->run_user_command( $opt->{command} ) if $opt->{command};
-				# Skip
-			} else {
-				# Add to history, tag file, and run post-record command if a stream was written
-				main::logger "\n";
-				if ( $opt->{thumb} ) {
-					$prog->create_dir();
-					$prog->download_thumbnail();
-				}
-				if ( $opt->{metadata} ) {
-					$prog->create_dir();
-					$prog->create_metadata_file();
-				}
-				if ( ! $opt->{nowrite} ) {
-					$hist->add( $prog );
-					$prog->tag_file if ! $opt->{notag};
-				} elsif ( $opt->{tagonly} ) {
-					$prog->tag_file;
-				}
-				if ( $opt->{command} && ! $opt->{nowrite} ) {
-					$prog->run_user_command( $opt->{command} );
+			if ( $opt->{metadata} ) {
+				$prog->create_dir();
+				$prog->create_metadata_file();
+			}
+			if ( $opt->{thumb} ) {
+				$prog->create_dir();
+				$prog->download_thumbnail();
+			}
+			if ( $opt->{tracklist} ) {
+				$prog->create_dir();
+				$prog->download_tracklist();
+			}
+			if ( $opt->{credits} ) {
+				$prog->create_dir();
+				$prog->download_credits();
+			}
+			# Add to history and tag file
+			if ( ! $opt->{nowrite} ) {
+				$hist->add( $prog );
+				$prog->tag_file if ! $opt->{notag} && ! $opt->{raw};
+			}
+			# Get subtitles if they exist and are required and media download succeeded
+			if ( $opt->{subtitles} && $prog->{type} eq 'tv' && ( ! $opt->{subsembed} || $opt->{raw} ) ) {
+				unless ( $prog->download_subtitles( $ua, $prog->{subspart}, [ $version ] ) ) {
+					# Rename the subtitle file accordingly if the stream get was successful
+					move($prog->{subspart}, $prog->{subsfile}) if -f $prog->{subspart};
 				}
 			}
+			# Run post-record command if a stream was written
+			my $command = $opt->{"command".$prog->{type}} || $opt->{command};
+			if ( $command && ! $opt->{nowrite} ) {
+				$prog->run_user_command( $command );
+			}
 			$prog->report() if $opt->{pvr};
 			return 0;
 
 		# Retry this mode
 		} elsif ( $retcode eq 'retry' && $count < $retries ) {
-			main::logger "WARNING: Retry recording for '$prog->{name} - $prog->{episode} ($prog->{pid})'\n";
 			# Try to get stream data for this version/mode - retries require new auth data
-			$prog->{streams}->{$version} = $prog->get_stream_data( $version_pid );
+			$prog->{streams}->{$version} = $prog->get_stream_data( $version_pid, undef, $version );
+			if ( keys %{ $prog->{streams}->{$version} } == 0 ) {
+				main::logger "WARNING: No streams available for '$version' version ($prog->{verpids}->{$version}) - skipping (retry)\n";
+				if ( $prog->{geoblocked} ) {
+					main::logger "WARNING: The BBC has blocked access to this programme because it has determined that you are using get_iplayer outside the UK. (retry)\n";
+				}
+				return 2;
+			}
+			main::logger "WARNING: Retrying $prog->{type}: '$prog->{name} - $prog->{episode} ($prog->{pid}) [$version]'\n";
 		}
 	}
 	return 1;
 }
 
-
-
-# Send a message to STDOUT so that cron can use this to email 
+# Send a message to STDOUT so that cron can use this to email
 sub report {
 	my $prog = shift;
 	print STDOUT "New $prog->{type} programme: '$prog->{name} - $prog->{episode}', '$prog->{desc}'\n";
 	return 0;
 }
 
-
-
-# create metadata for tagging
-sub tag_metadata {
-	my $prog = shift;
-	my $meta;
-	while ( my ($key, $val) = each %{$prog} ) {
-		if ( ref($val) eq 'HASH' ) {
-			$meta->{$key} = $prog->{$key}->{$prog->{version}};
-		} else {
-			$meta->{$key} = $val;
-		}
-	}
-	return $meta;
-}
-
 # add metadata tags to file
 sub tag_file {
 	my $prog = shift;
+	if ( $opt->{tagonly} ) {
+		if ( $opt->{tagonlyfilename} ) {
+			$prog->{filename} = $opt->{tagonlyfilename};
+			(undef, undef, $prog->{ext}) = fileparse($prog->{filename}, qr/\.[^.]*/);
+			$prog->{ext} =~ s/^\.//;
+		}
+		elsif ( $prog->{filename} =~ /\.EXT$/ ) {
+			for my $ext ( 'mp4', 'm4a' ) {
+				(my $filename = $prog->{filename}) =~ s/\.EXT$/\.$ext/;
+				if ( -f $filename ) {
+					$prog->{filename} = $filename;
+					$prog->{ext} = $ext;
+					last;
+				}
+			}
+		}
+		if ( ! -f $prog->{filename} ) {
+			main::logger "WARNING: Cannot tag missing file: $prog->{filename}\n";
+			return;
+		}
+	}
 	# return if file does not exist
 	return if ! -f $prog->{filename};
-	# download thumbnail if necessary
-	$prog->download_thumbnail if ( ! -f $prog->{thumbfile} );
-	# create metadata
-	my $meta = $prog->tag_metadata;
-	# tag file
-	my $tagger = Tagger->new();
-	$tagger->tag_file($meta);
-	# clean up thumbnail if necessary
-	unlink $prog->{thumbfile} if ! $opt->{thumb};
+	# tag programme
+	Tagger->tag_prog($prog);
 }
 
-
-
 # Create a metadata file if required
 sub create_metadata_file {
 	my $prog = shift;
 	my $template;
 	my $filename;
 
-	# XML templaye for XBMC movies - Ref: http://xbmc.org/wiki/?title=Import_-_Export_Library#Movies
-	$filename->{xbmc_movie} = "$prog->{dir}/$prog->{fileprefix}.nfo";
-	$template->{xbmc_movie} = '
-	<movie>
-		<title>[name] - [episode]</title>
-		<outline>[desc]</outline>
-		<plot>[desc]</plot>
-		<tagline>[descshort]</tagline>
-		<runtime>[duration]</runtime>
-		<thumb>[thumbnail]</thumb>
-		<id>[pid]</id>
-		<filenameandpath>[dir]/[fileprefix].[ext]</filenameandpath>
-		<trailer></trailer>
-		<genre>[categories]</genre>
-		<year>[firstbcast]</year>
-		<credits>[channel]</credits>
-        </movie>
-	';
-
-	# XML template for XBMC - Ref: http://xbmc.org/wiki/?title=Import_-_Export_Library#TV_Episodes
-	$filename->{xbmc} = "$prog->{dir}/$prog->{fileprefix}.nfo";
-	$template->{xbmc} = '
-	<episodedetails>
-		<title>[name] - [episode]</title>
-		<rating>10.00</rating>
-		<season>[seriesnum]</season>
-		<episode>[episodenum]</episode>
-		<plot>[desc]</plot>
-		<credits>[channel]</credits>
-		<aired>[firstbcast]</aired>
-	</episodedetails>
-	';
-
-	# XML template for Freevo - Ref: http://doc.freevo.org/MovieFxd
-	$filename->{freevo} = "$prog->{dir}/$prog->{fileprefix}.fxd";
-	$template->{freevo} = '<?xml version="1.0" ?>
-	<freevo>
-		<FREEVOTYPE title="[longname]">
-			<video>
-				<file id="f1">[fileprefix].[ext]</file>
-			</video>
-			<info>
-				<rating></rating>
-				<userdate>[dldate] [dltime]</userdate>
-				<plot>[desc]</plot>
-				<tagline>[episode]</tagline>
-				<year>[firstbcast]</year>
-				<genre>[categories]</genre>
-				<runtime>[duration]</runtime>
-				<channel>[channel]</channel>
-			</info>
-		</FREEVOTYPE>
-	</freevo>
-	';
-
 	# Generic XML template for all info
-	$filename->{generic} = "$prog->{dir}/$prog->{fileprefix}.xml";
+	$filename->{generic} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.xml"));
 	$template->{generic}  = '<?xml version="1.0" encoding="UTF-8" ?>'."\n";
 	$template->{generic} .= '<program_meta_data xmlns="http://linuxcentre.net/xmlstuff/get_iplayer" revision="1">'."\n";
 	$template->{generic} .= "\t<$_>[$_]</$_>\n" for ( sort keys %{$prog} );
@@ -4391,37 +3795,28 @@
 
 	return if ! -d $prog->{dir};
 	if ( not defined $template->{ $opt->{metadata} } ) {
-		main::logger "WARNING: metadata type '$opt->{metadata}' is not valid - must be one of ".(join ',', keys %{$template} )."\n";
+		main::logger "WARNING: metadata type '$opt->{metadata}' is not valid - must be one of: ".(join ',', keys %{$template} )."\n";
 		return;
 	}
 
-	main::logger "INFO: Writing $opt->{metadata} metadata to file '$filename->{ $opt->{metadata} }'\n";
+	main::logger "INFO: Writing metadata\n";
 
 	if ( open(XML, "> $filename->{ $opt->{metadata} }") ) {
 		my $text = $prog->substitute( $template->{ $opt->{metadata} }, 3, '\[', '\]' );
 		# Strip out unsubstituted tags
 		$text =~ s/<.+?>\[.+?\]<.+?>[\s\n\r]*//g;
-		# Hack: substitute here because freevo needs either <audio> or <movie> depending on filetype
-		if ( $opt->{metadata} eq 'freevo' ) {
-			if ( $prog->{type} =~ /radio/i ) {
-				$text =~ s/FREEVOTYPE/audio/g;
-			} else {
-				$text =~ s/FREEVOTYPE/movie/g;
-			}
-		}
 		print XML $text;
 		close XML;
 	} else {
-		main::logger "WARNING: Couldn't write to metadata file '$filename->{ $opt->{metadata} }'\n";
+		main::logger "ERROR: Couldn't write to metadata file: $filename->{ $opt->{metadata} }\n";
+		main::logger "ERROR: Use --metadata-only to retry\n";
 	}
 }
 
-
-
 # Usage: print $prog{$pid}->substitute('<name>-<pid>-<episode>', [mode], [begin regex tag], [end regex tag]);
 # Return a string with formatting fields substituted for a given pid
-# sanitize_mode == 0 then sanitize final string but dont sanitize '/' in field values
-# sanitize_mode == 1 then sanitize final string and also sanitize '/' in field values
+# sanitize_mode == 0 then sanitize final string and also sanitize '/' in field values
+# sanitize_mode == 1 then sanitize final string but don't sanitize '/' (and '\' on Windows) in field values
 # sanitize_mode == 2 then just substitute only
 # sanitize_mode == 3 then substitute then use encode entities for fields only
 # sanitize_mode == 4 then substitute then escape characters in fields only for use in double-quoted shell text.
@@ -4438,6 +3833,7 @@
 
 	# Make 'duration' == 'length' for the selected version
 	$self->{duration} = $self->{durations}->{$version} if $self->{durations}->{$version};
+	$self->{runtime} = int($self->{duration} / 60);
 
 	# Tokenize and substitute $format
 	for my $key ( keys %{$self} ) {
@@ -4461,40 +3857,49 @@
 		$value = '' if not defined $value;
 		main::logger "DEBUG: Substitute ($version): '$key' => '$value'\n" if $opt->{debug};
 		# Remove/replace all non-nice-filename chars if required
-		if ($sanitize_mode == 0) {
-			$replace = StringUtils::sanitize_path( $value );
+		# Keep '/' (and '\' on Windows) if $sanitize_mode == 1
+		if ($sanitize_mode == 0 || $sanitize_mode == 1) {
+			$replace = StringUtils::sanitize_path( $value, $sanitize_mode );
 		# html entity encode
 		} elsif ($sanitize_mode == 3) {
-			$replace = encode_entities( $value );
+			$replace = encode_entities( $value, '&<>"\'' );
+			if ( $key =~ /^(expires|timeadded)$/ ) {
+				$replace = strftime('%Y-%m-%dT%H:%M:%S+00:00', gmtime($replace));
+			}
 		# escape these chars: ! ` \ "
 		} elsif ($sanitize_mode == 4) {
 			$replace = $value;
 			# Don't escape file paths
-			if ( $key !~ /(filename|filepart|thumbfile)/ ) {
+			if ( $key !~ /(filename|filepart|thumbfile|tracklist|credits|^dir)/ ) {
 				$replace =~ s/([\!"\\`])/\\$1/g;
 			}
 		} else {
 			$replace = $value;
 		}
-		$key = $tag_begin.$key.$tag_end;
-		$string =~ s|$key|$replace|gi;
+		# special handling for <episode*>
+		$replace = '' if $replace eq '-' && $key =~ /episode/i;
+		# look for prefix in tag
+		my $pfx_key = $tag_begin.'([^A-Za-z0-9]*?)(0*?)'.$key.'([^A-Za-z0-9'.$tag_end.']*?)'.$tag_end;
+		my ($prefix, $pad, $suffix) = $string =~ m/$pfx_key/;
+		if ( $replace =~ m/^\d+$/ && length($pad) > length($replace) ) {
+			$replace = substr($pad.$replace, -length($pad))
+		}
+		$pfx_key = $tag_begin."\Q$prefix$pad\E".$key."\Q$suffix\E".$tag_end;
+		$prefix = '' if ! $replace;
+		$suffix = '' if ! $replace;
+		$string =~ s|$pfx_key|$prefix$replace$suffix|gi;
 	}
 
 	if ( $sanitize_mode == 0 || $sanitize_mode == 1 ) {
-		# Remove empty tags
+		# Remove unused tags
 		my $key = $tag_begin.'.*?'.$tag_end;
-		$string =~ s|$key||m;
-		# Strip whitespace if required
-		$string =~ s/[\s_]+/_/g if ! $opt->{whitespace};
-		# Remove/replace all non-nice-filename chars if required except for fwd slashes
-		return StringUtils::sanitize_path( $string, 1 );
-	} else {
-		return $string;
+		$string =~ s|$key||mg;
+		# Replace whitespace with _ unless --whitespace
+		$string =~ s/\s/_/g unless $opt->{whitespace};
 	}
+	return $string;
 }
 
-	
-
 # Determine the correct filenames for a recording
 # Sets the various filenames and creates appropriate directories
 # Gets more programme metadata if the prog name does not exist
@@ -4504,17 +3909,16 @@
 #	$opt->{subdir}
 #	$opt->{whitespace}
 #	$opt->{test}
-# Requires: 
+# Requires:
 #	$prog->{dir}
-# Sets: 
+# Sets:
 #	$prog->{fileprefix}
 #	$prog->{filename}
 #	$prog->{filepart}
-#	$prog->{symlink}
 # Returns 0 on success, 1 on failure (i.e. if the <filename> already exists)
 #
 sub generate_filenames {
-	my ($prog, $ua, $format, $multipart) = (@_);
+	my ($prog, $ua, $format, $mode, $version) = (@_);
 
 	# Get and set more meta data - Set the %prog values from metadata if they aren't already set (i.e. with --pid option)
 	if ( ! $prog->{name} ) {
@@ -4525,118 +3929,172 @@
 		$prog->get_metadata_general();
 	}
 
-	# Determine directory and find its absolute path
-	$prog->{dir} = File::Spec->rel2abs( $opt->{ 'output'.$prog->{type} } || $opt->{output} || $ENV{IPLAYER_OUTDIR} || '.' );
-	
-	# Add modename to default format string if multimode option is used
-	$format .= ' <mode>' if $opt->{multimode};
-
-	$prog->{fileprefix} = $opt->{fileprefix} || $format;
-
 	# get $name, $episode from title
 	my ( $name, $episode ) = Programme::bbciplayer::split_title( $prog->{title} ) if $prog->{title};
 	$prog->{name} = $name if $name && ! $prog->{name};
 	$prog->{episode} = $episode if $episode && ! $prog->{episode};
 
 	# store the name extracted from the title metadata in <longname> else just use the <name> field
-	$prog->{longname} = $name || $prog->{name};
+	$prog->{longname} = $prog->{name} || $name;
 
 	# Set some common metadata fallbacks
-	$prog->{nameshort} = $prog->{name} if ! defined $prog->{nameshort};
-	$prog->{episodeshort} = $prog->{episode} if ! defined $prog->{episodeshort};
+	$prog->{nameshort} = $prog->{name} if ! $prog->{nameshort};
+	$prog->{episodeshort} = $prog->{episode} if ! $prog->{episodeshort};
 
 	# Create descmedium, descshort by truncation of desc if they don't already exist
-	$prog->{descmedium} = substr( $prog->{desc}, 0, 1024 ) if ! defined $prog->{descmedium};
-	$prog->{descshort} = substr( $prog->{desc}, 0, 255 ) if ! defined $prog->{descshort};
+	$prog->{desclong} = $prog->{desc} if ! $prog->{desclong};
+	$prog->{descmedium} = substr( $prog->{desc}, 0, 1024 ) if ! $prog->{descmedium};
+	$prog->{descshort} = substr( $prog->{desc}, 0, 255 ) if ! $prog->{descshort};
 
+	# Determine directory and find its absolute path
+	$prog->{dir} = File::Spec->rel2abs( $opt->{ 'output'.$prog->{type} } || $opt->{output} || $ENV{GETIPLAYER_OUTPUT} || '.' );
+	$prog->{dir} = main::encode_fs($prog->{dir});
+	# Create a subdir for programme
+	if ( $opt->{subdir} ) {
+		my $subdir = $prog->substitute( $opt->{subdirformat} || '<longname>' );
+		$prog->{dir} = main::encode_fs(File::Spec->catdir($prog->{dir}, $subdir));
+		main::logger("INFO: Creating subdirectory $prog->{dir} for programme\n") if $opt->{verbose};
+	}
+
+	$prog->{fileprefix} = $opt->{fileprefix} || $format;
 	# substitute fields and sanitize $prog->{fileprefix}
 	main::logger "DEBUG: Substituted '$prog->{fileprefix}' as " if $opt->{debug};
 	# Don't allow <mode> in fileprefix as it can break when resumes fallback on differently numbered modes of the same type change for <modeshort>
 	$prog->{fileprefix} =~ s/<mode>/<modeshort>/g;
 	$prog->{fileprefix} = $prog->substitute( $prog->{fileprefix} );
-
+	$prog->{fileprefix} = main::encode_fs($prog->{fileprefix});
 	# Truncate filename to 240 chars (allows for extra stuff to keep it under system 256 limit)
-	$prog->{fileprefix} = substr( $prog->{fileprefix}, 0, 240 );
+	# limitprefixlength allows this to be shortened
+	unless ( $opt->{limitprefixlength} ) {
+		$opt->{limitprefixlength} = 240;
+	}
+	$prog->{fileprefix} = substr( $prog->{fileprefix}, 0, $opt->{limitprefixlength} );
 	main::logger "'$prog->{fileprefix}'\n" if $opt->{debug};
 
-	# Change the date in the filename to ISO8601 format if required
-	$prog->{fileprefix} =~ s|(\d\d)[/_](\d\d)[/_](20\d\d)|$3-$2-$1|g if $opt->{isodate};
+	# Get extension from streamdata if defined and raw not specified
+	$prog->{ext} = $prog->{streams}->{$version}->{$mode}->{ext};
+	$prog->{ext} = "m4a" if $prog->{type} eq "tv" && $opt->{audioonly};
+	# Use a dummy file ext if one isn't set - helps with readability of metadata
+	$prog->{ext} = 'EXT' if ! $prog->{ext};
+	# output files with --raw
+	if ( $opt->{raw} && $mode ) {
+		if ( $mode =~ /(haf|hvf|hls)/ ) {
+			$prog->{ext} = "ts";
+		} elsif ( $mode =~ /daf/ ) {
+			$prog->{ext} = "raw.m4a";
+		} elsif ( $mode =~ /dvf/ ) {
+			$prog->{rawaudio} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.raw.m4a"));
+			$prog->{rawvideo} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.raw.m4v"));
+		}
+	}
 
-	# Special case for history mode, parse the fileprefix and dir from filename if it is already defined
-	if ( $opt->{history} && defined $prog->{filename} && $prog->{filename} ne '' ) {
+	# force filename with --tag-only-filename
+	if ( $opt->{tagonly} && $opt->{tagonlyfilename} ) {
+		$prog->{filename} = $opt->{tagonlyfilename};
+	}
+	# Special case for history/tag-only mode, parse the fileprefix and dir from filename if it is already defined
+	if ( ( $opt->{history} || $opt->{tagonly} ) && defined $prog->{filename} && $prog->{filename} ne '' ) {
 		( $prog->{fileprefix}, $prog->{dir}, $prog->{ext} ) = fileparse($prog->{filename}, qr/\.[^.]*/);
 		# Fix up file path components
+		$prog->{dir} = main::encode_fs(File::Spec->canonpath($prog->{dir}));
+		$prog->{fileprefix} = main::encode_fs($prog->{fileprefix});
 		$prog->{ext} =~ s/\.//;
-		$prog->{dir} = File::Spec->canonpath($prog->{dir});
-		$prog->{filename} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.$prog->{ext}");
 	}
 
-	# Don't create subdir if we are only testing recordings
-	# Create a subdir for programme sorting option
-	if ( $opt->{subdir} ) {
-		my $subdir = $prog->substitute( $opt->{subdirformat} || '<longname>' );
-		$prog->{dir} = File::Spec->catdir($prog->{dir}, $subdir);
-		main::logger("INFO: Creating subdirectory $prog->{dir} for programme\n") if $opt->{verbose};
+	if ( ! $opt->{nowrite} ) {
+		main::logger("INFO: File name prefix = $prog->{fileprefix}\n") if $opt->{verbose};
 	}
 
-	# Create a subdir if there are multiple parts
-	if ( $multipart ) {
-		$prog->{dir} = File::Spec->catdir($prog->{dir}, $prog->{fileprefix});
-		main::logger("INFO: Creating multi-part subdirectory $prog->{dir} for programme\n") if $opt->{verbose};
+	# set final/partial file names
+	$prog->{filename} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.$prog->{ext}")) unless $prog->{filename};
+	$prog->{filepart} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.partial.$prog->{ext}")) unless $prog->{filepart};
+	
+	# Determine thumbnail filename
+	if ( $prog->{thumbnail} =~ /^http/i ) {
+		my $ext;
+		$ext = $1 if $prog->{thumbnail} =~ m{\.(\w+)$};
+		$ext = $opt->{thumbext} || $ext;
+		$prog->{thumbfile} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.${ext}") );
 	}
 
-	main::logger("\rINFO: File name prefix = $prog->{fileprefix}                 \n");
-
-	# Use a dummy file ext if one isn't set - helps with readability of metadata
-	$prog->{ext} = 'EXT' if ! $prog->{ext};
-	
-	# check if file extension has changed as a result of failed attempt with different mode
-	my $ext_changed = 0;
-	if ( ! $opt->{history} && ! $opt->{multimode} && defined $prog->{filename} && $prog->{filename} ne '' ) {
-		( my $fileprefix, my $dir, my $ext ) = fileparse($prog->{filename}, qr/\.[^.]*/);
-		$ext =~ s/\.//;
-		$ext_changed = ( defined $ext && $ext ne '' && $ext ne $prog->{ext} );
-		main::logger "DEBUG: File ext changed:   $ext -> $prog->{ext}\n" if $ext_changed && $opt->{debug};
-	}
-
-	# Don't override the {filename} if it is already set (i.e. for history info) or unless multimode option is specified
-	$prog->{filename} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.$prog->{ext}") if ( defined $prog->{filename} && $prog->{filename} =~ /\.EXT$/ ) || $opt->{multimode} || ! $prog->{filename} || $ext_changed;
-	$prog->{filepart} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.partial.$prog->{ext}");
-
-	# Create symlink filename if required
-	if ( $opt->{symlink} ) {
-		# Substitute the fields for the pid
-		$prog->{symlink} = $prog->substitute( $opt->{symlink} );
-		main::logger("INFO: Symlink file name will be '$prog->{symlink}'\n") if $opt->{verbose};
-		# remove old symlink
-		unlink $prog->{symlink} if -l $prog->{symlink} && ! $opt->{test};
+	# Determine tracklist filename
+	$prog->{tracklist} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.tracks.txt") );
+	# Determine credits filename
+	$prog->{credits} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.credits.txt") );
+	
+	# Determine subtitle filenames
+	if ( $prog->{type} eq "tv" ) {
+		$prog->{subsraw} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.ttml"));
+		$prog->{subspart} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.partial.srt"));
+		$prog->{subsfile} = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.srt"));
 	}
 
 	# overwrite/error if the file already exists and is going to be written to
+	my $min_download_size = main::progclass($prog->{type})->min_download_size();
 	if (
 		( ! $opt->{nowrite} )
 		&& ( ! $opt->{metadataonly} )
 		&& ( ! $opt->{thumbonly} )
+		&& ( ! $opt->{tracklistonly} )
+		&& ( ! $opt->{creditsonly} )
 		&& ( ! $opt->{subsonly} )
 		&& ( ! $opt->{tagonly} )
-		&& -f $prog->{filename} 
-		&& stat($prog->{filename})->size > $prog->min_download_size()
 	) {
-		if ( $opt->{overwrite} ) {
-			main::logger("INFO: Overwriting file $prog->{filename}\n\n");
-			unlink $prog->{filename};
-		} else {
-			main::logger("WARNING: File $prog->{filename} already exists\n\n");
-			return 1;
+		my @check_olds = ( 0 );
+		my $file_prefix_format = $opt->{fileprefix} || $format;
+		if ( $file_prefix_format =~ /<episode>/ && $prog->{episode} =~ /^0\d[a-z]?\.\s/ ) {
+			push @check_olds, 1
+		}
+		my $skip;
+		for my $check_old ( @check_olds ) {
+			my $media_type = $prog->{type} eq "tv" ? "video" : "audio";
+			my $prog_file = $prog->{filename};
+			my $media_raw = $prog->{filename};
+			my $audio_raw = $prog->{rawaudio};
+			my $video_raw = $prog->{rawvideo};
+			if ( $check_old ) {
+				my $ep_new = StringUtils::sanitize_path( $prog->{episode} );
+				my $ep_old = substr($ep_new, 1);
+				$prog_file =~ s/$ep_new/$ep_old/g;
+				$media_raw =~ s/$ep_new/$ep_old/g;
+				$audio_raw =~ s/$ep_new/$ep_old/g;
+				$video_raw =~ s/$ep_new/$ep_old/g;
+			}
+			if ( $opt->{raw} && $mode ) {
+				if ( $opt->{overwrite} ) {
+					if ( $mode =~ /dvf/ ) {
+						unlink ( $audio_raw, $video_raw ) unless $opt->{test};
+					} else {
+						unlink ( $media_raw ) unless $opt->{test};
+					}
+				} else {
+					if ( $mode =~ /dvf/ ) {
+						if ( -f $audio_raw ) {
+							main::logger "WARNING: Raw audio file already exists: $audio_raw\n";
+							$skip = 1;
+						}
+						if ( -f $video_raw ) {
+							main::logger "WARNING: Raw video file already exists: $video_raw\n";
+							$skip = 1;
+						}
+					} elsif ( -f $media_raw ) {
+						main::logger "WARNING: Raw $media_type file already exists: $media_raw\n";
+						$skip = 1;
+					}
+				}
+			} elsif ( -f $prog_file && stat($prog_file)->size > $min_download_size ) {
+				if ( $opt->{overwrite} ) {
+					unlink $prog_file unless $opt->{test};
+				} else {
+					main::logger("WARNING: File already exists: $prog_file\n");
+					$skip = 1;
+				}
+			}
+		}
+		if ( $skip ) {
+			main::logger "WARNING: Use --overwrite to replace\n";
+			return 3;
 		}
-	}
-
-	# Determine thumbnail filename
-	if ( $prog->{thumbnail} =~ /^http/i ) {
-		my $ext;
-		$ext = $1 if $prog->{thumbnail} =~ m{\.(\w+)$};
-		$ext = $opt->{thumbext} || $ext;
-		$prog->{thumbfile} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.${ext}");
 	}
 
 	main::logger "DEBUG: File prefix:        $prog->{fileprefix}\n" if $opt->{debug};
@@ -4645,18 +4103,17 @@
 	main::logger "DEBUG: Partial Filename:   $prog->{filepart}\n" if $opt->{debug};
 	main::logger "DEBUG: Final Filename:     $prog->{filename}\n" if $opt->{debug};
 	main::logger "DEBUG: Thumbnail Filename: $prog->{thumbfile}\n" if $opt->{debug};
-	main::logger "DEBUG: Raw Mode: $opt->{raw}\n" if $opt->{debug};
+	main::logger "DEBUG: Raw Mode:           $opt->{raw}\n" if $opt->{debug};
 
-	# Check path length is < 256 chars
-	if ( length( $prog->{filepart} ) > 255 ) {
-		main::logger("ERROR: Generated filename is too long, please use --fileprefix option to shorten it to below 250 characters ('$prog->{filepart}')\n\n");
+	# Check path length is < 256 chars (Windows only)
+	if ( length( $prog->{filepart} ) > 255 && $^O eq "MSWin32" ) {
+		main::logger("ERROR: Generated file path is too long, please use --fileprefix, --subdir-format, --subdir and --output options to shorten it to below 256 characters\n");
+		main::logger("ERROR: Generated file path: $prog->{filepart}\n");
 		return 1;
 	}
 	return 0;
 }
 
-
-
 # Run a user specified command
 # e.g. --command 'echo "<pid> <name> recorded"'
 # run_user_command($pid, 'echo "<pid> <name> recorded"');
@@ -4664,20 +4121,20 @@
 	my $prog = shift;
 	my $command = shift;
 
-	# Substitute the fields for the pid (and sanitize for double-quoted shell use)
+	# Substitute the fields for the PID (and sanitize for double-quoted shell use)
 	$command = $prog->substitute( $command, 4 );
+	$command = main::encode_fs($command);
 
 	# run command
+	main::logger "INFO: Running user command\n";
 	main::logger "INFO: Running command '$command'\n" if $opt->{verbose};
 	my $exit_value = main::run_cmd( 'normal', $command );
-	
+
 	main::logger "ERROR: Command Exit Code: $exit_value\n" if $exit_value;
 	main::logger "INFO: Command succeeded\n" if $opt->{verbose} && ! $exit_value;
-        return 0;
+				return 0;
 }
 
-
-
 # %type
 # Display a line containing programme info (using long, terse, and type options)
 sub list_entry {
@@ -4704,8 +4161,17 @@
 	} elsif ( $opt->{series} && $episode_width && $episode_count && ! $opt->{tree} ) {
 		main::logger sprintf( "%s%-${episode_width}s %5s %s\n", $prefix, $prog->{name}, "($episode_count)", $prog->{categories} );
 	} elsif ( $opt->{long} ) {
-		my @time = gmtime( time() - $prog->{timeadded} );
-		main::logger "${prefix}$prog->{index}:\t${prog_type}${name}$prog->{episode}".$prog->optional_list_entry_format.", $time[7] days $time[2] hours ago - $prog->{desc}\n";
+		my $now = time();
+		my @time = gmtime( $now - $prog->{timeadded} );
+		my $expires;
+		if ( $prog->{type} =~ /^(tv|radio)$/ ) {
+			if ( $prog->{expires} && $prog->{expires} > $now ) {
+				my @t = gmtime( $prog->{expires} - $now );
+				my $years = ($t[5]-70)." years " if ($t[5]-70) > 0;
+				$expires = ", expires in ${years}$t[7] days $t[2] hours";
+			}
+		}
+		main::logger "${prefix}$prog->{index}:\t${prog_type}${name}$prog->{episode}".$prog->optional_list_entry_format.", added $time[7] days $time[2] hours ago${expires} - $prog->{desc}\n";
 	} elsif ( $opt->{terse} ) {
 		main::logger "${prefix}$prog->{index}:\t${prog_type}${name}$prog->{episode}\n";
 	} else {
@@ -4714,66 +4180,16 @@
 	return 0;
 }
 
-
-
-sub list_entry_html {
-	my ($prog, $tree) = (@_);
-	my $html;
-	# If tree view
-	my $name = encode_entities( $prog->{name} );
-	my $episode = encode_entities( $prog->{episode} );
-	my $desc = encode_entities( $prog->{desc} );
-	my $channel = encode_entities( $prog->{channel} );
-	my $type = encode_entities( $prog->{type} );
-	my $categories = encode_entities( $prog->{categories} );
-
-	# Header
-	if ( not $tree ) {
-		# Assume all thumbnails for a prog name are the same
-		$html = "<tr bgcolor='#cccccc'>
-			<td rowspan=1 width=150><a href=\"$prog->{web}\"><img height=84 width=150 src=\"$prog->{thumbnail}\"></a></td>
-				<td><a href=\"$prog->{web}\">${name}</a></td>
-				<td>${channel}</td>
-				<td>${type}</td>
-				<td>${categories}</td>
-			</tr>
-		\n";
-	# Follow-on episodes
-	}
-		$html .= "<tr>
-				<td>$_</td>
-				<td><a href=\"$prog->{web}\">${episode}</a></td>
-				<td colspan=3>${desc}</td>
-			</tr>
-		\n";
-	return $html;
-}
-
-
-# Creates symlink
-# Usage: $prog->create_symlink( <symlink>, <target> );
-sub create_symlink {
-	my $prog = shift;
-	my $symlink = shift;
-	my $target = shift;
-
-	if ( ( ! ( $opt->{stdout} && $opt->{nowrite} ) ) && ( ! $opt->{test} ) ) {
-		# remove old symlink
-		unlink $symlink if -l $symlink;
-		# Create symlink
-		symlink $target, $symlink;
-		main::logger "INFO: Created symlink from '$symlink' -> '$target'\n" if $opt->{verbose};
-	}
-}
-
-
-
 # Get time ago made available (x days y hours ago) from '2008-06-22T05:01:49Z' and specified epoch time
 # Or, Get time in epoch from '2008-06-22T05:01:49Z' or '2008-06-22T05:01:49[+-]NN:NN' if no specified epoch time
 sub get_time_string {
 	$_ = shift;
 	my $diff = shift;
 
+	# suppress warnings for > 32-bit dates in obsolete Perl versions
+	local $SIG{__WARN__} = sub {
+			warn @_ unless $_[0] =~ m(^.* too (?:big|small));
+	};
 	# extract $year $mon $mday $hour $min $sec $tzhour $tzmin
 	my ($year, $mon, $mday, $hour, $min, $sec, $tzhour, $tzmin);
 	if ( m{(\d\d\d\d)\-(\d\d)\-(\d\d)T(\d\d):(\d\d):(\d\d)} ) {
@@ -4789,7 +4205,7 @@
 	# ending in 'Z'
 	($tzhour, $tzmin) = (0, 0) if m{\d\d\d\d\-\d\d\-\d\dT\d\d:\d\d:\d\dZ};
 
-	main::logger "DEBUG: $_ = $year, $mon, $mday, $hour, $min, $sec, $tzhour, $tzmin\n" if $opt->{debug};
+	# main::logger "DEBUG: $_ = $year, $mon, $mday, $hour, $min, $sec, $tzhour, $tzmin\n" if $opt->{debug};
 	# Sanity check date data
 	return '' if $year < 1970 || $mon < 1 || $mon > 12 || $mday < 1 || $mday > 31 || $hour < 0 || $hour > 24 || $min < 0 || $min > 59 || $sec < 0 || $sec > 59 || $tzhour < -13 || $tzhour > 13 || $tzmin < -59 || $tzmin > 59;
 	# Calculate the seconds difference between epoch_now and epoch_datestring and convert back into array_time
@@ -4825,847 +4241,1050 @@
 	}
 }
 
-
-
 sub download_thumbnail {
 	my $prog = shift;
 	my $file;
 	my $ext;
 	my $image;
-		
 	if ( $prog->{thumbnail} =~ /^http/i && $prog->{thumbfile} ) {
-		main::logger "INFO: Getting thumbnail from $prog->{thumbnail}\n" if $opt->{verbose};
 		$file = $prog->{thumbfile};
-
+		# Don't redownload thumbnail if the file already exists
+		if ( -f $file && ! $opt->{overwrite} ) {
+			main::logger "INFO: Thumbnail file already exists: $file\n";
+			main::logger "INFO: Use --overwrite to re-download\n";
+			return 0;
+		}
+		main::logger "INFO: Downloading thumbnail\n" if $opt->{thumb} || $opt->{verbose};
 		# Download thumb
-		$image = main::request_url_retry( main::create_ua( 'desktop', 1 ), $prog->{thumbnail}, 1);
+		$image = main::request_url_retry( main::create_ua( 'desktop', 1 ), $prog->{thumbnail}, 3);
 		if (! $image ) {
-			main::logger "ERROR: Thumbnail Download failed\n";
+			main::logger "ERROR: Thumbnail download failed\n";
+			main::logger "ERROR: Use --thumbnail-only to re-download\n";
 			return 1;
-		} else {
-			main::logger "INFO: Downloaded Thumbnail to '$file'\n";
 		}
-
 	} else {
 		# Return if we have no url
-		main::logger "INFO: Thumbnail not available\n" if $opt->{verbose};
+		main::logger "INFO: Thumbnail not available\n";
 		return 2;
 	}
-
 	# Write to file
 	unlink($file);
-	open( my $fh, "> $file" );
+	open( my $fh, ">:raw", $file );
 	binmode $fh;
 	print $fh $image;
 	close $fh;
-
 	return 0;
 }
 
+sub download_tracklist {
+	my $prog = shift;
+	my ($times, $durations, $tracklist);
+	my $file = $prog->{tracklist};
+	if ( -f $file && ! $opt->{overwrite} ) {
+		main::logger "INFO: Tracklist file already exists: $file\n";
+		main::logger "INFO: Use --overwrite to re-download\n";
+		return 0;
+	}
+	main::logger "INFO: Downloading tracklist\n" if $opt->{tracklist} || $opt->{verbose};
+	my $ua = main::create_ua( 'desktop', 1 );
+	my $url1 = "https://www.bbc.co.uk/programmes/$prog->{pid}/segments.inc";
+	my ($html, $res1) = main::request_url_retry($ua , $url1, 3, undef, undef, undef, undef, 1);
+	unless ( $res1 && $res1->is_success ) {
+		if ( $res1 && $res1->code == 404 ) {
+			main::logger "WARNING: Track info not found\n";
+		} else {
+			main::logger "WARNING: Track info download failed\n";
+		}
+		return 1;
+	}
+	unless ( $html =~ /\w/ ) {
+		main::logger "WARNING: Track info not defined\n";
+		return 1;
+	}
+	my $json;
+	if ( $res1 && $res1->request ) {
+		my ($url2, $res2);
+		($url2 = $res1->request->uri) =~ s/segments\.inc/segments\.json/;
+		if ( $url2 ) {
+			($json, $res2) = main::request_url_retry($ua , $url2, 3, undef, undef, undef, undef, 1);
+			unless ( $res2 && $res2->is_success ) {
+				if ( $res2 && $res2->code == 404 ) {
+					main::logger "WARNING: Track times not found\n";
+				} else {
+					main::logger "WARNING: Track times download failed\n";
+				}
+				undef $json;
+			}
+			if ( $json ) {
+				my $jom = eval { decode_json($json) };
+				undef $jom if ( $@ );
+				if ( $jom && @{$jom->{segment_events}} ) {
+					my $start = $opt->{mysubstart} > 0 ? $opt->{mysubstart}/1000 : 0;
+					my $stop = $opt->{mysubstop} > 0 ? $opt->{mysubstop}/1000 : 0;
+					for my $se ( @{$jom->{segment_events}} ) {
+						my $rec_id = $se->{segment}->{record_id};
+						next unless $rec_id;
+						my $begin = $se->{version_offset};
+						next unless defined $begin;
+						my $duration = $se->{segment}->{duration};
+						my $end = $begin + $duration;
+						unless ( ( $stop > 0 && $begin > $stop ) || ( $start > 0 && $end < $start ) ) {
+							$begin = $start if ( $start > 0 && $begin < $start );
+							$end = $stop if ( $stop > 0 && $end > $stop );
+							if ( $begin >= $start ) {
+								my $ts = sprintf("%02d:%02d:%02d", (gmtime($begin - $start))[2,1,0]);
+								$times->{$rec_id} = $ts;
+							}
+							if ( $end > 0 && $end > $begin ) {
+								my $td = sprintf("%02d:%02d:%02d", (gmtime($end - $begin))[2,1,0]);
+								if ( $end - $begin < $duration ) {
+									#$td .= sprintf(" (truncated from %02d:%02d:%02d)", (gmtime($duration))[2,1,0]);
+									$td .= " (partial)";
+								}
+								$durations->{$rec_id} = $td;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	if ( $json && keys %$times == 0 ) {
+		main::logger "WARNING: Track times not defined\n";
+	}
+	my $dom = XML::LibXML->load_html(string => $html, recover => 1, suppress_errors => 1);
+	my @tracks = $dom->findnodes('//li[contains(@class,"segments-list__item")]//div[contains(@class,"segment__track")]');
+	if ( @tracks ) {
+		my @out;
+		for my $track ( @tracks ) {
+			push @out, "\n--------\n";
+			my $rec_id = $track->findvalue('ancestor::li//bbc-snippet/@data-record-id');
+			my $ts = $times->{$rec_id} if $rec_id;
+			push @out, $ts if $ts;
+			my $artist = $track->findvalue('h3');
+			push @out, $artist if $artist;
+			my $title = $track->findvalue('p');
+			push @out, $title if $title;
+			for my $e ( $track->findnodes('ul/li') ) {
+				unless ( $e->findnodes('./abbr[@title="Track Number"]') ) {
+					my $item = $e->findvalue('.');
+					push @out, $item if $item;
+				}
+			}
+			my $td = $durations->{$rec_id} if $rec_id;
+			push @out, "Duration: $td" if $td;
+		}
+		my $heading = "$prog->{name}\n$prog->{episode}\n";
+		$heading .= "$prog->{firstbcastdate}\n" if $prog->{firstbcastdate};
+		$heading .= $prog->{player} ? "$prog->{player}\n" : "PID: $prog->{pid}\n";
+		unshift @out, $heading;
+		$tracklist = join "\n", @out;
+		$tracklist =~ s/([ \t]){2,}/$1/g;
+		$tracklist =~ s/(^[ \t]+|[ \t\.]+$)//gm;
+		$tracklist =~ s/\n{2,}/\n/g;
+	} else {
+		main::logger "WARNING: Track info not found\n";
+		return 1;
+	}
+	open( my $fh, "> $file" );
+	print $fh $tracklist, "\n";
+	close $fh;
+	return 0;
+}
 
+sub download_credits {
+	my $prog = shift;
+	my $credits;
+	my $file = $prog->{credits};
+	if ( -f $file && ! $opt->{overwrite} ) {
+		main::logger "INFO: Credits file already exists: $file\n";
+		main::logger "INFO: Use --overwrite to re-download\n";
+		return 0;
+	}
+	main::logger "INFO: Downloading credits\n" if $opt->{credits} || $opt->{verbose};
+	my $ua = main::create_ua( 'desktop', 1 );
+	my $url1 = "https://www.bbc.co.uk/programmes/$prog->{pid}/credits.inc";
+	my ($html, $res1) = main::request_url_retry($ua , $url1, 3, undef, undef, undef, undef, 1);
+	unless ( $res1 && $res1->is_success ) {
+		if ( $res1 && $res1->code == 404 ) {
+			main::logger "WARNING: Credits not found\n";
+		} else {
+			main::logger "WARNING: Credits download failed\n";
+		}
+		return 1;
+	}
+	unless ( $html =~ /\w/ ) {
+		main::logger "WARNING: Credits not defined\n";
+		return 1;
+	}
+	my $dom = XML::LibXML->load_html(string => $html, recover => 1, suppress_errors => 1);
+	my @out;
+	for my $typeof ( "PerformanceRole", "Person" ) {
+		my @credits = $dom->findnodes('//tr[@typeof="'.$typeof.'"]');
+		if ( @credits ) {
+			push @out, "\n----------\n";
+			for my $credit ( @credits ) {
+				my $role = $credit->findvalue('./td[1]');
+				my $contributor = $credit->findvalue('./td[2]');
+				push @out, "$role: $contributor"
+			}
+		}
+	}
+	if ( @out ) {
+		my $heading = "$prog->{name}\n$prog->{episode}\n";
+		$heading .= "$prog->{firstbcastdate}\n" if $prog->{firstbcastdate};
+		$heading .= $prog->{player} ? "$prog->{player}\n" : "PID: $prog->{pid}\n";
+		unshift @out, $heading;
+		$credits = join "\n", @out;
+		$credits =~ s/([ \t]){2,}/$1/g;
+		$credits =~ s/(^[ \t]+|[ \t\.]+$)//gm;
+		$credits =~ s/\n{2,}/\n/g;
+	} else {
+		main::logger "WARNING: Credits info not found\n";
+		return 1;
+	}
+	open( my $fh, "> $file" );
+	print $fh $credits, "\n";
+	close $fh;
+	return 0;
+}
 
-################### iPlayer Parent class #################
+################### iPlayer Programme parent class #################
 package Programme::bbciplayer;
 
+# Inherit from Programme class
+use base 'Programme';
 use Env qw[@PATH];
 use Fcntl;
 use File::Copy;
 use File::Path;
 use File::stat;
 use HTML::Entities;
+use HTML::Parser 3.71;
 use HTTP::Cookies;
 use HTTP::Headers;
 use IO::Seekable;
 use IO::Socket;
+use JSON::PP;
 use LWP::ConnCache;
 use LWP::UserAgent;
 use POSIX qw(mkfifo);
+use Storable qw(dclone);
 use strict;
 use Time::Local;
 use URI;
+use XML::LibXML 1.91;
+use XML::LibXML::XPathContext;
+use constant REGEX_PID => qr/^[b-df-hj-np-tv-z0-9]{8,}$/;
 
-# Inherit from Programme class
-use base 'Programme';
+my $ffmpeg_check;
 
+sub opt_format {
+	return {
+		ffmpeg		=> [ 0, "ffmpeg=s", 'External Program', '--ffmpeg <path>', "Location of ffmpeg binary. Assumed to be ffmpeg 3.0 or higher unless --ffmpeg-obsolete is specified."],
+		ffmpegobsolete		=> [ 1, "ffmpeg-obsolete|ffmpegobsolete!", 'External Program', '--ffmpeg-obsolete', "Indicates you are using an obsolete version of ffmpeg (<1.0) that may not support certain options. Without this option, MP4 conversion may fail with obsolete versions of ffmpeg."],
+		ffmpegforce		=> [ 1, "ffmpeg-force|ffmpegforce!", 'External Program', '--ffmpeg-force', "Bypass version checks and assume ffmpeg is version 3.0 or higher"],
+		ffmpegloglevel		=> [ 1, "ffmpeg-loglevel|ffmpegloglevel=s", 'External Program', '--ffmpeg-loglevel <level>', "Set logging level for ffmpeg. Overridden by --quiet and --silent. Default: 'fatal'"],
+	};
+}
 
-# Return hash of version => verpid given a pid
-sub get_verpids {
-	my ( $prog, $ua ) = @_;
-	my $url;
+sub pid_ok {
+	my $prog = shift;
+	return $prog->{pid} =~ REGEX_PID;
+}
 
-	# If this is already a live or streaming verpid just pass it through	
-	# e.g. http://www.bbc.co.uk/mediaselector/4/gtis/?server=cp52115.live.edgefcs.net&identifier=sport1a@s2388&kind=akamai&application=live&cb=28022
-	if ( $prog->{pid} =~ m{^http.+/mediaselector/4/[gm]tis}i ) {
-		# bypass all the xml parsing and return
-		$prog->{verpids}->{default} = $1 if $prog->{pid} =~ m{^.+(\?.+)$};
-
-		# Name
-		my $title;
-		$title = $1 if $prog->{pid} =~ m{identifier=(.+?)&};
-		$title =~ s/\@/_/g;
-
-		# Add to prog hash
-		$prog->{versions} = join ',', keys %{ $prog->{verpids} };
-		$prog->{title} = decode_entities($title);
-		return 0;
-	
-	# Determine if the is a standard pid, Live TV or EMP TV URL
-	# EMP URL
-	} elsif ( $prog->{pid} =~ /^http/i ) {
-		$url = $prog->{pid};
-		# May aswell set the web page metadata here if not set
-		$prog->{web} = $prog->{pid} if ! $prog->{web};
-		# Scrape the EMP web page and get playlist URL
-		my $xml = main::request_url_retry( $ua, $url, 3 );
-		if ( ! $xml ) {
-			main::logger "\rERROR: Failed to get EMP page from BBC site\n\n";
-			return 1;
+# extract PID from URL if necessary
+sub clean_pid {
+	my $prog = shift;
+	$prog->{pid} =~ s/(^\s+|\s+$)//g;
+	if ( $prog->{pid} =~ m{^https?://} ) {
+		my $uri = URI->new($prog->{pid});
+		my @pids = grep /${\REGEX_PID}/, $uri->path_segments;
+		if ( @pids ) {
+			$prog->{pid} = $pids[$#pids];
 		}
-		# flatten
-		$xml =~ s/\n/ /g;
-		# Find playlist URL in various guises
-		if ( $xml =~ m{<param\s+name="playlist"\s+value="(http.+?)"}i ) {
-			$url = $1;
-		# setPlaylist("http://www.bbc.co.uk/mundo/meta/dps/2009/06/emp/090625_video_festival_ms.emp.xml")
-		# emp.setPlaylist("http://www.bbc.co.uk/learningzone/clips/clips/p_chin/bb/p_chin_ch_05303_16x9_bb.xml")
-		} elsif ( $xml =~ m{setPlaylist$"(http.+?)"$}i ) {
-			$url = $1;
-		# playlist = "http://www.bbc.co.uk/worldservice/meta/tx/flash/live/eneuk.xml";
-		} elsif ( $xml =~ m{\splaylist\s+=\s+"(http.+?)";}i ) {
-			$url = $1;
-		# iplayer Programmes page format (also rewrite the pid)
-		# href="http://www.bbc.co.uk/iplayer/episode/b00ldhj2"
-		} elsif ( $xml =~ m{href="http://www.bbc.co.uk/iplayer/episode/(b0[a-z0-9]{6})"} ) {
-			$prog->{pid} = $1;
-			$url = 'http://www.bbc.co.uk/iplayer/playlist/'.$1;
-		} elsif ( $url =~ m{^http.+.xml$} ) {
-			# Just keep the url as it is probably already an xml playlist
-		## playlist: "http://www.bbc.co.uk/iplayer/playlist/bbc_radio_one",
-		#} elsif ( $xml =~ m{playlist: "http.+?playlist\/(\w+?)"}i ) {
-		#	$prog->{pid} = $1;
-		#	$url = 'http://www.bbc.co.uk/iplayer/playlist/'.$prog->{pid};
-		}
-		# URL decode url
-		$url = main::url_decode( $url );
-	# iPlayer LiveTV or PID
-	} else {
-		$url = 'http://www.bbc.co.uk/iplayer/playlist/'.$prog->{pid};
-		# use the audiodescribed playlist url if non-default versions are specified
-		$url .= '/ad' if defined $opt->{versionlist} && $opt->{versionlist} ne 'default';
 	}
-	
-	main::logger "INFO: iPlayer metadata URL = $url\n" if $opt->{verbose};
-	#main::logger "INFO: Getting version pids for programme $prog->{pid}        \n" if ! $opt->{verbose};
+}
 
-	# send request
-	my $xml = main::request_url_retry( $ua, $url, 3 );
-	if ( ! $xml ) {
-		main::logger "\rERROR: Failed to get version pid metadata from iplayer site\n\n";
-		return 1;
-	}
-	# The URL http://www.bbc.co.uk/iplayer/playlist/<PID> contains for example:
-	#<?xml version="1.0" encoding="UTF-8"?>
-	#<playlist xmlns="http://bbc.co.uk/2008/emp/playlist" revision="1">
-	#  <id>tag:bbc.co.uk,2008:pips:b00dlrc8:playlist</id>
-	#  <link rel="self" href="http://www.bbc.co.uk/iplayer/playlist/b00dlrc8"/>
-	#  <link rel="alternate" href="http://www.bbc.co.uk/iplayer/episode/b00dlrc8"/>
-	#  <link rel="holding" href="http://www.bbc.co.uk/iplayer/images/episode/b00dlrc8_640_360.jpg" height="360" width="640" type="image/jpeg" />
-	#  <title>Amazon with Bruce Parry: Episode 1</title>
-	#  <summary>Bruce Parry begins an epic adventure in the Amazon following the river from source to sea, beginning  in the High Andes and visiting the Ashaninka tribe.</summary>                                                                                                        
-	#  <updated>2008-09-18T14:03:35Z</updated>
-	#  <item kind="ident">
-	#    <id>tag:bbc.co.uk,2008:pips:bbc_two</id>
-	#    <mediator identifier="bbc_two" name="pips"/>
-	#  </item>
-	#  <item kind="programme" duration="3600" identifier="b00dlr9p" group="b00dlrc8" publisher="pips">
-	#    <tempav>1</tempav>
-	#    <id>tag:bbc.co.uk,2008:pips:b00dlr9p</id>
-	#    <service id="bbc_two" href="http://www.bbc.co.uk/iplayer/bbc_two">BBC Two</service>
-	#    <masterbrand id="bbc_two" href="http://www.bbc.co.uk/iplayer/bbc_two">BBC Two</masterbrand>
-	#
-	#    <alternate id="default" />
-	#    <guidance>Contains some strong language.</guidance>
-	#    <mediator identifier="b00dlr9p" name="pips"/>
-	#  </item>
-	#  <item kind="programme" duration="3600" identifier="b00dp4xn" group="b00dlrc8" publisher="pips">
-	#    <tempav>1</tempav>
-	#    <id>tag:bbc.co.uk,2008:pips:b00dp4xn</id>
-	#    <service id="bbc_one" href="http://www.bbc.co.uk/iplayer/bbc_one">BBC One</service>
-	#    <masterbrand id="bbc_two" href="http://www.bbc.co.uk/iplayer/bbc_two">BBC Two</masterbrand>
-	#
-	#    <alternate id="signed" />
-	#    <guidance>Contains some strong language.</guidance>
-	#    <mediator identifier="b00dp4xn" name="pips"/>
-	#  </item>
-
-	# If a prog is totally unavailable you get 
-	# ...
-	# <updated>2009-01-15T23:13:33Z</updated>
-	# <noItems reason="noMedia" />
-	#
-	#                <relatedLink>
-	                
-	# flatten
-	$xml =~ s/\n/ /g;
-
-	# Detect noItems or no programmes
-	if ( $xml =~ m{<noItems\s+reason="noMedia"} || $xml !~ m{kind="(programme|radioProgramme)"} ) {
-		main::logger "\rWARNING: No programmes are available for this pid with version(s): ".($opt->{versionlist} ? $opt->{versionlist} : 'default').($prog->{versions} ? " ($prog->{versions} are available)\n" : "\n");
+# Return hash of version => verpid given a PID
+# and fill in minimal metadata
+sub get_verpids {
+	my ( $prog, $ua ) = @_;
+
+	my $rc_json = $prog->get_verpids_json( $ua );
+	my $rc_html = 1;
+	if ( ( ! $prog->{type} || $prog->{type} eq 'tv' ) ) {
+		$rc_html = $prog->get_verpids_html( $ua );
+	}
+	# ensure title info extracted
+	$prog->parse_title();
+	return 0 if ! $rc_json || ! $rc_html;
+	main::logger "WARNING: No programmes are available for this PID with version(s): ".($opt->{versionlist} ? $opt->{versionlist} : 'default').($prog->{versions} ? " (available versions: $prog->{versions})\n" : "\n");
+	return 1;
+}
+
+# Return hash of version => verpid given a PID
+# and fill in minimal metadata
+# Uses JSON playlist: https://www.bbc.co.uk/programmes/<pid>/playlist.json
+sub get_verpids_json {
+	my ( $prog, $ua ) = @_;
+	my $pid = $prog->{pid};
+	my $url = "https://www.bbc.co.uk/programmes/$pid/playlist.json";
+	main::logger "INFO: iPlayer metadata URL (JSON) = $url\n" if $opt->{verbose};
+	my $json = main::request_url_retry( $ua, $url, 3, undef, undef, undef, undef, 1 );
+	if ( ! $json ) {
+		main::logger "ERROR: Failed to get version PID metadata from iPlayer site (JSON)\n" if $opt->{verbose};
 		return 1;
 	}
-
-	# Get title
-	# <title>Amazon with Bruce Parry: Episode 1</title>
-	my ( $title, $prog_type );
-	$title = $1 if $xml =~ m{<title>\s*(.+?)\s*<\/title>};
-
-	# Get type
-	$prog_type = 'tv' if grep /kind="programme"/, $xml;
-	$prog_type = 'radio' if grep /kind="radioProgramme"/, $xml;
-
-	# Split into <item kind="programme"> sections
-	my $prev_version = '';
-	for ( split /<item\s+kind="(radioProgramme|programme)"/, $xml ) {
-		main::logger "DEBUG: Block: $_\n" if $opt->{debug};
+	my ( $default, $versions ) = split /"allAvailableVersions"/, $json;
+	unless ( $prog->{channel} ) {
+		$prog->{channel} = $1 if $default =~ /"masterBrandName":"(.*?)"/;
+	}
+	unless ( $prog->{descshort} ) {
+		$prog->{descshort} = $1 if $default =~ /"summary":"(.*?)"/;
+	}
+	unless ( $prog->{guidance} ) {
+		my $guidance = $2 if $default =~ /"guidance":(null|"(.*?)")/;
+		$prog->{guidance} = "Yes" if $guidance;
+	}
+	unless ( $prog->{thumbnail} ) {
+		my $thumbnail = $1 if $default =~ /"holdingImageURL":"(.*?)"/;
+		$thumbnail =~ s/\\\//\//g;
+		my $recipe = $prog->thumb_url_recipe();
+		$thumbnail =~ s/\$recipe/$recipe/;
+		$prog->{thumbnail} = $thumbnail if $thumbnail;
+		$prog->{thumbnail} = "https:".$prog->{thumbnail} unless $prog->{thumbnail} =~ /^http/;
+	}
+	unless ( $prog->{title} ) {
+		my $title = $1 if $default =~ /"title":"(.*?)"/;
+		$title =~ s/\\\//\//g;
+		$prog->{title} = decode_entities($title) if $title;
+	}
+	$prog->{type} = 'radio' if $default =~ /"kind":"radioProgramme"/ && $prog->{type} ne 'radio';
+	unless ( $prog->{type} ) {
+		$prog->{type} = 'tv' if $default =~ /"kind":"programme"/;
+	}
+	my @versions = split /"markers"/, $versions;
+	pop @versions;
+	for ( @versions ) {
+		main::logger "DEBUG: Block (JSON): $_\n" if $opt->{debug};
 		my ($verpid, $version);
-
-		# Treat live streams accordingly
-		# Live TV
-		if ( m{\s+simulcast="true"} ) {
-			$version = 'default';
-			$verpid = "http://www.bbc.co.uk/emp/simulcast/".$1.".xml" if m{\s+live="true"\s+identifier="(.+?)"};
-			main::logger "INFO: Using Live TV: $verpid\n" if $opt->{verbose} && $verpid;
-
-		# Live/Non-live EMP tv/radio XML URL
-		} elsif ( $prog->{pid} =~ /^http/i && $url =~ /^http.+xml$/ ) {
-			$version = 'default';
-			$verpid = $url;
-			main::logger "INFO: Using Live/Non-live EMP tv/radio XML URL: $verpid\n" if $opt->{verbose} && $verpid;
-
-		# Live/Non-live EMP tv/radio
-		} elsif ( $prog->{pid} =~ /^http/i ) {
-			$version = 'default';
-			# <connection kind="akamai" identifier="48502/mundo/flash/2009/06/glastonbury_16x9_16x9_bb" server="cp48502.edgefcs.net"/>
-			# <connection kind="akamai" identifier="intl/abercrombie" server="cp57856.edgefcs.net" />
-			# <connection kind="akamai" application="live" identifier="sport2a@s2405" server="cp52115.live.edgefcs.net" tokenIssuer="akamaiUk" />
-			# <connection kind="akamai" identifier="secure/p_chin/p_chin_ch_05303_16x9_bb" server="cp54782.edgefcs.net" tokenIssuer="akamaiUk"/>
-			# <connection kind="akamai" application="live" identifier="eneuk_live@6512" server="wsliveflash.bbc.co.uk" />
-			# verpid = ?server=cp52115.live.edgefcs.net&identifier=sport2a@s2405&kind=akamai&application=live
-			$verpid = "?server=$4&identifier=$3&kind=$1&application=$2" if $xml =~ m{<connection\s+kind="(.+?)"\s+application="(.+?)"\s+identifier="(.+?)"\s+server="(.+?)"};
-			# Or try this if application is not defined (i.e. like in learning zone)
-			if ( ! $verpid ) {
-				$verpid = "?server=$3&identifier=$2&kind=$1&application=ondemand" if $xml =~ m{<connection\s+kind="(.+?)"\s+identifier="(.+?)"\s+server="(.+?)"};
-			}
-			main::logger "INFO: Using Live/Non-live EMP tv/radio: $verpid\n" if $opt->{verbose} && $verpid;
-
-		# Live radio
-		} elsif ( m{\s+live="true"\s} ) {
-			# Try to get live stream version and verpid
-			# <item kind="radioProgramme" live="true" identifier="bbc_radio_one" group="bbc_radio_one">
-			$verpid = $1 if m{\s+live="true"\s+identifier="(.+?)"};
-			$version = 'default';
-			main::logger "INFO: Using Live radio: $verpid\n" if $opt->{verbose} && $verpid;
-
-		# Not Live standard TV and Radio
-		} else {
-			#  duration="3600" identifier="b00dp4xn" group="b00dlrc8" publisher="pips">
-			$verpid = $1 if m{\s+duration=".*?"\s+identifier="(.+?)"};
-			# <alternate id="default" />
-			if ( m{<alternate\s+id="(.+?)"} ) {
-				my $curr_version = lc($1);
-				# Remap version name from 'default' => 'audiodescribed' if we are using the /ad playlist URL:
-				if ( defined $opt->{versionlist} && $opt->{versionlist} ne 'default' ) {
-					$curr_version = 'audiodescribed' if $curr_version eq 'default';
-				}
-				$version = $curr_version;
-				# if current version is already defined, add a numeric suffix
-				if ( $prog->{verpids}->{$curr_version} ) {
-					my $vercount = 1;
-					# Search for the next free suffix
-					while ( $prog->{verpids}->{$curr_version} ) {
-						$vercount++;
-						$curr_version = $version.$vercount;
-					}
-					$version = $curr_version;
-				}
-			# If this item has no version name then this is assumed to be the 'default' version
-			} else {
-				$version = 'default';
-			}
-			main::logger "INFO: Using Not Live standard TV and Radio: $verpid\n" if $opt->{verbose} && $verpid;
+		my $type = $1 if /"types":\["(.*?)"/;
+		if ( $type =~ /describe/i ) {
+			$version = "audiodescribed";
+		} elsif ($type =~ /sign/i ) {
+			$version = "signed";
+		} else {
+			($version = lc($type)) =~ s/\s+.*$//;
 		}
-
+		next if $prog->{verpids}->{$version};
+		$verpid = $1 if /{"vpid":"(\w+)","kind":"(programme|radioProgramme)"/i;
 		next if ! ($verpid && $version);
 		$prog->{verpids}->{$version} = $verpid;
-		$prog->{durations}->{$version} = $1 if m{duration="(\d+?)"};
-		main::logger "INFO: Version: $version, VersionPid: $verpid, Duration: $prog->{durations}->{$version}\n" if $opt->{verbose};  
+		$prog->{durations}->{$version} = $1 if /"duration":(\d+)/;
 	}
-
-	# Add to prog hash
 	$prog->{versions} = join ',', keys %{ $prog->{verpids} };
-	$prog->{title} = decode_entities($title);
+	my $version_map = { "default" => "", "audiodescribed" => "ad", "signed" => "sign"};
+	my $version_list = $opt->{versionlist} || $prog->{versions};
+	for ( split /,/, $version_list ) {
+		if ( $prog->{verpids}->{$_} ) {
+			my $episode_url;
+			if ( $prog->{type} eq 'tv' ) {
+				$episode_url = "https://www.bbc.co.uk/iplayer/episode/$pid/$version_map->{$_}";
+			} elsif ( $prog->{type} eq 'radio' ) {
+				$episode_url = "https://www.bbc.co.uk/programmes/$pid";
+			}
+			unless ( $prog->{player} ) {
+				$prog->{player} = $episode_url if $episode_url;
+				last;
+			}
+		}
+	}
+	my $found;
+	for ( keys %{ $prog->{verpids} } ) {
+		$found = 1 if $version_list =~ /$_/ && $prog->{verpids}->{$_};
+		last if $found;
+	}
+	return 1 if ! $found;
 	return 0;
 }
 
-
-
-# get full episode metadata given pid and ua. Uses two different urls to get data
-sub get_metadata {
-	my $prog = shift;
-	my $ua = shift;
-	my $metadata;
-	my $entry;
-	my $prog_feed_url = 'http://feeds.bbc.co.uk/iplayer/episode/'; # $pid
-
-	my ($name, $episode, $desc, $available, $channel, $expiry, $meddesc, $longdesc, $summary, $versions, $guidance, $prog_type, $categories, $player, $thumbnail, $seriestitle, $episodetitle, $nametitle, $seriesnum, $episodenum );
-
-	# This URL works for all prog types:
-	# http://www.bbc.co.uk/iplayer/playlist/${pid}
-
-	# This URL only works for TV progs:
-	# http://www.bbc.co.uk/iplayer/metafiles/episode/${pid}.xml
-
-	# This URL works for tv/radio prog types:
-	# http://www.bbc.co.uk/iplayer/widget/episodedetail/episode/${pid}/template/mobile/service_type/tv/
-
-	# This URL works for tv/radio prog types (has long synopsis):
-	# http://www.bbc.co.uk/programmes/{pid}.rdf
-
-	# This URL works for tv/radio prog types:
-	# http://feeds.bbc.co.uk/iplayer/episode/$pid
-
-	# Works for all Verison PIDs to get the last/first broadcast dates
-	# http://www.bbc.co.uk/programmes/<verpid>.rdf
-
-	main::logger "DEBUG: Getting Metadata for $prog->{pid}:\n" if $opt->{debug};
-
-	# Entry format
-	#<?xml version="1.0" encoding="utf-8"?>                                      
-	#<?xml-stylesheet href="http://www.bbc.co.uk/iplayer/style/rss.css" type="text/css"?>
-	#<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-GB">
-	#  <title>BBC iPlayer - Episode Detail: Edith Bowman: 22/09/2008</title>                                                                          
-	#  <subtitle>Sara Cox sits in for Edith with another Cryptic Randomizer.</subtitle>
-	#  <updated>2008-09-29T10:59:45Z</updated>
-	#  <id>tag:feeds.bbc.co.uk,2008:/iplayer/feed/episode/b00djtfh</id>
-	#  <link rel="related" href="http://www.bbc.co.uk/iplayer" type="text/html" />
-	#  <link rel="self" href="http://feeds.bbc.co.uk/iplayer/episode/b00djtfh" type="application/atom+xml" />
-	#  <author>
-	#    <name>BBC</name>
-	#    <uri>http://www.bbc.co.uk</uri>
-	#  </author>
-	#  <entry>
-	#    <title type="text">Edith Bowman: 22/09/2008</title>
-	#    <id>tag:feeds.bbc.co.uk,2008:PIPS:b00djtfh</id>
-	#    <updated>2008-09-15T01:28:36Z</updated>
-	#    <summary>Sara Cox sits in for Edith with another Cryptic Randomizer.</summary>
-	#    <content type="html">
-	#      &lt;p&gt;
-	#        &lt;a href=&quot;http://www.bbc.co.uk/iplayer/episode/b00djtfh?src=a_syn30&quot;&gt;
-	#          &lt;img src=&quot;http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_150_84.jpg&quot; alt=&quot;Edith Bowman: 22/09/2008&quot; /&gt;
-	#        &lt;/a&gt;
-	#      &lt;/p&gt;
-	#      &lt;p&gt;
-	#        Sara Cox sits in for Edith with movie reviews and great new music, plus another Cryptic Randomizer.
-	#      &lt;/p&gt;
-	#    </content>
-	#    <link rel="alternate" href="http://www.bbc.co.uk/iplayer/episode/b00djtfh?src=a_syn31" type="text/html" title="Edith Bowman: 22/09/2008">
-	#      <media:content medium="audio" duration="10800">
-	#        <media:title>Edith Bowman: 22/09/2008</media:title>
-	#        <media:description>Sara Cox sits in for Edith with movie reviews and great new music, plus another Cryptic Randomizer.</media:description>
-	#        <media:player url="http://www.bbc.co.uk/iplayer/episode/b00djtfh?src=a_syn31" />
-	#        <media:category scheme="urn:bbc:metadata:cs:iPlayerUXCategoriesCS" label="Entertainment">9100099</media:category>
-	#        <media:category scheme="urn:bbc:metadata:cs:iPlayerUXCategoriesCS" label="Music">9100006</media:category>
-	#        <media:category scheme="urn:bbc:metadata:cs:iPlayerUXCategoriesCS" label="Pop &amp; Chart">9200069</media:category>
-	#        <media:rating scheme="urn:simple">adult</media:rating>
-	#        <media:credit role="Production Department" scheme="urn:ebu">BBC Radio 1</media:credit>
-	#        <media:credit role="Publishing Company" scheme="urn:ebu">BBC Radio 1</media:credit>
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_86_48.jpg" width="86" height="48" />
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_150_84.jpg" width="150" height="84" />
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_178_100.jpg" width="178" height="100" />
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_512_288.jpg" width="512" height="288" />
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_528_297.jpg" width="528" height="297" />
-	#        <media:thumbnail url="http://www.bbc.co.uk/iplayer/images/episode/b00djtfh_640_360.jpg" width="640" height="360" />
-	#        <dcterms:valid>
-	#          start=2008-09-22T15:44:20Z;
-	#          end=2008-09-29T15:02:00Z;
-	#          scheme=W3C-DTF
-	#        </dcterms:valid>
-	#      </media:content>
-	#    </link>
-	#    <link rel="self" href="http://feeds.bbc.co.uk/iplayer/episode/b00djtfh?format=atom" type="application/atom+xml" title="22/09/2008" />
-	#    <link rel="related" href="http://www.bbc.co.uk/programmes/b006wks4/microsite" type="text/html" title="Edith Bowman" />
-	#    <link rel="parent" href="http://feeds.bbc.co.uk/iplayer/programme_set/b006wks4" type="application/atom+xml" title="Edith Bowman" />
-	#  </entry>
-	#</feed>
-
-	# Don't get metadata from this URL if the pid contains a full url (problem: this still tries for BBC iPlayer live channels)
-	if ( $prog->{pid} !~ m{^http}i ) {
-		$entry = main::request_url_retry($ua, $prog_feed_url.$prog->{pid}, 3, '', '');
-		decode_entities($entry);
-		main::logger "DEBUG: $prog_feed_url.$prog->{pid}:\n$entry\n\n" if $opt->{debug};
-		# Flatten
-		$entry =~ s|\n| |g;
-
-		if ( $entry =~ m{<dcterms:valid>\s*start=.+?;\s*end=(.*?);} ) {
-			$expiry = $1;
-			$prog->{expiryrel} = Programme::get_time_string( $expiry, time() );
-		}
-		$available = $1 if $entry =~ m{<dcterms:valid>\s*start=(.+?);\s*end=.*?;};
-		$prog_type = $1 if $entry =~ m{medium=\"(\w+?)\"};
-		$prog_type = 'tv' if $prog_type eq 'video';
-		$prog_type = 'radio' if $prog_type eq 'audio';
-		$desc = $1 if $entry =~ m{<media:description>\s*(.*?)\s*<\/media:description>};
-		$meddesc = '';
-		$meddesc = $1 if $entry =~ m{<content type="html">\s*(.+?)\s*</content>};
-		decode_entities( $meddesc );
-		$meddesc =~ s|^.+<p>\s*(.+?)\s*</p>|$1|g;
-		$meddesc =~ s|[\n\r]| |g;
-		$summary = $1 if $entry =~ m{<summary>\s*(.*?)\s*</summary>};
-		$guidance = $1 if $entry =~ m{<media:rating scheme="urn:simple">(.+?)<\/media:rating>};
-		$player = $1 if $entry =~ m{<media:player\s*url=\"(.*?)\"\s*\/>};
-		# Get all thumbnails into elements of thumbnailN with increasing width
-		my %thumbnails;
-		for ( split /<media:thumbnail/, $entry ) {
-			my ( $url, $width );
-			( $url, $width ) = ( $1, $2 ) if m{\s+url="\s*(http://.+?)\s*"\s+width="\s*(\d+)\s*"\s+height="\s*\d+\s*"};
-			$thumbnails{ $width } = $url if $width && $url;
-		}
-		my $count = 1;
-		for ( sort {$a <=> $b} keys %thumbnails ) {
-			$prog->{ 'thumbnail'.$count } = $thumbnails{ $_ };
-			$thumbnails{ $count } = $thumbnails{ $_ };
-			$count++;
+# Return hash of version => verpid given a PID
+# and fill in minimal metadata
+# Scrapes HTML from episode page: https://www.bbc.co.uk/iplayer/episode/<pid>
+# Only works for TV programmes
+sub get_verpids_html {
+	my ( $prog, $ua ) = @_;
+	my $pid = $prog->{pid};
+	my $version_list = $opt->{versionlist} || 'default';
+	my $version_map = { "default" => "", "audiodescribed" => "ad", "signed" => "sign"};
+	for my $version ( "default", "audiodescribed", "signed" ) {
+		next if $prog->{verpids}->{$version};
+		my $html;
+		my $url = "https://www.bbc.co.uk/iplayer/episode/$pid/$version_map->{$version}";
+		main::logger "INFO: iPlayer metadata URL (HTML) [$version] = $url\n" if $opt->{verbose};
+		$html = main::request_url_retry( $ua, $url, 3, undef, undef, undef, undef, 1 );
+		if ( ! $html ) {
+			main::logger "\nINFO: No metadata for '$version' version retrieved from iPlayer site (HTML)\n" if $opt->{verbose};
+			next;
 		}
-		# Use the default cache thumbnail unless --thumbsize=NNN is used where NNN is either the width or thumbnail index number
-		$thumbnail = $thumbnails{ $opt->{thumbsize} } if defined $opt->{thumbsize};
-		( $name, $episode ) = Programme::bbciplayer::split_title( $1 ) if $entry =~ m{<title\s+type="text">\s*(.+?)\s*<};
-		$channel = $1 if $entry =~ m{<media:credit\s+role="Publishing Company"\s+scheme="urn:ebu">(.+?)<};
-
-		# Get the title from the atom link refs only to determine the episode and series number
-		$episodetitle = $2 if $entry =~ m{<link\s+rel="self"\s+href="http[^"]+?/episode/[^"]+?"\s+type="(application/atom\+xml|text/html)"\s+title="(.+?)"};
-		$seriestitle = $2 if $entry =~ m{<link\s+rel="parent"\s+href="http[^"]+?/programme_set/[^"]+?"\s+type="(application/atom\+xml|text/html)"\s+title="(.+?)"};
-		$nametitle = $2 if $entry =~ m{<link\s+rel="related"\s+href="http[^"]+?/programmes/[^"]+?"\s+type="(application/atom\+xml|text/html)"\s+title="(.+?)"};
-
-		my @cats;
-		for (split /<media:category scheme=\".+?\"/, $entry) {
-			push @cats, $1 if m{\s*label="(.+?)">\d+<\/media:category>};
-		}
-		$categories = join ',', @cats;
-	}
-
-
-	# Even more info...
-	#<?xml version="1.0" encoding="utf-8"?>                                  
-	#<rdf:RDF xmlns:rdf      = "http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-	#         xmlns:rdfs     = "http://www.w3.org/2000/01/rdf-schema#"       
-	#         xmlns:foaf     = "http://xmlns.com/foaf/0.1/"                  
-	#         xmlns:po       = "http://purl.org/ontology/po/"                
-	#         xmlns:mo       = "http://purl.org/ontology/mo/"                
-	#         xmlns:skos     = "http://www.w3.org/2008/05/skos#"             
-	#         xmlns:time     = "http://www.w3.org/2006/time#"                
-	#         xmlns:dc       = "http://purl.org/dc/elements/1.1/"            
-	#         xmlns:dcterms  = "http://purl.org/dc/terms/"                   
-	#         xmlns:wgs84_pos= "http://www.w3.org/2003/01/geo/wgs84_pos#"    
-	#         xmlns:timeline = "http://purl.org/NET/c4dm/timeline.owl#"
-	#         xmlns:event    = "http://purl.org/NET/c4dm/event.owl#">
-	#
-	#<rdf:Description rdf:about="/programmes/b00mbvmz.rdf">
-	#  <rdfs:label>Description of the episode Episode 5</rdfs:label>
-	#  <dcterms:created rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2009-08-17T00:16:16+01:00</dcterms:created>
-	#  <dcterms:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2009-08-21T16:09:30+01:00</dcterms:modified>
-	#  <foaf:primaryTopic rdf:resource="/programmes/b00mbvmz#programme"/>
-	#</rdf:Description>
-	#
-	#<po:Episode rdf:about="/programmes/b00mbvmz#programme">
-	#
-	#  <dc:title>Episode 5</dc:title>
-	#  <po:short_synopsis>Jem Stansfield tries to defeat the US Navy&#39;s latest weapon with foam and a crash helmet.</po:short_synopsis>
-	#  <po:medium_synopsis>Jem Stansfield attempts to defeat the US Navy&#39;s latest weapon with no more than some foam and a crash helmet, while zoologist Liz Bonnin gets in contact with her frog brain.</po:medium_synopsis>
-	#  <po:long_synopsis>Jem Stansfield attempts to defeat the US Navy&#39;s latest weapon with no more than some foam and a crash helmet.
-	#
-	#Zoologist Liz Bonnin gets in contact with her frog brain, Dallas Campbell re-programmes his caveman brain to become a thrill-seeker, and Dr Yan Wong gets his thrills from inhaling sulphur hexafluoride.
-	#The programme is co-produced with The Open University.
-	#For more ways to put science to the test, go to the Hands-on Science area at www.bbc.co.uk/bang for details of our free roadshow touring the UK and activities that you can try at home.</po:long_synopsis>
-	#  <po:microsite rdf:resource="http://www.bbc.co.uk/bang"/>
-	#  <po:masterbrand rdf:resource="/bbcone#service"/>
-	#  <po:position rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</po:position>
-	#  <po:genre rdf:resource="/programmes/genres/factual/scienceandnature/scienceandtechnology#genre" />
-	#  <po:version rdf:resource="/programmes/b00mbvhc#programme" />
-	#
-	#</po:Episode>
-	#
-	#<po:Series rdf:about="/programmes/b00lywwy#programme">
-	#  <po:episode rdf:resource="/programmes/b00mbvmz#programme"/>
-	#</po:Series>
-	#
-	#<po:Brand rdf:about="/programmes/b00lwxj1#programme">
-	#  <po:episode rdf:resource="/programmes/b00mbvmz#programme"/>
-	#</po:Brand>
-	#</rdf:RDF>
-
-	# Get metadata from this URL only if the pid contains a standard BBC iPlayer PID)
-	if ( $prog->{pid} =~ /^\w{8}$/ ) {
-		$entry = main::request_url_retry($ua, 'http://www.bbc.co.uk/programmes/'.$prog->{pid}.'.rdf', 3, '', '');
-		decode_entities($entry);
-		main::logger "DEBUG: $prog_feed_url.$prog->{pid}:\n$entry\n\n" if $opt->{debug};
-		# Flatten
-		$entry =~ s|[\n\r]| |g;
-		$longdesc = $1 if $entry =~ m{<po:long_synopsis>\s*(.+?)\s*</po:long_synopsis>};
-		# Detect if this is just a series pid and report other episodes in the
-		# form of <po:episode rdf:resource="/programmes/b00fyl5z#programme" />
-		my $rdftitle = $1 if $entry =~ m{<dc:title>(.+?)<};
-	}
-
-
-	# Get list of available modes for each version available
-	# populate version pid metadata if we don't have it already
-	if ( keys %{ $prog->{verpids} } == 0 ) {
-		if ( $prog->get_verpids( $ua ) ) {
-			main::logger "ERROR: Could not get version pid metadata\n" if $opt->{verbose};
-			# Only return at this stage unless we want metadata/tags only for various reasons
-			return 1 if ! ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tagonly} )
+		my $config = $1 if $html =~ /bind\(\{\s*"player":(.*?)\<\/script\>/s;
+		unless ($config) {
+			$config = $1 if $html =~ /data-playable='(.*?)'/s;
+		}
+		unless ($config) {
+			$config = $1 if $html =~ /data-playable="(.*?)"/s;
+			$config =~ s/&quot;/"/g;
+		}
+		main::logger "DEBUG: Block (HTML): $config\n" if $opt->{debug};
+		my $verpid = $1 if $config =~ /"vpid":"(.*?)"/;
+		if ( ! $verpid ) {
+			$verpid = $1 if $html =~ /data-media-vpid="(.*?)"/;
 		}
-	}
-	$versions = join ',', sort keys %{ $prog->{verpids} };
-	my $modes;
-	my $mode_sizes;
-	my $first_broadcast;
-	my $last_broadcast;
-	# Do this for each version tried in this order (if they appeared in the content)
-	for my $version ( sort keys %{ $prog->{verpids} } ) {
-		# Set duration for this version if it is not defined
-		$prog->{durations}->{$version} = $prog->{duration} if $prog->{duration} =~ /\d+/ && ! $prog->{durations}->{$version};
-		# Try to get stream data for this version if it isn't already populated
-		if ( not defined $prog->{streams}->{$version} ) {
-			# Add streamdata to object
-			$prog->{streams}->{$version} = get_stream_data($prog, $prog->{verpids}->{$version} );
+		if ( ! $verpid ) {
+			main::logger "INFO: '$version' version not found in metadata retrieved from iPlayer site (HTML)\n" if $opt->{verbose};
+			next;
 		}
-		$modes->{$version} = join ',', sort keys %{ $prog->{streams}->{$version} };
-		# Estimate the file sizes for each mode
-		my @sizes;
-		for my $mode ( sort keys %{ $prog->{streams}->{$version} } ) {
-			next if ( ! $prog->{durations}->{$version} ) || (! $prog->{streams}->{$version}->{$mode}->{bitrate} );
-			push @sizes, sprintf( "%s=%.0fMB", $mode, $prog->{streams}->{$version}->{$mode}->{bitrate} * $prog->{durations}->{$version} / 8.0 / 1024.0 );
-		}
-		$mode_sizes->{$version} = join ',', @sizes;
-		
-		# get the last/first broadcast dates from the RDF for this verpid
-		# rdf url: http://www.bbc.co.uk/programmes/<verpid>.rdf
-		# Date in this format 'CCYY-MM-DDTHH:MM:SS+01:00'
-		# Don't get this feed if the verpid starts with '?'
-		my $rdf_url = 'http://www.bbc.co.uk/programmes/'.$prog->{verpids}->{$version}.'.rdf';
-		my $rdf;
-		$rdf = main::request_url_retry($ua, $rdf_url, 3, '', '') if $prog->{verpids}->{$version} !~ m{^\?};
-		decode_entities($rdf);
-		main::logger "DEBUG: $rdf_url:\n$rdf\n\n" if $opt->{debug};
-		# Flatten
-		$rdf =~ s|\n| |g;
-		# Get min/max bcast dates from rdf
-		my ( $first, $last, $first_string, $last_string ) = ( 9999999999, 0, 'Never', 'Never' );
-
-		# <po:(First|Repeat)Broadcast>
-		#  <po:schedule_date rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2009-06-06</po:schedule_date>
-		#    <event:time>
-		#        <timeline:Interval>
-		#              <timeline:start rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2009-06-06T21:30:00+01:00</timeline:start>
-		for ( split /<po:(First|Repeat)Broadcast>/, $rdf ) {
-			my $timestring;
-			my $epoch;
-			$timestring = $1 if m{<timeline:start\s+rdf:datatype=".+?">(20\d\d-\d\d-\d\dT\d\d:\d\d:\d\d([+-]\d\d:\d\d|Z))<};
-			next if ! $timestring;
-			$epoch = Programme::get_time_string( $timestring );
-			main::logger "DEBUG: $version: $timestring -> $epoch\n" if $opt->{debug};
-			if ( $epoch < $first ) {
-				$first = $epoch;
-				$first_string = $timestring;
-			}
-			if ( $epoch > $last ) {
-				$last = $epoch;
-				$last_string = $timestring;
-			}
-		}
-		# Only set these attribs if required
-		if ( $first < 9999999999 && $last > 0 ) {
-			$prog->{firstbcast}->{$version} = $first_string;
-			$prog->{lastbcast}->{$version} = $last_string;
-			$prog->{firstbcastrel}->{$version} = Programme::get_time_string( $first_string, time() );
-			$prog->{lastbcastrel}->{$version} = Programme::get_time_string( $last_string, time() );
+		unless ( $prog->{channel} ) {
+			$prog->{channel} = $1 if $config =~ /"masterBrandTitle":"(.*?)"/;
+		}
+		unless ( $prog->{descshort} ) {
+			$prog->{descshort} = $1 if $config =~ /"summary":"(.*?)"/;
+		}
+		unless ( $prog->{guidance} ) {
+			my $guidance = $2 if $config =~ /"guidance":(null|"(.*?)")/;
+			$prog->{guidance} = "Yes" if $guidance;
+		}
+		unless ( $prog->{thumbnail} ) {
+			my $thumbnail = $1 if $config =~ /"image":"(.*?)"/;
+			$thumbnail =~ s/\\\//\//g;
+			my $recipe = $prog->thumb_url_recipe();
+			$thumbnail =~ s/{recipe}/$recipe/;
+			$prog->{thumbnail} = $thumbnail if $thumbnail;
+			$prog->{thumbnail} = "https:".$prog->{thumbnail} unless $prog->{thumbnail} =~ /^http/;
+		}
+		unless ( $prog->{episodenum} ) {
+			$prog->{episodenum} = $1 if $config =~ /"parent_position":(\d+)/;
+		}
+		unless ( $prog->{title} ) {
+			my $title = $1 if $config =~ /"title":"(.*?)"/;
+			$title =~ s/\\\//\//g;
+			my $subtitle = $1 if $config =~ /"subtitle":"(.*?)"/;
+			$subtitle =~ s/\\\//\//g;
+			$title .= ": $subtitle" if $subtitle;
+			$prog->{title} = decode_entities($title) if $title;
 		}
+		unless ( $prog->{type} ) {
+			$prog->{type} = "tv";
+		}
+		$prog->{verpids}->{$version} = $verpid;
+		$prog->{durations}->{$version} = $1 if $config =~ /"duration":(\d+)/;
+	}
+	$prog->{versions} = join ',', keys %{ $prog->{verpids} };
+	for ( split /,/, $version_list ) {
+		if ( $prog->{verpids}->{$_} ) {
+			my $episode_url;
+			if ( $prog->{type} eq 'tv' ) {
+				$episode_url = "https://www.bbc.co.uk/iplayer/episode/$pid/$version_map->{$_}";
+			} elsif ( $prog->{type} eq 'radio' ) {
+				$episode_url = "https://www.bbc.co.uk/programmes/$pid";
+			}
+			unless ( $prog->{player} ) {
+				$prog->{player} = $episode_url if $episode_url;
+				last;
+			}
+		}
+	}
+	my $found;
+	for ( keys %{ $prog->{verpids} } ) {
+		$found = 1 if $version_list =~ /$_/ && $prog->{verpids}->{$_};
+		last if $found;
 	}
+	return 1 if ! $found;
+	return 0;
+}
 
+sub parse_title {
+	my $prog = shift;
+	return unless $prog->{title};
+	my ( $name, $episode );
+	$prog->{title} =~ s/,\s+(Series.+?),/: $1:/;
+	$prog->{title} =~ s/,\s+(Episode.+?)/: $1/;
+	$prog->{title} =~ s/^(.+?),\s+(.+)$/$1: $2/ unless $prog->{title} =~ /: Series/;
+	$prog->{title} =~ s/^(.+?),\s+(.+)$/$1: $2/ unless $prog->{title} =~ /: Episode/;
+	if ( $prog->{title} =~ m{^(.+?Series.*?):\s+(.+?)$} ) {
+		( $name, $episode ) = ( $1, $2 );
+	} elsif ( $prog->{title} =~ m{^(.+):\s+(.+)$} ) {
+		( $name, $episode ) = ( $1, $2 );
+	} else {
+		( $name, $episode ) = ( $prog->{title}, '-' );
+	}
+	my ($seriesnum, $episodenum);
 	# Extract the seriesnum
 	my $regex = 'Series\s+'.main::regex_numbers();
-	# Extract the seriesnum
-	if ( "$prog->{name} $prog->{episode}" =~ m{$regex}i ) {
-		$seriesnum = main::convert_words_to_number( $1 );
-	} elsif ( $seriestitle =~ m{$regex}i ) {
+	if ( "$name $episode" =~ m{$regex}i ) {
 		$seriesnum = main::convert_words_to_number( $1 );
 	}
-
 	# Extract the episode num
 	my $regex_1 = 'Episode\s+'.main::regex_numbers();
 	my $regex_2 = '^'.main::regex_numbers().'\.\s+';
-	if ( "$prog->{name} $prog->{episode}" =~ m{$regex_1}i ) {
-		$episodenum = main::convert_words_to_number( $1 );
-	} elsif ( "$name $episode" =~ m{$regex_1}i ) {
+	if ( "$name $episode" =~ m{$regex_1}i ) {
 		$episodenum = main::convert_words_to_number( $1 );
 	} elsif ( $episode =~ m{$regex_2}i ) {
 		$episodenum = main::convert_words_to_number( $1 );
-	} elsif ( $episodetitle =~ m{$regex_2}i ) {
-		$episodenum = main::convert_words_to_number( $1 );
 	}
+	# insert episode number in $episode
+	$episode = Programme::bbciplayer::insert_episode_number($episode, $episodenum);
+	# minimum episode number = 1 if not a film and series number == 0
+	$episodenum = 1 if ( $seriesnum == 0 && $episodenum == 0 && $prog->{type} eq 'tv' );
+	# minimum series number = 1 if episode number != 0
+	$seriesnum = 1 if ( $seriesnum == 0 && $episodenum != 0 );
+	$prog->{name} ||= $name;
+	$prog->{episode} ||= $episode;
+	$prog->{seriesnum} ||= $seriesnum;
+	$prog->{episodenum} ||= $episodenum;
+}
 
-	# Re-insert the episode number if the episode text doesn't have it
-	if ( $episodenum && $episodetitle =~ /^\d+\./ && $episode !~ /^(.+:\s+)?\d+\./ ) {
-		$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
+# get full episode metadata given pid and ua. Uses two different urls to get data
+sub get_metadata {
+	my $prog = shift;
+	my $ua = shift;
+	my $prog_data_url = "https://www.bbc.co.uk/programmes/";
+	my @ignore_categories = ("Films", "Sign Zone", "Audio Described", "Northern Ireland", "Scotland", "Wales", "England");
+	my ($title, $name, $brand, $series, $episode, $longname, $available, $channel, $expires, $meddesc, $longdesc, $summary, $guidance, $prog_type, $categories, $category, $web, $player, $thumbnail, $seriesnum, $episodenum, $episodepart, $firstbcast );
+	# This URL works for tv/radio prog types:
+	# https://www.bbc.co.uk/programmes/{pid}.json
+	my $got_metadata;
+	my $url = $prog_data_url.$prog->{pid}.".json";
+	my $json = main::request_url_retry($ua, $url, 3, '', '');
+	if ( $json ) {
+		my $dec = eval { decode_json($json) };
+		if ( ! $@ ) {
+			my $doc = $dec->{programme};
+			if ( $doc->{type} eq "episode" || $doc->{type} eq "clip" ) {
+				my $parent = $doc->{parent}->{programme};
+				my $grandparent = $parent->{parent}->{programme};
+				my $greatgrandparent = $grandparent->{parent}->{programme};
+				my $pid = $doc->{pid};
+				$prog_type = $doc->{media_type};
+				$prog_type = 'tv' if $prog_type =~ m{video}s;
+				$prog_type = 'radio' if $prog_type eq 'audio';
+				$longdesc = $doc->{long_synopsis};
+				$meddesc = $doc->{medium_synopsis};
+				$summary = $doc->{short_synopsis};
+				$channel = $doc->{ownership}->{service}->{title};
+				my $image_pid = $doc->{image}->{pid};
+				my $series_image_pid = $doc->{parent}->{programme}->{image}->{pid};
+				my $brand_image_pid = $doc->{parent}->{programme}->{parent}->{programme}->{image}->{pid};
+				if ( $opt->{thumbseries} || ! $image_pid ) {
+					if ( $series_image_pid ) {
+						$image_pid = $series_image_pid;
+					} elsif ( $brand_image_pid ) {
+						$image_pid = $brand_image_pid;
+					}
+				}
+				my $recipe = $prog->thumb_url_recipe();
+				$thumbnail = "https://ichef.bbci.co.uk/images/ic/${recipe}/${image_pid}.jpg";
+				# /programmes page
+				$web = "https://www.bbc.co.uk/programmes/$pid";
+				# player page
+				if ( $prog_type eq "tv" && $doc->{type} eq "episode" ) {
+					$player = "https://www.bbc.co.uk/iplayer/episode/$pid";
+				} else {
+					$player = "https://www.bbc.co.uk/programmes/$pid";
+				}
+				# title strings
+				my ($series_position, $subseries_position);
+				$episode = $doc->{title};
+				for my $ancestor ($parent, $grandparent, $greatgrandparent) {
+					if ( $ancestor->{type} && $ancestor->{title} ) {
+						if ( $ancestor->{type} eq "brand" ) {
+							$brand = $ancestor->{title};
+						} elsif ( $ancestor->{type} eq "series" ) {
+							# handle rare subseries
+							if ( $series ) {
+								$episode = "$series $episode";
+								$subseries_position = $series_position;
+							}
+							$series = $ancestor->{title};
+							$series_position = $ancestor->{position};
+						}
+					}
+				}
+				if ( $brand ) {
+					if ( $series && $series ne $brand ) {
+						$name = "$brand: $series";
+					} else {
+						$name = $brand;
+					}
+				} else {
+						$name = $series;
+				}
+				unless ( $name ) {
+					$name = $brand = $episode;
+					$episode = "-";
+					$title = $name;
+				} else {
+					$title = "$name: $episode";
+				}
+				# first broadcast date
+				$firstbcast = $doc->{first_broadcast_date};
+				# categories
+				my (@cats1, @cats2, @cats3);
+				for my $cat1 ( @{$doc->{categories}} ) {
+					unshift @cats1, $cat1->{title};
+					my $cat2 = $cat1->{broader}->{category};
+					unshift @cats2, $cat2->{title} if $cat2;
+					my $cat3 = $cat2->{broader}->{category};
+					unshift @cats3, $cat3->{title} if $cat3;
+				}
+				my %seen;
+				my @categories = grep { ! $seen{$_}++ } ( @cats3, @cats2, @cats1 );
+				$categories = join(',', @categories);
+				foreach my $cat ( @categories ) {
+					if ( ! grep(/$cat/i, @ignore_categories) ) {
+						$category = $cat;
+						last;
+					}
+				}
+				$categories ||= "get_iplayer";
+				$category ||= $categories[0] || "get_iplayer";
+				# series/episode numbers
+				if ( $subseries_position ) {
+					my @parts = ("a".."z");
+					$episodepart = $parts[$doc->{position} - 1];
+				}
+				$episodenum = $subseries_position || $doc->{position};
+				$seriesnum = $series_position || $parent->{position};
+				# the Doctor Who fudge
+				my ($seriesnum2, $episodenum2);
+				# Extract the seriesnum
+				my $regex = '(?:Series|Cyfres)\s+'.main::regex_numbers();
+				if ( "$name $episode" =~ m{$regex}i ) {
+					$seriesnum2 = main::convert_words_to_number( $1 );
+				}
+				# Extract the episode num
+				my $regex_1 = '(?:Episode|Pennod)\s+'.main::regex_numbers();
+				my $regex_2 = '^'.main::regex_numbers().'\.\s+';
+				if ( "$name $episode" =~ m{$regex_1}i ) {
+					$episodenum2 = main::convert_words_to_number( $1 );
+				} elsif ( $episode =~ m{$regex_2}i ) {
+					$episodenum2 = main::convert_words_to_number( $1 );
+				}
+				# override series/episode numbers if mismatch
+				$seriesnum = $seriesnum2 if $seriesnum2;
+				$episodenum = $episodenum2 if $episodenum2;
+				# insert episode number in $episode
+				$episode = Programme::bbciplayer::insert_episode_number($episode, $episodenum, $episodepart);
+				# minimum series number = 1 if episode number != 0
+				$seriesnum = 1 if ( $seriesnum == 0 && $episodenum != 0 );
+				# programme versions
+				my %found;
+				for my $ver ( @{$doc->{versions}} ) {
+					my @ver_types = @{$ver->{types}};
+					next unless @ver_types;
+					my $type;
+					if ( grep /(described|description)/i, @ver_types ) {
+						$type = "audiodescribed";
+					} elsif ( grep /sign/i, @ver_types ) {
+						$type = "signed";
+					} elsif ( grep /open subtitles/i, @ver_types ) {
+						$type = "opensubtitles";
+					} else {
+						my @other_types = grep !/(described|description|sign|open subtitles)/i, @ver_types;
+						next unless @other_types;
+						($type = lc($other_types[0])) =~ s/\s+.*$//;
+						$type =~ s/\W//g;
+					}
+					if ( $type ) {
+						my $version = $type;
+						$version .= $found{$type} if ++$found{$type} > 1;
+						$prog->{verpids}->{$version} = $ver->{pid};
+						$prog->{durations}->{$version} = $ver->{duration};
+					}
+				}
+				$got_metadata = 1 if $pid;
+			} else {
+				main::logger "WARNING: PID $prog->{pid} does not refer to an iPlayer programme episode or clip. Download may fail and metadata may be inaccurate.\n";
+			}
+		} else {
+			main::logger "WARNING: Could not parse programme metadata from $url ($@)\n";
+		}
+	} else {
+		main::logger "WARNING: Could not download programme metadata from $url\n";
 	}
 
-	# Use the longer of the episode texts
-	$episode = $episodetitle if length( $episodetitle ) > length( $episode );
-	$episode = $prog->{episode} if length( $prog->{episode} ) > length( $episode );
-
-	# Create a stripped episode and series with numbers removed + senum s##e## element.
-	$prog->{episodeshort} = $prog->{episode};
-	$prog->{episodeshort} =~ s/(^|:(\s+))\d+\.\s+/$1/i;
-	$prog->{episodeshort} =~ s/:?\s*Episode\s+.+?(:\s*|$)//i;
-	$prog->{episodeshort} =~ s/:?\s*Series\s+.+?(:\s*|$)//i;
-	$prog->{episodeshort} = $prog->{episode} if $prog->{episodeshort} eq '';
-	$prog->{nameshort} = $prog->{name};
-	$prog->{nameshort} =~ s/:?\s*Series\s+.+?(:\s*|$)//i;
-
-	# Conditionally set the senum
-	$prog->{senum} = sprintf "s%02se%02s", $seriesnum, $episodenum if $seriesnum != 0 || $episodenum != 0;
+	# Get list of available modes for each version available
+	# populate version PIDs and metadata if we don't have them already
+	if ( ! $got_metadata || keys %{ $prog->{verpids} } == 0 ) {
+		if ( $prog->get_verpids( $ua ) ) {
+			main::logger "ERROR: Could not get version PIDs and metadata\n" if $opt->{verbose};
+			# Return at this stage unless we want metadata/tags only for various reasons
+			return 1 if ! ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{tagonly} )
+		}
+	}
 
-	# Default to 150px width thumbnail;
-	my $thumbsize = $opt->{thumbsizecache} || 150;
-	my $thumbnail_prefix = 'http://www.bbc.co.uk/iplayer/images/episode';
+	# last-chance fallback in case streams found without complete metadata
+	$prog->{name} ||= "get_iplayer";
+	$prog->{episode} ||= $prog->{pid};
+	$prog->{title} ||= "$prog->{name}: $prog->{episode}";
 
-	# Thumbnail fallback if normal short pid (i.e. not URL)
-	$thumbnail = "${thumbnail_prefix}/$prog->{pid}".Programme::bbciplayer->thumb_url_suffixes->{ $thumbsize } if ! ( $thumbnail || $prog->{thumbnail} ) && $prog->{pid} !~ /^http/;
-	
-	# Fill in from cache if not got from metadata
+	$prog->{title} 		= $title || $prog->{title};
 	$prog->{name} 		= $name || $prog->{name};
 	$prog->{episode} 	= $episode || $prog->{episode} || $prog->{name};
+	$prog->{brand} 	= $brand || $prog->{name};
+	$prog->{series} 	= $series;
 	$prog->{type}		= $prog_type || $prog->{type};
 	$prog->{channel}	= $channel || $prog->{channel};
-	$prog->{expiry}		= $expiry || $prog->{expiry};
-	$prog->{versions}	= $versions;
+	$prog->{expires}	= $expires || $prog->{expires};
 	$prog->{guidance}	= $guidance || $prog->{guidance};
 	$prog->{categories}	= $categories || $prog->{categories};
-	$prog->{desc}		= $longdesc || $meddesc || $desc || $prog->{desc} || $summary;
-	$prog->{descmedium}	= $meddesc;
-	$prog->{descshort}	= $summary;
-	$prog->{player}		= $player;
+	$prog->{category}	= $category || $prog->{category};
+	$prog->{desc}		= $summary || $prog->{desc} || $prog->{descshort};
+	$prog->{desclong}	= $longdesc || $meddesc || $summary || $prog->{desclong};
+	$prog->{descmedium}	= $meddesc || $summary || $prog->{descmedium};
+	$prog->{descshort}	= $summary || $prog->{descshort};
+	$prog->{player}		= $player || $prog->{player};
+	$prog->{web}		= $web || $prog->{web};
 	$prog->{thumbnail}	= $thumbnail || $prog->{thumbnail};
-	$prog->{modes}		= $modes;
-	$prog->{modesizes}	= $mode_sizes;
-	$prog->{episodenum}	= $episodenum;
-	$prog->{seriesnum}	= $seriesnum;
-
-	return 0;
-}
-
+	$prog->{episodenum}	= $episodenum || $prog->{episodenum};
+	$prog->{episodepart}	= $episodepart || $prog->{episodepart};
+	$prog->{seriesnum}	= $seriesnum || $prog->{seriesnum};
+	# Conditionally set the senum
+	$prog->{senum} = sprintf "s%02de%02d%s", $prog->{seriesnum}, $prog->{episodenum}, $prog->{episodepart} if $prog->{seriesnum} != 0 && $prog->{episodenum} != 0;
+	$prog->{senumx} = sprintf "%02dx%02d%s", $prog->{seriesnum}, $prog->{episodenum}, $prog->{episodepart} if $prog->{seriesnum} != 0 && $prog->{episodenum} != 0;
+	# Create a stripped episode and series with numbers removed + senum s##e## element.
+	$prog->{episodeshort} = $prog->{episode};
+	$prog->{episodeshort} =~ s/(^|:(\s+))\d+[a-z]?\.\s+/$1/i;
+	my $no_number = $prog->{episodeshort};
+	$prog->{episodeshort} =~ s/:?\s*(Episode|Pennod)\s+.+?(:\s*|$)//i;
+	$prog->{episodeshort} =~ s/:?\s*(Series|Cyfres)\s+.+?(:\s*|$)//i;
+	$prog->{episodeshort} = $no_number if $prog->{episodeshort} eq '';
+	$prog->{nameshort} = $prog->{brand};
+	$prog->{nameshort} =~ s/:?\s*(Series|Cyfres)\s+\d.*?(:\s*|$)//i;
+	$prog->{series} = "Series $seriesnum" if $seriesnum && $prog->{series} && $prog->{nameshort} && $prog->{series} eq $prog->{nameshort};
+	$prog->{series} ||= "Series $seriesnum" if $seriesnum;
+	$prog->{firstbcast} = $firstbcast;
+	$prog->{firstbcastrel} = Programme::get_time_string( $firstbcast, time() );
+	($prog->{firstbcastdate} = $firstbcast) =~ s/T.*$//;
+	($prog->{firstbcasttime} = $firstbcast) =~ s/^.*T([:\d]+).*$/$1/;
+	($prog->{firstbcastyear}, $prog->{firstbcastmonth}, $prog->{firstbcastday}) = split( "-", $prog->{firstbcastdate} );
+	($prog->{sebcast} = substr($firstbcast, 0, 17)) =~ s/\D//g;
+	$prog->{sebcastdate} = substr($prog->{sebcast}, 0, 8);
+	$prog->{sebcasttime} = substr($prog->{sebcast}, 8, 4);
+	$prog->{sesort} = $prog->{senum} || $prog->{sebcast};
+	
+	# Do this for each version tried in this order (if they appeared in the content)
+	for my $version ( sort keys %{ $prog->{verpids} } ) {
+		# Try to get stream data for this version if it isn't already populated
+		if ( not defined $prog->{streams}->{$version} ) {
+			# Add streamdata to object
+			$prog->{streams}->{$version} = get_stream_data($prog, $prog->{verpids}->{$version}, undef, $version );
+		}
+		if ( keys %{ $prog->{streams}->{$version} } == 0 ) {
+			main::logger "INFO: No streams available for '$version' version ($prog->{verpids}->{$version}) - skipping\n" if $opt->{verbose};
+			next;
+		}
+		# Set duration for this version if it is not defined
+		$prog->{durations}->{$version} = $prog->{duration} if $prog->{duration} =~ /\d+/ && ! $prog->{durations}->{$version};
+	}
 
+	my @fields1 = qw(verpids streams durations);
 
-sub get_pids_recursive {
-	my $prog = shift;
-	my $ua = main::create_ua( 'desktop' );
-	my @pids = ();
+	# remove versions with no media streams
+	for my $version ( sort keys %{ $prog->{verpids} } ) {
+		my @version_modes = sort Programme::cmp_modes keys %{ $prog->{streams}->{$version} };
+		if ( ! grep !/^subtitles\d+$/, @version_modes ) {
+			main::logger "INFO: No media streams found for '$version' version ($prog->{verpids}->{$version}) - deleting\n" if $opt->{verbose};
+			for my $key ( @fields1 ) {
+				delete $prog->{$key}->{$version};
+			}
+		}
+	}
 
-	# Clean up the pid
-	$prog->clean_pid();
+	unless ( $opt->{nomergeversions} ) {
+		# merge versions with same name and duration
+		for my $version ( sort keys %{ $prog->{verpids} } ) {
+			next if $version !~ /\d+$/;
+			(my $base_version = $version) =~ s/\d+$//;
+			next unless $prog->{durations}->{$base_version} && $prog->{durations}->{$version};
+			if ( $prog->{durations}->{$base_version} == $prog->{durations}->{$version} ) {
+				main::logger "INFO: Merging '$version' version ($prog->{verpids}->{$version}) into '$base_version' version ($prog->{verpids}->{$base_version})\n" if $opt->{verbose};
+				my @version_modes = sort Programme::cmp_modes keys %{ $prog->{streams}->{$version} };
+				for my $mode ( @version_modes ) {
+					if ( ! $prog->{streams}->{$base_version}->{$mode} ) {
+						$prog->{streams}->{$base_version}->{$mode} = $prog->{streams}->{$version}->{$mode}
+					}
+				}
+				for my $key ( @fields1 ) {
+					delete $prog->{$key}->{$version};
+				}
+			}
+		}
+	}
 
-	# Skip RDF retrieval if a web URL
-	return $prog->{pid} if $prog->{pid} =~ '^http';
+	my $versions = join ',', sort keys %{ $prog->{verpids} };
 
-	eval "use XML::Simple";
-	if ($@) {
-		main::logger "WARNING: Please download and run latest installer or install the XML::Simple perl module to use the Series and Brand pid parsing functionality\n";
-		push @pids, $prog->{pid};
-	} else {
-		#use Data::Dumper qw(Dumper);
-		my $rdf = get_rdf_data( $ua, $prog->{pid} );
-		if ( ! $rdf ) {
-			main::logger "WARNING: PID URL contained no RDF data. Trying to record PID directly.\n";
-			return $prog->{pid};
-		}
-		# an episode-only pid page
-		if ( $rdf->{'po:Episode'} ) {
-			main::logger "INFO: Episode-only pid detected\n";
-			# No need to lookup - we already are an episode pid
-			push @pids, $prog->{pid};
-		} elsif ( $rdf->{'po:Clip'} ) {
-			main::logger "INFO: Clip-only pid detected\n";
-			# No need to lookup - we already are a clip pid
-			push @pids, $prog->{pid};
-		# a series pid page
-		} elsif ( $rdf->{'po:Series'} ) {
-			main::logger "INFO: Series pid detected\n";
-			push @pids, parse_rdf_series( $ua, $prog->{pid} );
-			if ( ! $opt->{pidrecursive} ) {
-				main::logger "INFO: Please run the command again using one of the above episode PIDs or to get all programmes add the --pid-recursive option\n";
-				return ();
-			}
-		# a brand pid page
-		} elsif ( $rdf->{'po:Brand'} ) {
-			main::logger "INFO: Brand pid detected\n";
-			push @pids, parse_rdf_brand( $ua, $prog->{pid} );
-			if ( ! $opt->{pidrecursive} ) {
-				main::logger "INFO: Please run the command again using one of the above episode PIDs or to get all programmes add the --pid-recursive option\n";
-				return ();
+	my $modes;
+	my $mode_sizes;
+	for my $version ( sort keys %{ $prog->{verpids} } ) {
+		my @version_modes = sort Programme::cmp_modes keys %{ $prog->{streams}->{$version} };
+		$modes->{$version} = join ',', @version_modes;
+		# Estimate the file sizes for each mode
+		my @sizes;
+		for my $mode ( @version_modes ) {
+			# get expiry from stream data
+			if ( ! $prog->{expires} && $prog->{streams}->{$version}->{$mode}->{expires} ) {
+				$prog->{expires} = Programme::get_time_string( $prog->{streams}->{$version}->{$mode}->{expires} );
+			}
+			my $size;
+			if ( $prog->{streams}->{$version}->{$mode}->{size} ) {
+				$size = $prog->{streams}->{$version}->{$mode}->{size};
+			} else {
+				next if ( ! $prog->{durations}->{$version} ) || (! $prog->{streams}->{$version}->{$mode}->{bitrate} );
+				$size = $prog->{streams}->{$version}->{$mode}->{bitrate} * $prog->{durations}->{$version} / 8.0 * 1000.0;
+			}
+			if ( $size < 1000000 ) {
+				push @sizes, sprintf( "%s=%.0fkB", $mode, $size / 1000.0 );
+			} else {
+				push @sizes, sprintf( "%s=%.0fMB", $mode, $size / 1000000.0 );
 			}
 		}
+		$mode_sizes->{$version} = join ',', sort Programme::cmp_modes @sizes;
 	}
-	# now make list unique
-	@pids = main::make_array_unique_ordered( @pids );
-	return @pids;
-}
-
-sub ensure_array {
-	my ($in) = @_;
-	return ref $in eq 'ARRAY' ? @$in : $in;
-}
 
-# Gets the episode data from a given episode pid
-sub parse_rdf_episode {
-	my $ua = shift;
-	my $uri = shift;
-	my $rdf = get_rdf_data( $ua, $uri );
-	if ( ! $rdf ) {
-		main::logger "WARNING: Episode PID rdf URL contained no RDF data.\n";
-		return '';
-	}
-	my $pid = extract_pid( $uri );
-	main::logger "INFO:      Episode '".$rdf->{'po:Episode'}->{'dc:title'}."' ($pid)\n";
-	# We don't really need the ver pids from here
-	if ( ref$rdf->{'po:Episode'}->{'po:version'} eq 'ARRAY' ) {
-		for my $verpid_element ( @{ $rdf->{'po:Episode'}->{'po:version'} } ) {
-			main::logger "INFO:        With Version PID '".extract_pid( $verpid_element->{'rdf:resource'} )."'\n" if $opt->{debug};
+	$prog->{versions} = $versions;
+	$prog->{modes} = $modes;
+	$prog->{modesizes} = $mode_sizes;
+
+	# check at least one version available
+	if ( keys %{ $prog->{verpids} } == 0 ) {
+		main::logger "WARNING: No media streams found for requested programme versions and recording modes.\n";
+		if ( $prog->{geoblocked} ) {
+			main::logger "WARNING: The BBC has blocked access to this programme because it has determined that you are using get_iplayer outside the UK.\n";
+		} else {
+			main::logger "WARNING: The programme may no longer be available - check the iPlayer site.\n";
+			main::logger "WARNING: The programme may only be available in an unsupported format (e.g., Flash) - check the iPlayer site.\n";
+			main::logger "WARNING: If you use a VPN/VPS/Smart DNS/web proxy, check with the provider to find out if it has been blocked.\n";
 		}
-	} else {
-		main::logger "INFO:        With Version PID '".extract_pid( $rdf->{'po:Episode'}->{'po:version'}->{'rdf:resource'} )."'\n" if $opt->{debug};
+		# Return at this stage unless we want metadata/tags only for various reasons
+		return 1 if ! ( $opt->{info} || $opt->{metadataonly} || $opt->{thumbonly} || $opt->{tracklistonly} || $opt->{creditsonly} || $opt->{tagonly} )
 	}
-	main::logger "INFO:        From Series PID '".extract_pid( $rdf->{'po:Series'}->{'rdf:about'} )."'\n" if $opt->{debug};
-	main::logger "INFO:        From Brand PID '".extract_pid( $rdf->{'po:Brand'}->{'rdf:about'} )."'\n" if $opt->{debug};
-}
-
 
+	return 0;
+}
 
-# Gets the clip data from a given clip pid
-sub parse_rdf_clip {
+sub fetch_pid_info {
 	my $ua = shift;
-	my $uri = shift;
-	my $rdf = get_rdf_data( $ua, $uri );
-	if ( ! $rdf ) {
-		main::logger "WARNING: Clip PID rdf URL contained no RDF data.\n";
-		return '';
-	}
-	my $pid = extract_pid( $uri );
-	main::logger "INFO:      Clip '".$rdf->{'po:Clip'}->{'dc:title'}."' ($pid)\n";
-	# We don't really need the ver pids from here
-	if ( ref$rdf->{'po:Clip'}->{'po:version'} eq 'ARRAY' ) {
-		for my $verpid_element ( @{ $rdf->{'po:Clip'}->{'po:version'} } ) {
-			main::logger "INFO:        With Version PID '".extract_pid( $verpid_element->{'rdf:resource'} )."'\n" if $opt->{debug};
+	my $pid = shift;
+	my $url = "https://www.bbc.co.uk/programmes/$pid.json";
+	my $pid_type;
+	my $prog_type;
+	my $prog_name;
+	my $prog_episode;
+	my $prog_channel;
+	my $prog_desc;
+	my $json = main::request_url_retry($ua, $url, 3, '', '');
+	if ( $json ) {
+		my $doc = eval { decode_json($json) };
+		if ( ! $@ ) {
+			$pid_type = $doc->{programme}->{type};
+			if ( $doc->{programme}->{media_type} eq 'audio' ) {
+				$prog_type = 'radio';
+			} elsif ( $doc->{programme}->{media_type} =~ /video/ )  {
+				$prog_type = 'tv';
+			} else {
+				$prog_type = $doc->{programme}->{ownership}->{service}->{type};
+			}
+			$prog_name = $doc->{programme}->{display_title}->{title};
+			$prog_episode = $doc->{programme}->{display_title}->{subtitle};
+			$prog_channel = $doc->{programme}->{ownership}->{service}->{title};
+			$prog_desc = $doc->{programme}->{short_synopsis};
+			if ( $prog_episode =~ s/((?:Series|Cyfres) \d+)[, :]+// ) {
+				$prog_name .= ": $1";
+			}
+		} else {
+			main::logger "ERROR: Could not parse JSON PID info: $url\n";
 		}
 	} else {
-		main::logger "INFO:        With Version PID '".extract_pid( $rdf->{'po:Clip'}->{'po:version'}->{'rdf:resource'} )."'\n" if $opt->{debug};
+		main::logger "WARNING: Failed to download JSON PID info: $url\n";
 	}
-	#main::logger "INFO:        From Series PID '".extract_pid( $rdf->{'po:Series'}->{'rdf:about'} )."'\n" if $opt->{debug};
-	main::logger "INFO:        From Brand PID '".extract_pid( $rdf->{'po:Brand'}->{'rdf:about'} )."'\n" if $opt->{debug};
+	return ($pid_type, $prog_type, $prog_name, $prog_episode, $prog_channel, $prog_desc);
 }
 
-
-
-sub parse_rdf_series {
+sub fetch_episodes_recursive {
 	my $ua = shift;
-	my $uri = shift;
-	my $rdf = get_rdf_data( $ua, $uri );
-	if ( ! $rdf ) {
-		main::logger "WARNING: Series PID rdf URL contained no RDF data.\n";
-		return '';
-	}
-	my @pids = ();
-	my $spid = extract_pid( $rdf->{'po:Series'}->{'rdf:about'} );
-	main::logger "INFO:    Series: '".$rdf->{'po:Series'}->{'dc:title'}."' ($spid)\n";
-	main::logger "INFO:      From Brand PID '".$rdf->{'po:Brand'}->{'rdf:about'}."'\n" if $opt->{debug};
-	for my $episode_element (ensure_array($rdf->{'po:Series'}->{'po:episode'})) {
-		my $pid = extract_pid( $episode_element->{'po:Episode'}->{'rdf:about'} );
-		main::logger "INFO:      Episode '".$episode_element->{'po:Episode'}->{'dc:title'}."' ($pid)\n";
-		push @pids, $pid;
-		#parse_rdf_episode( $ua, $pid );
+	my $parent_pid = shift;
+	my $prog_type = shift;
+	my $eps;
+	my %seen;
+	my $max_page = 1;
+	my $curr_page = 1;
+	my $last_page;
+	my $title;
+	my $channel;
+	my $check_series_nav;
+	my $has_series_nav;
+	{ do {
+		my $url = "https://www.bbc.co.uk/programmes/$parent_pid/episodes/player?page=$curr_page";
+		my $html = main::request_url_retry($ua, $url, 3, '', '');
+		last unless $html;
+		my $dom = XML::LibXML->load_html(string => $html, recover => 1, suppress_errors => 1);
+		unless ( $channel ) {
+			$channel = $dom->findvalue('//a[contains(@class,"br-masthead__masterbrand")]');
+		}
+		unless ( $title ) {
+			$title = $dom->findvalue('//div[contains(@class,"br-masthead__title")]/a');
+			unless ( $title ) {
+				$title = $dom->findvalue('//title');
+			}
+			$title =~ s/(^\s+|\s+$)//g;
+			$title =~ s/[-\s]+(Available now|Ar gael nawr)//gi;
+			$title =~ s/^BBC[-\s]+[^-]+[-\s]+//g;
+			$title =~ s/[-\s]+[^-]+[-\s]+BBC$//g;
+		}
+		my @episodes = $dom->findnodes('//div[@data-pid]');
+		if ( @episodes ) {
+			for my $episode ( @episodes ) {
+				my $pid = $episode->findvalue('@data-pid');
+				next unless $pid;
+				next if $seen{$pid};
+				$seen{$pid} = 1;
+				my $prog_episode = $episode->findvalue('.//span[contains(@class,"programme__title")]/span');
+				my $name2 = $episode->findvalue('.//span[contains(@class,"programme__subtitle")]/span');
+				my $prog_name = $name2 ? "$title: $name2" : $title;
+				my $prog_desc = $episode->findvalue('.//p[contains(@class,"programme__synopsis")]/span');
+				unless ( $name2 ) {
+					if ( $prog_episode =~ s/((?:Series|Cyfres) \d+(\s+Reversions)?)[, :]+// ) {
+						$prog_name .= ": $1";
+					}
+				}
+				push @$eps, main::progclass($prog_type)->new( pid => $pid, type => $prog_type, name => $prog_name, episode => $prog_episode, channel => $channel, desc => $prog_desc );
+			}
+		}
+		unless ( $last_page ) {
+			$last_page = $dom->findvalue('//li[contains(@class,"pagination__page--last")]/a');
+		}
+		last unless $last_page;
+		$last_page =~ s/(^\s+|\s+$)//g;
+		$max_page = $last_page if $last_page > $max_page;
+		$curr_page++;
+	} while ( $curr_page <= $max_page ) };
+	unless ( $eps && @$eps ) {
+		main::logger "INFO: No episodes found, checking alternate location...\n" if $opt->{verbose};
+		%seen = undef;
+		$title = undef;
+		$channel = undef;
+		my @urls = ( "https://www.bbc.co.uk/iplayer/episodes/$parent_pid" );
+		for my $url ( @urls ) {
+			$curr_page = 1;
+			$max_page = 1;
+			$last_page = undef;
+			{ do {
+				my $html = main::request_url_retry($ua, $url, 3, '', '');
+				last unless $html;
+				my $dom = XML::LibXML->load_html(string => $html, recover => 1, suppress_errors => 1);
+				if ( ! $check_series_nav ) {
+					my @hrefs = $dom->findnodes('//nav[contains(@class,"series-nav")]/ul/li/a/@href');
+					push @urls, "https://www.bbc.co.uk".$_->findvalue('.') for @hrefs;
+					$has_series_nav = @hrefs;
+					$check_series_nav = 1;
+				}
+				unless ( $channel ) {
+					$channel = $dom->findvalue('//div[contains(@class,"episodes-available")]/img/@alt');
+				}
+				unless ( $title ) {
+					$title = $dom->findvalue('//h1[contains(@class,"hero-header__title")]');
+					unless ( $title ) {
+						$title = $dom->findvalue('//title');
+					}
+					$title =~ s/(^\s+|\s+$)//g;
+					$title =~ s/[-\s]+(Available now|Ar gael nawr)//gi;
+					$title =~ s/^BBC[-\s]+[^-]+[-\s]+//g;
+					$title =~ s/[-\s]+[^-]+[-\s]+BBC$//g;
+				}
+				my @episodes = $dom->findnodes('//div[contains(@class,"list__grid")]/ul/li');
+				if ( @episodes ){
+					for my $episode ( @episodes ) {
+						my $item = $episode->findvalue('.//div[contains(@class,"content-item")]/a/@href');
+						my $pid = $1 if $item =~ m{/episode/([a-z0-9]+)};
+						next unless $pid;
+						next if $seen{$pid};
+						$seen{$pid} = 1;
+						my $prog_episode = $episode->findvalue('.//div[contains(@class,"content-item__title")]');
+						my $name2 = $episode->findvalue('.//div[contains(@class,"content-item__title")]/span[1]');
+						my $prog_name = $name2 ? "$title: $name2" : $title;
+						my $prog_desc = $episode->findvalue('.//div[contains(@class,"content-item__info__secondary")]/div[contains(@class,"content-item__description")]');
+						unless ( $name2 ) {
+							if ( $prog_episode =~ s/((?:Series|Cyfres) \d+(\s+Reversions)?)[, :]+// ) {
+								$prog_name .= ": $1";
+							}
+						}
+						push @$eps, main::progclass($prog_type)->new( pid => $pid, type => $prog_type, name => $prog_name, episode => $prog_episode, channel => $channel, desc => $prog_desc );
+					}
+				}
+				unless ( $last_page ) {
+					$last_page = $dom->findvalue('//div[contains(@class,"list__pagination")]//ol[contains(@class,"pagination__list")]/li[contains(@class,"pagination__number")][last()]//a/span/span[1]');
+				}
+				last unless $last_page;
+				$last_page =~ s/(^\s+|\s+$)//g;
+				$max_page = $last_page if $last_page > $max_page;
+				$curr_page++;
+				$url = "https://www.bbc.co.uk/iplayer/episodes/$parent_pid?page=$curr_page";
+			} while ( $curr_page <= $max_page ) };
+		}
 	}
-	return @pids;
-}
-
-
-
-sub parse_rdf_brand {
-	my $ua = shift;
-	my $uri = shift;
-	my $rdf = get_rdf_data( $ua, $uri );
-	if ( ! $rdf ) {
-		main::logger "WARNING: Brand PID rdf URL contained no RDF data.\n";
-		return '';
+	if ( $eps && @$eps ) {
+		@$eps = reverse @$eps unless $has_series_nav;
 	}
-	my @pids = ();
-	my $bpid = extract_pid( $uri );
-	main::logger "INFO:  Brand: '".$rdf->{'po:Brand'}->{'dc:title'}."' ($bpid)\n";
-	for my $series_element ( ensure_array($rdf->{'po:Brand'}->{'po:series'}) ) {
-		main::logger "INFO: With Series pid '".$series_element->{'rdf:resource'}."'\n" if $opt->{debug};
-		push @pids, parse_rdf_series( $ua, $series_element->{'rdf:resource'} );
-	}
-	my @episodes = ensure_array($rdf->{'po:Brand'}->{'po:episode'});
-	main::logger "INFO:    Series: <None>\n" if @episodes;
-	for my $episode_element ( @episodes ) {
-		main::logger "INFO:      Episode pid: ".$episode_element->{'rdf:resource'}."\n" if $opt->{debug};
-		push @pids, extract_pid( $episode_element->{'rdf:resource'} );
-		parse_rdf_episode( $ua, $episode_element->{'rdf:resource'} );
-	}
-	my @clips = ensure_array($rdf->{'po:Brand'}->{'po:clip'});
-	for my $clip_element ( @clips ) {
-		main::logger "INFO:      Clip pid: ".$clip_element->{'rdf:resource'}."\n" if $opt->{debug};
-		push @pids, extract_pid( $clip_element->{'rdf:resource'} );
-		parse_rdf_clip( $ua, $clip_element->{'rdf:resource'} );
-	}
-	return @pids;
-}
-
-
-
-# Extracts and returns a pid from a URI/URL
-sub extract_pid {
-	return $1 if $_[0] =~ m{/?([wpb]0[a-z0-9]{6})};
-	return '';
+	return $eps;
 }
 
-
-
-# Given a pid, gets the rdf URL and returns an XML::Simple object
-sub get_rdf_data {
-	eval "use XML::Simple";
-	if ($@) {
-		main::logger "WARNING: Please download and run latest installer or install the XML::Simple perl module to use the Series and Brand pid parsing functionality\n";
+sub get_episodes_recursive {
+	my $prog = shift;
+	my $eps;
+	my $pid_type;
+	my $prog_type;
+	my $prog_name;
+	my $prog_episode;
+	my $prog_channel;
+	my $prog_desc;
+	# Clean up the pid
+	main::logger "INFO: Cleaning PID - old: '$prog->{pid}'" if $opt->{verbose};
+	$prog->clean_pid();
+	main::logger " new: '$prog->{pid}'\n" if $opt->{verbose};
+	if ( ! $prog->pid_ok() ) {
+		main::logger "ERROR: Could not extract a valid PID from $prog->{pid}\n";
 		return;
 	}
-	#use Data::Dumper qw(Dumper);
-	my $ua = shift;
-	my $uri = shift;
-	my $pid = extract_pid( $uri );
-	my $entry = main::request_url_retry($ua, 'http://www.bbc.co.uk/programmes/'.$pid.'.rdf', 3, '', '');
-	if ( ! $entry ) {
-		main::logger "WARNING: rdf URL contained no data\n";
-		return '';
+	my $ua = main::create_ua( 'desktop' );
+	($pid_type, $prog_type, $prog_name, $prog_episode, $prog_channel, $prog_desc ) = fetch_pid_info( $ua, $prog->{pid} );
+	$prog_type ||= 'tv';
+	$prog_name ||= 'get_iplayer';
+	$prog_episode ||= $prog_name eq "get_iplayer" ? $prog->{pid} : "-";
+	$prog_channel ||= 'BBC iPlayer';
+	$prog_desc ||= 'No description';
+	if ( ! $pid_type ) {
+		main::logger "WARNING: Could not determine PID type ($prog->{pid}). Trying to record PID directly.\n";
+		push @$eps, main::progclass($prog_type)->new( pid => $prog->{pid}, type => $prog_type, name => $prog_name, episode => $prog_episode, channel => $prog_channel, desc => $prog_desc );
+	} elsif ( $pid_type eq "episode" || $pid_type eq "clip" ) {
+		main::logger "INFO: $prog_type $pid_type PID detected ($prog->{pid})\n" if $opt->{verbose};
+		push @$eps, main::progclass($prog_type)->new( pid => $prog->{pid}, type => $prog_type, name => $prog_name, episode => $prog_episode, channel => $prog_channel, desc => $prog_desc );
+	} elsif ( $pid_type eq "series" || $pid_type eq "brand" ) {
+		main::logger "INFO: $prog_type series or brand PID detected ($prog->{pid})\n" if $opt->{verbose};
+		if ( $opt->{pidrecursive} ) {
+			$eps = fetch_episodes_recursive($ua, $prog->{pid}, $prog_type);
+		} else {
+			main::logger "INFO: '$prog->{pid}' is a series or brand PID for '$prog_name' - add the --pid-recursive option to retrieve available episodes\n";
+			return;
+		}
+	} else {
+		main::logger "WARNING: Unknown PID type: $pid_type ($prog->{pid}). Trying to record PID directly.\n";
+		push @$eps, progclass($prog_type)->new( pid => $prog->{pid}, type => $prog_type, name => $prog_name, episode => $prog_episode, channel => $prog_channel, desc => $prog_desc );
 	}
-	# Flatten
-	$entry =~ s|[\n\r]| |g;
-	my $simple = new XML::Simple();
-	my $rdf = $simple->XMLin( $entry );
-	#main::logger Dumper ( $rdf )."\n" if $opt->{debug};
-	return $rdf;
+	return $eps;
 }
 
-
-
 # Intelligently split name and episode from title string for BBC iPlayer metadata
 sub split_title {
 	my $title = shift;
@@ -5684,43 +5303,84 @@
 	return ( $name, $episode );
 }
 
+sub insert_episode_number {
+	my $episode = shift;
+	my $episodenum = shift;
+	my $episodepart = shift;
+	#my $episode_regex = 'Episode\s+'.main::regex_numbers();
+	#my $date_regex = '^(\d{2}\/\d{2}\/\d{4}|\d{4}\-\d{2}\-\d{2})';
+	if ( $episodenum && $episode !~ /^\d+[a-z]?\./ ) { #&& $episode !~ /$episode_regex/ && $episode !~ /$date_regex/ ) {
+		$episode = sprintf("%02d%s. %s", $episodenum, $episodepart, $episode);
+	}
+	return $episode;
+}
 
+sub thumb_url_recipe {
+	my $prog = shift;
+	my $defsize = 192;
+	my $thumbsize = $opt->{thumbsize} || $defsize;
+	my $recipe = $prog->thumb_url_recipes->{ $thumbsize };
+	if ( ! $recipe ) {
+		if ( $thumbsize >= 1 && $thumbsize <= 11 ) {
+			main::logger "WARNING: Index numbers 1-11 no longer valid with --thumbsize - specify thumbnail image width\n";
+		}
+		my $newsize;
+		my @sizes = sort { $a <=> $b } keys %{$prog->thumb_url_recipes()};
+		if ( $thumbsize < $sizes[0] ) {
+			$newsize = $sizes[0];
+		} elsif ( $thumbsize > $sizes[$#sizes] ) {
+			$newsize = $sizes[$#sizes];
+		} else {
+			my $diff = abs($sizes[$#sizes] - $sizes[0]);
+			my $size = $defsize;
+			for my $size2 ( @sizes ) {
+				my $diff2 = abs($thumbsize - $size2);
+				if ( $diff2 < $diff ) {
+					$diff = $diff2;
+					$size = $size2;
+				}
+			}
+			$newsize = $size;
+		}
+		main::logger "WARNING: Invalid thumbnail size: $thumbsize - using nearest available ($newsize)\n";
+		$recipe = $prog->thumb_url_recipes->{ $newsize };
+	}
+	if ( $opt->{thumbsquare} ) {
+		$recipe =~ s/(\d+)x\d+/$1x$1/;
+	}
+	return $recipe;
+}
 
-# Returns hash
-sub thumb_url_suffixes {
+sub thumb_url_recipes {
 	return {
-		86	=> '_86_48.jpg',
-		150	=> '_150_84.jpg',
-		178	=> '_178_100.jpg',
-		512	=> '_512_288.jpg',
-		528	=> '_528_297.jpg',
-		640	=> '_640_360.jpg',
-		832	=> '_832_468.jpg',
-		1	=> '_86_48.jpg',
-		2	=> '_150_84.jpg',
-		3	=> '_178_100.jpg',
-		4	=> '_512_288.jpg',
-		5	=> '_528_297.jpg',
-		6	=> '_640_360.jpg',
-		7	=> '_832_468.jpg',
+		192 => '192x108',
+		256 => '256x144',
+		384 => '384x216',
+		448 => '448x252',
+		512	=> '512x288',
+		640	=> '640x360',
+		704	=> '704x396',
+		832	=> '832x468',
+		960	=> '960x540',
+		1280	=> '1280x720',
+		1920	=> '1920x1080',
 	}
 }
 
-
 #new_stream_report($mattribs, $cattribs)
 sub new_stream_report {
 	my $mattribs = shift;
 	my $cattribs = shift;
-	
+
 	main::logger "New BBC iPlayer Stream Found:\n";
 	main::logger "MEDIA-ELEMENT:\n";
-		
+
 	# list media attribs
 	main::logger "MEDIA-ATTRIBS:\n";
 	for (keys %{ $mattribs }) {
 		main::logger "\t$_ => $mattribs->{$_}\n";
 	}
-	
+
 	my @conn;
 	if ( defined $cattribs ) {
 		@conn = ( $cattribs );
@@ -5729,17 +5389,15 @@
 	}
 	for my $cattribs ( @conn ) {
 		main::logger "\tCONNECTION-ELEMENT:\n";
-			
+
 		# Print attribs
 		for (keys %{ $cattribs }) {
 			main::logger "\t\t$_ => $cattribs->{$_}\n";
-		}	
+		}
 	}
 	return 0;
 }
 
-
-
 sub parse_metadata {
 	my @medias;
 	my $xml = shift;
@@ -5757,15 +5415,20 @@
 			# push to data structure
 			push @{ $mattribs->{connections} }, parse_attributes( $1 );
 		}
+		# mediaselector 5 -> 4 compatibility
+		for my $cattribs ( @{ $mattribs->{connections} } ) {
+			if ( ! $cattribs->{kind} && $cattribs->{supplier} ) {
+				$cattribs->{kind} = $cattribs->{supplier};
+			}
+		}
 		push @medias, $mattribs;
 	}
 
-
 	# Parse and dump structure
 	if ( $opt->{debug} ) {
 		for my $mattribs ( @medias ) {
 			main::logger "MEDIA-ELEMENT:\n";
-		
+
 			# list media attribs
 			main::logger "MEDIA-ATTRIBS:\n";
 			for (keys %{ $mattribs }) {
@@ -5774,20 +5437,18 @@
 
 			for my $cattribs ( @{ $mattribs->{connections} } ) {
 				main::logger "\tCONNECTION-ELEMENT:\n";
-			
+
 				# Print attribs
 				for (keys %{ $cattribs }) {
 					main::logger "\t\t$_ => $cattribs->{$_}\n";
-				}	
+				}
 			}
-		}	
+		}
 	}
-	
+
 	return @medias;
 }
 
-
-
 sub parse_attributes {
 	$_ = shift;
 	my $attribs;
@@ -5798,145 +5459,321 @@
 	return $attribs;
 }
 
+# from https://github.com/osklil/hls-fetch
+sub parse_hls_connection {
+	my $media = shift;
+	my $conn = shift;
+	my $min_bitrate = shift;
+	my $max_bitrate = shift;
+	my $prefix = shift || "hls";
+	decode_entities($conn->{href});
+	my @hls_medias;
+	my $data = main::request_url_retry( main::create_ua( 'desktop' ), $conn->{href}, 3, undef, undef, 1 );
+	if ( ! $data ) {
+		main::logger "WARNING: No HLS playlist returned ($conn->{href})\n" if $opt->{verbose};
+		return;
+	}
+	my @lines = split(/\r*\n|\r\n*/, $data);
+	if ( @lines < 1 || $lines[0] !~ '^#EXTM3U' ) {
+		main::logger "WARNING: Invalid HLS playlist, no header ($conn->{href})\n" if $opt->{verbose};
+		return;
+	}
 
+	my $best_audio;
+	if (!grep { /^#EXTINF:/ } @lines) {
+		my (@streams, $last_stream);
+		foreach my $line (@lines) {
+			next if ($line =~ /^#/ && $line !~ /^#EXT/) || $line =~ /^\s*$/;
+			if ($line =~ /^#EXT-X-STREAM-INF:(.*)$/) {
+				$last_stream = parse_m3u_attribs($conn->{href}, $1);
+				next unless $last_stream;
+				if ( $last_stream->{RESOLUTION} && $last_stream->{AUDIO} ) {
+					$best_audio->{$last_stream->{RESOLUTION}} = $last_stream->{AUDIO};
+				}
+				push @streams, $last_stream;
+			} elsif ($line !~ /^#EXT/) {
+				if ( ! defined $last_stream ) {
+					main::logger "WARNING: Missing #EXT-X-STREAM-INF for URL: $line ($conn->{href})\n" if $opt->{verbose};
+					return;
+				}
+				$last_stream->{'URL'} = $line;
+				$last_stream = undef;
+			}
+		}
+		if ( ! @streams ) {
+			main::logger "WARNING: No streams found in HLS playlist ($conn->{href})\n";
+			return,
+		};
+
+		main::logger "WARNING: non-numeric bandwidth in HLS playlist\n" if grep { $_->{'BANDWIDTH'} =~ /\D/ } @streams;
+		for my $stream ( @streams ) {
+			next if $stream->{AUDIO} && $best_audio->{$stream->{RESOLUTION}} && $stream->{AUDIO} ne $best_audio->{$stream->{RESOLUTION}};
+			my $hls_media = dclone($media);
+			delete $hls_media->{fps};
+			delete $hls_media->{width};
+			delete $hls_media->{height};
+			delete $hls_media->{bitrate};
+			delete $hls_media->{media_file_size};
+			delete $hls_media->{service};
+			delete $hls_media->{connections};
+			my ($ab, $vb) = ($1, $2) if $stream->{'URL'} =~ /audio.*?=(\d+)-video.*?=(\d+)/;
+			if ( $ab && $vb ) {
+				$hls_media->{audio_bitrate} = int($ab/1000);
+				$hls_media->{video_bitrate} = int($vb/1000);
+			}
+			$hls_media->{bitrate} = int($stream->{BANDWIDTH}/1000.0);
+			next if $min_bitrate && $hls_media->{bitrate} < $min_bitrate;
+			next if $max_bitrate && $hls_media->{bitrate} > $max_bitrate;
+			if ( $stream->{RESOLUTION} ) {
+				($hls_media->{width}, $hls_media->{height}) = split(/x/, $stream->{RESOLUTION});
+				$hls_media->{fps} = $stream->{"FRAME-RATE"} || 25;
+			}
+			$hls_media->{service} = "gip_${prefix}_$hls_media->{bitrate}";
+			my $hls_conn = dclone($conn);
+			my $uri1 = URI->new($hls_conn->{href});
+			my $uri2 = URI->new($stream->{URL});
+			my $qs1 = $uri1->query;
+			my $qs2 = $uri2->query;
+			if ( ! $uri2->scheme ) {
+				my @segs1 = $uri1->path_segments;
+				my @segs2 = $uri2->path_segments;
+				pop @segs1;
+				push @segs1, @segs2;
+				$uri2 = dclone($uri1);
+				$uri2->path_segments(@segs1);
+			}
+			$qs1 .= "&" if $qs1 && $qs2;
+			$uri2->query($qs1.$qs2);
+			delete $hls_conn->{href};
+			$hls_conn->{href} = $uri2->as_string;
+			$hls_media->{connections} = [ $hls_conn ];
+			push @hls_medias, $hls_media;
+		}
+	}
+	return @hls_medias;
+}
+
+# from https://github.com/osklil/hls-fetch
+sub parse_m3u_attribs {
+	my ($url, $attr_str) = @_;
+	my %attr;
+	for (my $as = $attr_str; $as ne ''; ) {
+		unless ( $as =~ s/^?([^=]*)=([^,"]*|"[^"]*")\s*(,\s*|$)// ) {
+			main::logger "WARNING: Invalid attributes in HLS playlist: $attr_str ($url)\n";
+			return undef;
+		}
+		my ($key, $val) = ($1, $2);
+		$val =~ s/^"(.*)"$/$1/;
+		$attr{$key} = $val;
+	}
+	return \%attr;
+}
+
+sub parse_dash_connection {
+	my $media = shift;
+	my $conn = shift;
+	my $min_bitrate = shift;
+	my $max_bitrate = shift;
+	my $prefix = shift || "dash";
+	my $now = time();
+	my @dash_medias;
+	decode_entities($conn->{href});
+	my $xml = main::request_url_retry( main::create_ua( 'desktop' ), $conn->{href}, 3, undef, undef, 1 );
+	if ( ! $xml ) {
+		main::logger "WARNING: No DASH manifest returned ($conn->{href})\n" if $opt->{verbose};
+		return;
+	}
+	my $dom;
+	eval { $dom = XML::LibXML->load_xml(string => $xml); };
+	if ( $@ ) {
+		main::logger "ERROR: Failed to load DASH manifest:\n$@";
+		return;
+	}
+	my $xpc = XML::LibXML::XPathContext->new($dom);
+	my ($doc) = $xpc->findnodes('/*');
+	$xpc->registerNs('mpd', $doc->namespaceURI());
+	my $mediaPresentationDuration = $doc->findvalue('@mediaPresentationDuration');
+	$mediaPresentationDuration =~ /^(-)?P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:((\d+)(\.(\d+))?)S)?)?$/;
+	my $programme_duration = int($5 * 3600 + $6 * 60 + $7);
+	my ($period) = $xpc->findnodes('mpd:Period', $doc);
+	my $baseurl = $xpc->findvalue('mpd:BaseURL/@content', $doc);
+	if ( ! $baseurl ) {
+		$baseurl = $xpc->findvalue('mpd:BaseURL/text()', $period);
+	}
+	my ($template0) = $xpc->findnodes('mpd:AdaptationSet/mpd:SegmentTemplate', $period);
+	if ( ! $template0 ) {
+		($template0) = $xpc->findnodes('mpd:AdaptationSet/mpd:Representation/mpd:SegmentTemplate', $period);
+	}
+	my $xinit = $template0->findvalue('@initialization');
+	my $xmedia = $template0->findvalue('@media');
+	my $dash_conn = dclone($conn);
+	my $uri0 = URI->new($baseurl);
+	my $uri1 = URI->new($dash_conn->{href});
+	my $uri2 = URI->new($xinit);
+	if ( ! $uri2->scheme ) {
+		if ( ! $uri0->scheme ) {
+			$uri2 = URI->new_abs( $uri2, URI->new_abs($uri0, $uri1) );
+		} else {
+			$uri2 = URI->new_abs( $uri2, $uri0 )
+		}
+	}
+	my $qs1 = $uri1->query;
+	my $qs2 = $uri2->query;
+	$qs1 .= "&" if $qs1 && $qs2;
+	$uri2->query($qs1.$qs2);
+	my $init_template = $uri2->as_string;
+	my $uri3 = URI->new($xmedia);
+	if ( ! $uri3->scheme ) {
+		if ( ! $uri0->scheme ) {
+			$uri3 = URI->new_abs( $uri3, URI->new_abs($uri0, $uri1) );
+		} else {
+			$uri3 = URI->new_abs( $uri3, $uri0 )
+		}
+	}
+	$qs1 = $uri1->query;
+	my $qs3 = $uri3->query;
+	$qs1 .= "&" if $qs1 && $qs3;
+	$uri3->query($qs1.$qs3);
+	my $media_template = $uri3->as_string;
+	my @audio_medias;
+	my @video_medias;
+	for my $set ( $xpc->findnodes('mpd:AdaptationSet', $period) ) {
+		my $content_type = $set->findvalue('@contentType');
+		my ($template) = $xpc->findnodes('mpd:SegmentTemplate', $set);
+		for my $repr ( $xpc->findnodes('mpd:Representation', $set) ) {
+			my $bitrate = int($repr->findvalue('@bandwidth')/1000.0);
+			next if $min_bitrate && $bitrate < $min_bitrate;
+			next if $max_bitrate && $bitrate > $max_bitrate;
+			if ( ! $template ) {
+				($template) = $xpc->findnodes('mpd:SegmentTemplate', $repr);
+			}
+			my $segment_duration = $template->findvalue('@duration') / $template->findvalue('@timescale');
+			my $num_segments = int($programme_duration / $segment_duration);
+			$num_segments++ if $segment_duration * $num_segments < $programme_duration;
+			my $repr_media = {};
+			$repr_media->{id} = $repr->findvalue('@id');
+			$repr_media->{content_type} = $content_type;
+			$repr_media->{bitrate} = $bitrate;
+			$repr_media->{file_size} = int($programme_duration * $repr_media->{bitrate} * 1000.0 / 8.0);
+			$repr_media->{num_segments} = $num_segments;
+			$repr_media->{segment_duration} = $segment_duration;
+			$repr_media->{programme_duration} = $programme_duration;
+			$repr_media->{start_time} = $now;
+			$repr_media->{service} = "gip_${prefix}_$repr_media->{bitrate}";
+			$repr_media->{start_number} = $template->{startNumber} || 1;
+			$repr_media->{stop_number} = $repr_media->{start_number} + $num_segments - 1;
+			$repr_media->{init_template} = $init_template;
+			$repr_media->{media_template} = $media_template;
+			if ( $content_type eq "video" ) {
+				$repr_media->{width} = $repr->findvalue('@width');
+				$repr_media->{height} = $repr->findvalue('@height');
+				$repr_media->{frameRate} = $repr->findvalue('@frameRate') || $set->findvalue('@frameRate');
+				push @video_medias, $repr_media;
+			} else {
+				push @audio_medias, $repr_media;
+			}
+		}
+	}
+	my @sorted_audio = sort {$a->{bitrate} <=> $b->{bitrate}} @audio_medias;
+	my $video_audio = pop @sorted_audio;
+
+	if ( @video_medias ) {
+		for my $video_media ( @video_medias ) {
+			my $dash_media = dclone($media);
+			delete $dash_media->{width};
+			delete $dash_media->{height};
+			delete $dash_media->{bitrate};
+			delete $dash_media->{service};
+			delete $dash_media->{media_file_size};
+			delete $dash_media->{connections};
+			my $dash_conn = dclone($conn);
+			delete $dash_conn->{href};
+			$dash_media->{playlist_url} = $conn->{href};
+			$dash_media->{width} = $video_media->{width};
+			$dash_media->{height} = $video_media->{height};
+			$dash_media->{bitrate} = $video_media->{bitrate};
+			$dash_media->{video_bitrate} = $video_media->{bitrate};
+			$dash_media->{audio_bitrate} = $video_audio->{bitrate};
+			$dash_media->{service} = $video_media->{service};
+			$dash_media->{media_file_size} = $video_media->{file_size};
+			$dash_media->{fps} = $video_media->{frameRate};
+			$dash_media->{video_media} = $video_media;
+			$dash_media->{audio_media} = $video_audio;
+			($dash_conn->{href} = $video_media->{init_template}) =~ s/\$RepresentationID\$/$video_media->{id}/;
+			$dash_media->{connections} = [ $dash_conn ];
+			push @dash_medias, $dash_media;
+		}
+	} else {
+		for my $audio_media ( @audio_medias ) {
+			my $dash_media = dclone($media);
+			delete $dash_media->{bitrate};
+			delete $dash_media->{service};
+			delete $dash_media->{media_file_size};
+			my $dash_conn = dclone($conn);
+			delete $dash_conn->{href};
+			$dash_media->{playlist_url} = $conn->{href};
+			$dash_media->{bitrate} = $audio_media->{bitrate};
+			$dash_media->{audio_bitrate} = $audio_media->{bitrate};
+			$dash_media->{service} = $audio_media->{service};
+			$dash_media->{media_file_size} = $audio_media->{file_size};
+			$dash_media->{audio_media} = $audio_media;
+			($dash_conn->{href} = $audio_media->{init_template}) =~ s/\$RepresentationID\$/$audio_media->{id}/;
+			$dash_media->{connections} = [ $dash_conn ];
+			push @dash_medias, $dash_media;
+		}
+	}
+	return @dash_medias;
+}
 
 sub get_stream_data_cdn {
 	my ( $data, $mattribs, $mode, $streamer, $ext ) = ( @_ );
 	my $data_pri = {};
 
-	# Public Non-Live EMP Video without auth
-	#if ( $cattribs->{kind} eq 'akamai' && $cattribs->{identifier} =~ /^public\// ) {
-	#	$data->{$mode}->{bitrate} = 480; # ??
-	#	$data->{$mode}->{swfurl} = "http://news.bbc.co.uk/player/emp/2.11.7978_8433/9player.swf";
-	# Live TV, Live EMP Video or Non-public EMP video
-	#} elsif ( $cattribs->{kind} eq 'akamai' ) {
-	#	$data->{$mode}->{bitrate} = 480; # ??
-
 	my $count = 1;
-	my $count_rtsp = 1;
 	for my $cattribs ( @{ $mattribs->{connections} } ) {
 
-		# Get authstring from more specific mediaselector if this mode is specified - fails sometimes otherwise
-		if ( $cattribs->{authString} && $cattribs->{kind} =~ /^(limelight|akamai|level3|sis|iplayertok)$/ && (grep /^$mode$/, (split /,/, $mattribs->{modelist})) ) {
-			# Build URL
-			my $media_stream_data_prefix = 'http://www.bbc.co.uk/mediaselector/4/mtis/stream/';
-			my $url = $media_stream_data_prefix."$mattribs->{verpid}/$mattribs->{service}/$cattribs->{kind}?cb=".( sprintf "%05.0f", 99999*rand(0) );
-			my $xml = main::request_url_retry( main::create_ua( 'desktop' ), $url, 3, undef, undef, 1 );
-			main::logger "\n$xml\n" if $opt->{debug};
-			# get new set of connection attributes from the new xml data
-			my $new_mattribs = (parse_metadata( $xml ))[0];
-			my $new_cattribs = $new_mattribs->{connections}[0];
-			# Override elemnts from more specific connection attribs if present
-			for my $element ( keys %{ $new_cattribs } ) {
-				$cattribs->{$element} = $new_cattribs->{$element} if $new_cattribs->{$element};
-			}
-		}
-		decode_entities($cattribs->{authString});
-
 		# Common attributes
-		# swfurl = Default iPlayer swf version
 		my $conn = {
-			swfurl		=> "http://www.bbc.co.uk/emp/revisions/18269_21576_10player.swf?revision=18269_21576",
-			ext		=> $ext,
+			ext			=> $ext,
 			streamer	=> $streamer,
 			bitrate		=> $mattribs->{bitrate},
-			server		=> $cattribs->{server},
-			identifier	=> $cattribs->{identifier},
-			authstring	=> $cattribs->{authString},
 			priority	=> $cattribs->{priority},
+			expires		=> $mattribs->{expires},
+			size		=> $mattribs->{media_file_size},
 		};
 
-		# Akamai CDN
-		if ( $cattribs->{kind} eq 'akamai' ) {
-			# Set the live flag if this is not an ondemand stream
-			$conn->{live} = 1 if defined $cattribs->{application} && $cattribs->{application} =~ /^live/;
-			# Default appication is 'ondemand'
-			$cattribs->{application} = 'ondemand' if ! $cattribs->{application};
-
-			# if the authString is not set and this is a live (i.e. simulcast) then try to get an authstring
-			# Maybe should this be general for all CDNs?
-			if ( ! $cattribs->{authString} ) {
-				# Build URL
-				my $media_stream_live_prefix = 'http://www.bbc.co.uk/mediaselector/4/gtis/stream/';
-				my $url = ${media_stream_live_prefix}."?server=$cattribs->{server}&identifier=$cattribs->{identifier}&kind=$cattribs->{kind}&application=$cattribs->{application}";
-				my $xml = main::request_url_retry( main::create_ua( 'desktop' ), $url, 3, undef, undef, 1 );
-				main::logger "\n$xml\n" if $opt->{debug};
-				$cattribs->{authString} = 'auth='.$1 if $xml =~ m{<token>auth=(.+?)</token>};
-				if ( ! $cattribs->{authString} ) {
-					$cattribs->{authString} = 'auth='.$1 if $xml =~ m{<token>(.+?)</token>};
-				}
-				$conn->{authstring} = $cattribs->{authString};
-			}
-
-			$conn->{playpath} = $cattribs->{identifier};
-			$conn->{streamurl} = "rtmp://$cattribs->{server}:1935/$cattribs->{application}?_fcs_vhost=$cattribs->{server}&undefined";
-			$conn->{application} = "$cattribs->{application}?_fcs_vhost=$cattribs->{server}&undefined";
-
-			if ( $cattribs->{authString} ) {
-				if ( $cattribs->{authString} !~ /&aifp=/ ) {
-					$cattribs->{authString} .= '&aifp=v001';
-				}
-
-				if ( $cattribs->{authString} !~ /&slist=/ ) {
-					$cattribs->{identifier} =~ s/^mp[34]://;
-					$cattribs->{authString} .= "&slist=$cattribs->{identifier}";
-				}
-
-				### ??? live and Live TV, Live EMP Video or Non-public EMP video:
-				$conn->{playpath} .= "?$cattribs->{authString}";
-				$conn->{streamurl} .= "&$cattribs->{authString}";
-				$conn->{application} .= "&$cattribs->{authString}";
-			} else {
-				$conn->{streamurl} .= "&undefined";
-				$conn->{application} .= "&undefined";
-			}
-
-			# Port 1935? for live?
-			$conn->{tcurl} = "rtmp://$cattribs->{server}:80/$conn->{application}";
-
-		# Limelight CDN
-		} elsif ( $cattribs->{kind} eq 'limelight' ) {
-			# Set the live flag if this has 'live' in the service name
-			$conn->{live} = 1 if defined $mattribs->{service} && $mattribs->{service} =~ /live/;
-			decode_entities( $cattribs->{authString} );
-			$conn->{playpath} = $cattribs->{identifier};
-			# Remove offending mp3/mp4: at the start of the identifier (don't remove in stream url)
-			### Not entirely sure if this is even required for video modes either??? - not reqd for aac and low
-			# $conn->{playpath} =~ s/^mp[34]://g;
-			$conn->{streamurl} = "rtmp://$cattribs->{server}:1935/ondemand?_fcs_vhost=$cattribs->{server}&auth=$cattribs->{authString}&aifp=v001&slist=$cattribs->{identifier}";
-			$conn->{application} = "$cattribs->{application}?$cattribs->{authString}";
-			$conn->{tcurl} = "rtmp://$cattribs->{server}:1935/$conn->{application}";
-			
-		# Level3 CDN	
-		} elsif ( $cattribs->{kind} eq 'level3' ) {
-			$conn->{playpath} = $cattribs->{identifier};
-			$conn->{application} = "$cattribs->{application}?$cattribs->{authString}";
-			$conn->{tcurl} = "rtmp://$cattribs->{server}:1935/$conn->{application}";
-			$conn->{streamurl} = "rtmp://$cattribs->{server}:1935/ondemand?_fcs_vhost=$cattribs->{server}&auth=$cattribs->{authString}&aifp=v001&slist=$cattribs->{identifier}";
-
-		# iplayertok CDN
-		} elsif ( $cattribs->{kind} eq 'iplayertok' ) {
-			$conn->{application} = $cattribs->{application};
-			decode_entities($cattribs->{authString});
-			$conn->{playpath} = "$cattribs->{identifier}?$cattribs->{authString}";
-			$conn->{playpath} =~ s/^mp[34]://g;
-			$conn->{streamurl} = "rtmp://$cattribs->{server}:1935/ondemand?_fcs_vhost=$cattribs->{server}&auth=$cattribs->{authString}&aifp=v001&slist=$cattribs->{identifier}";
-			$conn->{tcurl} = "rtmp://$cattribs->{server}:1935/$conn->{application}";
-
 		# sis/edgesuite/sislive streams
-		} elsif ( $cattribs->{kind} eq 'sis' || $cattribs->{kind} eq 'edgesuite' || $cattribs->{kind} eq 'sislive' ) {
+		if ( $cattribs->{kind} eq 'sis' || $cattribs->{kind} eq 'edgesuite' || $cattribs->{kind} eq 'sislive' ) {
 			$conn->{streamurl} = $cattribs->{href};
 
 		# http stream
-		} elsif ( $cattribs->{kind} eq 'http' ) {
+		} elsif ( $mattribs->{kind} eq 'captions' || $cattribs->{kind} eq 'http' || $cattribs->{kind} eq 'https' ) {
 			$conn->{streamurl} = $cattribs->{href};
 
-		# drm license - ignore
-		} elsif ( $cattribs->{kind} eq 'licence' ) {
+		# hls stream
+		} elsif ( $cattribs->{transferFormat} =~ /hls/ ) {
+			$conn->{streamurl} = $cattribs->{href};
+			$conn->{kind} = $mattribs->{kind};
+			if ( $conn->{kind} eq 'video' ) {
+				$mattribs->{audio_bitrate} ||= 96;
+				$conn->{audio_bitrate} = $mattribs->{audio_bitrate};
+				$mattribs->{video_bitrate} ||= $mattribs->{bitrate} - $conn->{audio_bitrate};
+				$conn->{video_bitrate} = $mattribs->{video_bitrate};
+			} elsif ( $conn->{kind} eq 'audio' ) {
+				$mattribs->{audio_bitrate} ||= $mattribs->{bitrate};
+				$conn->{audio_bitrate} ||= $mattribs->{audio_bitrate};
+			}
 
-		# iphone new
-		} elsif ( $cattribs->{kind} eq 'securesis' ) {
+		# dash stream
+		} elsif ( $cattribs->{transferFormat} =~ /dash/ ) {
 			$conn->{streamurl} = $cattribs->{href};
+			$conn->{kind} = $mattribs->{kind};
+			$conn->{audio_media} = $mattribs->{audio_media};
+			$conn->{video_media} = $mattribs->{video_media};
+			if ( $conn->{kind} eq 'video' ) {
+				$conn->{audio_bitrate} = $mattribs->{audio_bitrate};
+				$conn->{video_bitrate} = $mattribs->{video_bitrate};
+			}
 
 		# Unknown CDN
 		} else {
@@ -5954,44 +5791,14 @@
 		$data->{$mode.$count} = $conn;
 		$count++;
 
-		# synthesized rtsp modes
-		if ( $mode =~ /^flash/ && ! $conn->{live} ) {
-			my $flashmode = $mode.$count_rtsp;
-			my $rtspmode = $flashmode;
-			$rtspmode =~ s/^flash/rtsp/g;
-			$data->{$rtspmode}->{bitrate} = $data->{$flashmode}->{bitrate};
-			$data->{$rtspmode}->{encoding} = $data->{$flashmode}->{encoding};
-			$data->{$rtspmode}->{type} = $data->{$flashmode}->{type};
-			$data->{$rtspmode}->{type} =~ s/streaming_/streaming_rtsp_/g;
-			$data->{$rtspmode}->{identifier} =  $data->{$flashmode}->{identifier};
-			# Audio
-			if ($mode =~ /(audio|aac)/) {
-				$data->{$rtspmode}->{identifier} =~ s|^mp[34]:secure/(\w+?)/(.+$)|$1/secure_auth/$2|;
-			# Video
-			} else {
-				# convert from akamai format
-				$data->{$rtspmode}->{identifier} =~ s|^mp[34]:secure/(\w+?/.+$)|iplayerstream/secure_auth/$1|;
-				# convert from level3
-				$data->{$rtspmode}->{identifier} =~ s|^mp[34]:(\d{3,4}\w+?/.+$)|iplayerstream/secure_auth/$1|;
-			}
-			$data->{$rtspmode}->{identifier} =~ s/^mp[34]://;
-			$data->{$rtspmode}->{ext} = $data->{$flashmode}->{identifier};
-			$data->{$rtspmode}->{ext} =~ s/^(mp[34]):.*$/$1/g;
-			# use .aac ext for audio mp4
-			$data->{$rtspmode}->{ext} = 'aac' if $data->{$rtspmode}->{ext} eq 'mp4' && $mode =~ /(audio|aac)/;
-			$data->{$rtspmode}->{streamurl} = "rtsp://3gp-acl.bbc.net.uk:554/".$data->{$rtspmode}->{identifier};
-			$data->{$rtspmode}->{streamurl} .= '.'.$data->{$rtspmode}->{ext} if $data->{$rtspmode}->{streamurl} !~ m{\.mp[34]$};
-			# Mplayer fails fo some reason - use vlc for now
-			# $data->{$rtspmode}->{streamer} = 'rtsp';
-			$data->{$rtspmode}->{streamer} = '3gp';
-			get_stream_set_type( $data->{$rtspmode} ) if ! $data->{$rtspmode}->{type};
-			$count_rtsp++;
-		}
 	}
 
 	# Add to data structure hased by priority
 	$count = 1;
 	while ( defined $data->{$mode.$count} ) {
+		while ( defined $data_pri->{ $data->{$mode.$count}->{priority} } ) {
+			$data->{$mode.$count}->{priority}++;
+		}
 		$data_pri->{ $data->{$mode.$count}->{priority} } = $data->{$mode.$count};
 		$count++;
 	}
@@ -6005,242 +5812,244 @@
 	}
 }
 
-
-
 # Builds connection type string
 sub get_stream_set_type {
 		my ( $conn, $mattribs, $cattribs ) = ( @_ );
 		my @type;
-		push @type, "($mattribs->{service})" if $mattribs->{service};
-		push @type, "$conn->{streamer}";
-		push @type, "$mattribs->{encoding}" if $mattribs->{encoding};
-		push @type, "$mattribs->{width}x$mattribs->{height}" if $mattribs->{width} && $mattribs->{height};
-		push @type, "$mattribs->{bitrate}kbps" if $mattribs->{bitrate};
-		push @type, "stream";
-		push @type, "(CDN: $cattribs->{kind}/$cattribs->{priority})" if $cattribs->{kind} && $cattribs->{priority};
-		push @type, "(CDN: $cattribs->{kind})" if $cattribs->{kind} && not defined $cattribs->{priority};
-		$conn->{type} = join ' ', @type;
+		push @type, $mattribs->{service} ? $mattribs->{service} : "N/A";
+		push @type, $conn->{streamer};
+		push @type, $mattribs->{encoding} ? $mattribs->{encoding} : "N/A";
+		push @type, $mattribs->{width} && $mattribs->{height} ? "$mattribs->{width}x$mattribs->{height}" : "N/A";
+		push @type, $mattribs->{fps} ? "$mattribs->{fps}fps" : "N/A" ;
+		push @type, $mattribs->{video_bitrate} ? "$mattribs->{video_bitrate}kbps" : "N/A";
+		push @type, $mattribs->{audio_bitrate} ? "$mattribs->{audio_bitrate}kbps" : "N/A";
+		push @type, "$cattribs->{kind}/$cattribs->{priority}" if $cattribs->{kind} && $cattribs->{priority};
+		push @type, "$cattribs->{kind}" if $cattribs->{kind} && not defined $cattribs->{priority};
+		$conn->{type} = sprintf("%12s %4s %4s %9s %5s %8s %7s %s", @type);
 }
 
-
+sub check_geoblock {
+	return shift =~ /geolocation|notukerror/;
+}
 
 # Generic
 # Gets media streams data for this version pid
 # $media = undef|<modename>
 sub get_stream_data {
-	my ( $prog, $verpid, $media ) = @_;
+	my ( $prog, $verpid, $media, $version ) = @_;
+	my $modelist = $prog->modelist();
 	my $data = {};
-	my $media_stream_data_prefix = 'http://www.bbc.co.uk/mediaselector/4/mtis/stream/'; # $verpid
-	my $media_stream_live_prefix = 'http://www.bbc.co.uk/mediaselector/4/gtis/stream/'; # $verpid
 
-	# Setup user agent with redirection enabled
-	my $ua = main::create_ua( 'desktop' );
-	$opt->{quiet} = 0 if $opt->{streaminfo};
+	main::logger "INFO: Getting stream data for version: '$version'\n" if $opt->{verbose};
+	# filter CDN suppliers
+	my @exclude_supplier = split(/,/, $opt->{excludesupplier});
+	if ( $opt->{includesupplier} ) {
+		@exclude_supplier = grep { $opt->{includesupplier} !~ /\b$_\b/ } @exclude_supplier;
+	}
+	if ( grep /^ll$/, @exclude_supplier ) {
+		push @exclude_supplier, 'limelight';
+	}
+	my $exclude_regex = '^ROGUEVALUE$';
+	if ( @exclude_supplier ) {
+		$exclude_regex = '('.(join('|', @exclude_supplier)).')';
+	}
 
-	# BBC streams
-	my $xml;
+	# retrieve stream data
+	my $ua = main::create_ua( 'desktop' );
+	my $unblocked;
+	my $checked_geoblock;
+	my %seen;
 	my @medias;
-
-	# If this is an EMP stream verpid
-	if ( $verpid =~ /^\?/ ) {
-		$xml = main::request_url_retry( $ua, $media_stream_live_prefix.$verpid, 3, undef, undef, 1 );
+	my @mediasets;
+	my @ms_tf;
+	my $unknown_modes = $modelist !~ /(daf|dvf|haf|hla|hvf)/;
+	my $get_dash = $opt->{info} || $modelist =~ /(daf|dvf)/ || $unknown_modes;
+	my $get_hls = $opt->{info} || $modelist =~ /(haf|hla|hvf)/ || $unknown_modes;
+	if ( $get_dash ) {
+		push @ms_tf, "dash";
+		push @mediasets, "iptv-all", "pc";
+	}
+	if ( $get_hls ) {
+		push @ms_tf, "hls";
+		push @mediasets, "iptv-all" unless $get_dash;
+		push @mediasets, "apple-ipad-hls";
+		if ( $prog->{type} eq "radio" ) {
+			# for hlalow stream
+			push @mediasets, "apple-iphone4-ipad-hls-3g";
+		}
+	}
+	for my $mediaset ( @mediasets ) {
+		my $url = "https://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/mediaset/$mediaset/vpid/$verpid?cb=".( sprintf "%05.0f", 99999*rand(0) );
+		my $xml = main::request_url_retry( $ua, $url, 3, undef, undef, 1, undef, 1 );
 		main::logger "\n$xml\n" if $opt->{debug};
-		my $mattribs;
-		my $cattribs;
-		# Parse connection attribs
-		$cattribs->{server} = $1 if $xml =~ m{<server>(.+?)</server>};
-		$cattribs->{kind} = $1 if $xml =~ m{<kind>(.+?)</kind>};
-		$cattribs->{identifier} = $1 if $xml =~ m{<identifier>(.+?)</identifier>};
-		$cattribs->{authString} = $1 if $xml =~ m{<token>(.+?)</token>};
-		$cattribs->{application} = $1 if $xml =~ m{<application>(.+?)</application>};
-		# TV / EMP video (flashnormal mode)
-		if ( $prog->{type} eq 'tv' || $prog->{type} eq 'livetv' ) {
-			# Parse XML
-			#<server>cp56493.live.edgefcs.net</server>
-			#<identifier>bbc1_simcast@s3173</identifier>
-			#<token>dbEb_c0abaHbWcxaYbRcHcQbfcMczaocvaB-bklOc_-c0-d0i_-EpnDBnzoNDqEnxF</token>
-			#<kind>akamai</kind>
-			#<application>live</application>
-			#width="512" height="288" type="video/x-flv" encoding="vp6"
-			$mattribs = { kind => 'video', type => 'video/x-flv', encoding => 'vp6', width => 512, height => 288 };
-		# AAC Live Radio / EMP Audio
-		} elsif ( $prog->{type} eq 'radio' || $prog->{type} eq 'liveradio' ) {
-			# MP3 (flashaudio mode)
-			if ( $cattribs->{identifier} =~ m{mp3:} ) {
-				$mattribs = { kind => 'audio', type => 'audio/mpeg', encoding => 'mp3' };
-			# AAC (flashaac mode)
-			} else {
-				$mattribs = { kind => 'audio', type => 'audio/mp4', encoding => 'aac' };
+		$checked_geoblock = 1;
+		next if check_geoblock( $xml );
+		$unblocked = 1;
+		decode_entities($xml);
+		my @ms_medias = parse_metadata( $xml );
+		for my $ms_media ( @ms_medias ) {
+			my $ms_proto = "https";
+			unless ( grep { $_->{protocol} eq $ms_proto } @{$ms_media->{connections}} ) {
+				$ms_proto = "http";
+			}
+			for my $ms_conn ( @{$ms_media->{connections}} ) {
+				next unless $ms_conn->{protocol} eq $ms_proto;
+				next unless grep(/^$ms_conn->{transferFormat}$/, @ms_tf) || $ms_media->{kind} eq "captions";
+				next if $ms_conn->{supplier} =~ /$exclude_regex/;
+				(my $supplier = $ms_conn->{supplier}) =~ s/_https?$//;
+				my $stream_key = "$ms_media->{service}-$supplier";
+				next if $seen{$stream_key};
+				$seen{$stream_key}++;
+				($stream_key = $ms_conn->{href}) =~ s/\?.*//;
+				next if $seen{$stream_key};
+				$seen{$stream_key}++;
+				if ( $ms_media->{kind} eq "captions" ) {
+					my $media = dclone($ms_media);
+					@{$media->{connections}} = ( $ms_conn );
+					push @medias, $media;
+					next;
+				}
+				my ( $prefix, $min_bitrate, $max_bitrate, @new_medias );
+				if ( $ms_conn->{transferFormat} eq "dash" ) {
+					$prefix = $prog->{type} eq "tv" ? "dvf" : "daf";
+					@new_medias = parse_dash_connection( $ms_media, $ms_conn, $min_bitrate, $max_bitrate, $prefix );
+				} elsif ( $ms_conn->{transferFormat} eq "hls" ) {
+					if ( $ms_conn->{supplier} =~ /hls_open/ ) {
+						$prefix = $prog->{type} eq "tv" ? "hls" : "hla";
+					} else {
+						$prefix = $prog->{type} eq "tv" ? "hvf" : "haf";
+						unless ( $prog->{type} eq "tv" && $opt->{hlslqaudio} ) {
+							# for 320k tv audio or 320k/96k radio
+							$ms_conn->{href} =~ s!([^/]+)\.ism(?:\.hlsv2\.ism)?/[^/]+\.m3u8!$1.ism/$1.m3u8!;
+						}
+					}
+					@new_medias = parse_hls_connection( $ms_media, $ms_conn, $min_bitrate, $max_bitrate, $prefix );
+				}
+				for my $new_media ( @new_medias ) {
+					for my $new_conn ( @{$new_media->{connections}} ) {
+						(my $supplier = $new_conn->{supplier}) =~ s/_https?$//;
+						my $stream_key = "$new_media->{service}-$supplier";
+						next if $seen{$stream_key};
+						$seen{$stream_key}++;
+						($stream_key = $new_conn->{href}) =~ s/\?.*//;
+						next if $seen{$stream_key};
+						$seen{$stream_key}++;
+						push @medias, $new_media;
+						last;
+					}
+				}
 			}
 		}
-		# Push into media data structure
-		push @{ $mattribs->{connections} }, $cattribs;
-		push @medias, $mattribs;
-
-	# Live simulcast verpid: http://www.bbc.co.uk/emp/simulcast/bbc_one_london.xml
-	} elsif ( $verpid =~ /http:/ ) {
-		$xml = main::request_url_retry( $ua, $verpid, 3, undef, undef, 1 );
-		main::logger "\n$xml\n" if $opt->{debug};
-		if  ( $xml =~ m{<mediator identifier=\"(.+?)\"} ) {
-		    $verpid = $media_stream_data_prefix.$1;
-		    main::logger "new verpid $verpid" if $opt->{debug};
-		    $xml = main::request_url_retry( $ua, $verpid, 3, undef, undef, 1 );
-		}
-		@medias = parse_metadata( $xml );
+	}
 
-	# Could also use Javascript based one: 'http://www.bbc.co.uk/iplayer/mediaselector/4/js/stream/$verpid?cb=NNNNN
-	} else {
-		$xml = main::request_url_retry( $ua, $media_stream_data_prefix.$verpid.'?cb='.( sprintf "%05.0f", 99999*rand(0) ), 3, undef, undef, 1 );
-		main::logger "\n$xml\n" if $opt->{debug};
-		@medias = parse_metadata( $xml );
+	unless ( $unblocked ) {
+		$prog->{geoblocked} = 1 if $checked_geoblock;
+		return undef;
 	}
 
 	# Parse and dump structure
-	my $mode;
 	for my $mattribs ( @medias ) {
-		
+
 		# Put verpid into mattribs
 		$mattribs->{verpid} = $verpid;
-		$mattribs->{modelist} = $prog->modelist;
+		$mattribs->{modelist} = $modelist;
 
-		# New iphone stream
-		if ( $mattribs->{service} eq 'iplayer_streaming_http_mp4' ) {
-			# Fix/remove some audio stream attribs
-			if ( $prog->{type} eq 'radio' ) {
-				$mattribs->{bitrate} = 128;
-				delete $mattribs->{width};
-				delete $mattribs->{height};
-			}
-			get_stream_data_cdn( $data, $mattribs, 'iphone', 'iphone', 'mov' );
-		
-		
-		# flashhd modes
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/mp4' &&
-				$mattribs->{encoding} eq 'h264'
-		) {
-			# Determine classifications of modes based mainly on bitrate
-
-			# flashhd modes
-			if ( $mattribs->{bitrate} > 2000 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashhd', 'rtmp', 'mp4' );
-
-			# flashvhigh modes
-			} elsif ( $mattribs->{bitrate} > 1200 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashvhigh', 'rtmp', 'mp4' );
-
-			# flashhigh modes
-			} elsif ( $mattribs->{bitrate} > 700 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashhigh', 'rtmp', 'mp4' );
-
-			# flashstd modes
-			} elsif ( $mattribs->{bitrate} > 400 && $mattribs->{width} >= 500 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashstd', 'rtmp', 'mp4' );
-
-			# flashlow modes
-			} elsif ( $mattribs->{bitrate} > 300 && $mattribs->{width} >= 380 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashlow', 'rtmp', 'mp4' );
-			}
-			
-		# flashnormal modes (also live and EMP modes)
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/x-flv' &&
-				$mattribs->{encoding} eq 'vp6'
-		) {
-			get_stream_data_cdn( $data, $mattribs, 'flashnormal', 'rtmp', 'avi' );
-
-		# flashlow modes
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/x-flv' &&
-				$mattribs->{encoding} eq 'spark'
-		) {
-			get_stream_data_cdn( $data, $mattribs, 'flashlow', 'rtmp', 'avi' );
-
-		# flashnormal modes without encoding specifed - assume vp6
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/x-flv'
-		) {
-			$mattribs->{encoding} = 'vp6';
-			get_stream_data_cdn( $data, $mattribs, 'flashnormal', 'rtmp', 'avi' );
-
-		# n95 modes
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/mpeg' &&
-				$mattribs->{encoding} eq 'h264'
-		) {
-			# n95_wifi modes
-			if ( $mattribs->{bitrate} > 140 ) {
-				$mattribs->{width} = $mattribs->{width} || 320;
-				$mattribs->{height} = $mattribs->{height} || 176;
-				get_stream_data_cdn( $data, $mattribs, 'n95_wifi', '3gp', '3gp' );
-
-			# n95_3g modes
-			} else {
-				$mattribs->{width} = $mattribs->{width} || 176;
-				$mattribs->{height} = $mattribs->{height} || 96;
-				get_stream_data_cdn( $data, $mattribs, 'n95_3g', '3gp', '3gp' );
+		if ( $mattribs->{service} =~ /hls/ ) {
+			if ( $mattribs->{kind} =~ 'video' ) {
+				my $ext = "mp4";
+				if ( $mattribs->{height} > 700 ) {
+					get_stream_data_cdn( $data, $mattribs, "hlshd", 'hls', $ext );
+				}
 			}
 
-		# WMV drm modes - still used?
-		} elsif (	$mattribs->{kind} eq 'video' &&
-				$mattribs->{type} eq 'video/wmv'
-		) {
-			$mattribs->{width} = $mattribs->{width} || 320;
-			$mattribs->{height} = $mattribs->{height} || 176;
-			get_stream_data_cdn( $data, $mattribs, 'mobile_wmvdrm', 'http', 'wmv' );
-			# Also DRM (same data - just remove _mobile from href and identfier)
-			$mattribs->{width} = 672;
-			$mattribs->{height} = 544;
-			get_stream_data_cdn( $data, $mattribs, 'wmvdrm', 'http', 'wmv' );
-			$data->{wmvdrm}->{identifier} =~ s/_mobile//g;
-			$data->{wmvdrm}->{streamurl} =~ s/_mobile//g;
-
-		# flashaac modes
-		} elsif (	$mattribs->{kind} eq 'audio' &&
-				$mattribs->{type} eq 'audio/mp4'
-				# This also catches worldservice who happen not to set the encoding type
-				# && $mattribs->{encoding} eq 'aac'
-		) {
-			# flashaachigh
-			if (  $mattribs->{bitrate} >= 192 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashaachigh', 'rtmp', 'aac' );
-
-			# flashaacstd
-			} elsif ( $mattribs->{bitrate} >= 96 ) {
-				get_stream_data_cdn( $data, $mattribs, 'flashaacstd', 'rtmp', 'aac' );
-
-			# flashaaclow
-			} else {
-				get_stream_data_cdn( $data, $mattribs, 'flashaaclow', 'rtmp', 'aac' );
+		} elsif ( $mattribs->{service} =~ /hla/ ) {
+			if ( $mattribs->{kind} =~ 'audio' ) {
+				my $ext = "m4a";
+				if ( $mattribs->{bitrate} >= 192 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hlahigh', 'hls', $ext );
+				} elsif ( $mattribs->{bitrate} >= 120 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hlastd', 'hls', $ext );
+				} elsif ( $mattribs->{bitrate} >= 80 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hlamed', 'hls', $ext );
+				} else {
+					get_stream_data_cdn( $data, $mattribs, 'hlalow', 'hls', $ext );
+				}
 			}
 
-		# flashaudio modes
-		} elsif (	$mattribs->{kind} eq 'audio' &&
-				( $mattribs->{type} eq 'audio/mpeg' || $mattribs->{type} eq 'audio/mp3' )
-				#&& $mattribs->{encoding} eq 'mp3'
-		) {
-			get_stream_data_cdn( $data, $mattribs, 'flashaudio', 'rtmp', 'mp3' );
+		} elsif ( $mattribs->{service} =~ /hvf/ ) {
+			if ( $mattribs->{kind} =~ 'video' ) {
+				my $ext = "mp4";
+				if ( $mattribs->{height} > 1000 ) {
+					# full HD streams do not exist yet
+				} elsif ( $mattribs->{height} > 700 ) {
+					get_stream_data_cdn( $data, $mattribs, "hvfhd", 'hls', $ext );
+				} elsif ( $mattribs->{height} > 500 ) {
+					if ( $mattribs->{fps} > 25 ) {
+						get_stream_data_cdn( $data, $mattribs, "hvfsd", 'hls', $ext );
+					} else {
+						get_stream_data_cdn( $data, $mattribs, "hvfxsd", 'hls', $ext );
+					}
+				} elsif ( $mattribs->{height} > 360 ) {
+					if ( $mattribs->{fps} > 25 ) {
+						get_stream_data_cdn( $data, $mattribs, "hvfhigh", 'hls', $ext );
+					} else {
+						get_stream_data_cdn( $data, $mattribs, "hvfxhigh", 'hls', $ext );
+					}
+				} elsif ( $mattribs->{height} > 260  && $mattribs->{height} < 300 ) {
+					get_stream_data_cdn( $data, $mattribs, "hvflow", 'hls', $ext );
+				}
+			}
 
-		# RealAudio modes
-		} elsif (	$mattribs->{type} eq 'audio/real' &&
-				$mattribs->{encoding} eq 'real'
-		) {
-			get_stream_data_cdn( $data, $mattribs, 'realaudio', 'rtsp', 'mp3' );
+		} elsif ( $mattribs->{service} =~ /haf/ ) {
+			if ( $mattribs->{kind} =~ 'audio' ) {
+				my $ext = "m4a";
+				if ( $mattribs->{bitrate} >= 192 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hafhigh', 'hls', $ext );
+				} elsif ( $mattribs->{bitrate} >= 120 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hafstd', 'hls', $ext );
+				} elsif ( $mattribs->{bitrate} >= 80 ) {
+					get_stream_data_cdn( $data, $mattribs, 'hafmed', 'hls', $ext );
+				} else {
+					get_stream_data_cdn( $data, $mattribs, 'haflow', 'hls', $ext );
+				}
+			}
 
-		# wma modes
-		} elsif (	$mattribs->{type} eq 'audio/wma' &&
-				$mattribs->{encoding} eq 'wma'
-		) {
-			get_stream_data_cdn( $data, $mattribs, 'wma', 'mms', 'wma' );
+		} elsif ( $mattribs->{service} =~ /dvf/ ) {
+			if ( $mattribs->{kind} =~ 'video' ) {
+				my $ext = "mp4";
+				if ( $mattribs->{height} > 700 ) {
+					get_stream_data_cdn( $data, $mattribs, "dvfhd", 'dash', $ext );
+				} elsif ( $mattribs->{height} > 500 ) {
+					if ( $mattribs->{bitrate} > 2500 ) {
+						get_stream_data_cdn( $data, $mattribs, "dvfsd", 'dash', $ext );
+					} else {
+						get_stream_data_cdn( $data, $mattribs, "dvfxsd", 'dash', $ext );
+					}
+				} elsif ( $mattribs->{height} > 350 ) {
+					if ( $mattribs->{bitrate} > 1500 ) {
+						get_stream_data_cdn( $data, $mattribs, "dvfhigh", 'dash', $ext );
+					} else {
+						get_stream_data_cdn( $data, $mattribs, "dvfxhigh", 'dash', $ext );
+					}
+				} elsif ( $mattribs->{height} > 250 ) {
+					get_stream_data_cdn( $data, $mattribs, "dvflow", 'dash', $ext );
+				}
+			}
 
-		# aac3gp modes
-		} elsif (	$mattribs->{kind} eq '' &&
-				$mattribs->{type} eq 'audio/mp4' &&
-				$mattribs->{encoding} eq 'aac'
-		) {
-			# Not sure how to stream these yet
-			#$mattribs->{kind} = 'sis';
-			#get_stream_data_cdn( $data, $mattribs, 'aac3gp', 'http', 'aac' );
+		} elsif ( $mattribs->{service} =~ /daf/ ) {
+			if ( $mattribs->{kind} =~ 'audio' ) {
+				my $ext = "m4a";
+				# use DASH 320k stream as HLS 320k stream
+				if ( $mattribs->{bitrate} >= 192 ) {
+					get_stream_data_cdn( $data, $mattribs, "dafhigh", 'dash', $ext );
+				} elsif ( $mattribs->{bitrate} >= 120 ) {
+					get_stream_data_cdn( $data, $mattribs, "dafstd", 'dash', $ext );
+				} elsif ( $mattribs->{bitrate} >= 80 ) {
+					get_stream_data_cdn( $data, $mattribs, "dafmed", 'dash', $ext );
+				} else {
+					get_stream_data_cdn( $data, $mattribs, "daflow", 'dash', $ext );
+				}
+			}
 
 		# Subtitles modes
 		} elsif (	$mattribs->{kind} eq 'captions' &&
@@ -6251,33 +6060,12 @@
 		# Catch unknown
 		} else {
 			new_stream_report($mattribs, undef) if $opt->{verbose};
-		}	
-	}
-
-	# Do iphone redirect check regardless of an xml entry for iphone (except for EMP/Live) - sometimes the iphone streams exist regardless
-	# Skip check if the modelist selected excludes iphone
-	if ( $prog->{pid} !~ /^http/i && $verpid !~ /^\?/ && $verpid !~ /^http:/ && grep /^iphone/, split ',', $prog->modelist() ) {
-		if ( my $streamurl = Streamer::iphone->get_url($ua, $prog->{pid}) ) {
-			my $mode = 'iphone1';
-			if ( $prog->{type} eq 'radio' ) {
-				$data->{$mode}->{bitrate} = 128;
-				$data->{$mode}->{type} = "(iplayer_streaming_http_mp3) http mp3 128kbps stream";
-			} else {
-				$data->{$mode}->{bitrate} = 480;
-				$data->{$mode}->{type} = "(iplayer_streaming_http_mp4) http h264 480x272 480kbps stream";
-			}
-			$data->{$mode}->{streamurl} = $streamurl;
-			$data->{$mode}->{streamer} = 'iphone';
-			$data->{$mode}->{ext} = 'mov';
-			get_stream_set_type( $data->{$mode} ) if ! $data->{$mode}->{type};
-		} else {
-			main::logger "DEBUG: No iphone redirect stream\n" if $opt->{verbose};
 		}
 	}
 
 	# Report modes found
 	if ( $opt->{verbose} ) {
-		main::logger "INFO: Found mode $_: $data->{$_}->{type}\n" for sort keys %{ $data };
+		main::logger sprintf("INFO: Found mode %10s: %s\n", $_, $data->{$_}->{type}) for sort Programme::cmp_modes keys %{ $data };
 	}
 
 	# Return a hash with media => url if '' is specified - otherwise just the specified url
@@ -6290,696 +6078,1061 @@
 	}
 }
 
+sub modelist {
+	my $prog = shift;
+	my $mlist = $opt->{$prog->{type}."mode"} || $opt->{modes};
+	# Defaults
+	if ( ! $mlist ) {
+		$mlist = 'default';
+	}
+	my $mlist_orig = $mlist;
+	# backcompat
+	$mlist =~ s/(\b|[^t])vgood/$1better/g;
+	$mlist =~ s/worse/good/g;
+	$mlist =~ s/hlsvhigh/hvfxsd/g;
+	$mlist =~ s/(hlsx?|hvf)std/hvfxhigh/g;
+	$mlist =~ s/(flash|hls)aac/radio/g;
+	$mlist =~ s/(flash|rtmp)/tv/g;
+	if ( $mlist ne $mlist_orig && ! $opt->{nowarnmoderemap} ) {
+		main::logger "WARNING: Input mode list remapped from '$mlist_orig' to '$mlist'\n";
+		main::logger "WARNING: Please update your preferences\n";
+		$opt->{nowarnmoderemap} = 1;
+	}
+	# stream format aliases
+	if ( $prog->{type} eq "tv" ) {
+		$mlist =~ s/dash/dvf/g;
+		$mlist =~ s/hls(?!hd)/hvf/g;
+	} elsif ( $prog->{type} eq "radio" ) {
+		$mlist =~ s/dash/daf/g;
+		$mlist =~ s/hls(?!hd)/hlsaudio/g;
+	}
+	# Deal with fallback modes and expansions
+	# Generic aliases
+	$mlist = main::expand_list($mlist, 'default', "$prog->{type}default");
+	$mlist = main::expand_list($mlist, 'best', "$prog->{type}best");
+	$mlist = main::expand_list($mlist, 'better', "$prog->{type}better");
+	$mlist = main::expand_list($mlist, 'good', "$prog->{type}good");
+	$mlist = main::expand_list($mlist, 'worst', "$prog->{type}worst");
+	# single quality levels
+	if ( $prog->{type} eq "tv" ) {
+		$mlist = main::expand_list($mlist, 'hd', "$prog->{type}hd");
+		$mlist = main::expand_list($mlist, 'sd', "$prog->{type}sd");
+	}
+	$mlist = main::expand_list($mlist, 'high', "$prog->{type}high");
+	if ( $prog->{type} eq "radio" ) {
+		$mlist = main::expand_list($mlist, 'std', "$prog->{type}std");
+		$mlist = main::expand_list($mlist, 'med', "$prog->{type}med");
+	}
+	$mlist = main::expand_list($mlist, 'low', "$prog->{type}low");
+	# DASH on-demand radio
+	if ( $prog->{type} eq "radio" && $mlist =~ /daf/ ) {
+		$mlist = main::expand_list($mlist, 'daf', 'dafdefault');
+		$mlist = main::expand_list($mlist, 'dafdefault', 'dafbest');
+		$mlist = main::expand_list($mlist, 'dafbest', 'dafhigh,dafbetter');
+		$mlist = main::expand_list($mlist, 'dafbetter', 'dafstd,dafgood');
+		$mlist = main::expand_list($mlist, 'dafgood', 'dafmed,dafworst');
+		$mlist = main::expand_list($mlist, 'dafworst', 'daflow');
+	}
+	# DASH on-demand tv
+	if ( $prog->{type} eq "tv" && $mlist =~ /dvf/ ) {
+		$mlist = main::expand_list($mlist, 'dvf', 'dvfdefault');
+		$mlist = main::expand_list($mlist, 'dvfdefault', 'dvfbest');
+		if ( $opt->{fps25} ) {
+			$mlist = main::expand_list($mlist, 'dvfbest', 'dvfbetter');
+			$mlist = main::expand_list($mlist, 'dvfbetter', 'dvfxsd,dvfgood');
+			$mlist = main::expand_list($mlist, 'dvfgood', 'dvfxhigh,dvfworst');
+		} else {
+			$mlist = main::expand_list($mlist, 'dvfbest', 'dvfhd,dvfbetter');
+			$mlist = main::expand_list($mlist, 'dvfbetter', 'dvfsd,dvfxsd,dvfgood');
+			$mlist = main::expand_list($mlist, 'dvfgood', 'dvfhigh,dvfxhigh,dvfworst');
+		}
+		$mlist = main::expand_list($mlist, 'dvfworst', 'dvflow');
+	}
+	# HLS Audio Factory on-demand radio
+	if ( $prog->{type} eq "radio" && $mlist =~ /haf/ ) {
+		$mlist = main::expand_list($mlist, 'haf', 'hafdefault');
+		$mlist = main::expand_list($mlist, 'hafdefault', 'hafbest');
+		$mlist = main::expand_list($mlist, 'hafbest', 'hafhigh,hafbetter');
+		$mlist = main::expand_list($mlist, 'hafbetter', 'hafstd,hafgood');
+		$mlist = main::expand_list($mlist, 'hafgood', 'hafmed,hafworst');
+		$mlist = main::expand_list($mlist, 'hafworst', 'haflow');
+	}
+	# HLS audio clips and archives
+	if ( $prog->{type} eq "radio" && $mlist =~ /hla/ ) {
+		$mlist = main::expand_list($mlist, 'hla', 'hladefault');
+		$mlist = main::expand_list($mlist, 'hladefault', 'hlabest');
+		$mlist = main::expand_list($mlist, 'hlabest', 'hlahigh,hlabetter');
+		$mlist = main::expand_list($mlist, 'hlabetter', 'hlastd,hlagood');
+		$mlist = main::expand_list($mlist, 'hlagood', 'hlamed,hlaworst');
+		$mlist = main::expand_list($mlist, 'hlaworst', 'hlalow');
+	}
+	# HLS Video Factory on-demand tv
+	if ( $prog->{type} eq "tv" && $mlist =~ /hvf/ ) {
+		$mlist = main::expand_list($mlist, 'hvf', 'hvfdefault');
+		$mlist = main::expand_list($mlist, 'hvfdefault', 'hvfbest');
+		if ( $opt->{fps25} ) {
+			$mlist = main::expand_list($mlist, 'hvfbest', 'hvfbetter');
+			$mlist = main::expand_list($mlist, 'hvfbetter', 'hvfxsd,hvfgood');
+			$mlist = main::expand_list($mlist, 'hvfgood', 'hvfxhigh,hvfworst');
+		} else {
+			$mlist = main::expand_list($mlist, 'hvfbest', 'hvfhd,hvfbetter');
+			$mlist = main::expand_list($mlist, 'hvfbetter', 'hvfsd,hvfxsd,hvfgood');
+			$mlist = main::expand_list($mlist, 'hvfgood', 'hvfhigh,hvfxhigh,hvfworst');
+		}
+		$mlist = main::expand_list($mlist, 'hvfworst', 'hvflow');
+	}
+	# HLS on-demand radio
+	if ( $prog->{type} eq "radio" && $mlist =~ /hlsaudio/ ) {
+		$mlist = main::expand_list($mlist, 'hlsaudio', 'hlsaudiodefault');
+		$mlist = main::expand_list($mlist, 'hlsaudiodefault', 'hlsaudiobest');
+		$mlist = main::expand_list($mlist, 'hlsaudiobest', 'hafhigh,hlahigh,hlsaudiobetter');
+		$mlist = main::expand_list($mlist, 'hlsaudiobetter', 'hafstd,hlastd,hlsaudiogood');
+		$mlist = main::expand_list($mlist, 'hlsaudiogood', 'hafmed,hlsmed,hlsaudioworst');
+		$mlist = main::expand_list($mlist, 'hlsaudioworst', 'haflow,hlalow');
+	}
+	# default on-demand radio
+	if ( $prog->{type} eq "radio" && $mlist =~ /radio/ ) {
+		$mlist = main::expand_list($mlist, 'radio', 'radiodefault');
+		$mlist = main::expand_list($mlist, 'radiodefault', 'radiobest');
+		$mlist = main::expand_list($mlist, 'radiobest', 'hafhigh,hlahigh,dafhigh,radiobetter');
+		$mlist = main::expand_list($mlist, 'radiobetter', 'hafstd,hlastd,dafstd,radiogood');
+		$mlist = main::expand_list($mlist, 'radiogood', 'hafmed,hlamed,dafmed,radioworst');
+		$mlist = main::expand_list($mlist, 'radioworst', 'haflow,hlalow,daflow');
+	}
+	# default on-demand tv
+	if ( $prog->{type} eq "tv" && $mlist =~ /tv/ ) {
+		$mlist = main::expand_list($mlist, 'tv', 'tvdefault');
+		$mlist = main::expand_list($mlist, 'tvdefault', 'tvbest');
+		if ( $opt->{fps25} ) {
+			$mlist = main::expand_list($mlist, 'tvbest', 'tvbetter');
+			$mlist = main::expand_list($mlist, 'tvbetter', 'hvfxsd,dvfxsd,tvgood');
+			$mlist = main::expand_list($mlist, 'tvgood', 'hvfxhigh,dvfxhigh,tvworst');
+		} else {
+			$mlist = main::expand_list($mlist, 'tvbest', 'hvfhd,dvfhd,tvbetter');
+			$mlist = main::expand_list($mlist, 'tvbetter', 'hvfsd,dvfsd,hvfxsd,dvfxsd,tvgood');
+			$mlist = main::expand_list($mlist, 'tvgood', 'hvfhigh,dvfhigh,hvfxhigh,dvfxhigh,tvworst');
+		}
+		$mlist = main::expand_list($mlist, 'tvworst', 'hvflow,dvflow');
+	}
+	# single quality level tv
+	if ( $prog->{type} eq "tv" && $mlist =~ /\btv(hd|sd|high|low)\b/ ) {
+		if ( $opt->{fps25} ) {
+			$mlist = main::expand_list($mlist, 'tvsd', 'hvfxsd,dvfxsd');
+			$mlist = main::expand_list($mlist, 'tvhigh', 'hvfxhigh,dvfxhigh');
+		} else {
+			$mlist = main::expand_list($mlist, 'tvhd', 'hvfhd,dvfhd');
+			$mlist = main::expand_list($mlist, 'tvsd', 'hvfsd,dvfsd,hvfxsd,dvfxsd');
+			$mlist = main::expand_list($mlist, 'tvhigh', 'hvfhigh,dvfhigh,hvfxhigh,dvfxhigh');
+		}
+		$mlist = main::expand_list($mlist, 'tvlow', 'hvflow,dvflow');
+	}
+	# single quality level radio
+	if ( $prog->{type} eq "radio" && $mlist =~ /\bradio(high|std|med|low)\b/ ) {
+		$mlist = main::expand_list($mlist, 'radiohigh', 'hafhigh,hlahigh,dafhigh');
+		$mlist = main::expand_list($mlist, 'radiostd', 'hafstd,hlastd,dafstd');
+		$mlist = main::expand_list($mlist, 'radiomed', 'hafmed,hlamed,dafmed');
+		$mlist = main::expand_list($mlist, 'radiolow', 'haflow,hlalow,daflow');
+	}
+	# remove duplicates
+	my %seen;
+	$mlist = join( ",", grep { my $seen = $seen{$_}; $seen{$_} = 1; !$seen } split( ",", $mlist ) );
+	return $mlist;
+}
+
+sub ffmpeg_init {
+	return if $ffmpeg_check;
+	$bin->{ffmpeg} = $opt->{ffmpeg} || 'ffmpeg';
+	if (! main::exists_in_path('ffmpeg') ) {
+		if ( $bin->{ffmpeg} ne 'ffmpeg' ) {
+			$bin->{ffmpeg} = 'ffmpeg';
+			if (! main::exists_in_path('ffmpeg') ) {
+				$ffmpeg_check = 1;
+				return;
+			}
+		} else {
+			$ffmpeg_check = 1;
+			return;
+		}
+	}
+	# ffmpeg checks
+	my ($ffvs, $ffvn);
+	my $ffcmd = main::encode_fs("\"$bin->{ffmpeg}\" -version 2>&1");
+	my $ffout = `$ffcmd`;
+	if ( $ffout =~ /ffmpeg version (\S+)/i ) {
+		$ffvs = $1;
+		if ( $ffvs =~ /^n?(\d+\.\d+)/i ) {
+			$ffvn = $1;
+			if ( $ffvn >= 3.0 ) {
+				$opt->{myffmpeg30} = 1;
+				$opt->{myffmpeg25} = 1;
+			} elsif ( $ffvn >= 2.5 ) {
+				$opt->{myffmpeg25} = 1;
+			} elsif ( $ffvn < 1.0 ) {
+				$opt->{ffmpegobsolete} = 1 unless defined $opt->{ffmpegobsolete};
+			}
+		}
+	}
+	if ( $opt->{verbose} ) {
+		main::logger "INFO: ffmpeg version string = ".($ffvs || "not found")."\n";
+		main::logger "INFO: ffmpeg version number = ".($ffvn || "unknown")."\n";
+	}
+	$opt->{myffmpegversion} = $ffvn;
+	unless ( $opt->{myffmpegversion} ) {
+		if ( $bin->{ffmpeg} =~ /avconv/ || $ffout =~ /avconv/ ) {
+			delete $opt->{ffmpegobsolete};
+			$opt->{myffmpegav} = 1;
+		}
+		$opt->{myffmpegxx} = 1;
+	}
+	# override ffmpeg checks
+	if ( $opt->{ffmpegforce} ) {
+		$opt->{myffmpeg30} = 1;
+		$opt->{myffmpeg25} = 1;
+		delete $opt->{myffmpegav};
+		delete $opt->{myffmpegxx};
+	}
+	delete $binopts->{ffmpeg};
+	push @{ $binopts->{ffmpeg} }, ();
+	if ( ! $opt->{ffmpegobsolete} ) {
+		if ( $opt->{quiet} || $opt->{silent} ) {
+			push @{ $binopts->{ffmpeg} }, ('-loglevel', 'quiet');
+		} elsif ( $opt->{ffmpegloglevel} ) {
+			if ( $opt->{ffmpegloglevel} =~ /^(quiet|-8|panic|0|fatal|8|error|16|warning|24|info|32|verbose|40|debug|48|trace|56)$/ ) {
+				push @{ $binopts->{ffmpeg} }, ('-loglevel', $opt->{ffmpegloglevel});
+			} else {
+				main::logger "WARNING: invalid value for --ffmpeg-loglevel ('$opt->{ffmpegloglevel}') - using default\n";
+				push @{ $binopts->{ffmpeg} }, ('-loglevel', 'fatal');
+			}
+		} else {
+			push @{ $binopts->{ffmpeg} }, ('-loglevel', 'fatal');
+		}
+		if ( main::hide_progress() || ! $opt->{verbose} ) {
+			push @{ $binopts->{ffmpeg} }, ( '-nostats' );
+		} else {
+			push @{ $binopts->{ffmpeg} }, ( '-stats' );
+		}
+	}
+	$ffmpeg_check = 1;
+	return;
+}
+
+sub postproc {
+	my ( $prog, $audio_file, $video_file, $ua ) = @_;
+	my @cmd;
+	my $return;
 
+	$prog->ffmpeg_init();
+	if ( ! main::exists_in_path('ffmpeg') ) {
+		main::logger "WARNING: Required ffmpeg utility not found - cannot convert to \U$prog->{ext}\E\n";
+		return 'stop';
+	}
+
+	# do nothing if no files
+	my $audio_ok = $audio_file && -f $audio_file;
+	my $video_ok = $video_file && -f $video_file;
+	return 0 unless ( $audio_ok || $video_ok);
+
+	my @global_opts = ( '-y' );
+	my @input_opts;
+	push @input_opts, ( '-i', $audio_file ) if $audio_ok;
+	push @input_opts, ( '-i', $video_file ) if $video_ok;
+	my @codec_opts;
+	if ( ! $opt->{ffmpegobsolete} ) {
+		push @codec_opts, ( '-c:v', 'copy', '-c:a', 'copy' );
+	} else {
+		push @codec_opts, ( '-vcodec', 'copy', '-acodec', 'copy' );
+	}
+	my @stream_opts;
+	push @stream_opts, ( '-map', '0:a:0', '-map', '1:v:0' ) if $audio_ok && $video_ok;
+	my @filter_opts;
+	if ( $audio_file =~ /\.ts$/ || $video_file =~ /\.ts$/ ) {
+		if ( ! $opt->{ffmpegobsolete} ) {
+			push @filter_opts, ( '-bsf:a', 'aac_adtstoasc' );
+		} else {
+			push @filter_opts, ( '-absf', 'aac_adtstoasc' );
+		}
+	}
+	my @other_opts;
+	if ( ! $opt->{ffmpegobsolete} && $opt->{notag} ) {
+		push @other_opts, ( '-movflags', 'faststart' );
+	}
+
+	my $embedding;
+	if ( ! $opt->{audioonly} && $opt->{subtitles} && $prog->{type} eq "tv" && $opt->{subsembed} ) {
+		# download subtitles here if embedding
+		unless ( $prog->download_subtitles( $ua, $prog->{subspart}, [ $prog->{version} ] ) ) {
+			# Rename the subtitle file accordingly if the stream get was successful
+			move($prog->{subspart}, $prog->{subsfile}) if -f $prog->{subspart};
+		}
+		if ( ! $opt->{ffmpegobsolete} ) {
+			if ( -f $prog->{subsfile} ) {
+					push @input_opts, ( '-i', $prog->{subsfile} );
+					push @codec_opts, ( '-c:s', 'mov_text' );
+					push @stream_opts, ( '-map', '2:s:0' ) if $audio_ok && $video_ok;
+					push @stream_opts, ( '-metadata:s:s:0', 'language=eng' );
+					$embedding = " and embedding subtitles";
+			} else {
+				main::logger "WARNING: --subs-embed specified but subtitles file not found: $prog->{subsfile}\n";
+			}
+		} else {
+			main::logger "WARNING: Your version of ffmpeg ($opt->{myffmpegversion}) does not support embedding subtitles\n";
+		}
+	}
+
+	@cmd = (
+		$bin->{ffmpeg},
+		@{ $binopts->{ffmpeg} },
+		@global_opts,
+		@input_opts,
+		@codec_opts,
+		@stream_opts,
+		@filter_opts,
+		@other_opts,
+		$prog->{filepart},
+	);
+
+	main::logger "INFO: Converting to \U$prog->{ext}\E$embedding\n";
+
+	# Run conversion and delete source file on success
+	$return = main::run_cmd( 'STDERR', @cmd );
+
+	my $min_download_size = main::progclass($prog->{type})->min_download_size();
+
+	if ( (! $return) && -f $prog->{filepart} && stat($prog->{filepart})->size > $min_download_size ) {
+		unlink( $audio_file, $video_file );
+	} else {
+		# remove the failed converted file
+		unlink $prog->{filepart};
+		main::logger "ERROR: Conversion failed - retaining audio file: $audio_file\n" if $audio_ok;
+		main::logger "ERROR: Conversion failed - retaining video file: $video_file\n" if $video_ok;
+		return 'stop';
+	}
+	# Moving file into place as complete
+	if ( ! move($prog->{filepart}, $prog->{filename}) ) {
+		main::logger "ERROR: Could not rename file: $prog->{filepart}\n";
+		main::logger "ERROR: Destination file name: $prog->{filename}\n";
+		return 'stop';
+	}
 
+	return 0;
+}
 
-################### TV class #################
+################### TV Programme class #################
 package Programme::tv;
 
+# Inherit from Programme::bbciplayer class
+use base 'Programme::bbciplayer';
 use Env qw[@PATH];
 use Fcntl;
 use File::Copy;
 use File::Path;
 use File::stat;
 use HTML::Entities;
+use HTML::Parser 3.71;
 use HTTP::Cookies;
 use HTTP::Headers;
 use IO::Seekable;
 use IO::Socket;
+use JSON::PP;
 use LWP::ConnCache;
+use LWP::Protocol::https;
 use LWP::UserAgent;
-use POSIX qw(mkfifo);
+use POSIX qw(mkfifo strftime);
 use strict;
 use Time::Local;
+use Time::Piece;
 use URI;
-
-# Inherit from Programme class
-use base 'Programme::bbciplayer';
+use XML::LibXML 1.91;
+use XML::LibXML::XPathContext;
+use constant DEFAULT_THUMBNAIL => "https://ichef.bbci.co.uk/images/ic/192xn/p01tqv8z.png";
 
 # Class vars
 sub index_min { return 1 }
-sub index_max { return 9999 }
+
+sub index_max { return 29999 }
+
 sub channels {
 	return {
-		'bbcone'			=> 'BBC One',
-		'bbctwo'			=> 'BBC Two',
-		'bbcthree'			=> 'BBC Three',
-		'bbcfour'			=> 'BBC Four',
-		'bbcnews'			=> 'BBC News',
-		'cbbc'				=> 'CBBC',
-		'cbeebies'			=> 'CBeebies',
-		'parliament'			=> 'BBC Parliament',
-		'bbcwebonly'			=> 'BBC Web Only',
-		'bbchd'				=> 'BBC HD',
-		'bbcalba'			=> 'BBC Alba',
-		'categories/news/tv'		=> 'BBC News',
-		'categories/sport/tv'		=> 'BBC Sport',
-		'categories/signed'		=> 'Signed',
-		'categories/audiodescribed'	=> 'Audio Described',
-		'popular/tv'			=> 'Popular',
-		'highlights/tv'			=> 'Highlights',
+		'national' => {
+			'bbc_one'			=> 'BBC One',
+			'bbc_two'			=> 'BBC Two',
+			'bbc_four'			=> 'BBC Four',
+			'bbc_sport'		=> 'BBC Sport',
+			'cbbc'				=> 'CBBC',
+			'cbeebies'			=> 'CBeebies',
+			'bbc_news'		=> 'BBC News',
+			'bbc_news24'		=> 'BBC News',
+			'bbc_parliament'	=> 'BBC Parliament',
+			'bbc_webonly'		=> 'BBC Web Only',
+		},
+		'regional' => {
+			'bbc_alba'			=> 'BBC Alba',
+			's4cpbs'			=> 'S4C'
+		}
 	};
 }
 
-
-# channel ids be found on http://www.bbc.co.uk/bbcone/programmes/schedules/today
+# channel ids be found on https://www.bbc.co.uk/bbcone/programmes/schedules/today
 sub channels_schedule {
 	return {
-		'bbcalba/programmes/schedules'		=> 'BBC Alba',
-		'bbcfour/programmes/schedules'		=> 'BBC Four',
-		'bbchd/programmes/schedules'		=> 'BBC HD',
-		'bbcnews/programmes/schedules'		=> 'BBC News 24',
-		'bbcone/programmes/schedules/cambridge'	=> 'BBC One Cambridgeshire',
-		'bbcone/programmes/schedules/channel_islands'	=> 'BBC One Channel Islands',
-		'bbcone/programmes/schedules/east'	=> 'BBC One East',
-		'bbcone/programmes/schedules/east_midlands'	=> 'BBC One East Midlands',
-		'bbcone/programmes/schedules/hd'	=> 'BBC One HD',
-		'bbcone/programmes/schedules/london'	=> 'BBC One London',
-		'bbcone/programmes/schedules/north_east'	=> 'BBC One North East & Cumbria',
-		'bbcone/programmes/schedules/north_west'	=> 'BBC One North West',
-		'bbcone/programmes/schedules/ni'	=> 'BBC One Northern Ireland',
-		'bbcone/programmes/schedules/oxford'	=> 'BBC One Oxfordshire',
-		'bbcone/programmes/schedules/scotland'	=> 'BBC One Scotland',
-		'bbcone/programmes/schedules/south'	=> 'BBC One South',
-		'bbcone/programmes/schedules/south_east'	=> 'BBC One South East',
-		'bbcone/programmes/schedules/south_west'	=> 'BBC One South West',
-		'bbcone/programmes/schedules/wales'	=> 'BBC One Wales',
-		'bbcone/programmes/schedules/west'	=> 'BBC One West',
-		'bbcone/programmes/schedules/west_midlands'	=> 'BBC One West Midlands',
-		'bbcone/programmes/schedules/east_yorkshire'	=> 'BBC One Yorks & Lincs',
-		'bbcone/programmes/schedules/yorkshire'	=> 'BBC One Yorkshire',
-		'parliament/programmes/schedules'	=> 'BBC Parliament',
-		'bbcthree/programmes/schedules'		=> 'BBC Three',
-		'bbctwo/programmes/schedules/england'	=> 'BBC Two England',
-		'bbctwo/programmes/schedules/ni'	=> 'BBC Two Northern Ireland',
-		'bbctwo/programmes/schedules/scotland'	=> 'BBC Two Scotland',
-		'bbctwo/programmes/schedules/wales'	=> 'BBC Two Wales',
-		'cbbc/programmes/schedules'		=> 'CBBC',
-		'cbeebies/programmes/schedules'		=> 'CBeebies',
+		'national' => {
+			'p00fzl6b' => 'BBC Four', # bbcfour/programmes/schedules
+			'p00fzl6g' => 'BBC News', # bbcnews/programmes/schedules
+			'p00fzl6n' => 'BBC One', # bbcone/programmes/schedules/hd
+			'p00fzl73' => 'BBC Parliament', # bbcparliament/programmes/schedules
+			'p015pksy' => 'BBC Two', # bbctwo/programmes/schedules/hd
+			'p00fzl9r' => 'CBBC', # cbbc/programmes/schedules
+			'p00fzl9s' => 'CBeebies', # cbeebies/programmes/schedules
+		},
+		'regional' => {
+			'p00fzl67' => 'BBC Alba', # bbcalba/programmes/schedules
+			'p00fzl6q' => 'BBC One Northern Ireland', # bbcone/programmes/schedules/ni
+			'p00zskxc' => 'BBC One Northern Ireland', # bbcone/programmes/schedules/ni_hd
+			'p00fzl6v' => 'BBC One Scotland', # bbcone/programmes/schedules/scotland
+			'p013blmc' => 'BBC One Scotland', # bbcone/programmes/schedules/scotland_hd
+			'p00fzl6z' => 'BBC One Wales', # bbcone/programmes/schedules/wales
+			'p013bkc7' => 'BBC One Wales', # bbcone/programmes/schedules/wales_hd
+			'p06kvypx' => 'BBC Scotland', # bbcscotland/programmes/schedules
+			'p06p396y' => 'BBC Scotland', # bbcscotland/programmes/schedules/hd
+			'p00fzl97' => 'BBC Two England', # bbctwo/programmes/schedules/england
+			'p00fzl99' => 'BBC Two Northern Ireland', # bbctwo/programmes/schedules/ni
+			'p06ngcbm' => 'BBC Two Northern Ireland', # bbctwo/programmes/schedules/ni_hd
+			'p00fzl9d' => 'BBC Two Wales', # bbctwo/programmes/schedules/wales
+			'p06ngc52' => 'BBC Two Wales', # bbctwo/programmes/schedules/wales_hd
+			'p020dmkf' => 'S4C', # s4c/programmes/schedules
+		},
+		'local' => {
+			'p00fzl6h' => 'BBC One Cambridgeshire', # bbcone/programmes/schedules/cambridge
+			'p00fzl6j' => 'BBC One Channel Islands', # bbcone/programmes/schedules/channel_islands
+			'p00fzl6k' => 'BBC One East', # bbcone/programmes/schedules/east
+			'p00fzl6l' => 'BBC One East Midlands', # bbcone/programmes/schedules/east_midlands
+			'p00fzl6m' => 'BBC One Yorks & Lincs', # bbcone/programmes/schedules/east_yorkshire
+			'p00fzl6p' => 'BBC One London', # bbcone/programmes/schedules/london
+			'p00fzl6r' => 'BBC One North East & Cumbria', # bbcone/programmes/schedules/north_east
+			'p00fzl6s' => 'BBC One North West', # bbcone/programmes/schedules/north_west
+			'p00fzl6t' => 'BBC One Oxfordshire', # bbcone/programmes/schedules/oxford
+			'p00fzl6w' => 'BBC One South', # bbcone/programmes/schedules/south
+			'p00fzl6x' => 'BBC One South East', # bbcone/programmes/schedules/south_east
+			'p00fzl6y' => 'BBC One South West', # bbcone/programmes/schedules/south_west
+			'p00fzl70' => 'BBC One West', # bbcone/programmes/schedules/west
+			'p00fzl71' => 'BBC One West Midlands', # bbcone/programmes/schedules/west_midlands
+			'p00fzl72' => 'BBC One Yorkshire', # bbcone/programmes/schedules/yorkshire
+		},
 	};
 }
 
-
 # Class cmdline Options
 sub opt_format {
 	return {
-		tvmode		=> [ 1, "tvmode|vmode=s", 'Recording', '--tvmode <mode>,<mode>,...', "TV Recoding modes: rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi (default: flashhigh,flashstd,flashnormal). Use --tvmode=best to automatically select highest quality available."],
-		outputtv	=> [ 1, "outputtv=s", 'Output', '--outputtv <dir>', "Output directory for tv recordings"],
-		vlc		=> [ 1, "vlc=s", 'External Program', '--vlc <path>', "Location of vlc or cvlc binary"],
-		rtmptvopts	=> [ 1, "rtmp-tv-opts|rtmptvopts=s", 'Recording', '--rtmp-tv-opts <options>', "Add custom options to flvstreamer for tv"],
+		tvmode		=> [ 1, "tvmode|vmode=s", 'Recording', '--tvmode <mode>,<mode>,...', "TV recording modes (overrides --modes): dvfhd,dvfsd,dvfxsd,dvfhigh,dvfxhigh,dvflow,hlshd,hvfhd,hvfsd,hvfxsd,hvfhigh,hvfxhigh,hvflow. Shortcuts: best,better,good,worst,dvf,hvf,dash,hls,hd,sd,high,low. 50fps streams (if available) preferred unless --fps25 specified (default=hvfhd,dvfhd,hvfsd,dvfsd,hvfxsd,dvfxsd,hvfhigh,dvfhigh,hvfxhigh,dvfxhigh,hvflow,dvflow)."],
+		commandtv	=> [ 1, "commandtv|command-tv=s", 'Output', '--command-tv <command>', "User command to run after successful recording of TV programme. Use substitution parameters in command string (see docs for list). Overrides --command."],
+		outputtv	=> [ 1, "outputtv=s", 'Output', '--outputtv <dir>', "Output directory for tv recordings (overrides --output)"],
 	};
 }
 
-
-
 # Method to return optional list_entry format
 sub optional_list_entry_format {
 	my $prog = shift;
 	my @format;
-	for ( qw/ channel categories versions / ) {
+	for ( qw/ channel pid / ) {
 		push @format, $prog->{$_} if defined $prog->{$_};
 	}
 	return ', '.join ', ', @format;
 }
 
+# Usage: Programme::tv->get_links( \%prog, 'tv' );
+# Uses: %{ channels_schedule() }, \%prog
+sub get_links {
+	my $self = shift; # ignore obj ref
+	my $prog = shift;
+	my $prog_type = shift;
+	my $mra = shift;
+	my $now = shift || time();
+	my $rc = 0;
+	$rc = $self->get_links_schedule($prog, $prog_type, 0, $mra, $now);
+	return 1 if $rc && $opt->{refreshabortonerror};
+	if ( $opt->{refreshfuture} ) {
+		$rc = $self->get_links_schedule($prog, $prog_type, 1, $mra, $now);
+		return 1 if $rc && $opt->{refreshabortonerror};
+	}
+	main::logger "\n";
+	return 0;
+}
 
-
-# Returns the modes to try for this prog type
-sub modelist {
+# get cache info for programmes from schedule
+sub get_links_schedule {
+	my $self = shift;
 	my $prog = shift;
-	my $mlist = $opt->{tvmode} || $opt->{modes};
-	
-	# Defaults
-	if ( ! $mlist ) {
-		if ( ! main::exists_in_path('flvstreamer') ) {
-			main::logger "WARNING: Not using flash modes since flvstreamer is not found\n" if $opt->{verbose};
-			$mlist = 'iphone';
-		} else {
-			$mlist = 'flashhigh,flashstd,flashnormal';
+	my $prog_type = shift;
+	my $future = shift;
+	my $mra = shift;
+	my $now = shift || time();
+	my @schedule_dates;
+	my ($timepiece, $stop);
+	my $one_week = 7 * 86400;
+	my $limit = 0;
+	if ( $future ) {
+		$timepiece = Time::Piece::gmtime($now);
+		$stop = Time::Piece::gmtime($now + 2 * $one_week);
+	} else {
+		my $limit_min = $now - ( 30 * 86400 );
+		unless ( $opt->{cacherebuild} ) {
+			my $limit_days = $opt->{"refreshlimit".${prog_type}} || $opt->{"refreshlimit"};
+			if ( $limit_days ) {
+				$limit = $now - ($limit_days * 86400);
+			} else {
+				if ( $mra ) {
+					$limit = $mra;
+				} else {
+					my $cache_file = File::Spec->catfile($profile_dir, "${prog_type}.cache");
+					my $cache_time;
+					if ( -f $cache_file ) {
+						$cache_time = stat($cache_file)->mtime;
+					}
+					if ( $cache_time ) {
+						$limit = $cache_time;
+					} else {
+						$limit = $limit_min;
+					}
+				}
+			}
+		}
+		my $overlap = $opt->{expiry} || $self->expiry() || 14400;
+		$limit -= $overlap;
+		$limit = $limit_min if $limit < $limit_min;
+		my $limit_str = strftime('%Y-%m-%dT%H:%M:%S+00:00', gmtime($limit));
+		main::logger("INFO: Cache refresh limit ($prog_type): $limit_str\n") if $opt->{verbose};
+		$timepiece = Time::Piece::gmtime($limit);
+		$stop = Time::Piece::gmtime($now + $one_week);
+	}
+	my $iso8601_year_diff;
+	while ( $timepiece->week != $stop->week ) {
+		$iso8601_year_diff = int($timepiece->mon == 12 && $timepiece->week == 1);
+		$iso8601_year_diff = -1 if $timepiece->mon == 1 && $timepiece->week > 51;
+		push @schedule_dates, sprintf("%04d/w%02d", $timepiece->year + $iso8601_year_diff, $timepiece->week);
+		$timepiece += $one_week;
+	}
+	return unless @schedule_dates;
+	my %channels = %{ main::progclass($prog_type)->channels_filtered( main::progclass($prog_type)->channels_schedule() ) };
+	my @channel_list = sort keys %channels;
+	if ( ! $opt->{noindexconcurrent} ) {
+		eval "use Mojo::UserAgent";
+		if ( $@ ) {
+			main::logger "WARNING: Please download and run latest installer or install the Mojolicious Perl module for concurrent indexing of $prog_type programmes.\n";
+			main::logger "ERROR: Failed to load Mojo::UserAgent:\n$@" if $opt->{verbose};
+		} else {
+			main::logger "\nINFO: Indexing $prog_type programmes (concurrent)".($future ? " [future]\n" : "\n");
+			my @mojo_urls;
+			my %mojo_channel_ids;
+			my %mojo_channels;
+			for my $channel_id ( @channel_list ) {
+				for my $schedule_date ( @schedule_dates ) {
+					my $mojo_url = "https://www.bbc.co.uk/schedules/${channel_id}/${schedule_date}";
+					push @mojo_urls, $mojo_url;
+					$mojo_channel_ids{$mojo_url} = $channel_id;
+					$mojo_channels{$mojo_url} = $channels{$channel_id};
+				}
+			}
+			my $rc = $self->get_links_schedule_mojo($prog, $prog_type, $future, $limit, $now, \@mojo_urls, \%mojo_channel_ids, \%mojo_channels);
+			if ( $rc ) {
+				return 1 if $opt->{refreshabortonerror};
+			}
+			return;
+		}
+		return;
+	}
+	my $ua = main::create_ua( 'desktop', 1 );
+	$ua->timeout(60);
+	main::logger "\nINFO: Indexing $prog_type programmes (sequential)".($future ? " [future]\n" : "\n");
+	for my $channel_id ( @channel_list ) {
+		for my $schedule_date ( @schedule_dates ) {
+			my ($url, $rc);
+			$url = "https://www.bbc.co.uk/schedules/${channel_id}/${schedule_date}";
+			$rc = $self->get_links_schedule_lwp($ua, $prog, $prog_type, $channel_id, $channels{$channel_id}, $future, $url, $limit, $now);
+			if ( $rc ) {
+				return 1 if $opt->{refreshabortonerror};
+				next;
+			}
 		}
 	}
-	# Deal with BBC TV fallback modes and expansions
-	# Valid modes are iphone,rtmp,flashhigh,flashnormal,flashlow,n95_wifi
-	# 'rtmp' or 'flash' => 'flashhigh,flashnormal'
-	$mlist = main::expand_list($mlist, 'best', 'flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow');
-	$mlist = main::expand_list($mlist, 'flash', 'flashhigh,flashstd,flashnormal');
-	$mlist = main::expand_list($mlist, 'rtmp', 'flashhigh,flashstd,flashnormal');
-
-	return $mlist;
 }
 
-
-
-# Cleans up a pid and removes url parts that might be specified
-sub clean_pid {
+# get cache info from schedule html with Mojolicious
+sub get_links_schedule_mojo {
+	my $self = shift;
 	my $prog = shift;
-
-	# Extract the appended start timestamp if it exists and set options accordingly e.g. '?t=16m51s'
-	if ( $prog->{pid} =~ m{\?t=(\d+)m(\d+)s$} ) {
-		# calculate the start offset
-		$opt->{start} = $1*60.0 + $2;
-	}
-	
-	# Expand Short iplayer URL redirects
-	# e.g. http://bbc.co.uk/i/lnc8s/
-	if ( $prog->{pid} =~ m{bbc\.co\.uk\/i\/[a-z0-9]{5}\/.*$}i ) {
-		# Do a recursive redirect lookup to get the final URL
-		my $ua = main::create_ua( 'desktop' );
-		main::proxy_disable($ua) if $opt->{partialproxy};
-		my $res;
-		do {
-			# send request (use simple_request here because that will not allow redirects)
-			$res = $ua->simple_request( HTTP::Request->new( 'GET', $prog->{pid} ) );
-			if ( $res->is_redirect ) {
-				$prog->{pid} = $res->header("location");
-				$prog->{pid} = 'http://bbc.co.uk'.$prog->{pid} if $prog->{pid} !~ /^http/;
-				main::logger "DEBUG: got short url redirect to '$prog->{pid}' from iplayer site\n" if $opt->{debug};
+	my $prog_type = shift;
+	my $future = shift;
+	my $limit = shift;
+	my $now = shift || time();
+	my $urls = shift;
+	my $channel_ids = shift;
+	my $channels = shift;
+	return 1 unless @$urls;
+
+	my $retries = 3;
+	my %attempts;
+	my $rc_mojo;
+	my $max_conn = $opt->{indexmaxconn} || 5;
+	# sync Mojo::UserAgent certificate verification with LWP
+	unless ( $ENV{MOJO_CA_FILE} || $ENV{MOJO_INSECURE} ) {
+		my %ssl_opts;
+		eval {
+			%ssl_opts = LWP::Protocol::create("https", LWP::UserAgent->new)->_extra_sock_opts;
+		};
+		if ( $@ ) {
+			main::logger "WARNING: Failed to load LWP SSL options with LWP::Protocol::https:\n$@" if $opt->{verbose};
+		} else {
+			my $verify_mode = $ssl_opts{SSL_verify_mode};
+			my $ca_file = $ssl_opts{SSL_ca_file};
+			if ( $opt->{verbose} ) {
+				main::logger "DEBUG: LWP verify mode: $verify_mode\n";
+				main::logger "DEBUG: LWP CA file: $ca_file\n";
+			}
+			if ( $verify_mode ) {
+				if ( -f $ca_file ) {
+					$ENV{MOJO_CA_FILE} = $ca_file;
+				} else {
+					main::logger "WARNING: LWP CA file not found: $ca_file\n" if $opt->{verbose};
+				}
+			} else {
+				$ENV{MOJO_INSECURE} = 1;
 			}
-		} while ( $res->is_redirect );
-		main::proxy_enable($ua) if $opt->{partialproxy};
-		main::logger "DEBUG: Final expanded short URL is '$prog->{pid}'\n" if $opt->{debug};
+		}
 	}
-		
-	# If this is an iPlayer pid
-	if ( $prog->{pid} =~ m{^([pb]0[a-z0-9]{6})$} ) {
-		# extract b??????? format from any URL containing it
-		$prog->{pid} = $1;
-
-	# If this an URL containing a PID (except for BBC programmes URLs)
-	} elsif ( $prog->{pid} =~ m{^http.+\/([pb]0[a-z0-9]{6})\/?.*$} && $prog->{pid} !~ m{/programmes/} ) {
-		# extract b??????? format from any URL containing it
-		$prog->{pid} = $1;
-
-	# If this is a BBC *iPlayer* Live channel
-	# e.g. http://www.bbc.co.uk/iplayer/playlive/bbc_radio_fourfm/
-	} elsif ( $prog->{pid} =~ m{http.+bbc\.co\.uk/iplayer}i ) {
-		# Remove trailing path for URLs like 'http://www.bbc.co.uk/iplayer/radio/bbc_radio_fourfm/listenlive'
-		$prog->{pid} =~ s/\/\w+live\/?$//;
-		# Remove extra URL path for URLs like 'http://www.bbc.co.uk/iplayer/playlive/bbc_one_london/' or 'http://www.bbc.co.uk/iplayer/tv/bbc_one'
-		$prog->{pid} =~ s/^http.+\/(.+?)\/?$/$1/g;
-	# Else this is an embedded media player URL (live or otherwise)
-	} elsif ($prog->{pid} =~ m{^http}i ) {
-		# Just leave the URL as the pid
+	my $ua = Mojo::UserAgent->new(max_redirects => 7);
+	if ( $opt->{verbose} ) {
+		if ( $ua->can('insecure') ) {
+			main::logger "DEBUG: Mojo::UserAgent insecure: ".($ua->insecure)."\n";
+		}
+		main::logger "DEBUG: Mojo::UserAgent CA file: ".($ua->ca)."\n";
 	}
-}
+	$ua->transactor->name(main::user_agent());
+	$ua->connect_timeout(60);
+	$ua->inactivity_timeout(60);
+	if ( $opt->{proxy} && $opt->{proxy} !~ /^prepend:/ && ! $opt->{partialproxy} ) {
+		$ua->proxy->http($opt->{proxy})->https($opt->{proxy});
+	}
+
+	my $sig_int = $SIG{INT};
+	local $SIG{INT} = sub {
+		undef $ua;
+		$sig_int->(shift) if ref $sig_int eq 'CODE';
+	};
+
+	my $get_callback = sub {
+		my (undef, $tx) = @_;
+		my $tx0 = $tx;
+		while ( $tx0->previous ) {
+			$tx0 = $tx0->previous;
+		}
+		my $url = $tx0->req->url;
+		my $channel_id = $channel_ids->{$url};
+		my $channel = $channels->{$url};
+		my $html = $tx->res->text;
+		unless ( $tx->res->code >= 200 && $tx->res->code < 300 && $html =~ /\w/ ) {
+			my $errmsg;
+ 			if ( my $err = $tx->error ) {
+				if ( ref($err) eq 'HASH') {
+					if ( $err->{code} ) {
+						$errmsg = "Response: $err->{code} $err->{message}";
+					} else {
+						$errmsg = "Connection error: $err->{message}";
+					}
+				} else {
+					$errmsg = $err;
+				}
+			}
+			if ( $attempts{$url} < $retries ) {
+				if ( $opt->{verbose} ) {
+					main::logger "\nWARNING: Failed to download $channel schedule page ($attempts{$url}/$retries): $url\n";
+					main::logger "WARNING: $errmsg\n" if $errmsg;
+					main::logger "INFO: Retrying download of $channel schedule page: $url\n";
+				}
+				unshift @$urls, $url;
+			} else {
+				main::logger "\nERROR: Failed to download $channel schedule page ($attempts{$url}/$retries): $url\n";
+				main::logger "ERROR: $errmsg\n" if $errmsg;
+				$rc_mojo = 1;
+			}
+			return;
+		} else {
+			main::logger ".";
+		}
+		my $rc = $self->get_links_schedule_json($html, $prog, $prog_type, $channel_id, $channel, $future, $limit, $now, $url);
+		if ( $rc ) {
+			main::logger "\nWARNING: Failed to parse $channel schedule page (JSON): $url\n" if $opt->{verbose};
+			$rc = $self->get_links_schedule_html($html, $prog, $prog_type, $channel_id, $channel, $future, $limit, $now, $url);
+			if ( $rc ) {
+				if ( $opt->{verbose} ) {
+					main::logger "\nWARNING: Failed to parse $channel schedule page (HTML): $url\n";
+				} else {
+					main::logger "\nWARNING: Failed to parse $channel schedule page: $url\n";
+				}
+				$rc_mojo = 1;
+			}
+		}
+	};
 
+	my $delay = Mojo::IOLoop->delay;
+	my $fetch;
+	$fetch = sub {
+		return unless my $url = shift @$urls;
+		return if ( $rc_mojo && $opt->{refreshabortonerror} );
+		my $end = $delay->begin;
+		$attempts{$url}++;
+		main::logger "\nINFO: Downloading $channels->{$url} schedule page ($attempts{$url}/$retries): $url\n" if $opt->{verbose};
+		$ua->get($url => sub {
+			my ($ua, $tx) = @_;
+			unless ( $rc_mojo && $opt->{refreshabortonerror} ) {
+				$get_callback->($ua, $tx);
+				$fetch->();
+			}
+			$end->();
+		});
+	};
 
+	$fetch->() for 1 .. $max_conn;
+	$delay->wait;
+	undef $ua;
+	return 1 if $rc_mojo;
+}
 
-# Usage: Programme::tv->get_links( \%prog, 'tv' );
-# Uses: %{ channels() }, \%prog
-sub get_links {
-	shift; # ignore obj ref
+# get cache info from schedule html
+sub get_links_schedule_lwp {
+	my $self = shift;
+	my $ua = shift;
 	my $prog = shift;
 	my $prog_type = shift;
-	# Hack to get correct 'channels' method because this methods is being shared with Programme::radio
-	my %channels = %{ main::progclass($prog_type)->channels_filtered( main::progclass($prog_type)->channels() ) };
-	my $channel_feed_url = 'http://feeds.bbc.co.uk/iplayer'; # /$channel/list
-	my $bbc_prog_page_prefix = 'http://www.bbc.co.uk/programmes'; # /$pid
-	my $thumbnail_prefix = 'http://www.bbc.co.uk/iplayer/images/episode';
-	my $xml;
-	my $feed_data;
-	my $res;
-	main::logger "INFO: Getting $prog_type Index Feeds\n";
-	# Setup User agent
-	my $ua = main::create_ua( 'desktop', 1 );
-
-	# Download index feed
-	# Sort feeds so that category based feeds are done last - this makes sure that the channels get defined correctly if there are dups
-	my @channel_list;
-	push @channel_list, grep !/(categor|popular|highlights|bbchd)/, keys %channels;
-	push @channel_list, grep  /categor/, keys %channels;
-	push @channel_list, grep  /popular/, keys %channels;
-	push @channel_list, grep  /highlights/, keys %channels;
-	push @channel_list, grep  /bbchd/, keys %channels;
-	for ( @channel_list ) {
-
-		my $url = "${channel_feed_url}/$_/list/limit/400";
-		main::logger "DEBUG: Getting feed $url\n" if $opt->{verbose};
-		$xml = main::request_url_retry($ua, $url, 3, '.', "WARNING: Failed to get programme index feed for $_ from iplayer site\n");
-		decode_entities($xml);
-		
-		# Feed as of August 2008
-		#	 <entry>
-		#	   <title type="text">Bargain Hunt: Series 18: Oswestry</title>
-		#	   <id>tag:feeds.bbc.co.uk,2008:PIPS:b0088jgs</id>
-		#	   <updated>2008-07-22T00:23:50Z</updated>
-		#	   <content type="html">
-		#	     &lt;p&gt;
-		#	       &lt;a href=&quot;http://www.bbc.co.uk/iplayer/episode/b0088jgs?src=a_syn30&quot;&gt;
-		#		 &lt;img src=&quot;http://www.bbc.co.uk/iplayer/images/episode/b0088jgs_150_84.jpg&quot; alt=&quot;Bargain Hunt: Series 18: Oswestry&quot; /&gt;
-		#	       &lt;/a&gt;
-		#	     &lt;/p&gt;
-		#	     &lt;p&gt;
-		#	       The teams are at an antiques fair in Oswestry showground. Hosted by Tim Wonnacott.
-		#	     &lt;/p&gt;
-		#	   </content>
-		#	   <category term="Factual" />
-		#          <category term="Guidance" />
-		#	   <category term="TV" />
-		#	   <link rel="via" href="http://www.bbc.co.uk/iplayer/episode/b0088jgs?src=a_syn30" type="text/html" title="Bargain Hunt: Series 18: Oswestry" />
-		#       </entry>
-		#
-
-		### New Feed
-		#  <entry>
-		#    <title type="text">House of Lords: 02/07/2008</title>
-		#    <id>tag:bbc.co.uk,2008:PIPS:b00cd5p7</id>
-		#    <updated>2008-06-24T00:15:11Z</updated>
-		#    <content type="html">
-		#      <p>
-		#	<a href="http://www.bbc.co.uk/iplayer/episode/b00cd5p7?src=a_syn30">
-		#	  <img src="http://www.bbc.co.uk/iplayer/images/episode/b00cd5p7_150_84.jpg" alt="House of Lords: 02/07/2008" />
-		#	</a>
-		#      </p>
-		#      <p>
-		#	House of Lords, including the third reading of the Health and Social Care Bill. 1 July.
-		#      </p>
-		#    </content>
-		#    <category term="Factual" scheme="urn:bbciplayer:category" />
-		#    <link rel="via" href="http://www.bbc.co.uk/iplayer/episode/b00cd5p7?src=a_syn30" type="application/atom+xml" title="House of Lords: 02/07/2008">
-		#    </link>
-		#  </entry>
-
-		### Newer feed (Sept 2009)
-		#  <entry>
-		#    <title type="text">BBC Proms: 2009: Prom 65: Gustav Mahler Jugend Orchester</title>
-		#    <id>tag:feeds.bbc.co.uk,2008:PIPS:b00mgw03</id>
-		#    <updated>2009-09-05T03:29:07Z</updated>
-		#    <content type="html">
-		#      &lt;p&gt;
-		#        &lt;a href=&quot;http://www.bbc.co.uk/iplayer/episode/b00mgw03/BBC_Proms_2009_Prom_65_Gustav_Mahler_Jugend_Orchester/&quot;&gt;
-		#          &lt;img src=&quot;http://node1.bbcimg.co.uk/iplayer/images/episode/b00mgw03_150_84.jpg&quot; alt=&quot;BBC Proms: 2009: Prom 65: Gustav Mahler Jugend Orchester&quot; /&gt;
-		#        &lt;/a&gt;
-		#      &lt;/p&gt;
-		#      &lt;p&gt;
-		#        The Gustav Mahler Youth Orchestra perform works by Mahler, Richard Strauss and Ligeti.
-		#      &lt;/p&gt;
-		#    </content>
-		#    <category term="Music" />
-		#    <category term="Classical" />
-		#    <category term="TV" />
-		#    <link rel="alternate" href="http://www.bbc.co.uk/iplayer/episode/b00mgw03/BBC_Proms_2009_Prom_65_Gustav_Mahler_Jugend_Orchester/" type="text/html" title="BBC Proms: 2009: Prom 65: Gustav Mahler Jugend Orchester">
-		#      <media:content>
-		#        <media:thumbnail url="http://node1.bbcimg.co.uk/iplayer/images/episode/b00mgw03_150_84.jpg" width="150" height="84" />
-		#      </media:content>
-		#    </link>
-		#    <link rel="self" href="http://feeds.bbc.co.uk/iplayer/episode/b00mgw03" type="application/atom+xml" title="Prom 65: Gustav Mahler Jugend Orchester" />
-		#    <link rel="related" href="http://www.bbc.co.uk/programmes/b007v097/microsite" type="text/html" title="BBC Proms" />
-		#  </entry>
-
-
-		# Parse XML
-
-		# get list of entries within <entry> </entry> tags
-		my @entries = split /<entry>/, $xml;
-		# Discard first element == header
-		shift @entries;
-
-		main::logger "INFO: Got ".($#entries + 1)." programmes\n" if $opt->{verbose};
-		foreach my $entry (@entries) {
-			my ( $title, $name, $episode, $episodetitle, $nametitle, $episodenum, $seriesnum, $desc, $pid, $available, $channel, $duration, $thumbnail, $version, $guidance );
-			
-			my $entry_flat = $entry;
-			$entry_flat =~ s/\n/ /g;
-
-			# <id>tag:bbc.co.uk,2008:PIPS:b008pj3w</id>
-			$pid = $1 if $entry =~ m{<id>.*PIPS:(.+?)</id>};
-
-			# <title type="text">Richard Hammond's Blast Lab: Series Two: Episode 11</title>
-			# <title type="text">Skate Nation: Pro-Skate Camp</title>
-			$title = $1 if $entry =~ m{<title\s*.*?>\s*(.*?)\s*</title>};
-
-			# determine name and episode from title
-			( $name, $episode ) = Programme::bbciplayer::split_title( $title );
-
-			# Get the title from the atom link refs only to determine the longer episode name
-			$episodetitle = $1 if $entry =~ m{<link\s+rel="self"\s+href="http.+?/episode/.+?"\s+type="application/atom\+xml"\s+title="(.+?)"};
-			$nametitle = $1 if $entry =~ m{<link\s+rel="related"\s+href="http.+?/programmes/.+?"\s+type="text/html"\s+title="(.+?)"};
-
-			# Extract the seriesnum
-			my $regex = 'Series\s+'.main::regex_numbers();
-			$seriesnum = main::convert_words_to_number( $1 ) if "$name $episode" =~ m{$regex}i;
+	my $channel_id = shift;
+	my $channel = shift;
+	my $future = shift;
+	my $url = shift;
+	my $limit = shift;
+	my $now = shift || time();
+	my $rc_lwp;
+	main::logger "\INFO: Downloading $channel schedule page: $url\n" if $opt->{verbose};
+	my $html = main::request_url_retry($ua, $url, 3, '.', "Failed to download $channel schedule page");
+	return 1 unless $html;
+	my $rc = $self->get_links_schedule_json($html, $prog, $prog_type, $channel_id, $channel, $future, $limit, $now, $url);
+	if ( $rc ) {
+		main::logger "\nWARNING: Failed to parse $channel schedule page (JSON): $url\n" if $opt->{verbose};
+		$rc = $self->get_links_schedule_html($html, $prog, $prog_type, $channel_id, $channel, $future, $limit, $now, $url);
+		if ( $rc ) {
+			if ( $opt->{verbose} ) {
+				main::logger "\nWARNING: Failed to parse $channel schedule page (HTML): $url\n";
+			} else {
+				main::logger "\nWARNING: Failed to parse $channel schedule page: $url\n";
+			}
+			$rc_lwp = 1;
+		}
+	}
+	return $rc_lwp;
+}
 
+sub get_links_schedule_html {
+	my $self = shift;
+	my $html = shift;
+	my $prog = shift;
+	my $prog_type = shift;
+	my $channel_id = shift;
+	my $channel = shift;
+	my $future = shift;
+	my $limit = shift;
+	my $now = shift || time();
+	my $url = shift;
+	return 1 unless $html;
+	my $cache_channel = $channel;
+	if ( $prog_type eq "tv" ) {
+		# collapse BBC One/Two variants
+		$cache_channel =~ s/(BBC (One|Two)).*/$1/;
+	}
+	my $thirty_days = 30 * 86400;
+	my $min_available = $limit || ( $now - $thirty_days );
+	my $dom = XML::LibXML->load_html(string => $html, recover => 1, suppress_errors => 1);
+	my @entries = $dom->findnodes('//li[contains(@class,"week-guide__table__item")]');
+	main::logger "\n".(@entries ? "INFO" : "WARNING").": Got ".($#entries + 1)." programmes for $channel schedule page (HTML): $url\n" if $opt->{verbose} || ! @entries;
+	return 1 unless @entries;
+	foreach my $entry (@entries) {
+		my ( $name, $episode, $episodenum, $seriesnum, $desc, $pid, $available, $expires, $duration, $web, $thumbnail );
+		my ($available_str, $until_str);
+		my $pid = $entry->findvalue('.//div[contains(@class,"programme--episode")]/@data-pid');
+		next unless $pid;
+		my $available_str = $entry->findvalue('.//h3[contains(@class,"broadcast__time")]/@content');
+		$available = Programme::get_time_string( $available_str );
+		my $end_date = $entry->findvalue('.//meta[@property="endDate"]/@content');
+		if ( $end_date ) {
+			my $finish = Programme::get_time_string( $end_date );
+			if ( $finish ) {
+				$duration = $finish - $available;
+				$available_str = $end_date;
+				$available = $finish;
+			}
+		}
+		next unless $available_str;
+		next if $available < $min_available;
+		next if ! $future && $available > $now;
+		next if $future && $available <= $now;
+		$expires = $available + $thirty_days;
+		if ( defined $prog->{$pid} ) {
+			main::logger "WARNING: '$pid, $prog->{$pid}->{name} - $prog->{$pid}->{episode}, $prog->{$pid}->{channel}' already exists (this channel = $channel $available)\n" if $opt->{verbose};
+			# use listing with earliest availability
+			if ( $prog->{$pid}->{available} && $available_str lt $prog->{$pid}->{available} ) {
+				$prog->{$pid}->{available} = $available_str;
+			}
+			# use listing with latest expiry
+			if ( $prog->{$pid}->{expires} && $expires > $prog->{$pid}->{expires} ) {
+				$prog->{$pid}->{expires} = $expires;
+			}
+			next;
+		}
+		$desc = $entry->findvalue('.//p[contains(@class,"programme__synopsis")]/span');
+		$desc =~ s/[\r\n]/ /g;
+		my @title_nodes = $entry->findnodes('.//h4[contains(@class,"programme__titles")]//span/span');
+		my @titles = map {$_->findvalue('.')} @title_nodes;
+		if ( $#titles == 2 ) {
+			$name = "$titles[0]: $titles[1]";
+			$episode = $titles[2];
+		} elsif ( $#titles == 1 ) {
+			$name = $titles[0];
+			$episode = $titles[1];
+		} elsif ( $#titles == 0 ) {
+			$name = $titles[0];
+			$episode = "-";
+		}
+		$episodenum = $entry->findvalue('.//p[contains(@class,"programme__synopsis")]/abbr/span[@datatype="xsd:int"]');
+		if ( ! $episodenum ) {
 			# Extract the episode num
-			my $regex_1 = 'Episode\s+'.main::regex_numbers();
+			my $regex_1 = '(?:Episode|Pennod)\s+'.main::regex_numbers();
 			my $regex_2 = '^'.main::regex_numbers().'\.\s+';
-			if ( "$name $episode" =~ m{$regex_1}i ) { 
+			if ( $episode =~ m{$regex_1}i ) {
 				$episodenum = main::convert_words_to_number( $1 );
 			} elsif ( $episode =~ m{$regex_2}i ) {
 				$episodenum = main::convert_words_to_number( $1 );
-			} elsif ( $episodetitle =~ m{$regex_2}i ) {
-				$episodenum = main::convert_words_to_number( $1 );
 			}
+		}
+		# Extract the seriesnum
+		my $regex = '(?:Series|Cyfres)\s+'.main::regex_numbers();
+		$seriesnum = main::convert_words_to_number( $1 ) if "$name $episode" =~ m{$regex}i;
+		# /programmes page
+		$web = "https://www.bbc.co.uk/programmes/${pid}";
+		$thumbnail = DEFAULT_THUMBNAIL;
+		# build data structure
+		decode_entities($name);
+		decode_entities($episode);
+		decode_entities($desc);
+		$prog->{$pid} = main::progclass($prog_type)->new(
+			'pid'		=> $pid,
+			'name'		=> $name,
+			'episode'	=> $episode,
+			'seriesnum'	=> $seriesnum,
+			'episodenum'	=> $episodenum,
+			'desc'		=> $desc,
+			'duration'	=> $duration,
+			'channel'	=> $cache_channel,
+			'type'		=> $prog_type,
+			'web'		=> $web,
+			'available' => $available_str,
+			'expires' => $expires,
+			'thumbnail'	=> $thumbnail,
+		);
+	}
+}
 
-			# Re-insert the episode number if the episode text doesn't have it
-			if ( $episodenum && $episodetitle =~ /^\d+\./ && $episode !~ /^(.+:\s+)?\d+\./ ) {
-				$episode =~ s/^(.+:\s+)?(.*)$/$1$episodenum. $2/;
-			}
-
-			#<p>    House of Lords, including the third reading of the Health and Social Care Bill. 1 July.   </p>    </content>
-			$desc = $1 if $entry =~ m{<p>\s*(.*?)\s*</p>\s*</content>};
-			# Remove unwanted html tags
-			$desc =~ s!</?(br|b|i|p|strong)\s*/?>!!gi;
-
-			# Parse the categories into hash
-			# <category term="Factual" />
-			my @category;
-			for my $line ( grep /<category/, (split /\n/, $entry) ) {
-				push @category, $1 if $line =~ m{<category\s+term="(.+?)"};
-			}
-			# strip commas - they confuse sorting and spliting later
-			s/,//g for @category;
-
-			# Extract channel
-			$channel = $channels{$_};
-			# Add HD as category
-			push @category, 'HD' if $channel eq 'BBC HD';
-
-			main::logger "DEBUG: '$pid, $name - $episode, $channel'\n" if $opt->{debug};
-
-			# Merge and Skip if this pid is a duplicate
-			if ( defined $prog->{$pid} ) {
-				main::logger "WARNING: '$pid, $prog->{$pid}->{name} - $prog->{$pid}->{episode}, $prog->{$pid}->{channel}' already exists (this channel = $channel)\n" if $opt->{verbose};
-				# Since we use the 'Signed' (or 'Audio Described') channel to get sign zone/audio described data, merge the categories from this entry to the existing entry
-				if ( $prog->{$pid}->{categories} ne join(',', sort @category) ) {
-					my %cats;
-					$cats{$_} = 1 for ( @category, split /,/, $prog->{$pid}->{categories} );
-					main::logger "INFO: Merged categories for $pid from $prog->{$pid}->{categories} to ".join(',', sort keys %cats)."\n" if $opt->{verbose};
-					$prog->{$pid}->{categories} = join(',', sort keys %cats);
-				}
-
-				# If this a popular or highlights programme then add these tags to categories
-				my %cats;
-				$cats{$_} = 1 for ( @category, split /,/, $prog->{$pid}->{categories} );
-				$cats{Popular} = 1 if $channel eq 'Popular';
-				$cats{Highlights} = 1 if $channel eq 'Highlights';
-				$prog->{$pid}->{categories} = join(',', sort keys %cats);
-
-				# If this is a dupicate pid and the channel is now Signed then both versions are available
-				$version = 'signed' if $channel eq 'Signed';
-				$version = 'audiodescribed' if $channel eq 'Audio Described';
-				# Add version to versions for existing prog
-				$prog->{$pid}->{versions} = join ',', main::make_array_unique_ordered( (split /,/, $prog->{$pid}->{versions}), $version );
-				next;
+sub get_links_schedule_json {
+	my $self = shift;
+	my $html = shift;
+	my $prog = shift;
+	my $prog_type = shift;
+	my $channel_id = shift;
+	my $channel = shift;
+	my $future = shift;
+	my $limit = shift;
+	my $now = shift || time();
+	my $url = shift;
+	return 1 unless $html;
+	my $cache_channel = $channel;
+	if ( $prog_type eq "tv" ) {
+		# collapse BBC One/Two variants
+		$cache_channel =~ s/(BBC (One|Two)).*/$1/;
+	}
+	my $thirty_days = 30 * 86400;
+	my $min_available = $limit || ( $now - $thirty_days );
+	my $blob = $1 if $html =~ /<script type="application\/ld\+json">(.+?)<\/script>/s;
+	return 1 unless $blob =~ /\w/;
+	my $json = eval { decode_json($blob) };
+	return 1 if $@ || ! $json;
+	my $graph = $json->{'@graph'};
+	my @entries = @{$graph} if $graph;
+	main::logger "\n".(@entries ? "INFO" : "WARNING").": Got ".($#entries + 1)." programmes for $channel schedule page (JSON): $url\n" if $opt->{verbose} || ! @entries;
+	return 1 unless @entries;
+	for my $entry ( @entries ) {
+		my ( $name, $episode, $episodenum, $seriesnum, $desc, $pid, $available, $expires, $duration, $web, $thumbnail );
+		my ($available_str, $until_str);
+		my $pid = $entry->{identifier};
+		next unless $pid;
+		my $available_str = $entry->{publication}->{startDate};
+		$available = Programme::get_time_string( $available_str );
+		my $end_date = $entry->{publication}->{endDate};
+		if ( $end_date ) {
+			my $finish = Programme::get_time_string( $end_date );
+			if ( $finish ) {
+				$duration = $finish - $available;
+				$available_str = $end_date;
+				$available = $finish;
+			}
+		}
+		next unless $available_str;
+		next if $available < $min_available;
+		next if ! $future && $available > $now;
+		next if $future && $available <= $now;
+		$expires = $available + $thirty_days;
+		if ( defined $prog->{$pid} ) {
+			main::logger "WARNING: '$pid, $prog->{$pid}->{name} - $prog->{$pid}->{episode}, $prog->{$pid}->{channel}' already exists (this channel = $channel $available)\n" if $opt->{debug};
+			# use listing with earliest availability
+			if ( $prog->{$pid}->{available} && $available_str lt $prog->{$pid}->{available} ) {
+				$prog->{$pid}->{available} = $available_str;
+			}
+			# use listing with latest expiry
+			if ( $prog->{$pid}->{expires} && $expires > $prog->{$pid}->{expires} ) {
+				$prog->{$pid}->{expires} = $expires;
 			}
-
-			# Set guidance based on category
-			$guidance = 'Yes' if grep /guidance/i, @category;
-
-			# Check for signed-only or audiodescribed-only version from Channel
-			if ( $channel eq 'Signed' ) {
-				$version = 'signed';
-			} elsif ( $channel eq 'Audio Described' ) {
-				$version = 'audiodescribed';
-			} else {
-				$version = 'default';
+			next;
+		}
+		$desc = $entry->{description};
+		$desc =~ s/[\r\n]/ /g;
+		my @titles = grep /\w/, ($entry->{partOfSeries}->{name}, $entry->{partOfSeason}->{name}, $entry->{name});
+		if ( $#titles == 2 ) {
+			$name = "$titles[0]: $titles[1]";
+			$episode = $titles[2];
+		} elsif ( $#titles == 1 ) {
+			$name = $titles[0];
+			$episode = $titles[1];
+		} elsif ( $#titles == 0 ) {
+			$name = $titles[0];
+			$episode = "-";
+		}
+		$episodenum = $entry->{episodeNumber};
+		if ( ! $episodenum ) {
+			# Extract the episode num
+			my $regex_1 = '(?:Episode|Pennod)\s+'.main::regex_numbers();
+			my $regex_2 = '^'.main::regex_numbers().'\.\s+';
+			if ( $episode =~ m{$regex_1}i ) {
+				$episodenum = main::convert_words_to_number( $1 );
+			} elsif ( $episode =~ m{$regex_2}i ) {
+				$episodenum = main::convert_words_to_number( $1 );
 			}
-
-			# Default to 150px width thumbnail;
-			my $thumbsize = $opt->{thumbsizecache} || 150;
-
-			# build data structure
-			$prog->{$pid} = main::progclass($prog_type)->new(
-				'pid'		=> $pid,
-				'name'		=> $name,
-				'versions'	=> $version,
-				'episode'	=> $episode,
-				'seriesnum'	=> $seriesnum,
-				'episodenum'	=> $episodenum,
-				'desc'		=> $desc,
-				'guidance'	=> $guidance,
-				'available'	=> 'Unknown',
-				'duration'	=> 'Unknown',
-				'thumbnail'	=> "${thumbnail_prefix}/${pid}".Programme::bbciplayer->thumb_url_suffixes->{ $thumbsize },
-				'channel'	=> $channel,
-				'categories'	=> join(',', sort @category),
-				'type'		=> $prog_type,
-				'web'		=> "${bbc_prog_page_prefix}/${pid}.html",
-			);
-
 		}
-	}
-
-	# Get future schedules if required
-	# http://www.bbc.co.uk/cbbc/programmes/schedules/this_week.xml
-	# http://www.bbc.co.uk/cbbc/programmes/schedules/next_week.xml
-	if ( $opt->{refreshfuture} ) {
-		# Hack to get correct 'channels' method because this methods is being shared with Programme::radio
-		my %channels = %{ main::progclass($prog_type)->channels_filtered( main::progclass($prog_type)->channels_schedule() ) };
-		# Only get schedules for real channels
-		@channel_list = keys %channels;
-		for my $channel_id ( @channel_list ) {
-			my @schedule_feeds = (
-				"http://www.bbc.co.uk/${channel_id}/this_week.xml",
-				"http://www.bbc.co.uk/${channel_id}/next_week.xml",
-			);
-			for my $url ( @schedule_feeds ) {
-				main::logger "DEBUG: Getting feed $url\n" if $opt->{verbose};
-				$xml = main::request_url_retry($ua, $url, 3, '.', "WARNING: Failed to get programme schedule feed for $channel_id from iplayer site\n");
-				decode_entities($xml);
-		
-				# <broadcast is_repeat="1" is_blanked="0">
-				#   <pid>p00l44r8</pid>
-				#   <start>2011-10-24T00:45:00+01:00</start>
-				#   <end>2011-10-24T01:15:00+01:00</end>
-				#   <duration>1800</duration>
-				#   <programme type="episode">
-				#     <pid>b016c73c</pid>
-				#     <position>3</position>
-				#     <title>Episode 3</title>
-				#     <short_synopsis>With team captains Noel Fielding and Phill Jupitus, and a surprise special guest host.</short_synopsis>
-				#     <media_type>audio_video</media_type>
-				#     <duration>2100</duration>
-				#     <display_titles>
-				#       <title>Never Mind the Buzzcocks</title>
-				#       <subtitle>Series 25, Episode 3</subtitle>
-				#     </display_titles>
-				#     <first_broadcast_date>2011-10-17T22:00:00+01:00</first_broadcast_date>
-				#     <ownership>
-				#       <service type="tv" id="bbc_two" key="bbctwo">
-				#         <title>BBC Two</title>
-				#       </service>
-				#     </ownership>
-				#     <programme type="series">
-				#       <pid>b015skhy</pid>
-				#       <title>Series 25</title>
-				#       <position>25</position>
-				#       <expected_child_count>12</expected_child_count>
-				#       <first_broadcast_date>2011-10-03T22:00:00+01:00</first_broadcast_date>
-				#       <programme type="brand">
-				#         <pid>b006v0dz</pid>
-				#         <title>Never Mind the Buzzcocks</title>
-				#         <position />
-				#         <expected_child_count />
-				#         <first_broadcast_date>2007-06-20T22:00:00+01:00</first_broadcast_date>
-				#         <ownership>
-				#           <service type="tv" id="bbc_two" key="bbctwo">
-				#             <title>BBC Two</title>
-				#           </service>
-				#         </ownership>
-				#       </programme>
-				#     </programme>
-				#     <available_until>2011-10-30T23:29:00Z</available_until>
-				#     <actual_start>2011-10-17T22:30:00+01:00</actual_start>
-				#     <is_available_mediaset_pc_sd>1</is_available_mediaset_pc_sd>
-				#     <is_legacy_media>0</is_legacy_media>
-				#     <media format="video">
-				#       <expires>2011-10-30T23:29:00Z</expires>
-				#       <availability>11 days left to watch</availability>
-				#     </media>
-				#   </programme>
-				# </broadcast>
-
-				# get list of entries within <broadcast> </broadcast> tags
-				my @entries = split /<broadcast[^s]/, $xml;
-				# Discard first element == header
-				shift @entries;
-				main::logger "INFO: Got ".($#entries + 1)." programmes\n" if $opt->{verbose};
-				my $now = time();
-				foreach my $entry (@entries) {
-					my ( $title, $channel, $name, $episode, $episodetitle, $nametitle, $seriestitle, $episodenum, $seriesnum, $desc, $pid, $available, $duration, $thumbnail, $version, $guidance );
-
-					my $entry_flat = $entry;
-					$entry_flat =~ s/\n/ /g;
-
-					$pid = $1 if $entry =~ m{<programme\s+type="episode">.*?<pid>\s*(.+?)\s*</pid>};
-
-					$episode = $1 if $entry =~ m{<programme\s+type="episode">.*?<title>\s*(.*?)\s*</title>};
-					$nametitle = $1 if $entry =~ m{<programme\s+type="brand">.*?<title>\s*(.*?)\s*</title>.*?</programme>};
-					$seriestitle = $1 if $entry =~ m{<programme\s+type="series">.*?<title>\s*(.*?)\s*</title>.*?</programme>};
-
-					# Set name
-					if ( $nametitle && $seriestitle ) {
-						$name = "$nametitle: $seriestitle";
-					} elsif ( $seriestitle && ! $nametitle ) {
-						$name = $seriestitle;
-					# Fallback to episade name if the BBC missed out both Series and Name
-					} elsif ( ( ! $seriestitle ) && ! $nametitle ) {
-						$name = $episode;
-					} else {
-						$name = $nametitle;
-					}
-
-					# Extract the seriesnum
-					my $regex = 'Series\s+'.main::regex_numbers();
-					$seriesnum = main::convert_words_to_number( $1 ) if $seriestitle =~ m{$regex}i;
-
-					# Extract the episode num
-					my $regex_1 = 'Episode\s+'.main::regex_numbers();
-					my $regex_2 = '^'.main::regex_numbers().'\.\s+';
-					if ( $episode =~ m{$regex_1}i ) { 
-						$episodenum = main::convert_words_to_number( $1 );
-					} elsif ( $episode =~ m{$regex_2}i ) {
-						$episodenum = main::convert_words_to_number( $1 );
-					}
-
-					# extract desc
-					if ( $entry =~ m{<long_synopsis>\s*(.+?)\s*</long_synopsis>} ) {
-						$desc = $1;
-					} elsif ( $entry =~ m{<medium_synopsis>\s*(.+?)\s*</medium_synopsis>} ) {
-						$desc = $1;
-					} elsif ( $entry =~ m{<short_synopsis>\s*(.+?)\s*</short_synopsis>} ) {
-						$desc = $1;
-					};
-					# Remove unwanted html tags
-					$desc =~ s!</?(br|b|i|p|strong)\s*/?>!!gi;
-
-					$duration = $1 if $entry =~ m{<duration>\s*(.+?)\s*</duration>};
-					$available = $1 if $entry =~ m{<start>\s*(.+?)\s*</start>};
-
-					# Extract channel nice name
-					$channel = $channels{$channel_id};
-
-					main::logger "DEBUG: '$pid, $name - $episode, $channel'\n" if $opt->{debug};
-
-					# Merge and Skip if this pid is a duplicate
-					if ( defined $prog->{$pid} ) {
-						main::logger "WARNING: '$pid, $prog->{$pid}->{name} - $prog->{$pid}->{episode}, $prog->{$pid}->{channel}' already exists (this channel = $channel)\n" if $opt->{verbose};
-						# Update this info from schedule (not available in the usual iplayer channels feeds)
-						$prog->{$pid}->{duration} = $duration;
-						$prog->{$pid}->{episodenum} = $episodenum if ! $prog->{$pid}->{episodenum};
-						$prog->{$pid}->{seriesnum} = $seriesnum if ! $prog->{$pid}->{seriesnum};
-						# don't add this as some progs are already available
-						#$prog->{$pid}->{available} = $available;
-						next;
-					}
-
-					$version = 'default';
-
-					# Default to 150px width thumbnail;
-					my $thumbsize = $opt->{thumbsizecache} || 150;
-
-					# Don't create this prog instance if the availablity is in the past 
-					# this prevents programmes which never appear in iPlayer from being indexed
-					next if Programme::get_time_string( $available ) < $now;
-
-					# build data structure
-					$prog->{$pid} = main::progclass($prog_type)->new(
-						'pid'		=> $pid,
-						'name'		=> $name,
-						'versions'	=> $version,
-						'episode'	=> $episode,
-						'seriesnum'	=> $seriesnum,
-						'episodenum'	=> $episodenum,
-						'desc'		=> $desc,
-						'available'	=> $available,
-						'duration'	=> $duration,
-						'thumbnail'	=> "${thumbnail_prefix}/${pid}".Programme::bbciplayer->thumb_url_suffixes->{ $thumbsize },
-						'channel'	=> $channel,
-						'type'		=> $prog_type,
-						'web'		=> "${bbc_prog_page_prefix}/${pid}.html",
-					);
-				}
-			}		
-
+		# Extract the seriesnum
+		$seriesnum = $entry->{partOfSeason}->{position};
+		if ( ! $seriesnum ) {
+			my $regex = '(?:Series|Cyfres)\s+'.main::regex_numbers();
+			$seriesnum = main::convert_words_to_number( $1 ) if "$name $episode" =~ m{$regex}i;
 		}
+		# /programmes page
+		$web = "https://www.bbc.co.uk/programmes/${pid}";
+		$thumbnail = $entry->{image} || $entry->{partOfSeries}->{image};
+		$thumbnail =~ s!/\d+xn/!/192xn/!;
+		$thumbnail ||= DEFAULT_THUMBNAIL;
+		# build data structure
+		decode_entities($name);
+		decode_entities($episode);
+		decode_entities($desc);
+		$prog->{$pid} = main::progclass($prog_type)->new(
+			'pid'		=> $pid,
+			'name'		=> $name,
+			'episode'	=> $episode,
+			'seriesnum'	=> $seriesnum,
+			'episodenum'	=> $episodenum,
+			'desc'		=> $desc,
+			'duration'	=> $duration,
+			'channel'	=> $cache_channel,
+			'type'		=> $prog_type,
+			'web'		=> $web,
+			'available' => $available_str,
+			'expires' => $expires,
+			'thumbnail'	=> $thumbnail,
+		);
 	}
-	main::logger "\n";
-	return 0;
 }
 
-
-
 # Usage: download (<prog>, <ua>, <mode>, <version>, <version_pid>)
 sub download {
 	my ( $prog, $ua, $mode, $version, $version_pid ) = ( @_ );
 
-	# Check if we need 'tee'
-	if ( $mode =~ /^real/ && (! main::exists_in_path('tee')) && $opt->{stdout} && (! $opt->{nowrite}) ) {
-		main::logger "\nERROR: tee does not exist in path, skipping\n";
-		return 'next';
-	}
-	if ( $mode =~ /^(real|wma)/ && (! main::exists_in_path('mplayer')) ) {
-		main::logger "\nWARNING: Required mplayer does not exist\n";
-		return 'next';
-	}
-	# Check if we have mplayer and lame
-	if ( $mode =~ /^real/ && (! $opt->{wav}) && (! $opt->{raw}) && (! main::exists_in_path('lame')) ) {
-		main::logger "\nWARNING: Required lame does not exist, will save file in wav format\n";
-		$opt->{wav} = 1;
-	}
-	# Check if we have vlc
-	if ( $mode =~ /^n95/ && (! main::exists_in_path('vlc')) ) {
-		main::logger "\nWARNING: Required vlc does not exist\n";
-		return 'next';
-	}
-	# if flvstreamer does not exist
-	if ( $mode =~ /^flash/ && ! main::exists_in_path('flvstreamer')) {
-		main::logger "WARNING: Required program flvstreamer does not exist (see http://linuxcentre.net/getiplayer/installation and http://linuxcentre.net/getiplayer/download)\n";
-		return 'next';
-	}
-	# Force raw mode if ffmpeg is not installed
-	if ( $mode =~ /^flash/ && ! main::exists_in_path('ffmpeg')) {
-		main::logger "\nWARNING: ffmpeg does not exist - not converting flv file\n";
-		$opt->{raw} = 1;
+	if ( ! $opt->{raw} ) {
+		$prog->ffmpeg_init();
+		# require ffmpeg for HLS
+		if ( $mode =~ /^(hls|hvf|haf)/ && ! $opt->{raw} && ! main::exists_in_path('ffmpeg') ) {
+			main::logger "WARNING: Required ffmpeg utility not found - not converting .ts file(s)\n";
+			$opt->{raw} = 1;
+		}
+		# cannot convert hvf with avconv or ffmpeg < 2.5
+		if ( $mode =~ /^hvf/ && ! $opt->{raw} ) {
+			if ( $opt->{myffmpegav} ) {
+				main::logger "WARNING: avconv does not support conversion of hvf downloads to MP4 - not converting .ts file\n";
+				$opt->{raw} = 1;
+			} elsif ( $opt->{myffmpegxx} ) {
+				main::logger "WARNING: Unable to determine ffmpeg version - MP4 conversion for hvf downloads may fail\n";
+			} elsif ( ! $opt->{myffmpeg25} ) {
+				main::logger "WARNING: Your version of ffmpeg ($opt->{myffmpegversion}) does not support conversion of hvf downloads to MP4 - not converting .ts file\n";
+				$opt->{raw} = 1;
+			}
+			if ( $opt->{myffmpegav} || $opt->{myffmpegxx} || ! $opt->{myffmpeg25} ) {
+				main::logger "WARNING: ffmpeg 2.5 or higher is required to convert hvf downloads to MP4\n";
+				main::logger "WARNING: Use --raw to bypass MP4 conversion and retain .ts file\n";
+				main::logger "WARNING: Use --ffmpeg-force to override checks and force MP4 conversion attempt\n";
+			}
+		}
+		# require ffmpeg for DASH
+		if ( $mode =~ /^(daf|dvf)/ && ! $opt->{raw} && ! main::exists_in_path('ffmpeg') ) {
+			main::logger "WARNING: Required ffmpeg utility not found - not converting .m4a and .m4v files\n";
+			$opt->{raw} = 1;
+		}
+		# cannot convert dvf with avconv or ffmpeg < 3.0
+		if ( $mode =~ /^dvf/ && ! $opt->{raw} ) {
+			if ( $opt->{myffmpegav} ) {
+				main::logger "WARNING: avconv does not support conversion of dvf downloads to MP4 - not converting .m4a and .m4v files\n";
+				$opt->{raw} = 1;
+			} elsif ( $opt->{myffmpegxx} ) {
+				main::logger "WARNING: Unable to determine ffmpeg version - MP4 conversion for dvf downloads may fail\n";
+			} elsif ( ! $opt->{myffmpeg30} ) {
+				main::logger "WARNING: Your version of ffmpeg ($opt->{myffmpegversion}) does not support conversion of dvf downloads to MP4 - not converting .m4a and .m4v files\n";
+				$opt->{raw} = 1;
+			}
+			if ( $opt->{myffmpegav} || $opt->{myffmpegxx} || ! $opt->{myffmpeg30} ) {
+				main::logger "WARNING: ffmpeg 3.0 or higher is required to convert dvf downloads to MP4\n";
+				main::logger "WARNING: Use --raw to bypass MP4 conversion and retain .m4a and .m4v files\n";
+				main::logger "WARNING: Use --ffmpeg-force to override checks and force MP4 conversion attempt\n";
+			}
+		}
 	}
 
-	# Get extension from streamdata if defined and raw not specified
-	$prog->{ext} = $prog->{streams}->{$version}->{$mode}->{ext};
-
-	# Nasty hacky filename ext overrides based on non-default fallback modes
-	# Override iphone ext from metadata which is wrong for radio
-	$prog->{ext} = 'mp3' if $mode =~ /^iphone/ && $prog->{type} eq 'radio';
-	# Override realaudio ext based on raw / wav
-	$prog->{ext} = 'ra'  if $opt->{raw} &&  $mode =~ /^real/;
-	$prog->{ext} = 'wav' if $opt->{wav} &&  $mode =~ /^real/;
-	# Override flash ext based on raw
-	$prog->{ext} = 'flv' if $opt->{raw} && $mode =~ /^flash/;
-	# Override flashaac ext based on aactomp3
-	$prog->{ext} = 'mp3' if ! $opt->{raw} && $opt->{aactomp3} && $mode =~ /^flashaac/;
-	# Override ext based on mkv option
-	$prog->{ext} = 'mkv' if ! $opt->{raw} && $opt->{mkv} && $prog->{type} eq 'tv';
-
 	# Determine the correct filenames for this recording
-	if ( $prog->generate_filenames( $ua, $prog->file_prefix_format() ) ) {
+	if ( my $rc = $prog->generate_filenames( $ua, $prog->file_prefix_format(), $mode, $version ) ) {
+		return 'stop' if $rc == 3;
 		return 'skip';
 	}
 
-	# Create symlink if required
-	$prog->create_symlink( $prog->{symlink}, $prog->{filename}) if $opt->{symlink};
-
-	# Create dir for prog if not streaming-only
-	if ( ( ! ( $opt->{stdout} && $opt->{nowrite} ) ) && ( ! $opt->{test} ) ) {
+	# Create dir for prog
+	if ( ! ( $opt->{nowrite} || $opt->{test} ) ) {
 		$prog->create_dir();
 	}
 
 	# Skip from here if we are only testing recordings
 	return 'skip' if $opt->{test};
 
-	# Get subtitles if they exist and are required 
-	# best to do this before streaming file so that the subtitles can be enjoyed while recording progresses
-	my $subfile_done;
-	my $subfile;
-	if ( $opt->{subtitles} ) {
-		$subfile_done = "$prog->{dir}/$prog->{fileprefix}.srt";
-		$subfile = "$prog->{dir}/$prog->{fileprefix}.partial.srt";
-		main::logger "\n";
-		$prog->download_subtitles( $ua, $subfile );
+	# check subtitles if required
+	if ( $opt->{subtitles} && $prog->{type} eq 'tv'&& $opt->{subsrequired} ) {
+		if ( ! $prog->subtitles_available( [ $version ] ) ) {
+			main::logger "WARNING: Subtitles not available and --subtitles-required specified.\n";
+			return 'skip';
+		}
 	}
 
 	my $return = 0;
-	# Only get the stream if we are writing a file or streaming
-	if ( $opt->{stdout} || ! $opt->{nowrite} ) {
+	# Only get the stream if we are writing a file
+	if ( ! $opt->{nowrite} ) {
 		# set mode
 		$prog->{mode} = $mode;
 
@@ -6988,132 +7141,278 @@
 
 		# Instantiate new streamer based on streamdata
 		my $class = "Streamer::$prog->{streams}->{$version}->{$mode}->{streamer}";
+		if ( ! $class->can('new') ) {
+			main::logger "ERROR: Cannot instantiate streamer for class=$class version=$version mode=$mode\n";
+			return 'skip';
+		}
 		my $stream = $class->new;
 
 		# Do recording
-		$return = $stream->get( $ua, $prog->{streams}->{$version}->{$mode}->{streamurl}, $prog, %{ $prog->{streams}->{$version}->{$mode} } );
+		$return = $stream->get( $ua, $prog->{streams}->{$version}->{$mode}->{streamurl}, $prog, $version, %{ $prog->{streams}->{$version}->{$mode} } );
 
 		# Re-enable proxy here if required
 		main::proxy_enable($ua) if $opt->{partialproxy};
 	}
 
-	# Rename the subtitle file accordingly if the stream get was successful
-	move($subfile, $subfile_done) if $opt->{subtitles} && -f $subfile && ! $return;
-
 	return $return;
 }
 
-
+sub subtitles_available {
+	my ( $prog, $versions ) = @_;
+	for my $version ( @$versions ) {
+		my @subkeys = grep /subtitles/, sort keys %{$prog->{streams}->{$version}};
+		for my $subkey ( @subkeys ) {
+			my $suburl = $prog->{streams}->{$version}->{$subkey}->{streamurl};
+			if ( $suburl ) {
+				return 1;
+			}
+		}
+	}
+}
 
 # BBC iPlayer TV
 # Download Subtitles, convert to srt(SubRip) format and apply time offset
-# Todo: get the subtitle streamurl before this...
 sub download_subtitles {
 	my $prog = shift;
-	my ( $ua, $file ) = @_;
-	my $suburl;
+	my ( $ua, $file, $versions ) = @_;
 	my $subs;
-	
+	my $found;
+	my $dumped;
+	my $converted;
+	my $rc;
+
+	# in case --subtitles used with --pid for radio programme
+	return unless $prog->{type} eq "tv";
+
 	# Don't redownload subs if the file already exists
-	if ( ( -f $file || -f "$prog->{dir}/$prog->{fileprefix}.partial.srt" ) && ! $opt->{overwrite} ) {
-		main::logger "INFO: Skipping subtitles download - file already exists: $file\n" if $opt->{verbose};
+	if ( -f $prog->{subsfile}  && ! $opt->{overwrite} ) {
+		main::logger "WARNING: Subtitles file already exists: $prog->{subsfile}\n";
+		main::logger "WARNING: Use --overwrite to re-download\n";
 		return 0;
 	}
 
-	$suburl = $prog->{streams}->{$prog->{version}}->{subtitles1}->{streamurl};
+	# Find subtitles stream
+	for my $version ( @$versions ) {
+		my @subkeys = grep /subtitles/, sort keys %{$prog->{streams}->{$version}};
+		for my $subkey ( @subkeys ) {
+			my $suburl = $prog->{streams}->{$version}->{$subkey}->{streamurl};
+			if ( $suburl ) {
+				$found = 1;
+				main::logger "INFO: Downloading subtitles [$version]\n";
+				$subs = main::request_url_retry($ua, $suburl, 3);
+				if ($subs) {
+					# Dump raw subs into a file if required
+					if ( $opt->{subsraw} && ! $dumped ) {
+						main::logger "INFO: Saving raw subtitles [$version]\n" if $opt->{verbose};
+						unlink($prog->{subsraw});
+						open( my $fhraw, "> $prog->{subsraw}");
+						print $fhraw $subs;
+						close $fhraw;
+						$dumped = 1;
+					}
+					unless ( $converted ) {
+						$rc = ttml_to_srt( $subs, $file, $opt->{subsmono}, $opt->{suboffset}, $opt->{mysubstart}, $opt->{mysubstop} );
+						$converted = 1 unless $rc;
+					}
+				}
+				last if $converted;
+			}
+		}
+		last if $converted;
+	}
 	# Return if we have no url
-	if (! $suburl) {
-		main::logger "INFO: Subtitles not available\n";
+	if (! $found) {
+		my $vermsg = " for version(s): ".(join ',', @$versions) if @$versions;
+		main::logger "INFO: Subtitles not available${vermsg}\n";
 		return 2;
 	}
-
-	main::logger "INFO: Getting Subtitles from $suburl\n" if $opt->{verbose};
-
-	# Open subs file
-	unlink($file);
-	open( my $fh, "> $file" );
-	binmode $fh;
-
-	# Download subs
-	$subs = main::request_url_retry($ua, $suburl, 2);
 	if (! $subs ) {
-		main::logger "ERROR: Subtitle Download failed\n";
-		close $fh;
-		unlink($file) if -f $file;
+		main::logger "ERROR: Subtitles download failed\n";
+		main::logger "ERROR: Use --subtitles-only to re-download\n";
 		return 1;
-	} else {
-		# Dump raw subs into a file if required
-		if ( $opt->{subsraw} ) {
-			unlink("$prog->{dir}/$prog->{fileprefix}.ttxt");
-			main::logger "INFO: 'Downloading Raw Subtitles to $prog->{dir}/$prog->{fileprefix}.ttxt'\n";
-			open( my $fhraw, "> $prog->{dir}/$prog->{fileprefix}.ttxt");
-			binmode $fhraw;
-			print $fhraw $subs;
-			close $fhraw;
-		}
-		main::logger "INFO: Downloading Subtitles to '$prog->{dir}/$prog->{fileprefix}.srt'\n";
-	}
-
-	# Convert the format to srt
-	# SRT:
-	#1
-	#00:01:22,490 --> 00:01:26,494
-	#Next round!
-	#
-	#2
-	#00:01:33,710 --> 00:01:37,714
-	#Now that we've moved to paradise, there's nothing to eat.
-	#
-	
-	# TT:
-	#<p begin="0:01:12.400" end="0:01:13.880">Thinking.</p>
-	#<p begin="00:01:01.88" id="p15" end="00:01:04.80"><span tts:color="cyan">You're thinking of Hamburger Hill...<br /></span>Since we left...</p>
-	#<p begin="00:00:18.48" id="p0" end="00:00:20.52">APPLAUSE AND CHEERING</p>
-	my $count = 1;
-	my @lines = grep /<p\s.*begin=/, split /\n/, $subs;
-	for ( @lines ) {
-		my ( $begin, $end, $sub );
-		# Remove <br /> elements
-		s|<br.*?>| |g;
-		# Remove >1 spaces
-		s|\s{2,}| |g;
-		( $begin, $end, $sub ) = ( $1, $2, $3 ) if m{<p\s+.*begin="(.+?)".+end="(.+?)".*?>(.+?)<\/p>};
-		if ($begin && $end && $sub ) {
-			# Format numerical field widths
-			$begin = sprintf( '%02d:%02d:%02d,%02d', split /[:\.,]/, $begin );
-			$end = sprintf( '%02d:%02d:%02d,%02d', split /[:\.,]/, $end );
-			# Add trailing zero if ttxt format only uses hundreths of a second
-			$begin .= '0' if $begin =~ m{,\d\d$};
-			$end .= '0' if $end =~ m{,\d\d$};
-			if ($opt->{suboffset}) {
-				$begin = main::subtitle_offset( $begin, $opt->{suboffset} );
-				$end = main::subtitle_offset( $end, $opt->{suboffset} );
-			}
-			# Separate individual lines based on <span>s
-			$sub =~ s|<span.*?>(.*?)</span>|\n$1\n|g;
-			if ($sub =~ m{\n}) {
-				chomp($sub);
-				$sub =~ s|^\n?|- |;
-				$sub =~ s|\n+|\n- |g;
-			}
-			decode_entities($sub);
-			# Write to file
-			print $fh "$count\n";
-			print $fh "$begin --> $end\n";
-			print $fh "$sub\n\n";
-			$count++;
+	}
+	if (! $converted) {
+		main::logger "ERROR: Subtitles conversion to SRT failed\n";
+		main::logger "ERROR: Use --subtitles-only to re-download\n";
+		return $rc;
+	}
+}
+
+sub ttml_to_srt {
+	my $ttml = shift;
+	my $srt = shift;
+	my $mono = shift;
+	my $offset = shift;
+	my $start = shift;
+	my $stop = shift;
+	my $prefix = "\n- ";
+	my $index = 0;
+	my %hex_colors = (
+		'black'   => '#000000',
+		'blue'    => '#0000ff',
+		'green'   => '#00ff00',
+		'lime'    => '#00ff00',
+		'aqua'    => '#00ffff',
+		'cyan'    => '#00ffff',
+		'red'     => '#ff0000',
+		'fuchsia' => '#ff00ff',
+		'magenta' => '#ff00ff',
+		'yellow'  => '#ffff00',
+		'white'   => '#ffffff'
+	);
+
+	use Text::Wrap qw(fill $columns $huge);
+	$columns = 37;
+	$huge = 'overflow';
+
+	$ttml =~ tr/\x00//d;
+	my $dom;
+	eval { $dom = XML::LibXML->load_xml(string => $ttml); };
+	if ( $@ ) {
+		main::logger "ERROR: Failed to load subtitles:\n$@";
+		return 4;
+	}
+	my $xpc = XML::LibXML::XPathContext->new($dom);
+	my ($doc) = $xpc->findnodes('/*');
+	$xpc->registerNs('tt', $doc->namespaceURI());
+	my @ns = $xpc->findnodes("/*/namespace::*");
+	for my $ns (@ns) {
+		if ( $ns->getLocalName() && $ns->getValue() ) {
+			$xpc->registerNs($ns->getLocalName(), $ns->getValue());
+		}
+	}
+	my $fps;
+	eval { $fps = $xpc->findvalue('/*/@ttp:frameRate') };
+	my %style_colors;
+	foreach my $style ($xpc->findnodes('//tt:styling/tt:style')) {
+		my $style_id = $style->findvalue('@id');
+		if ($style_id) {
+			my $style_color;
+			eval { $style_color = $style->findvalue('@tts:color') };
+			if ($style_color) {
+				my $style_hex = $hex_colors{$style_color};
+				if ($style_hex) {
+					$style_colors{$style_id} = $style_hex;
+				}
+			}
 		}
-	}	
+	}
+	my ($body) = $xpc->findnodes('//tt:body');
+	my $body_style = $body->findvalue('@style');
+	my $body_color = $style_colors{$body_style} || $hex_colors{'white'};
+	my $curr_color = $body_color;
+
+	open( my $fh, "> $srt" );
+	for my $div ($xpc->findnodes('tt:div', $body)) {
+		my $div_style = $div->findvalue('@style');
+		my $div_color = $style_colors{$div_style} || $body_color;
+		$curr_color = $div_color;
+		for my $p ($xpc->findnodes('tt:p', $div)) {
+			my (@times, @ts);
+			for my $key ('begin', 'end') {
+				my $val = $p->findvalue("\@$key");
+				my @parts = split /:/, $val;
+				if ( $#parts == 3 ) {
+					my $frames = pop @parts;
+					if ( $fps ) {
+						my $fraction = $frames / $fps;
+						$parts[$#parts] += $fraction;
+					}
+				}
+				(my $time = sprintf( '%02d:%02d:%06.3f', @parts )) =~ s/\./,/;
+				push @times, $time;
+			}
+			my ($begin, $end) = @times;
+			next unless $begin && $end;
+			$begin = main::subtitle_offset( $begin, $offset, $start, $stop );
+			$end = main::subtitle_offset( $end, $offset, $start, $stop );
+			next unless $begin && $end;
+			my $text;
+			my $p_color;
+			my $p_style = $p->findvalue('@style');
+			if ($p_style) {
+				$p_color = $style_colors{$p_style};
+			} else {
+				eval { $p_color = $p->findvalue('@tts:color') };
+			}
+			if ( $p_color && $p_color !~ /^#/ ) {
+				$p_color = $hex_colors{$p_color};
+			}
+			$p_color ||= $div_color;
+			for my $p_child ($p->childNodes) {
+				if ($p_child->nodeName eq "br") {
+					$text .= "\n";
+				} elsif ($p_child->nodeName eq "#text") {
+					my $p_text = $p_child->to_literal();
+					if ($p_text =~ /\S/) {
+						$p_text =~ s/(^\s{2,}|\s{2,}$)/ /g;
+						if ($mono) {
+							if ($p_color ne $curr_color) {
+								$curr_color = $p_color;
+								$text .= $prefix;
+							}
+							$text .= $p_text;
+						} else {
+							$text .= "<font color=\"$p_color\">$p_text</font>";
+						}
+					}
+				} elsif ($p_child->nodeName eq "span") {
+					my $span = $p_child;
+					my $span_color;
+					my $span_style = $span->findvalue('@style');
+					if ($span_style) {
+						$span_color = $style_colors{$span_style};
+					} else {
+						eval { $span_color = $span->findvalue('@tts:color') };
+					}
+					if ( $span_color && $span_color !~ /^#/ ) {
+						$span_color = $hex_colors{$span_color};
+					}
+					$span_color ||= $p_color;
+					for my $span_child ($span->childNodes) {
+						if ($span_child->nodeName eq "br") {
+							$text .= "\n";
+						} elsif ($span_child->nodeName eq "#text") {
+							my $span_text = $span_child->to_literal();
+							if ($span_text =~ /\S/) {
+								$span_text =~ s/(^\s{2,}|\s{2,}$)/ /g;
+								if ($mono) {
+									if ($span_color ne $curr_color) {
+										$curr_color = $span_color;
+										$text .= $prefix;
+									}
+									$text .= $span_text;
+								} else {
+									$text .= "<font color=\"$span_color\">$span_text</font>";
+								}
+							}
+						}
+					}
+				}
+			}
+			if ($mono) {
+				$text =~ s/\n([^-])/ $1/g;
+				$text =~ s/\n-/\n\n-/g;
+				$text = join("", fill('', '', $text));
+			}
+			$text =~ s/(^\s+|\s+$)//g;
+			$text =~ s/\n{2,}/\n/g;
+			print $fh ++$index."\n$begin --> $end\n$text\n\n";
+		}
+	}
 	close $fh;
-
+	if ( ! $index ) {
+		main::logger "WARNING: Subtitles empty\n";
+		return 3;
+	}
 	return 0;
 }
 
-
-
-################### Radio class #################
+################### Radio Programme class #################
 package Programme::radio;
 
+# Inherit from Programme::bbciplayer class
+use base 'Programme::bbciplayer';
 use Env qw[@PATH];
 use Fcntl;
 use File::Copy;
@@ -7131,631 +7430,138 @@
 use Time::Local;
 use URI;
 
-# Inherit from Programme class
-use base 'Programme::bbciplayer';
-
 # Class vars
-sub index_min { return 10001 }
-sub index_max { return 19999 };
-sub channels {
-	return {
-		'bbc_1xtra'				=> 'BBC 1Xtra',
-		'bbc_radio_one'				=> 'BBC Radio 1',
-		'bbc_radio_two'				=> 'BBC Radio 2',
-		'bbc_radio_three'			=> 'BBC Radio 3',
-		'bbc_radio_four'			=> 'BBC Radio 4',
-		'bbc_radio_four_extra'			=> 'BBC Radio 4 Extra',
-		'bbc_radio_five_live'			=> 'BBC Radio 5 live',
-		'bbc_radio_five_live_sports_extra'	=> 'BBC 5 live Sports Extra',
-		'bbc_6music'				=> 'BBC 6 Music',
-		'bbc_7'					=> 'BBC 7',
-		'bbc_asian_network'			=> 'BBC Asian Network',
-		'bbc_radio_foyle'			=> 'BBC Radio Foyle',
-		'bbc_radio_scotland'			=> 'BBC Radio Scotland',
-		'bbc_radio_nan_gaidheal'		=> 'BBC Radio Nan Gaidheal',
-		'bbc_radio_ulster'			=> 'BBC Radio Ulster',
-		'bbc_radio_wales'			=> 'BBC Radio Wales',
-		'bbc_radio_cymru'			=> 'BBC Radio Cymru',
-		'bbc_world_service'			=> 'BBC World Service',
-		'bbc_radio_cumbria'			=> 'BBC Cumbria',
-		'bbc_radio_newcastle'			=> 'BBC Newcastle',
-		'bbc_tees'				=> 'BBC Tees',
-		'bbc_radio_lancashire'			=> 'BBC Lancashire',
-		'bbc_radio_merseyside'			=> 'BBC Merseyside',
-		'bbc_radio_manchester'			=> 'BBC Manchester',
-		'bbc_radio_leeds'			=> 'BBC Leeds',
-		'bbc_radio_sheffield'			=> 'BBC Sheffield',
-		'bbc_radio_york'			=> 'BBC York',
-		'bbc_radio_humberside'			=> 'BBC Humberside',
-		'bbc_radio_lincolnshire'		=> 'BBC Lincolnshire',
-		'bbc_radio_nottingham'			=> 'BBC Nottingham',
-		'bbc_radio_leicester'			=> 'BBC Leicester',
-		'bbc_radio_derby'			=> 'BBC Derby',
-		'bbc_radio_stoke'			=> 'BBC Stoke',
-		'bbc_radio_shropshire'			=> 'BBC Shropshire',
-		'bbc_wm'				=> 'BBC WM',
-		'bbc_radio_coventry_warwickshire'	=> 'BBC Coventry & Warwickshire',
-		'bbc_radio_hereford_worcester'		=> 'BBC Hereford & Worcester',
-		'bbc_radio_northampton'			=> 'BBC Northampton',
-		'bbc_three_counties_radio'		=> 'BBC Three Counties',
-		'bbc_radio_cambridge'			=> 'BBC Cambridgeshire',
-		'bbc_radio_norfolk'			=> 'BBC Norfolk',
-		'bbc_radio_suffolk'			=> 'BBC Suffolk',
-		'bbc_radio_essex'			=> 'BBC Essex',
-		'bbc_london'				=> 'BBC London',
-		'bbc_radio_kent'			=> 'BBC Kent',
-		'bbc_radio_surrey'			=> 'BBC Surrey',
-		'bbc_radio_sussex'			=> 'BBC Sussex',
-		'bbc_radio_oxford'			=> 'BBC Oxford',
-		'bbc_radio_berkshire'			=> 'BBC Berkshire',
-		'bbc_radio_solent'			=> 'BBC Solent',
-		'bbc_radio_gloucestershire'		=> 'BBC Gloucestershire',
-		'bbc_radio_wiltshire'			=> 'BBC Wiltshire',
-		'bbc_radio_bristol'			=> 'BBC Bristol',
-		'bbc_radio_somerset_sound'		=> 'BBC Somerset',
-		'bbc_radio_devon'			=> 'BBC Devon',
-		'bbc_radio_cornwall'			=> 'BBC Cornwall',
-		'bbc_radio_guernsey'			=> 'BBC Guernsey',
-		'bbc_radio_jersey'			=> 'BBC Jersey',
-		'popular/radio'				=> 'Popular',
-		'highlights/radio'			=> 'Highlights',
-	};
-}
+sub index_min { return 30001 }
 
+sub index_max { return 99999 };
 
-# channel ids be found on http://www.bbc.co.uk/bbcone/programmes/schedules/today
+# channel ids be found on https://www.bbc.co.uk/radio/stations
 sub channels_schedule {
 	return {
-		'1xtra/programmes/schedules'		=> 'BBC 1Xtra',
-		'radio1/programmes/schedules/england'	=> 'BBC Radio 1 England',
-		'radio1/programmes/schedules/northernireland'=> 'BBC Radio 1 Northern Ireland',
-		'radio1/programmes/schedules/scotland'	=> 'BBC Radio 1 Scotland',
-		'radio1/programmes/schedules/wales'	=> 'BBC Radio 1 Wales',
-		'radio2/programmes/schedules'		=> 'BBC Radio 2',
-		'radio3/programmes/schedules'		=> 'BBC Radio 3',
-		'radio4/programmes/schedules/fm'	=> 'BBC Radio 4 FM',
-		'radio4/programmes/schedules/lw'	=> 'BBC Radio 4 LW',
-		'radio4extra/programmes/schedules'	=> 'BBC Radio 4 Extra',
-		'5live/programmes/schedules'		=> 'BBC Radio 5 live',
-		'5livesportsextra/programmes/schedules'	=> 'BBC 5 live Sports Extra',
-		'6music/programmes/schedules'		=> 'BBC 6 Music',
-		'asiannetwork/programmes/schedules'	=> 'BBC Asian Network',
-		'radiofoyle/programmes/schedules'	=> 'BBC Radio Foyle',
-		'radioscotland/programmes/schedules/fm'	=> 'BBC Radio Scotland', # fm,mw,orkney,shetland,highlandsandislands
-		'radionangaidheal/programmes/schedules'	=> 'BBC Radio Nan Gaidheal',
-		'radioulster/programmes/schedules'	=> 'BBC Radio Ulster',
-		'radiowales/programmes/schedules/fm'	=> 'BBC Radio Wales FM',
-		'radiowales/programmes/schedules/mw'	=> 'BBC Radio Wales MW',
-		'radiocymru/programmes/schedules'	=> 'BBC Radio Cymru',
-		'worldservice/programmes/schedules'	=> 'BBC World Service',
-		'cumbria/programmes/schedules'		=> 'BBC Cumbria',
-		'newcastle/programmes/schedules'	=> 'BBC Newcastle',
-		'tees/programmes/schedules'		=> 'BBC Tees',
-		'lancashire/programmes/schedules'	=> 'BBC Lancashire',
-		'merseyside/programmes/schedules'	=> 'BBC Merseyside',
-		'manchester/programmes/schedules'	=> 'BBC Manchester',
-		'leeds/programmes/schedules'		=> 'BBC Leeds',
-		'sheffield/programmes/schedules'	=> 'BBC Sheffield',
-		'york/programmes/schedules'		=> 'BBC York',
-		'humberside/programmes/schedules'	=> 'BBC Humberside',
-		'lincolnshire/programmes/schedules'	=> 'BBC Lincolnshire',
-		'nottingham/programmes/schedules'	=> 'BBC Nottingham',
-		'leicester/programmes/schedules'	=> 'BBC Leicester',
-		'derby/programmes/schedules'		=> 'BBC Derby',
-		'stoke/programmes/schedules'		=> 'BBC Stoke',
-		'shropshire/programmes/schedules'	=> 'BBC Shropshire',
-		'wm/programmes/schedules'		=> 'BBC WM',
-		'coventry/programmes/schedules'		=> 'BBC Coventry & Warwickshire',
-		'herefordandworcester/programmes/schedules'=> 'BBC Hereford & Worcester',
-		'northampton/programmes/schedules'	=> 'BBC Northampton',
-		'threecounties/programmes/schedules'	=> 'BBC Three Counties',
-		'cambridgeshire/programmes/schedules'	=> 'BBC Cambridgeshire',
-		'norfolk/programmes/schedules'		=> 'BBC Norfolk',
-		'suffolk/programmes/schedules'		=> 'BBC Suffolk',
-		'essex/programmes/schedules'		=> 'BBC Essex',
-		'london/programmes/schedules'		=> 'BBC London',
-		'kent/programmes/schedules'		=> 'BBC Kent',
-		'surrey/programmes/schedules'		=> 'BBC Surrey',
-		'sussex/programmes/schedules'		=> 'BBC Sussex',
-		'oxford/programmes/schedules'		=> 'BBC Oxford',
-		'berkshire/programmes/schedules'	=> 'BBC Berkshire',
-		'solent/programmes/schedules'		=> 'BBC Solent',
-		'gloucestershire/programmes/schedules'	=> 'BBC Gloucestershire',
-		'wiltshire/programmes/schedules'	=> 'BBC Wiltshire',
-		'bristol/programmes/schedules'		=> 'BBC Bristol',
-		'somerset/programmes/schedules'		=> 'BBC Somerset',
-		'devon/programmes/schedules'		=> 'BBC Devon',
-		'cornwall/programmes/schedules'		=> 'BBC Cornwall',
-		'guernsey/programmes/schedules'		=> 'BBC Guernsey',
-		'jersey/programmes/schedules'		=> 'BBC Jersey',
+		'national' => {
+			'p00fzl64' => 'BBC Radio 1Xtra', # 1xtra/programmes/schedules
+			'p00fzl7g' => 'BBC Radio 5 live', # 5live/programmes/schedules
+			'p00fzl7h' => 'BBC Radio 5 live sports extra', # 5livesportsextra/programmes/schedules
+			'p00fzl65' => 'BBC Radio 6 Music', # 6music/programmes/schedules
+			'p00fzl68' => 'BBC Asian Network', # asiannetwork/programmes/schedules
+			'p00fzl86' => 'BBC Radio 1', # radio1/programmes/schedules
+			'p00fzl8v' => 'BBC Radio 2', # radio2/programmes/schedules
+			'p00fzl8t' => 'BBC Radio 3', # radio3/programmes/schedules
+			'p00fzl7j' => 'BBC Radio 4', # radio4/programmes/schedules/fm
+			'p00fzl7k' => 'BBC Radio 4', # radio4/programmes/schedules/lw
+			'p00fzl7l' => 'BBC Radio 4 Extra', # radio4extra/programmes/schedules
+			'p02zbmb3' => 'BBC World Service', # worldserviceradio/programmes/schedules/uk
+		},
+		'regional' => {
+			'p00fzl7b' => 'BBC Radio Cymru', # radiocymru/programmes/schedules
+			'p00fzl7m' => 'BBC Radio Foyle', # radiofoyle/programmes/schedules
+			'p00fzl81' => 'BBC Radio Nan Gaidheal', # radionangaidheal/programmes/schedules
+			'p00fzl8d' => 'BBC Radio Scotland', # radioscotland/programmes/schedules/fm
+			'p00fzl8g' => 'BBC Radio Scotland', # radioscotland/programmes/schedules/mw
+			'p00fzl8b' => 'BBC Radio Scotland', # radioscotland/programmes/schedules/orkney
+			'p00fzl8j' => 'BBC Radio Scotland', # radioscotland/programmes/schedules/shetland
+			'p00fzl8w' => 'BBC Radio Ulster', # radioulster/programmes/schedules
+			'p00fzl8y' => 'BBC Radio Wales', # radiowales/programmes/schedules/fm
+			'p00fzl8x' => 'BBC Radio Wales', # radiowales/programmes/schedules/mw
+		},
+		'local' => {
+			'p00fzl78' => 'BBC Coventry & Warwickshire', # bbccoventryandwarwickshire/programmes/schedules
+			'p00fzl7f' => 'BBC Essex', # bbcessex/programmes/schedules
+			'p00fzl7q' => 'BBC Hereford & Worcester', # bbcherefordandworcester/programmes/schedules
+			'p00fzl82' => 'BBC Newcastle', # bbcnewcastle/programmes/schedules
+			'p00fzl8m' => 'BBC Somerset', # bbcsomerset/programmes/schedules
+			'p00fzl8q' => 'BBC Surrey', # bbcsurrey/programmes/schedules
+			'p00fzl8r' => 'BBC Sussex', # bbcsussex/programmes/schedules
+			'p00fzl93' => 'BBC Tees', # bbctees/programmes/schedules
+			'p00fzl8z' => 'BBC Wiltshire', # bbcwiltshire/programmes/schedules
+			'p00fzl74' => 'BBC Radio Berkshire', # radioberkshire/programmes/schedules
+			'p00fzl75' => 'BBC Radio Bristol', # radiobristol/programmes/schedules
+			'p00fzl76' => 'BBC Radio Cambridgeshire', # radiocambridgeshire/programmes/schedules
+			'p00fzl77' => 'BBC Radio Cornwall', # radiocornwall/programmes/schedules
+			'p00fzl79' => 'BBC Radio Cumbria', # radiocumbria/programmes/schedules
+			'p00fzl7c' => 'BBC Radio Derby', # radioderby/programmes/schedules
+			'p00fzl7d' => 'BBC Radio Devon', # radiodevon/programmes/schedules
+			'p00fzl7n' => 'BBC Radio Gloucestershire', # radiogloucestershire/programmes/schedules
+			'p00fzl7p' => 'BBC Radio Guernsey', # radioguernsey/programmes/schedules
+			'p00fzl7r' => 'BBC Radio Humberside', # radiohumberside/programmes/schedules
+			'p00fzl7s' => 'BBC Radio Jersey', # radiojersey/programmes/schedules
+			'p00fzl7t' => 'BBC Radio Kent', # radiokent/programmes/schedules
+			'p00fzl7v' => 'BBC Radio Lancashire', # radiolancashire/programmes/schedules
+			'p00fzl7w' => 'BBC Radio Leeds', # radioleeds/programmes/schedules
+			'p00fzl7x' => 'BBC Radio Leicester', # radioleicester/programmes/schedules
+			'p00fzl7y' => 'BBC Radio Lincolnshire', # radiolincolnshire/programmes/schedules
+			'p00fzl6f' => 'BBC Radio London', # radiolondon/programmes/schedules
+			'p00fzl7z' => 'BBC Radio Manchester', # radiomanchester/programmes/schedules
+			'p00fzl80' => 'BBC Radio Merseyside', # radiomerseyside/programmes/schedules
+			'p00fzl83' => 'BBC Radio Norfolk', # radionorfolk/programmes/schedules
+			'p00fzl84' => 'BBC Radio Northampton', # radionorthampton/programmes/schedules
+			'p00fzl85' => 'BBC Radio Nottingham', # radionottingham/programmes/schedules
+			'p00fzl8c' => 'BBC Radio Oxford', # radiooxford/programmes/schedules
+			'p00fzl8h' => 'BBC Radio Sheffield', # radiosheffield/programmes/schedules
+			'p00fzl8k' => 'BBC Radio Shropshire', # radioshropshire/programmes/schedules
+			'p00fzl8l' => 'BBC Radio Solent', # radiosolent/programmes/schedules
+			'p00fzl8n' => 'BBC Radio Stoke', # radiostoke/programmes/schedules
+			'p00fzl8p' => 'BBC Radio Suffolk', # radiosuffolk/programmes/schedules
+			'p00fzl90' => 'BBC Radio York', # radioyork/programmes/schedules
+			'p00fzl96' => 'BBC Three Counties Radio', # threecountiesradio/programmes/schedules
+			'p00fzl9f' => 'BBC WM 95.6', # wm/programmes/schedules
+		},
 	};
 }
 
-
 # Class cmdline Options
 sub opt_format {
 	return {
-		radiomode	=> [ 1, "radiomode|amode=s", 'Recording', '--radiomode <mode>,<mode>,...', "Radio Recording mode(s): flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma (default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow). Use --radiomode=best to automatically select highest quality available."],
-		bandwidth 	=> [ 1, "bandwidth=n", 'Recording', '--bandwidth', "In radio realaudio mode specify the link bandwidth in bps for rtsp streaming (default 512000)"],
-		lame		=> [ 0, "lame=s", 'External Program', '--lame <path>', "Location of lame binary"],
-		outputradio	=> [ 1, "outputradio=s", 'Output', '--outputradio <dir>', "Output directory for radio recordings"],
-		wav		=> [ 1, "wav!", 'Recording', '--wav', "In radio realaudio mode output as wav and don't transcode to mp3"],
-		rtmpradioopts	=> [ 1, "rtmp-radio-opts|rtmpradioopts=s", 'Recording', '--rtmp-radio-opts <options>', "Add custom options to flvstreamer for radio"],
+		radiomode	=> [ 1, "radiomode|amode=s", 'Recording', '--radiomode <mode>,<mode>,...', "Radio recording modes (overrides --modes): dafhigh,dafstd,dafmed,daflow,hafhigh,hafstd,hafmed,haflow,hlahigh,hlastd,hlsmed,hlalow. Shortcuts: best,better,good,worst,haf,hla,daf,hls,dash,high,std,med,low (default=hafhigh,hlahigh,dafhigh,hafstd,hlastd,dafstd,hafmed,hlamed,dafmed,haflow,hlalow,daflow)."],
+		commandradio	=> [ 1, "commandradio|command-radio=s", 'Output', '--command-radio <command>', "User command to run after successful recording of radio programme. Use substitution parameters in command string (see docs for list). Overrides --command."],
+		outputradio	=> [ 1, "outputradio=s", 'Output', '--outputradio <dir>', "Output directory for radio recordings (overrides --output)"],
 	};
 }
 
-
-
 # This gets run before the download retry loop if this class type is selected
 sub init {
-	# Force certain options for radio
-	# Force --raw otherwise realaudio stdout streaming fails
-	# (this would normally be a bad thing but since its a stdout stream we 
-	# won't be downloading other types of progs afterwards)
-	$opt->{raw} = 1 if $opt->{stdout} && $opt->{nowrite};
 }
 
-
-
 # Method to return optional list_entry format
 sub optional_list_entry_format {
 	my $prog = shift;
 	my @format;
-	for ( qw/ channel categories / ) {
+	for ( qw/ channel pid / ) {
 		push @format, $prog->{$_} if defined $prog->{$_};
 	}
 	return ', '.join ', ', @format;
 }
 
-
-
 # Default minimum expected download size for a programme type
 sub min_download_size {
 	return 102400;
 }
 
-
-
-# Returns the modes to try for this prog type
-sub modelist {
-	my $prog = shift;
-	my $mlist = $opt->{radiomode} || $opt->{modes};
-	
-	# Defaults
-	if ( ! $mlist ) {
-		if ( ! main::exists_in_path('flvstreamer') ) {
-			main::logger "WARNING: Not using flash modes since flvstreamer is not found\n" if $opt->{verbose};
-			$mlist = 'rtspaudio,realaudio,wma';
-		} else {
-			$mlist = 'flashaachigh,flashaacstd,flashaudio,rtspaudio,realaudio,flashaaclow,wma';
-		}
-	}
-	# Deal with BBC Radio fallback modes and expansions
-	# Valid modes are iphone,rtmp,flashaac,flashaudio,realaudio,wmv
-	# 'rtmp' or 'flash' => 'flashaudio,flashaac'
-	# flashaac => flashaachigh,flashaacstd,flashaaclow
-	# flashaachigh => flashaachigh1,flashaachigh2
-	$mlist = main::expand_list($mlist, 'best', 'flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow,wma');
-	$mlist = main::expand_list($mlist, 'flash', 'flashaudio,flashaac');
-	$mlist = main::expand_list($mlist, 'rtmp', 'flashaudio,flashaac');
-	$mlist = main::expand_list($mlist, 'flashaac', 'flashaachigh,flashaacstd,flashaaclow');
-
-	return $mlist;
-}
-
-
-
-sub clean_pid {
-	my $prog = shift;
-
-	## extract [bpw]??????? format - remove surrounding url
-	#$prog->{pid} =~ s/^.+\/([bpw]\w{7})(\..+)?$/$1/g;
-	## Remove extra URL path for URLs like 'http://www.bbc.co.uk/iplayer/radio/bbc_radio_one'
-	#$prog->{pid} =~ s/^.+\/(.+?)\/?$/$1/g;
-
-	# If this is an iPlayer pid
-	if ( $prog->{pid} =~ m{^([bpw]0[a-z0-9]{6})$} ) {
-		# extract b??????? format from any URL containing it
-		$prog->{pid} = $1;
-
-	# If this is an iPlayer programme pid URL (and not on BBC programmes site)
-	} elsif ( $prog->{pid} =~ m{^http.+\/([bpw]0[a-z0-9]{6})\/?.*$} && $prog->{pid} !~ m{/programmes/} ) {
-		# extract b??????? format from any URL containing it
-		$prog->{pid} = $1;
-
-	# If this is a BBC *iPlayer* Live channel
-	#} elsif ( $prog->{pid} =~ m{http.+bbc\.co\.uk/iplayer/console/}i ) {
-	#	# Just leave the URL as the pid
-
-	# e.g. http://www.bbc.co.uk/iplayer/playlive/bbc_radio_fourfm/
-	} elsif ( $prog->{pid} =~ m{http.+bbc\.co\.uk/iplayer}i ) {
-		# Remove trailing path for URLs like 'http://www.bbc.co.uk/iplayer/radio/bbc_radio_fourfm/listenlive'
-		$prog->{pid} =~ s/\/\w+live\/?$//;
-		# Remove extra URL path for URLs like 'http://www.bbc.co.uk/iplayer/playlive/bbc_radio_one/'
-		$prog->{pid} =~ s/^http.+\/(.+?)\/?$/$1/g;
-
-	# Else this is an embedded media player URL (live or otherwise)
-	} elsif ($prog->{pid} =~ m{^http}i ) {
-		# Just leave the URL as the pid
-	}
-}
-
-
-
 sub get_links {
 	shift;
 	# Delegate to Programme::tv (same function is used)
 	return Programme::tv->get_links(@_);
 }
 
-
-
-sub download {
-	# Delegate to Programme::tv (same function is used)
-	return Programme::tv::download(@_);
-}
-
-
-
-################### BBC Live Parent class #################
-package Programme::bbclive;
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme::bbciplayer';
-
-# Class vars
-sub file_prefix_format { '<name> <episode> <dldate> <dltime>' }
-
-# Class cmdline Options
-sub opt_format {
-	return {};
-}
-
-
-
-# Method to return optional list_entry format
-sub optional_list_entry_format {
-	return '';
-}
-
-
-sub clean_pid {
-	my $prog = shift;
-
-	# If this is a BBC *iPlayer* Live channel
-	#if ( $prog->{pid} =~ m{http.+bbc\.co\.uk/iplayer/console/}i ) {
-	#	# Just leave the URL as the pid
-	# e.g. http://www.bbc.co.uk/iplayer/playlive/bbc_radio_fourfm/
-	if ( $prog->{pid} =~ m{http.+bbc\.co\.uk/iplayer}i ) {
-		# Remove trailing path for URLs like 'http://www.bbc.co.uk/iplayer/radio/bbc_radio_fourfm/listenlive'
-		$prog->{pid} =~ s/\/\w+live\/?$//;
-		# Remove extra URL path for URLs like 'http://www.bbc.co.uk/iplayer/playlive/bbc_radio_one/'
-		$prog->{pid} =~ s/^http.+\/(.+?)\/?$/$1/g;
-
-	# Else this is an embedded media player URL (live or otherwise)
-	} elsif ($prog->{pid} =~ m{^http}i ) {
-		# Just leave the URL as the pid
-	}
-}
-
-
-
-# Usage: Programme::liveradio->get_links( \%prog, 'liveradio' );
-# Uses: %{ channels() }, \%prog
-sub get_links {
-	shift; # ignore obj ref
-	my $prog = shift;
-	my $prog_type = shift;
-	# Hack to get correct 'channels' method because this methods is being shared with Programme::radio
-	my %channels = %{ main::progclass($prog_type)->channels_filtered( main::progclass($prog_type)->channels() ) };
-
-	for ( sort keys %channels ) {
-
-			# Extract channel
-			my $channel = $channels{$_};
-			my $pid = $_;
-			my $name = $channels{$_};
-			my $episode = 'live';
-			main::logger "DEBUG: '$pid, $name - $episode, $channel'\n" if $opt->{debug};
-
-			# build data structure
-			$prog->{$pid} = main::progclass($prog_type)->new(
-				'pid'		=> $pid,
-				'name'		=> $name,
-				'versions'	=> 'default',
-				'episode'	=> $episode,
-				'desc'		=> "Live stream of $name",
-				'guidance'	=> '',
-				#'thumbnail'	=> "http://static.bbc.co.uk/mobile/iplayer_widget/img/ident_${pid}.png",
-				'thumbnail'	=> "http://www.bbc.co.uk/iplayer/img/station_logos/${pid}.png",
-				'channel'	=> $channel,
-				#'categories'	=> join(',', @category),
-				'type'		=> $prog_type,
-				'web'		=> "http://www.bbc.co.uk/iplayer/playlive/${pid}/",
-			);
-	}
-	main::logger "\n";
-	return 0;
-}
-
-
-
 sub download {
 	# Delegate to Programme::tv (same function is used)
 	return Programme::tv::download(@_);
 }
 
+################### Streamer class #################
+package Streamer;
 
-
-################### Live TV class #################
-package Programme::livetv;
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
 use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme::bbclive';
-
-# Class vars
-sub index_min { return 80000 }
-sub index_max { return 80099 }
-sub channels {
-	return {
-		'bbc_one'			=> 'BBC One',
-		'bbc_two'			=> 'BBC Two',
-		'bbc_three'			=> 'BBC Three',
-		'bbc_four'			=> 'BBC Four',
-		'cbbc'				=> 'CBBC',
-		'cbeebies'			=> 'CBeebies',
-		'bbc_news24'			=> 'BBC News',
-		'bbc_parliament'		=> 'BBC Parliament',
-		'bbc_alba'			=> 'BBC Alba',
-	};
-}
-
-
-# Class cmdline Options
-sub opt_format {
-	return {
-		livetvmode	=> [ 1, "livetvmode=s", 'Recording', '--livetvmode <mode>,<mode>,...', "Live TV Recoding modes: flashhd,flashvhigh,flashhigh,flashstd,flashnormal (default: flashhd,flashvhigh,flashhigh,flashstd,flashnormal). Use --livetvmode=best to automatically select highest quality available."],
-		outputlivetv	=> [ 1, "outputlivetv=s", 'Output', '--outputlivetv <dir>', "Output directory for live tv recordings"],
-		rtmplivetvopts	=> [ 1, "rtmp-livetv-opts|rtmplivetvopts=s", 'Recording', '--rtmp-livetv-opts <options>', "Add custom options to flvstreamer for livetv"],
-	};
-}
-
-
-
-# This gets run before the download retry loop if this class type is selected
-sub init {
-	# Force certain options for Live 
-	# Force only one try if live and recording to file
-	$opt->{attempts} = 1 if ( ! $opt->{attempts} ) && ( ! $opt->{nowrite} );
-	# Force to skip checking history if live
-	$opt->{force} = 1;
-}
-
-
-
-# Returns the modes to try for this prog type
-sub modelist {
-	my $prog = shift;
-	my $mlist = $opt->{livetvmode} || $opt->{modes};
-	
-	# Defaults
-	if ( ! $mlist ) {
-		$mlist = 'flashhd,flashvhigh,flashhigh,flashstd,flashnormal';
-	}
-	# Deal with BBC TV fallback modes and expansions
-	# Valid modes are rtmp,flashhigh,flashstd
-	# 'rtmp' or 'flash' => 'flashhigh,flashnormal'
-	$mlist = main::expand_list($mlist, 'best', 'flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow');
-	$mlist = main::expand_list($mlist, 'flash', 'flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow');
-	$mlist = main::expand_list($mlist, 'rtmp', 'flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow');
-
-	return $mlist;
-}
-
-
-
-# Default minimum expected download size for a programme type
-sub min_download_size {
-	return 102400;
-}
-
-
-
-################### Live Radio class #################
-package Programme::liveradio;
-
-use Env qw[@PATH];
-use Fcntl;
+use File::Basename;
 use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
 use strict;
-use Time::Local;
-use URI;
-
-# Inherit from Programme class
-use base 'Programme::bbclive';
-
-# Class vars
-sub index_min { return 80100 }
-sub index_max { return 80199 }
-sub channels {
-	return {
-		'bbc_1xtra'				=> 'BBC 1Xtra',
-		'bbc_radio_one'				=> 'BBC Radio 1',
-		'bbc_radio_two'				=> 'BBC Radio 2',
-		'bbc_radio_three'			=> 'BBC Radio 3',
-		'bbc_radio_fourfm'			=> 'BBC Radio 4 FM',
-		'bbc_radio_fourlw'			=> 'BBC Radio 4 LW',
-		'bbc_radio_four_extra'			=> 'BBC Radio 4 Extra',
-		'bbc_radio_five_live'			=> 'BBC Radio 5 live',
-		'bbc_radio_five_live_sports_extra'	=> 'BBC 5 live Sports Extra',
-		'bbc_6music'				=> 'BBC 6 Music',
-		'bbc_asian_network'			=> 'BBC Asian Network',
-		'bbc_radio_foyle'			=> 'BBC Radio Foyle',
-		'bbc_radio_scotland'			=> 'BBC Radio Scotland',
-		'bbc_radio_nan_gaidheal'		=> 'BBC Radio Nan Gaidheal',
-		'bbc_radio_ulster'			=> 'BBC Radio Ulster',
-		'bbc_radio_wales'			=> 'BBC Radio Wales',
-		'bbc_radio_cymru'			=> 'BBC Radio Cymru',
-		'bbc_world_service' 			=> 'BBC World Service',
-		'bbc_radio_cumbria'			=> 'BBC Cumbria',
-		'bbc_radio_newcastle'			=> 'BBC Newcastle',
-		'bbc_tees'				=> 'BBC Tees',
-		'bbc_radio_lancashire'			=> 'BBC Lancashire',
-		'bbc_radio_merseyside'			=> 'BBC Merseyside',
-		'bbc_radio_manchester'			=> 'BBC Manchester',
-		'bbc_radio_leeds'			=> 'BBC Leeds',
-		'bbc_radio_sheffield'			=> 'BBC Sheffield',
-		'bbc_radio_york'			=> 'BBC York',
-		'bbc_radio_humberside'			=> 'BBC Humberside',
-		'bbc_radio_lincolnshire'		=> 'BBC Lincolnshire',
-		'bbc_radio_nottingham'			=> 'BBC Nottingham',
-		'bbc_radio_leicester'			=> 'BBC Leicester',
-		'bbc_radio_derby'			=> 'BBC Derby',
-		'bbc_radio_stoke'			=> 'BBC Stoke',
-		'bbc_radio_shropshire'			=> 'BBC Shropshire',
-		'bbc_wm'				=> 'BBC WM',
-		'bbc_radio_coventry_warwickshire'	=> 'BBC Coventry & Warwickshire',
-		'bbc_radio_hereford_worcester'		=> 'BBC Hereford & Worcester',
-		'bbc_radio_northampton'			=> 'BBC Northampton',
-		'bbc_three_counties_radio'		=> 'BBC Three Counties',
-		'bbc_radio_cambridge'			=> 'BBC Cambridgeshire',
-		'bbc_radio_norfolk'			=> 'BBC Norfolk',
-		'bbc_radio_suffolk'			=> 'BBC Suffolk',
-		'bbc_radio_sussex'			=> 'BBC Sussex',
-		'bbc_radio_essex'			=> 'BBC Essex',
-		'bbc_london'				=> 'BBC London',
-		'bbc_radio_kent'			=> 'BBC Kent',
-		'bbc_southern_counties_radio'		=> 'BBC Southern Counties',
-		'bbc_radio_oxford'			=> 'BBC Oxford',
-		'bbc_radio_berkshire'			=> 'BBC Berkshire',
-		'bbc_radio_solent'			=> 'BBC Solent',
-		'bbc_radio_gloucestershire'		=> 'BBC Gloucestershire',
-		'bbc_radio_swindon'			=> 'BBC Swindon',
-		'bbc_radio_wiltshire'			=> 'BBC Wiltshire',
-		'bbc_radio_bristol'			=> 'BBC Bristol',
-		'bbc_radio_somerset_sound'		=> 'BBC Somerset',
-		'bbc_radio_devon'			=> 'BBC Devon',
-		'bbc_radio_cornwall'			=> 'BBC Cornwall',
-		'bbc_radio_guernsey'			=> 'BBC Guernsey',
-		'bbc_radio_jersey'			=> 'BBC Jersey',
-	};
-}
-
-
-# Class cmdline Options
-sub opt_format {
-	return {
-		liveradiomode	=> [ 1, "liveradiomode=s", 'Recording', '--liveradiomode <mode>,<mode>,..', "Live Radio Recording modes: flashaac,realaudio,wma. Use --liveradiomode=best to automatically select highest quality available."],
-		outputliveradio	=> [ 1, "outputliveradio=s", 'Output', '--outputliveradio <dir>', "Output directory for live radio recordings"],
-		rtmpliveradioopts => [ 1, "rtmp-liveradio-opts|rtmpliveradioopts=s", 'Recording', '--rtmp-liveradio-opts <options>', "Add custom options to flvstreamer for liveradio"],
-	};
-}
-
-
-
-# This gets run before the download retry loop if this class type is selected
-sub init {
-	# Force certain options for Live 
-	# Force --raw otherwise realaudio stdout streaming fails
-	# (this would normally be a bad thing but since its a live stream we 
-	# won't be downloading other types of progs afterwards)
-	$opt->{raw} = 1 if $opt->{stdout} && $opt->{nowrite};
-	# Force only one try if live and recording to file
-	$opt->{attempts} = 1 if ( ! $opt->{attempts} ) && ( ! $opt->{nowrite} );
-	# Force to skip checking history if live
-	$opt->{force} = 1;
-}
-
-
-
-# Returns the modes to try for this prog type
-sub modelist {
-	my $prog = shift;
-	my $mlist = $opt->{liveradiomode} || $opt->{modes};
-	
-	# Defaults
-	if ( ! $mlist ) {
-		if ( ! main::exists_in_path('flvstreamer') ) {
-			main::logger "WARNING: Not using flash modes since flvstreamer is not found\n" if $opt->{verbose};
-			$mlist = 'realaudio,wma';
-		} else {
-			$mlist = 'flashaachigh,flashaacstd,realaudio,flashaaclow,wma';
-		}
-	}
-	# Deal with BBC Radio fallback modes and expansions
-	# Valid modes are rtmp,flashaac,realaudio,wmv
-	# 'rtmp' or 'flash' => 'flashaac'
-	# flashaac => flashaachigh,flashaacstd,flashaaclow
-	# flashaachigh => flashaachigh1,flashaachigh2
-	$mlist = main::expand_list($mlist, 'best', 'flashaachigh,flashaacstd,realaudio,flashaaclow,wma');
-	$mlist = main::expand_list($mlist, 'flash', 'flashaac');
-	$mlist = main::expand_list($mlist, 'rtmp', 'flashaac');
-	$mlist = main::expand_list($mlist, 'flashaac', 'flashaachigh,flashaacstd,flashaaclow');
-
-	return $mlist;
-}
-
-
-
-# Default minimum expected download size for a programme type
-sub min_download_size {
-	return 102400;
-}
-
-
-################### Streamer class #################
-package Streamer;
+use Text::ParseWords;
 
 # Class vars
 # Global options
 my $optref;
 my $opt;
 
-
 # Constructor
 # Usage: $streamer = Streamer->new();
 sub new {
@@ -7770,14 +7576,12 @@
 	bless $self, $type;
 }
 
-
 # Use to bind a new options ref to the class global $optref var
 sub add_opt_object {
 	my $self = shift;
 	$Streamer::optref = shift;
 }
 
-
 # $opt->{<option>} access method
 sub opt {
 	my $self = shift;
@@ -7785,1222 +7589,797 @@
 	return $opt->{$optname};
 }
 
-
-
-################### Streamer::iphone class #################
-package Streamer::iphone;
+################### HLS Streamer class #################
+package Streamer::hls;
 
 # Inherit from Streamer class
 use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
+use File::Basename;
 use File::Copy;
 use File::Path;
+use File::Spec;
 use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
+use List::Util qw(max);
 use strict;
-use Time::Local;
+use Text::ParseWords;
 use URI;
 
+sub opt_format {
+	return {
+		noresume	=> [ 1, "no-resume|noresume!", 'Recording', '--no-resume', "Do not resume partial HLS/DASH downloads."],
+		noverify	=> [ 1, "no-verify|noverify!", 'Recording', '--no-verify', "Do not verify size of downloaded HLS/DASH file segments or file resize upon resume."],
+	};
+}
 
-
-# Generic
-# Get streaming iphone URL
-# More iphone stream data http://www.bbc.co.uk/json/stream/b0067vmx/iplayer_streaming_http_mp4?r=585330738351 HTTP/1.1
-# Capabilities based on IP address: http://www.bbc.co.uk/mobile/iplayer-mgw/damp/proxytodemi?ip=111.222.333.444
-# Category codes list: http://www.bbc.co.uk/mobile/iwiplayer/category_codes.php
-sub get_url {
-	shift;
-	my $ua = shift;
-	my $pid = shift;
-
-	# Look for href="http://download.iplayer.bbc.co.uk/iplayer_streaming_http_mp4/5439950172312621205.mp4?token=iVX.lots.of.text.x9Z%2F2GNBdQKl0%3D%0A&amp;pid=b00qhs36"
-	my $url;
-	my $iphone_download_prefix = 'http://www.bbc.co.uk/mobile/iplayer/episode';
-	my $url_0 = ${iphone_download_prefix}.'/'.${pid};
-	main::logger "INFO: iphone stream URL = $url_0\n" if $opt->{verbose};
-	my $safari_ua = main::create_ua( 'safari' );
-	my $html = main::request_url_retry( $safari_ua, $url_0, 3, undef, undef, 1 );
-	$html =~ s/\n/ /g;
-	# Check for guidance warning
-	my $guidance_post;
-	$guidance_post = $1 if $html =~ m{(isOver\d+)};
-	if ( $guidance_post ) {
-		my $h = new HTTP::Headers(
-			'User-Agent'		=> main::user_agent( 'coremedia' ),
-			'Accept'		=> '*/*',
-			'Accept-Language'	=> 'en',
-			'Connection'		=> 'keep-alive',
- 			'Pragma'		=> 'no-cache',
-		);
-		main::logger "INFO: Guidance '$guidance_post' Warning Detected\n" if $opt->{verbose};
-		# Now post this var and get html again
-		my $req = HTTP::Request->new('POST', $url_0, $h);
-		$req->content_type('application/x-www-form-urlencoded');
-		$req->content('form=guidanceprompt&'.$guidance_post.'=1');
-		my $res = $ua->request($req);
-		$html = $res->as_string;
+sub parse_playlist {
+	my (undef, $ua, $url) = @_;
+	my $playlist_url = $url;
+	main::logger "DEBUG: HLS playlist URL: $playlist_url\n" if $opt->{verbose};
+	# resolve playlist redirect
+	for (my $i = 0; $i < 3; $i++) {
+		my $request = HTTP::Request->new( HEAD => $playlist_url );
+		my $response = $ua->request($request);
+		if ( $response->is_success ) {
+			if ( $response->previous ) {
+				$playlist_url = $response->request->uri;
+				main::logger "DEBUG: HLS playlist URL (actual): $playlist_url\n" if $opt->{verbose};
+			}
+			last;
+		}
 	}
-	$url = decode_entities($1) if $html =~ m{href="(http.//download\.iplayer\.bbc\.co\.uk/iplayer_streaming_http_mp4.+?)"};
-	main::logger "DEBUG: Got iphone mediaselector URL: $url\n" if $opt->{verbose};
-	
-	if ( ! $url ) {
-		main::logger "ERROR: Failed to get iphone URL from iplayer site\n\n";
+	my $data = main::request_url_retry($ua, $playlist_url, 3, undef, "Failed to download HLS playlist", 1);
+	return undef if ! $data;
+	my @lines = split(/\r?\n/, $data);
+	if ( @lines < 1 || $lines[0] ne '#EXTM3U' ) {
+		main::logger "WARNING: Invalid HLS playlist (no header): $playlist_url\n";
+		return undef;
+	}
+	my $sequence = 0;
+	my $segment_duration = 0;
+	my $segments;
+	foreach my $line (@lines) {
+		next if $line =~ /^\s*$/;
+		next if $line =~ /^##/;
+		if ($line =~ /^#EXT-X-MEDIA-SEQUENCE:(\d+)$/) {
+			$sequence = $1;
+		} elsif ($line =~ /^#EXTINF:([\d\.]+)/) {
+			$segment_duration = $1;
+		} elsif ($line !~ /^#/) {
+			my $segment_url = $line;
+			if ( $segment_url !~ /^http/ ) {
+				($segment_url = $playlist_url) =~ s/[^\/]+\.m3u8/$line/;
+			}
+			$segments->{$sequence} = { 'url' => $segment_url, 'duration' => $segment_duration };
+			$segment_duration = 0;
+			$sequence++;
+		} else {
+			$segment_duration = 0;
+		}
 	}
-	return $url;
+	return $segments;
 }
 
-
-
-# %prog (only for %prog for mode and tagging)
-# Get the h.264/mp3 stream
-# ( $stream, $ua, $url_2, $prog )
 sub get {
-	my ( $stream, $ua, $url_2, $prog ) = @_;
-	my $childpid;
-	my $iphone_block_size	= 0x2000000; # 32MB
-
-	# Stage 3a: Download 1st byte to get exact file length
-	main::logger "INFO: Stage 3 URL = $url_2\n" if $opt->{verbose};
+	my ( $self, $ua, $url, $prog, $version, %streamdata ) = @_;
+	my $rc;
 
-	# Use url prepend if required
-	if ( defined $opt->{proxy} && $opt->{proxy} =~ /^prepend:/ ) {
-		$url_2 = $opt->{proxy}.main::url_encode( $url_2 );
-		$url_2 =~ s/^prepend://g;
+	# media file
+	my $media_type = $prog->{type} eq "tv" ? "video" : "audio";
+	my $media_prefix = $prog->{fileprefix};
+	my $media_tmp = main::encode_fs(File::Spec->catfile($prog->{dir}, "${media_prefix}.${media_type}.ts"));
+	my $media_file = main::encode_fs(File::Spec->catfile($prog->{dir}, "${media_prefix}.hls.ts"));
+	my $media_raw = $prog->{filename};
+
+	if ( $opt->{overwrite} ) {
+		unlink $media_file;
+	} else {
+		if ( -f $media_file ) {
+			main::logger "INFO: Using existing HLS $media_type file: $media_file\n";
+			main::logger "INFO: Use --overwrite to re-download\n";
+		}
 	}
 
-	# Setup request header
-	my $h = new HTTP::Headers(
-		'User-Agent'	=> main::user_agent( 'coremedia' ),
-		'Accept'	=> '*/*',
-		'Range'		=> 'bytes=0-1',
-	);
-	# detect bad url => not available
-	if ( $url_2 !~ /^http:\/\// ) {
-		main::logger "WARNING: iphone version not available\n";
-		return 'next';
-	}
-	my $req = HTTP::Request->new ('GET', $url_2, $h);
-	my $res = $ua->request($req);
-	# e.g. Content-Range: bytes 0-1/181338136 (return if no content length returned)
-	my $download_len = $res->header("Content-Range");
-	if ( ! $download_len ) {
-		main::logger "WARNING: iphone version not available\n";
-		return 'retry';
-	}
-	$download_len =~ s|^bytes 0-1/(\d+).*$|$1|;
-	main::logger "INFO: Download File Length $download_len\n" if $opt->{verbose};
-
-	# Only do this if we're rearranging QT streams
-	my $mdat_start = 0;
-	# default (tells the download chunk loop where to stop - i.e. EOF instead of end of mdat atom)
-	my $moov_start = $download_len + 1;
-	my $header;
-
-	# If we have partial content and wish to stream, resume the recording & spawn off STDOUT from existing file start 
-	# Sanity check - we cannot support resuming of partial content if we're streaming also. 
-	if ( $opt->{stdout} && (! $opt->{nowrite}) && -f $prog->{filepart} ) {
-		main::logger "WARNING: Partially recorded file exists, streaming will start from the beginning of the programme\n";
-		# Don't do usual streaming code - also force all messages to go to stderr
-		delete $opt->{stdout};
-		$opt->{stderr} = 1;
-		$childpid = fork();
-		if (! $childpid) {
-			# Child starts here
-			main::logger "INFO: Streaming directly for partially recorded file $prog->{filepart}\n";
-			if ( ! open( STREAMIN, "< $prog->{filepart}" ) ) {
-				main::logger "INFO: Cannot Read partially recorded file to stream\n";
-				exit 4;
-			}
-			my $outbuf;
-			# Write out until we run out of bytes
-			my $bytes_read = 65536;
-			while ( $bytes_read == 65536 ) {
-				$bytes_read = read(STREAMIN, $outbuf, 65536 );
-				#main::logger "INFO: Read $bytes_read bytes\n";
-				print STDOUT $outbuf;
-			}
-			close STREAMIN;
-			main::logger "INFO: Stream thread has completed\n";
-			exit 0;
-		}
-	}
-
-	# Open file if required
-	my $fh = main::open_file_append($prog->{filepart});
-
-	# If the partial file already exists, then resume from the correct mdat/download offset
-	my $restart_offset = 0;
-	my $moovdata;
-	my $moov_length = 0;
-
-	# If we have a too-small-sized file (greater than moov_length+mdat_start) and not stdout and not no-write then this is a partial recording
-	if (-f $prog->{filepart} && (! $opt->{stdout}) && (! $opt->{nowrite}) && stat($prog->{filepart})->size > ($moov_length+$mdat_start) ) {
-		# Calculate new start offset (considering that we've put moov first in file)
-		$restart_offset = stat($prog->{filepart})->size - $moov_length;
-		main::logger "INFO: Resuming recording from $restart_offset                        \n";
-	}
-
-	# Not sure if this is already done in download method???
-	# Create symlink if required
-	$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};
-
-	# Start marker
-	my $start_time = time();
-
-	# Download mdat in blocks
-	my $chunk_size = $iphone_block_size;
-	for ( my $s = $restart_offset; $s < ${moov_start}-1; $s+= $chunk_size ) {
-		# get mdat chunk into file
-		my $retcode;
-		my $e;
-		# Get block end offset
-		if ( ($s + $chunk_size - 1) > (${moov_start}-1) ) {
-			$e = $moov_start - 1;
-		} else {
-			$e = $s + $chunk_size - 1;
-		}
-		# Get block from URL and append to $prog->{filepart}
-		if ( main::download_block($prog->{filepart}, $url_2, $ua, $s, $e, $download_len, $fh ) ) {
-			main::logger "\rERROR: Could not download block $s - $e from $prog->{filepart}\n\n";
-			return 'retry';
+	unless ( -f $media_file ) {
+		$streamdata{kind} = $prog->{type} eq "tv" ? "audio+video" : "audio";
+		if ( $opt->{audioonly} && $url =~ /-video=\d+/ ) {
+			$url =~ s/-video=\d+//;
+			$streamdata{kind} = "audio";
+			if ( $streamdata{audio_bitrate} ) {
+				$streamdata{media_size} = undef;
+				$streamdata{media_bitrate} = $streamdata{audio_bitrate};
+			}
+		}
+		my $segments = $self->parse_playlist($ua, $url);
+		if ( keys %{$segments} == 0 ) {
+			main::logger "ERROR: No file segments in HLS playlist\n";
+			main::logger "ERROR: HLS playlist URL: $url\n";
+			return 'next';
+		}
+		$rc = $self->fetch( $ua, $segments, $media_tmp, $prog, %streamdata );
+		return $rc if $rc;
+		if ( ! move($media_tmp, $media_file) ) {
+			main::logger "ERROR: Could not rename file: $media_tmp\n";
+			main::logger "ERROR: Destination file name: $media_file\n";
+			return 'skip';
 		}
 	}
 
-	# Close fh
-	close $fh;
-
-	# end marker
-	my $end_time = time() + 0.0001;
-
-	# Calculate average speed, duration and total bytes recorded
-	main::logger sprintf("\rINFO: Recorded %.2fMB in %s at %5.0fkbps to %s\n", 
-		($moov_start - 1 - $restart_offset) / (1024.0 * 1024.0),
-		sprintf("%02d:%02d:%02d", ( gmtime($end_time - $start_time))[2,1,0] ), 
-		( $moov_start - 1 - $restart_offset ) / ($end_time - $start_time) / 1024.0 * 8.0, 
-		$prog->{filename} );
-
-	# Moving file into place as complete (if not stdout)
-	move($prog->{filepart}, $prog->{filename}) if $prog->{filepart} ne $prog->{filename} && ! $opt->{stdout};
-
-	# Re-symlink file
-	$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
+	if ( $opt->{raw} ) {
+		if ( ! move($media_file, $media_raw) ) {
+			main::logger "ERROR: Could not rename file: $media_file\n";
+			main::logger "ERROR: Destination file name: $media_raw\n";
+			return 'skip';
+		}
+		return 0;
+	}
 
-	return 0;
+	if ( $prog->{type} eq "tv" && ! $opt->{audioonly} ) {
+		return $prog->postproc(undef, $media_file, $ua);
+	} else {
+		return $prog->postproc($media_file, undef, $ua);
+	}
 }
 
+sub fetch {
+	my ( $self, $ua, $segments, $file_tmp, $prog, %streamdata ) = @_;
+	my $return;
+	my $fh;
+	my $rh;
+	my $media_size = $streamdata{file_size};
+	my $media_bitrate = $streamdata{media_bitrate} || $streamdata{bitrate};
+	my $begin_time = time();
+	my $begin_size = 0;
+	my $percent = 0;
+	my $size = 0;
+	my $elapsed = 0;
+	my $hash_count = 0;
+	my $prev_percent = 0;
+	my $prev_sequence = 0;
+	my $prev_size = 0;
+	my $prev_elapsed = 0;
+	my $start_sequence = 0;
+	my $start_elapsed = 0;
+	my $stop_sequence = 0;
+	my $stop_elapsed = 0;
+	my $stop_elapsed_str = "--:--:--";
+	my $resume_sequence = 0;
+	my $resume_size = 0;
+	my $resume_elapsed = 0;
+	my $resume_begin = 0;
+	my $curr_percent = 0;
+	my $curr_sequence = 0;
+	my $curr_size = 0;
+	my $curr_elapsed = 0;
+	my $curr_segment_url;
+	my $total_duration = 0;
+	my $file_duration = 0;
+	my $file_size = 0;
+	my $file_size_mb = 0;
+	my $proxy_prefix;
+	my $resuming = 0;
+	my $retries = 3;
+	my $hide_progress = main::hide_progress();
+	my $crlf = ( $hide_progress || $opt->{logprogress} ) ? "\n" : "\r";
+	my $noresume = $opt->{noresume};
+	my $prog_mode = $streamdata{mode} || $prog->{mode};
+	my $prog_kind = $streamdata{kind};
+	my $rate_str;
+	my $rate_percent;
+	my $eta_str;
+	my $prog_cdn;
+	($prog_cdn = "$streamdata{type} ak ll bi") =~ s/^.*akamai(?=.*\b(ak)\b).*$|^.*limelight(?=.*\b(ll)\b).*$|^.*bidi(?=.*\b(bi)\b).*$/$1$2$3/;
+	$prog_cdn = "un" unless $prog_cdn =~ /^(ak|ll|bi)$/;
 
-
-################### Streamer::rtmp class #################
-package Streamer::rtmp;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::Spec;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-
-sub opt_format {
-	return {
-		ffmpeg		=> [ 0, "ffmpeg=s", 'External Program', '--ffmpeg <path>', "Location of ffmpeg binary"],
-		rtmpport	=> [ 1, "rtmpport=n", 'Recording', '--rtmpport <port>', "Override the RTMP port (e.g. 443)"],
-		flvstreamer	=> [ 0, "flvstreamer=s", 'External Program', '--flvstreamer <path>', "Location of flvstreamer binary"],
+	# LWP download callback
+	my $callback = sub {
+		my ($data, $res, undef) = @_;
+		return 0 if ( ! $res->is_success || ! $res->header("Content-Length") );
+		if ( ! print $fh $data ) {
+			main::logger "ERROR: Cannot write to $file_tmp\n";
+			exit 1;
+		}
+		$size = tell $fh;
+		return if $opt->{quiet} || $opt->{silent};
+		$percent = $file_size ? 100.0 * $curr_size / $file_size : 0;
+		# limit progress display to 99.9%
+		if ( $percent > 99.9 ) {
+			$curr_percent = 99.9;
+			$curr_size = int($file_size * 0.999);
+			$curr_elapsed = int($stop_elapsed * 0.999);
+		} else {
+			$curr_percent = $percent;
+			$curr_size = $size;
+			$curr_elapsed = $elapsed;
+		}
+		if ( ! $opt->{hash} && ! $opt->{logprogress} ) {
+			return if ($curr_percent - $prev_percent) < 0.1;
+		} else {
+			return if ($curr_percent - $prev_percent) < 1;
+		}
+		$prev_percent = $curr_percent;
+		my $curr_time = time();
+		my $rate_time = max(1, ($curr_time - $begin_time));
+		my $rate_size_b = max(0, ($curr_size - $begin_size));
+		my $rate_size_mbit = $rate_size_b * 8.0 / 1000000.0;
+		my $rate_b = $rate_size_b / $rate_time;
+		my $rate_mbit = $rate_size_mbit / $rate_time;
+		if ( $opt->{hash} ) {
+			main::logger '#';
+			$hash_count++;
+			if ( ! ($hash_count % 100) ) {
+				main::logger "\n";
+			}
+		} else {
+			unless ( $hide_progress ) {
+				if ($curr_time - $begin_time < 1) {
+					$rate_str = '----.- Mb/s';
+					$eta_str = '--:--:--';
+				} else {
+					if ( ($curr_percent - $rate_percent) >= 1.0 ) {
+						$rate_percent = $curr_percent;
+						$rate_str = sprintf("%6.1f Mb/s", $rate_mbit);
+						$eta_str = sprintf("%02d:%02d:%02d", ( gmtime( max(0, ($file_size - $curr_size)) / $rate_b ) )[2,1,0] );
+					}
+				}
+				if ( $opt->{verbose} ) {
+					main::logger sprintf("%5.1f%% %8.2f MB / ~%.2f MB (%02d:%02d:%02d / %8s) [%5d / %d] @%s ETA: %s (%s/%s) [%s]${crlf}",
+						$curr_percent,
+						$curr_size / 1000000.0,
+						$file_size_mb,
+						(gmtime($curr_elapsed))[2,1,0],
+						$stop_elapsed_str,
+						$curr_sequence,
+						$stop_sequence,
+						$rate_str,
+						$eta_str,
+						$prog_mode,
+						$prog_cdn,
+						$prog_kind,
+					);
+				} else {
+					main::logger sprintf("%5.1f%% of ~%.2f MB @%s ETA: %s (%s/%s) [%s]${crlf}",
+						$curr_percent,
+						$file_size_mb,
+						$rate_str,
+						$eta_str,
+						$prog_mode,
+						$prog_cdn,
+						$prog_kind,
+					);
+				}
+			}
+		}
+		if ( $opt->{throttle} > 0 ) {
+			my $rate_time_min = $rate_size_mbit / $opt->{throttle};
+			if ( $rate_time < $rate_time_min ) {
+				my $rate_sleep = 1 + ($rate_time_min - $rate_time);
+				sleep($rate_sleep);
+			}
+		}
 	};
-}
-
-
-# %prog (only for {ext} and {mode})
-# Actually do the RTMP streaming
-sub get {
-	my ( $stream, undef, undef, $prog, %streamdata ) = @_;
-	my @cmdopts;
-
-	my $url_2 	= $streamdata{streamurl};
-	my $server	= $streamdata{server};
-	my $application = $streamdata{application};
-	my $tcurl 	= $streamdata{tcurl};
-	my $authstring 	= $streamdata{authstring};
-	my $swfurl 	= $streamdata{swfurl};
-	my $playpath 	= $streamdata{playpath};
-	my $port 	= $streamdata{port} || $opt->{rtmpport} || 1935;
-	my $protocol	= $streamdata{protocol} || 0;
-	my $pageurl	= $prog->{player};
-	my $mode	= $prog->{mode};
-	push @cmdopts, ( split /\s+/, $streamdata{extraopts} ) if $streamdata{extraopts};
 
-	my $file_tmp;
-	my @cmd;
-	my $swfarg = "--swfUrl";
-
-	if ( $opt->{raw} ) {
-		$file_tmp = $prog->{filepart};
-	} else {
-		$file_tmp = $prog->{filepart}.'.flv'
+	# set up sequence list
+	my @sequences = sort { $a <=> $b } keys %{$segments};
+	my $min_sequence = $sequences[0];
+	my $max_sequence = $sequences[$#sequences];
+	my $init_sequence;
+	if ( $segments->{$min_sequence}->{initialization} ) {
+		# capture DASH init segment
+		$init_sequence = $min_sequence;
+		$min_sequence = $sequences[1];
+	}
+
+	# resume file
+	my $resume_params = "$prog->{pid},$prog->{version},$prog->{modeshort},".($opt->{start} || 0).",".($opt->{stop} || 0);
+	my $resume_prefix = fileparse($file_tmp, qr/\.[^.]+/);
+	my $resume_file = File::Spec->catfile($prog->{dir}, $resume_prefix.".txt");
+
+	# remove resume file with --no-resume
+	unlink $resume_file if $noresume;
+	# look for resume file and initialise
+	if ( ! $noresume && -f $resume_file ) {
+		if ( ! open $rh, "<", $resume_file ) {
+			main::logger "ERROR: Cannot open (read): $resume_file\n";
+			exit 1;
+		}
+		my @resume_data = <$rh>;
+		close $rh;
+		if ( $#resume_data > 0 ) {
+			chomp(my $last_params = $resume_data[0]);
+			if ( $last_params =~ /^#(\w+,){3}\d+,\d+/ ) {
+				$last_params =~ s/^#//;
+				if ( $last_params eq $resume_params ) {
+					chomp(my $last_data = $resume_data[$#resume_data]);
+					if ( $last_data =~ /^(\d+,){2}[\.\d]+,\d+,[\.\d]+,\d+/ ) {
+						my ($last_sequence, $last_size, $last_elapsed) = split /,/, $last_data;
+						if ( $last_sequence > 0 && $last_size > 0 && $last_elapsed > 0 ) {
+							my $tmp_size = -s $file_tmp || 0;
+							if ( $last_sequence >= $max_sequence ) {
+								main::logger "WARNING: Unexpected resume sequence ($last_sequence >= $max_sequence)\n";
+								main::logger "WARNING: Restarting download\n";
+							} elsif ( $last_size > $tmp_size ) {
+								main::logger "WARNING: Unexpected resume size ($last_size > $tmp_size)\n";
+								main::logger "WARNING: Restarting download\n";
+							} else {
+								$prev_sequence = $last_sequence;
+								$resume_sequence = $last_sequence + 1;
+								$resume_size = $last_size;
+								$resume_elapsed = $last_elapsed;
+								$resuming = 1;
+							}
+						} else {
+							main::logger "WARNING: Unexpected resume data: $last_data\n";
+							main::logger "WARNING: Restarting download\n";
+						}
+					} else {
+						main::logger "WARNING: Invalid resume data: $last_data\n";
+						main::logger "WARNING: Restarting download\n";
+					}
+				} else {
+					if ( $opt->{verbose} ) {
+						main::logger "INFO: Resume parameters changed: $last_params != $resume_params\n";
+						main::logger "INFO: Restarting download\n";
+					}
+				}
+			} else {
+				main::logger "WARNING: Invalid resume parameters: $last_params\n";
+				main::logger "WARNING: Restarting download\n";
+			}
+		}
 	}
+	unlink $resume_file unless $resuming;
+	$begin_size = $prev_size = $size = $resume_size;
 
-	# Remove failed file recording (below a certain size) - hack to get around flvstreamer not returning correct exit code
-	if ( -f $file_tmp && stat($file_tmp)->size < $prog->min_download_size() ) {
-		unlink( $file_tmp );
+	# find duration and start/stop points
+	for my $sequence ( $min_sequence..$max_sequence ) {
+		my $segment = $segments->{$sequence};
+		my $segment_duration = $segment->{duration};
+		$total_duration += $segment_duration;
+		if ( $start_sequence < 1 && defined $opt->{start} && $total_duration > $opt->{start} ) {
+			$start_sequence = $sequence;
+			$start_elapsed = $total_duration - $segment_duration;
+		};
+		if ( $stop_sequence < 1 && defined $opt->{stop} && $total_duration >= $opt->{stop} ) {
+			$stop_sequence = $sequence;
+			$stop_elapsed = $total_duration;
+		}
 	}
-		
-	# Add custom options to flvstreamer for this type if specified with --rtmp-<type>-opts
-	if ( defined $opt->{'rtmp'.$prog->{type}.'opts'} ) {
-		push @cmdopts, ( split /\s+/, $opt->{'rtmp'.$prog->{type}.'opts'} );
+	$start_sequence ||= $min_sequence;
+	$start_elapsed ||= 0;
+	$stop_sequence ||= $max_sequence;
+	$stop_elapsed ||= $total_duration;
+	$stop_elapsed_str = sprintf("%02d:%02d:%02d", (gmtime($stop_elapsed))[2,1,0]);
+	if ( $opt->{verbose} ) {
+		my $start_elapsed_str = sprintf("%02d:%02d:%02d", (gmtime($start_elapsed))[2,1,0]);
+		main::logger "INFO: Actual start time: ".sprintf("%.3f secs (%s.%.3d)\n", $start_elapsed, $start_elapsed_str, ($start_elapsed - int($start_elapsed)) * 1000) if $opt->{start};
+		main::logger "INFO: Actual stop  time: ".sprintf("%.3f secs (%s.%.3d)\n", $stop_elapsed, $stop_elapsed_str, ($stop_elapsed - int($stop_elapsed)) * 1000) if $opt->{stop};
+	}
+	$resume_sequence ||= $start_sequence;
+	$resume_elapsed ||= $start_elapsed;
+	$prev_elapsed = $elapsed = $resume_elapsed;
+	# estimate expected file size
+	$media_size ||= int($total_duration * $media_bitrate * 1000.0 / 8.0);
+	$file_duration = $stop_elapsed - $start_elapsed;
+	$file_size = int($file_duration / $total_duration * $media_size);
+	$file_size_mb = $file_size / 1000000.0;
+
+	# capture subtitles start/stop
+	delete $opt->{mysubstart};
+	delete $opt->{mysubstop};
+	$opt->{mysubstart} = $start_elapsed * 1000.0 if $opt->{start};
+	$opt->{mysubstop} = $stop_elapsed * 1000.0 if $opt->{stop};
+
+	# open files
+	if ( $resuming ) {
+		# open output file for resume
+		if ( ! open($fh, ">>:raw", $file_tmp) ) {
+			main::logger "ERROR: Cannot open (append): $file_tmp\n";
+			exit 1;
+		}
+		binmode $fh;
+		$fh->autoflush(1);
+		my $tmp_size = -s $file_tmp || 0;
+		# overwrite any partial segment appended in last run
+		if ( $resume_size < $tmp_size ) {
+			main::logger "INFO: Resizing file from $tmp_size to $resume_size for resume\n" if $opt->{verbose};
+			if ( ! truncate($fh, $resume_size) || ! seek($fh, 0, 2) ) {
+				$resuming = 0;
+				close $fh;
+				main::logger "WARNING: Unable to resize file: $file_tmp\n";
+				main::logger "WARNING: Restarting download\n";
+			} else {
+				unless ( $opt->{noverify} ) {
+					my $trunc_size = tell $fh;
+					if ( $trunc_size != $resume_size ) {
+						$resuming = 0;
+						close $fh;
+						main::logger "WARNING: Resize incorrect for file: $file_tmp\n";
+						main::logger "WARNING: Expected: $resume_size Got: $trunc_size\n";
+						main::logger "WARNING: Restarting download\n";
+					}
+				}
+			}
+		}
 	}
-
-	# flvstreamer version detection e.g. 'FLVStreamer v1.8a'
-	my $rtmpver = `"$bin->{flvstreamer}" --help 2>&1`;
-	if ( $rtmpver =~ /swfVfy/ ) {
-		$swfarg = "--swfVfy";
-	} else {
-		main::logger "WARNING: Your version of flvstreamer/rtmpdump does not support SWF Verification\n";
+	unlink $resume_file unless $resuming;
+	if ( $resuming ) {
+		main::logger sprintf("INFO: Resume downloading at: %.2f MB (%02d:%02d:%02d) [%d]\n",
+			$resume_size / 1000000.0,
+			(gmtime($resume_elapsed))[2,1,0],
+			$resume_sequence
+		) if $opt->{verbose};
+	} else {
+		# start download from beginning if not resuming
+		if ( ! open($fh, ">:raw", $file_tmp) ) {
+			main::logger "ERROR: Cannot open (write): $file_tmp\n";
+			exit 1;
+		}
+		binmode $fh;
+		$fh->autoflush(1);
+		main::logger sprintf("INFO: Begin downloading at: %.2f MB (%02d:%02d:%02d) [%d]\n",
+			$size / 1000000.0,
+			(gmtime($start_elapsed))[2,1,0],
+			$start_sequence
+		) if $opt->{verbose};
+	}
+	unless ( $noresume ) {
+		my $open_mode = $resuming ? ">>" : ">";
+		# open resume data file
+		if ( ! open $rh, $open_mode, $resume_file ) {
+			main::logger "ERROR: Cannot open (".($resuming ? "append" : "write")."): $resume_file\n";
+			exit 1;
+		}
+		$rh->autoflush(1);
+		unless ( $resuming ) {
+			print $rh "#$resume_params\n";
+		}
 	}
-	$rtmpver =~ s/^\w+\s+v?([\.\d]+)(.*\n)*$/$1/g;
-	main::logger "INFO: $bin->{flvstreamer} version $rtmpver\n" if $opt->{verbose};
-	main::logger "INFO: RTMP_URL: $url_2, tcUrl: $tcurl, application: $application, authString: $authstring, swfUrl: $swfurl, file: $prog->{filepart}, file_done: $prog->{filename}\n" if $opt->{verbose};
 
-	# Save the effort and don't support < v1.8
-	if ( $rtmpver < 1.8 ) {
-		main::logger "WARNING: rtmpdump/flvstreamer 1.8 or later is required - please upgrade\n";
-		return 'next';
+	if ( defined $opt->{proxy} && $opt->{proxy} =~ /^prepend:/ ) {
+		($proxy_prefix = $opt->{proxy}) =~ s/^prepend://g;
 	}
 
-	# Add --live option if required
-	push @cmdopts, '--live' if $streamdata{live};
-
-	# Add start stop options if defined
-	if ( $opt->{start} || $opt->{stop} ) {
-		push @cmdopts, ( '--start', $opt->{start} ) if $opt->{start};
-		push @cmdopts, ( '--stop', $opt->{stop} ) if $opt->{stop};
+	# process segments in playlist
+	my @file_sequences = ($resume_sequence..$stop_sequence);
+	if ( $size == 0 && defined $init_sequence ) {
+		# ensure DASH init segment downloaded for new file
+		unshift @file_sequences, $init_sequence;
+	}
+	my @warnings;
+	for my $sequence ( @file_sequences ) {
+		$curr_sequence = $sequence;
+		my $segment = $segments->{$sequence};
+		my $segment_duration = $segment->{duration};
+		$elapsed += $segment_duration;
+		my $segment_url;
+		# proxy url
+		if ( $proxy_prefix ) {
+			$segment_url = $proxy_prefix.main::url_encode( $segment->{url} );
+		} else {
+			$segment_url = $segment->{url};
+		}
+		$curr_segment_url = $segment_url;
+		main::logger "\nDEBUG: Downloading file segment [$sequence]\n" if $opt->{debug};
+		main::logger "DEBUG: File segment URL: $segment_url\n" if $opt->{debug};;
+		# download segment with retries
+		my $expected = 0;
+		my $got404 = 0;
+		my $i;
+		my $res;
+		for ($i = 0; $i < $retries; $i++) {
+			$res = $ua->get($segment_url, ':content_cb' => $callback);
+			$expected = $res->header("Content-Length");
+			if ( ! $res->is_success || ! $res->header("Content-Length") ) {
+				if ( $res->code == 404 ) {
+					if ( $sequence == $max_sequence ) {
+						# potential edge cases with incorrect DASH manifests
+						main::logger "\nWARNING: File segment not available from server [$sequence]\n";
+						main::logger "WARNING: This is the final file segment of the programme\n";
+						main::logger "WARNING: It may be incorrectly flagged as unavailable due to inaccurate programme data\n";
+						main::logger "WARNING: Check the end of the downloaded file to ensure it is complete\n";
+						if ( $opt->{verbose} ) {
+							main::logger "WARNING: File segment URL: $curr_segment_url\n";
+						}
+					} else {
+						# don't retry if 404 received
+						@warnings = (
+							"File segment not available from server [$sequence]",
+							"This is NOT a problem with get_iplayer. It is a problem with the BBC media stream."
+						);
+						$return = 2;
+					}
+					$got404 = 1;
+					last;
+				}
+			} else {
+				last;
+			}
+		}
+		# bail out if not available
+		last if $got404;
+		# bail out on download failure
+		if ( $i == $retries ) {
+			@warnings = (
+				"Failed to download file segment [$sequence]",
+				"Response: ${\$res->code()} ${\$res->message()}"
+			);
+			$return = 1;
+			last;
+		}
+		my $size_diff = $size - $prev_size;
+		# verify segment size
+		unless ( $opt->{noverify} ) {
+			if ( $size_diff != $expected) {
+				close $rh unless $noresume;
+				@warnings = (
+					"Unexpected size for file segment [$sequence]",
+					"Expected: $expected  Downloaded: $size_diff",
+					"This indicates a problem with your network connection to the media server"
+				);
+				$return = 1;
+				last;
+			}
+		}
+		# capture resume data
+		unless ( $noresume ) {
+			if ( ! print $rh "$sequence,$size,$elapsed,$size_diff,$segment_duration,$begin_time\n" ) {
+				close $rh;
+				@warnings = (
+					"Unable to save resume data for file segment [$sequence]"
+				);
+				$return = 1;
+				last;
+			}
+		}
+		$prev_sequence = $sequence;
+		$prev_size = $size;
+		$prev_elapsed = $elapsed;
 	}
-	
-	# Add hashes option if required
-	push @cmdopts, '--hashes' if $opt->{hash};
-	
-	# Create symlink if required
-	$prog->create_symlink( $prog->{symlink}, $file_tmp ) if $opt->{symlink};
+	close $fh;
+	close $rh unless $noresume;
 
-	# Deal with stdout streaming
-	if ( $opt->{stdout} && not $opt->{nowrite} ) {
-		main::logger "ERROR: Cannot stream RTMP to STDOUT and file simultaneously\n";
-		exit 4;
+	# summary stats
+	unless ( $hide_progress || $opt->{logprogress} ) {
+		main::logger "${crlf}".(" " x ($opt->{verbose} || $opt->{hash} ? 120 : 80));
 	}
-	push @cmdopts, ( '--resume', '-o', $file_tmp ) if ! ( $opt->{stdout} && $opt->{nowrite} );
-	push @cmdopts, @{ $binopts->{flvstreamer} } if $binopts->{flvstreamer};
-	
-	my $return;
-	# Different invocation depending on version
-	# if playpath is defined
-	if ( $playpath ) {
-		@cmd = (
-			$bin->{flvstreamer},
-			'--port', $port,
-			'--protocol', $protocol,
-			'--playpath', $playpath,
-			'--host', $server,
-			$swfarg, $swfurl,
-			'--tcUrl', $tcurl,
-			'--app', $application,
-			'--pageUrl', $pageurl,
-			@cmdopts,
+	my $end_time = time() + 0.0001;
+	if ( $opt->{verbose} ) {
+		main::logger sprintf("${crlf}INFO: Downloaded: %.2f MB (%02d:%02d:%02d) [%d] in %02d:%02d:%02d \@ %.2f Mb/s (%s/%s) [%s]\n",
+			($prev_size - $resume_size) / 1000000.0,
+			(gmtime($prev_elapsed - $resume_elapsed))[2,1,0],
+			max($prev_sequence - $resume_sequence + 1, 0),
+			(gmtime($end_time - $begin_time))[2,1,0],
+			($prev_size - $resume_size) / ($end_time - $begin_time) / 1000000.0 * 8.0,
+			$prog_mode,
+			$prog_cdn,
+			$prog_kind,
 		);
-	# Using just streamurl (i.e. no playpath defined)
 	} else {
-		@cmd = (
-			$bin->{flvstreamer},
-			'--port', $port,
-			'--protocol', $protocol,
-			'--rtmp', $streamdata{streamurl},
-			@cmdopts,
+		main::logger sprintf("${crlf}INFO: Downloaded: %.2f MB (%02d:%02d:%02d) \@ %.2f Mb/s (%s/%s) [%s]\n",
+			($prev_size - $resume_size) / 1000000.0,
+			(gmtime($prev_elapsed - $resume_elapsed))[2,1,0],
+			($prev_size - $resume_size) / ($end_time - $begin_time) / 1000000.0 * 8.0,
+			$prog_mode,
+			$prog_cdn,
+			$prog_kind,
 		);
 	}
 
-	$return = main::run_cmd( 'normal', @cmd );
-
-	# exit behaviour when streaming
-	if ( $opt->{nowrite} && $opt->{stdout} ) {
-		if ( $return == 0 ) {
-			main::logger "\nINFO: Streaming completed successfully\n";
-			return 0;
-		} else {
-			main::logger "\nINFO: Streaming failed with exit code $return\n";
-			return 'abort';
-		}
-	}
-
-	# if we fail during the rtmp streaming, try to resume (this gets new streamdata again so that it isn't stale)
-	return 'retry' if $return && -f $file_tmp && stat($file_tmp)->size > $prog->min_download_size();
-
-	# If file is too small or non-existent then delete and try next mode
-	if ( (! -f $file_tmp) || ( -f $file_tmp && stat($file_tmp)->size < $prog->min_download_size()) ) {
-		main::logger "WARNING: Failed to stream file $file_tmp via RTMP\n";
-		unlink $file_tmp;
-		return 'next';
-	}
-	
-	# Retain raw flv format if required
-	if ( $opt->{raw} ) {
-		move($file_tmp, $prog->{filename}) if $file_tmp ne $prog->{filename} && ! $opt->{stdout};
-		return 0;
-
-	# Convert flv to mp3/aac
-	} elsif ( $mode =~ /^flashaudio/ ) {
-		# We could do id3 tagging here with ffmpeg but id3v2 does this later anyway
-		# This fails
-		# $cmd = "$bin->{ffmpeg} -i \"$file_tmp\" -vn -acodec copy -y \"$prog->{filepart}\" 1>&2";
-		# This works but it's really bad bacause it re-transcodes mp3 and takes forever :-(
-		# $cmd = "$bin->{ffmpeg} -i \"$file_tmp\" -acodec libmp3lame -ac 2 -ab 128k -vn -y \"$prog->{filepart}\" 1>&2";
-		# At last this removes the flv container and dumps the mp3 stream! - mplayer dumps core but apparently succeeds
-		@cmd = (
-			$bin->{mplayer},
-			@{ $binopts->{mplayer} },
-			'-dumpaudio',
-			$file_tmp,
-			'-dumpfile', $prog->{filepart},
-		);
-	# Convert flv to aac/mp4a/mp3
-	} elsif ( $mode =~ /flashaac/ ) {
-		# transcode to MP3 if directed. If mp3vbr is not set then perform CBR.
-		if ( $opt->{aactomp3} ) {
-			my @br_opts = ('-ab', '128k');
-			if ( $opt->{mp3vbr} =~ /^\d$/ ) {
-				@br_opts = ('-aq', $opt->{mp3vbr});
-			}
-			@cmd = (
-				$bin->{ffmpeg},
-				'-i', $file_tmp,
-				'-vn',
-				'-acodec', 'libmp3lame', '-ac', '2', @br_opts,
-				'-y', $prog->{filepart},
-			);
-		} else {
-			@cmd = (
-				$bin->{ffmpeg},
-				'-i', $file_tmp,
-				'-vn',
-				'-acodec', 'copy',
-				'-y', $prog->{filepart},
+	# retry if we fail during streaming
+	if ( $return ) {
+		main::logger "WARNING: ".(join "\nWARNING: ", @warnings)."\n" if @warnings;
+		if ( $opt->{verbose} ) {
+			main::logger "WARNING: File segment URL: $curr_segment_url\n";
+			main::logger sprintf("WARNING: Stopped downloading at: %.2f MB (%02d:%02d:%02d) [%d]\n",
+				$prev_size / 1000000.0,
+				(gmtime($prev_elapsed))[2,1,0],
+				$prev_sequence
 			);
 		}
-	# Convert video flv to mkv if required
-	} elsif ( $opt->{mkv} ) {
-		@cmd = (
-			$bin->{ffmpeg},
-			'-i', $file_tmp,
-			'-vcodec', 'copy',
-			'-acodec', 'copy',
-			'-y', $prog->{filepart},
-		);
-	# Convert video flv to mp4/avi if required
-	} else {
-		@cmd = (
-			$bin->{ffmpeg},
-			'-i', $file_tmp,
-			'-vcodec', 'copy',
-			'-acodec', 'copy',
-			'-f', $prog->{ext},
-			'-y', $prog->{filepart},
-		);
+		return $return > 1 ? 'next' : 'retry';
 	}
 
-	# Run flv conversion and delete source file on success
-	my $return = main::run_cmd( 'STDERR', @cmd );
-	if ( (! $return) && -f $prog->{filepart} && stat($prog->{filepart})->size > $prog->min_download_size() ) {
-			unlink( $file_tmp );
-
-			# If we have an aac file use ffmpeg to pack in m4a container and remove adts headers
-			# Have to do a second ffmpeg call because remuxing flv to m4a with -absf aac_adtstoasc gives corrupt m4a
-			# flv -> aac -> m4a works
-			if ( $mode =~ /flashaac/ && $prog->{ext} eq 'aac' && ! $opt->{aactomp3} ) {
-
-				# Temp file is now partial file from flv->aac conversion
-				# Change the extension to m4a for later info / debug messages
-				# final and partial filenames use new extension
-				$file_tmp = $prog->{filepart};
-				$prog->{ext} = 'm4a';
-				$prog->{filename} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.$prog->{ext}");
-				$prog->{filepart} = File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.partial.$prog->{ext}");
-
-				@cmd = (
-					$bin->{ffmpeg},
-					'-i', $file_tmp,
-					'-vn',
-					'-acodec', 'copy',
-					'-absf', 'aac_adtstoasc',
-					'-y', $prog->{filepart},
-				);
+	# clear resume data
+	unlink $resume_file;
 
-				# Run aac conversion and delete source file on success
-				my $return = main::run_cmd( 'STDERR', @cmd );
-				if ( (! $return) && -f $prog->{filepart} && stat($prog->{filepart})->size > $prog->min_download_size() ) {
-					unlink( $file_tmp );
-
-				# If the ffmpeg conversion failed, remove the failed-converted file attempt - move the file as done anyway
-				} else {
-					main::logger "WARNING: aac conversion failed - retaining aac file\n";
-					unlink $prog->{filepart};
-					$prog->{filepart} = $file_tmp;
-					$prog->{filename} = $file_tmp;
-
-					# reset the extension to aac for later info / debug messages
-					$prog->{ext} = 'aac';
-				}
-			}
-
-	# If the ffmpeg conversion failed, remove the failed-converted file attempt - move the file as done anyway
-	} else {
-		main::logger "WARNING: flv conversion failed - retaining flv file\n";
-		unlink $prog->{filepart};
-		$prog->{filepart} = $file_tmp;
-		$prog->{filename} = $file_tmp;
+	if ( $resuming ) {
+		# summary for file
+		main::logger sprintf("INFO: Downloaded (total): %.2f MB (%02d:%02d:%02d) [%d]\n",
+			$prev_size / 1000000.0,
+			(gmtime($prev_elapsed - $start_elapsed))[2,1,0],
+			$prev_sequence - $start_sequence + 1
+		) if $opt->{verbose};
 	}
-	# Moving file into place as complete (if not stdout)
-	move($prog->{filepart}, $prog->{filename}) if $prog->{filepart} ne $prog->{filename} && ! $opt->{stdout};
-	
-	# Re-symlink file
-	$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
 
-	main::logger "INFO: Recorded $prog->{filename}\n";
 	return 0;
 }
 
+################### DASH Streamer class #################
+package Streamer::dash;
 
-
-package Streamer::rtsp;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
+# Inherit from Streamer::hls class
+use base 'Streamer::hls';
+use File::Basename;
 use File::Copy;
-use File::Path;
 use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
+use List::Util qw(max);
 use strict;
-use Time::Local;
-use URI;
 
+sub generate_segments {
+	my ($self, $media ) = @_;
+	return undef if ! $media;
+	my $segments;
+	for my $sequence ( $media->{start_number} .. $media->{stop_number} ) {
+		my $segment_url;
+		if ( $sequence == $media->{start_number} ) {
+			($segment_url = $media->{init_template}) =~ s/\$RepresentationID\$/$media->{id}/;
+			$segments->{$sequence - 1} = { 'url' => $segment_url, 'duration' => 0, 'initialization' => 1 };
+		}
+		($segment_url = $media->{media_template}) =~ s/\$RepresentationID\$/$media->{id}/;
+		$segment_url =~ s/\$Number\$/$sequence/;
+		$segments->{$sequence} = { 'url' => $segment_url, 'duration' => $media->{segment_duration} };
+	}
+	return $segments;
+}
 
-# %prog (only for lame id3 tagging and {mode})
-# Actually do the rtsp streaming
 sub get {
-	my ( $stream, $ua, $url, $prog ) = @_;
-	my $childpid;
+	my ( $self, $ua, $url, $prog, $version, %streamdata ) = @_;
+	my $rc;
 
-	# get bandwidth options value
-	# Download bandwidth bps used for rtsp streams
-	my $bandwidth = $opt->{bandwidth} || 512000;
-
-	# Parse/recurse playlist if required to get mms url
-	$url = main::get_playlist_url( $ua, $url, 'rtsp' );
-
-	# Add stop and start if defined
-	# append: ?start=5400&end=7400 or &start=5400&end=7400
-	if ( $opt->{start} || $opt->{stop} ) {
-		# Make sure we add the correct separator for adding to the rtsp url
-		my $prefix_char = '?';
-		$prefix_char = '&' if $url =~ m/\?.+/;
-		if ( $opt->{start} && $opt->{stop} ) {
-			$url .= "${prefix_char}start=$opt->{start}&end=$opt->{stop}";
-		} elsif ( $opt->{start} && not $opt->{stop} ) {
-			$url .= "${prefix_char}start=$opt->{start}";
-		} elsif ( $opt->{stop} && not $opt->{start} ) {
-			$url .= "${prefix_char}end=$opt->{stop}";
+	# audio files
+	my $audio_prefix = $prog->{fileprefix};
+	my $audio_tmp = main::encode_fs(File::Spec->catfile($prog->{dir}, "${audio_prefix}.audio.m4a"));
+	my $audio_file = main::encode_fs(File::Spec->catfile($prog->{dir}, "${audio_prefix}.dash.m4a"));
+	my $audio_raw = $prog->{type} eq "tv" ? $prog->{rawaudio} : $prog->{filename};
+
+	# video files
+	my $video_prefix = $prog->{fileprefix};
+	my $video_tmp = main::encode_fs(File::Spec->catfile($prog->{dir}, "${video_prefix}.video.m4v"));
+	my $video_file = main::encode_fs(File::Spec->catfile($prog->{dir}, "${video_prefix}.dash.m4v"));
+	my $video_raw = $prog->{rawvideo};
+
+	if ( $opt->{overwrite} ) {
+		unlink ( $audio_file, $video_file );
+	} else {
+		my $skip;
+		if ( -f $audio_file ) {
+			main::logger "WARNING: Using existing DASH audio file: $audio_file\n";
+			$skip = 1;
+		}
+		if ( $prog->{type} eq "tv" && -f $video_file ) {
+			main::logger "WARNING: Using existing DASH video file: $video_file\n";
+			$skip = 1;
+		}
+		if ( $skip ) {
+			main::logger "WARNING: Use --overwrite to re-download\n";
 		}
 	}
-	
-	# Create named pipe
-	if ( $^O !~ /^MSWin32$/ ) {
-		mkfifo($namedpipe, 0700);
-	} else {
-		main::logger "WARNING: fifos/named pipes are not supported - only limited output modes will be supported\n";
-	}
-	
-	main::logger "INFO: RTSP URL = $url\n" if $opt->{verbose};
 
-	# Create ID3 tagging options for lame (escape " for shell)
-	my ( $id3_name, $id3_episode, $id3_desc, $id3_channel ) = ( $prog->{name}, $prog->{episode}, $prog->{desc}, $prog->{channel} );
-	s|"|\\"|g for ($id3_name, $id3_episode, $id3_desc, $id3_channel);
-	$binopts->{lame} .= " --ignore-tag-errors --ty ".( (localtime())[5] + 1900 )." --tl \"$id3_name\" --tt \"$id3_episode\" --ta \"$id3_channel\" --tc \"$id3_desc\" ";
-
-	# Use post-streaming transcoding using lame if namedpipes are not supported (i.e. ActivePerl/Windows)
-	# (Fallback if no namedpipe support and raw/wav not specified)
-	if ( ( ! -p $namedpipe ) && ! ( $opt->{raw} || $opt->{wav} ) ) {
-			my @cmd;
-			# Remove filename extension
-			$prog->{filepart} =~ s/\.mp3$//gi;
-			# Remove named pipe
-			unlink $namedpipe;
-			main::logger "INFO: Recording wav format (followed by transcoding)\n";
-			my $wavfile = "$prog->{filepart}.wav";
-			# Strip off any leading drivename in win32 - mplayer doesn't like this for pcm output files
-			$wavfile =~ s|^[a-zA-Z]:||g;
-			@cmd = (
-				$bin->{mplayer},
-				@{ $binopts->{mplayer} },
-				'-cache', 128,
-				'-bandwidth', $bandwidth,
-				'-vc', 'null',
-				'-vo', 'null',
-				'-ao', "pcm:waveheader:fast:file=\"$wavfile\"",
-				$url,
-			);
-			# Create symlink if required
-			$prog->create_symlink( $prog->{symlink}, "$prog->{filepart}.wav" ) if $opt->{symlink};
-			if ( main::run_cmd( 'STDERR', @cmd ) ) {
-				unlink $prog->{symlink};
-				return 'next';
-			}
-			# Transcode
-			main::logger "INFO: Transcoding $prog->{filepart}.wav\n";
-			my $cmd = "$bin->{lame} $binopts->{lame} \"$prog->{filepart}.wav\" \"$prog->{filepart}.mp3\" 1>&2";
-			main::logger "DEGUG: Running $cmd\n" if $opt->{debug};
-			# Create symlink if required
-			$prog->create_symlink( $prog->{symlink}, "$prog->{filepart}.mp3" ) if $opt->{symlink};		
-			if ( system($cmd) || (-f "$prog->{filepart}.wav" && stat("$prog->{filepart}.wav")->size < $prog->min_download_size()) ) {
-				unlink $prog->{symlink};
-				return 'next';
-			}
-			unlink "$prog->{filepart}.wav";
-			move "$prog->{filepart}.mp3", $prog->{filename};
-			$prog->{ext} = 'mp3';
-		
-	} elsif ( $opt->{wav} && ! $opt->{stdout} ) {
-		main::logger "INFO: Writing wav format\n";
-		my $wavfile = $prog->{filepart};
-		# Strip off any leading drivename in win32 - mplayer doesn't like this for pcm output files
-		$wavfile =~ s|^[a-zA-Z]:||g;
-		# Start the mplayer process and write to wav file
-		my @cmd = (
-			$bin->{mplayer},
-			@{ $binopts->{mplayer} },
-			'-cache', 128,
-			'-bandwidth', $bandwidth,
-			'-vc', 'null',
-			'-vo', 'null',
-			'-ao', "pcm:waveheader:fast:file=\"$wavfile\"",
-			$url,
-		);
-		# Create symlink if required
-		$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};		
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			unlink $prog->{symlink};
+	unless ( -f $audio_file ) {
+		my $audio_media = $streamdata{audio_media};
+		$streamdata{file_size} = $audio_media->{file_size};
+		$streamdata{media_bitrate} = $audio_media->{bitrate};
+		$streamdata{kind} = "audio";
+		my $segments = $self->generate_segments($audio_media);
+		if ( keys %{$segments} <= 1 ) {
+			main::logger "ERROR: No file segments generated from DASH audio media\n";
 			return 'next';
 		}
-		# Move file to done state
-		move $prog->{filepart}, $prog->{filename} if $prog->{filepart} ne $prog->{filename} && ! $opt->{nowrite};
-
-	# No transcoding if --raw was specified
-	} elsif ( $opt->{raw} && ! $opt->{stdout} ) {
-		# Write out to .ra ext instead (used on fallback if no fifo support)
-		main::logger "INFO: Writing raw realaudio stream\n";
-		# Start the mplayer process and write to raw file
-		my @cmd = (
-			$bin->{mplayer},
-			@{ $binopts->{mplayer} },
-			'-cache', 128,
-			'-bandwidth', $bandwidth,
-			'-dumpstream',
-			'-dumpfile', $prog->{filepart},
-			$url,
-		);
-		# Create symlink if required
-		$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};		
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			unlink $prog->{symlink};
-			return 'next';
+		$rc = $self->fetch( $ua, $segments, $audio_tmp, $prog, %streamdata );
+		return $rc if $rc;
+		if ( ! move($audio_tmp, $audio_file) ) {
+			main::logger "ERROR: Could not rename file: $audio_tmp\n";
+			main::logger "ERROR: Destination file name: $audio_file\n";
+			return 'skip';
 		}
-		# Move file to done state
-		move $prog->{filepart}, $prog->{filename} if $prog->{filepart} ne $prog->{filename} && ! $opt->{nowrite};
-
-	# Fork a child to do transcoding on the fly using a named pipe written to by mplayer
-	# Use transcoding via named pipes
-	} elsif ( -p $namedpipe )  {
-		$childpid = fork();
-		if (! $childpid) {
-			# Child starts here
-			$| = 1;
-			main::logger "INFO: Transcoding $prog->{filepart}\n";
-
-			# Stream mp3 to file and stdout simultaneously
-			if ( $opt->{stdout} && ! $opt->{nowrite} ) {
-				# Create symlink if required
-				$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};
-				if ( $opt->{wav} || $opt->{raw} ) {
-					# Race condition - closes named pipe immediately unless we wait
-					sleep 5;
-					# Create symlink if required
-					$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};
-					main::tee($namedpipe, $prog->{filepart});
-					#system( "cat $namedpipe 2>/dev/null| $bin->{tee} $prog->{filepart}");
-				} else {
-					my $cmd = "$bin->{lame} $binopts->{lame} \"$namedpipe\" - 2>/dev/null| $bin->{tee} \"$prog->{filepart}\"";
-					main::logger "DEGUG: Running $cmd\n" if $opt->{debug};
-					# Create symlink if required
-					$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};
-					system($cmd);
-				}
+	}
 
-			# Stream mp3 stdout only
-			} elsif ( $opt->{stdout} && $opt->{nowrite} ) {
-				if ( $opt->{wav} || $opt->{raw} ) {
-					sleep 5;
-					main::tee($namedpipe);
-					#system( "cat $namedpipe 2>/dev/null");
-				} else {
-					my $cmd = "$bin->{lame} $binopts->{lame} \"$namedpipe\" - 2>/dev/null";
-					main::logger "DEGUG: Running $cmd\n" if $opt->{debug};
-					system( "$bin->{lame} $binopts->{lame} \"$namedpipe\" - 2>/dev/null");
-				}
-
-			# Stream mp3 to file directly
-			} elsif ( ! $opt->{stdout} ) {
-				my $cmd = "$bin->{lame} $binopts->{lame} \"$namedpipe\" \"$prog->{filepart}\" >/dev/null 2>/dev/null";
-				main::logger "DEGUG: Running $cmd\n" if $opt->{debug};
-				# Create symlink if required
-				$prog->create_symlink( $prog->{symlink}, $prog->{filepart} ) if $opt->{symlink};
-				system($cmd);
-			}
-			# Remove named pipe
-			unlink $namedpipe;
-
-			# Move file to done state
-			move $prog->{filepart}, $prog->{filename} if $prog->{filepart} ne $prog->{filename} && ! $opt->{nowrite};
-			main::logger "INFO: Transcoding thread has completed\n";
-			# Re-symlink if required
-			$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
-			exit 0;
-		}
-		# Start the mplayer process and write to named pipe
-		# Raw mode
-		if ( $opt->{raw} ) {
-			my @cmd = (
-				$bin->{mplayer},
-				@{ $binopts->{mplayer} },
-				'-cache', 32,
-				'-bandwidth', $bandwidth,
-				'-dumpstream',
-				'-dumpfile', $namedpipe,
-				$url,
-			);
-			if ( main::run_cmd( 'STDERR', @cmd ) ) {
-				# If we fail then kill off child processes
-				kill 9, $childpid;
-				unlink $prog->{symlink};
+	if ( $prog->{type} eq "tv" && ! $opt->{audioonly} ) {
+		unless ( -f $video_file ) {
+			my $video_media = $streamdata{video_media};
+			$streamdata{file_size} = $video_media->{file_size};
+			$streamdata{media_bitrate} = $video_media->{bitrate};
+			$streamdata{kind} = "video";
+			my $segments = $self->generate_segments($video_media);
+			if ( keys %{$segments} <= 1 ) {
+				main::logger "ERROR: No file segments generated from DASH video media\n";
 				return 'next';
 			}
-		# WAV / mp3 mode - seems to fail....
-		} else {
-			my @cmd = (
-				$bin->{mplayer},
-				@{ $binopts->{mplayer} },
-				'-cache', 128,
-				'-bandwidth', $bandwidth,
-				'-vc', 'null',
-				'-vo', 'null',
-				'-ao', "pcm:waveheader:fast:file=$namedpipe",
-				$url,
-			);
-			if ( main::run_cmd( 'STDERR', @cmd ) ) {
-				# If we fail then kill off child processes
-				kill 9, $childpid;
-				unlink $prog->{symlink};
-				return 'next';
+			$rc = $self->fetch( $ua, $segments, $video_tmp, $prog, %streamdata );
+			return $rc if $rc;
+			if ( ! move($video_tmp, $video_file) ) {
+				main::logger "ERROR: Could not rename file: $video_tmp\n";
+				main::logger "ERROR: Destination file name: $video_file\n";
+				return 'skip';
 			}
 		}
-		# Wait for child processes to prevent zombies
-		wait;
-
-		unlink $namedpipe;
 	} else {
-		main::logger "ERROR: Unsupported method of download on this platform\n";
-		return 'next';
+		unlink ( $video_tmp, $video_file );
 	}
 
-	main::logger "INFO: Recorded $prog->{filename}\n";
-	# Re-symlink if required
-	$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
-
-	return 0;
-}
-
-
-
-
-package Streamer::mms;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-
-
-# %prog (only used for {mode} and generating multi-part file prefixes)
-# Actually do the MMS video streaming
-sub get {
-	my ( $stream, $ua, $urls, $prog ) = @_;
-	my $file_tmp;
-	my $cmd;
-	my @url_list = split /\|/, $urls;
-	my @file_tmp_list;
-	my %threadpid;
-	my $retries = $opt->{attempts} || 3;
-
-	main::logger "INFO: MMS_URLs: ".(join ', ', @url_list).", file: $prog->{filepart}, file_done: $prog->{filename}\n" if $opt->{verbose};
-
-	if ( $opt->{stdout} ) {
-		main::logger "ERROR: stdout streaming isn't supported for mms streams\n";
-		return 'next';
-	}
-
-	# Start marker
-	my $start_time = time();
-	# Download each mms url (multi-threaded to stream in parallel)
-	my $file_part_prefix = "$prog->{dir}/$prog->{fileprefix}_part";
-	for ( my $count = 0; $count <= $#url_list; $count++ ) {
-		
-		# Parse/recurse playlist if required to get mms url
-		$url_list[$count] = main::get_playlist_url( $ua, $url_list[$count], 'mms' );
-
-		# Create temp recording filename
-		$file_tmp = sprintf( "%s%02d.".$prog->{ext}, $file_part_prefix, $count+1);
-		$file_tmp_list[$count] = $file_tmp;
-		#my $null;
-		#$null = '-really-quiet' if ! $opt->{quiet};
-		# Can also use 'mencoder mms://url/ -oac copy -ovc copy -o out.asf' - still gives zero exit code on failed stream...
-		# Can also use $bin->{vlc} --sout file/asf:\"$file_tmp\" \"$url_list[$count]\" vlc://quit
-		# The vlc cmd does not quit of there is an error - it just hangs
-		# $cmd = "$bin->{mplayer} $binopts->{mplayer} -dumpstream \"$url_list[$count]\" -dumpfile \"$file_tmp\" $null 1>&2";
-		# Use backticks to invoke mplayer and grab all output then grep for 'read error'
-		# problem is that the following output is given by mplayer at the end of liong streams:
-		#read error:: Operation now in progress
-		#pre-header read failed
-		#Core dumped ;)
-		#vo: x11 uninit called but X11 not initialized..
-		#
-		#Exiting... (End of file)
-		$cmd = "\"$bin->{mplayer}\" ".(join ' ', @{ $binopts->{mplayer} } )." -dumpstream \"$url_list[$count]\" -dumpfile \"$file_tmp\" 2>&1";
-		main::logger "INFO: Command: $cmd\n" if $opt->{verbose};
-
-		# fork streaming threads
-		if ( not $opt->{mmsnothread} ) {
-			my $childpid = fork();
-			if (! $childpid) {
-				# Child starts here
-				main::logger "INFO: Streaming to file $file_tmp\n";
-				# Remove old file
-				unlink $file_tmp;
-				# Retry loop
-				my $retry = $retries;
-				while ($retry) {
-					my $cmdoutput = `$cmd`;
-					my $exitcode = $?;
-					main::logger "DEBUG: Command '$cmd', Output:\n$cmdoutput\n\n" if $opt->{debug};
-					# Assume file is fully downloaded if > 10MB and we get an error reported !!!
-					if ( ( -f $prog->{filename} && stat($prog->{filename})->size < $prog->min_download_size()*10.0 && grep /(read error|connect error|Failed, exiting)/i, $cmdoutput ) || $exitcode ) {
-						# Failed, retry
-						main::logger "WARNING: Failed, retrying to stream $file_tmp, exit code: $exitcode\n";
-						$retry--;
-					} else {
-						# Successfully streamed
-						main::logger "INFO: Streaming thread has completed for file $file_tmp\n";
-						exit 0;
-					}
-				}
-				main::logger "ERROR: Record thread failed after $retries retries for $file_tmp (renamed to ${file_tmp}.failed)\n";
-				move $file_tmp, "${file_tmp}.failed";
-				exit 1;
-			}
-			# Create a hash of process_id => 'count'
-			$threadpid{$childpid} = $count;
-
-		# else stream each part in turn
-		} else {
-			# Child starts here
-			main::logger "INFO: Recording file $file_tmp\n";
-			# Remove old file
-			unlink $file_tmp;
-			# Retry loop
-			my $retry = $retries;
-			my $done = 0;
-			while ( $retry && not $done ) {
-				my $cmdoutput = `$cmd`;
-				my $exitcode = $?;
-				main::logger "DEBUG: Command '$cmd', Output:\n$cmdoutput\n\n" if $opt->{debug};
-				# Assume file is fully downloaded if > 10MB and we get an error reported !!!
-				if ( ( -f $prog->{filename} && stat($prog->{filename})->size < $prog->min_download_size()*10.0 && grep /(read error|connect error|Failed, exiting)/i, $cmdoutput ) || $exitcode ) {
-				#if ( grep /(read error|connect error|Failed, exiting)/i, $cmdoutput || $exitcode ) {
-					# Failed, retry
-					main::logger "DEBUG: Trace of failed command:\n####################\n${cmdoutput}\n####################\n" if $opt->{debug};
-					main::logger "WARNING: Failed, retrying to stream $file_tmp, exit code: $exitcode\n";
-					$retry--;
-				} else {
-					# Successfully downloaded
-					main::logger "INFO: Streaming has completed to file $file_tmp\n";
-					$done = 1;
-				}
-			} 
-			# if the programme part failed after a few retries...
-			if (not $done) {
-				main::logger "ERROR: Recording failed after $retries retries for $file_tmp (renamed to ${file_tmp}.failed)\n";
-				move $file_tmp, "${file_tmp}.failed";
-				return 'next';
+	if ( $opt->{raw} ) {
+		if ( ! move($audio_file, $audio_raw) ) {
+			main::logger "ERROR: Could not rename file: $audio_file\n";
+			main::logger "ERROR: Destination file name: $audio_raw\n";
+			return 'skip';
+		}
+		if ( $prog->{type} eq "tv" && ! $opt->{audioonly} ) {
+			if ( ! move($video_file, $video_raw) ) {
+				main::logger "ERROR: Could not rename file: $video_file\n";
+				main::logger "ERROR: Destination file name: $video_raw\n";
+				return 'skip';
 			}
-		} 
-	}
-
-	# If doing a threaded streaming, monitor the progress and thread completion
-	if ( not $opt->{mmsnothread} ) {
-		# Wait for all threads to complete
-		$| = 1;
-		# Autoreap zombies
-		$SIG{CHLD}='IGNORE';
-		my $done = 0;
-		my $done_symlink;
-		while (keys %threadpid) {
-			my @sizes;
-			my $total_size = 0;
-			my $total_size_new = 0;
-			my $format = "Threads: ";
-			sleep 1;
-			#main::logger "DEBUG: ProcessIDs: ".(join ',', keys %threadpid)."\n";
-			for my $procid (sort keys %threadpid) {
-				my $size = 0;
-				# Is this child still alive?
-				if ( kill 0 => $procid ) {
-					main::logger "DEBUG Thread $threadpid{$procid} still alive ($file_tmp_list[$threadpid{$procid}])\n" if $opt->{debug};
-					# Build the status string
-					$format .= "%d) %.3fMB   ";
-					$size = stat($file_tmp_list[$threadpid{$procid}])->size if -f $file_tmp_list[$threadpid{$procid}];
-					push @sizes, $threadpid{$procid}+1, $size/(1024.0*1024.0);
-					$total_size_new += $size;
-					# Now create a symlink if this is the first part and size > $prog->min_download_size()
-					if ( $threadpid{$procid} == 0 && $done_symlink != 1 && $opt->{symlink} && $size > $prog->min_download_size() ) {
-						# Symlink to file if only one part or to dir if multi-part
-						if ( $#url_list ) {
-							$prog->create_symlink( $prog->{symlink}, $prog->{dir} );
-						} else {
-							$prog->create_symlink( $prog->{symlink}, $file_tmp_list[$threadpid{$procid}] );
-						}
-						$done_symlink = 1;
-					}
-				# Thread has completed/failed
-				} else {
-					$size = stat($file_tmp_list[$threadpid{$procid}])->size if -f $file_tmp_list[$threadpid{$procid}];
-					# end marker
-					my $end_time = time() + 0.0001;
-					# Calculate average speed, duration and total bytes downloaded
-					main::logger sprintf("INFO: Thread #%d Recorded %.2fMB in %s at %5.0fkbps to %s\n", 
-						($threadpid{$procid}+1),
-						$size / (1024.0 * 1024.0),
-						sprintf("%02d:%02d:%02d", ( gmtime($end_time - $start_time))[2,1,0] ), 
-						$size / ($end_time - $start_time) / 1024.0 * 8.0,
-						$file_tmp_list[$threadpid{$procid}] );
-					# Remove from thread test list
-					delete $threadpid{$procid};
-				}
-			}
-			$format .= " recorded (%.0fkbps)        \r";
-			main::logger sprintf $format, @sizes, ($total_size_new - $total_size) / (time() - $start_time) / 1024.0 * 8.0;
-		}
-		main::logger "INFO: All streaming threads completed\n";	
-		# Unset autoreap
-		delete $SIG{CHLD};
-	}
-	# If not all files > min_size then assume streaming failed
-	for (@file_tmp_list) {
-		# If file doesnt exist or too small then skip
-		if ( (! -f $_) || ( -f $_ && stat($_)->size < $prog->min_download_size() ) ) {
-			main::logger "ERROR: Recording of programme failed, skipping\n" if $opt->{verbose};
-			return 'next';
 		}
+		return 0;
 	}
 
-#	# Retain raw format if required
-#	if ( $opt->{raw} ) {
-#		# Create symlink to first part file
-#		$prog->create_symlink( $prog->{symlink}, $file_tmp_list[0] ) if $opt->{symlink};
-#		return 0;
-#	}
-#
-#	# Convert video asf to mp4 if required - need to find a suitable converter...
-#	} else {
-#		# Create part of cmd that specifies each partial file
-#		my $filestring;
-#		$filestring .= " -i \"$_\" " for (@file_tmp_list);
-#		$cmd = "$bin->{ffmpeg} $binopts->{ffmpeg} $filestring -vcodec copy -acodec copy -f $prog->{ext} -y \"$prog->{filepart}\" 1>&2";
-#	}
-#
-#	main::logger "INFO: Command: $cmd\n\n" if $opt->{verbose};
-#	# Run asf conversion and delete source file on success
-#	if ( ! system($cmd) ) {
-#		unlink( @file_tmp_list );
-#	} else {
-#		main::logger "ERROR: asf conversion failed - retaining files ".(join ', ', @file_tmp_list)."\n";
-#		return 2;
-#	}
-#	# Moving file into place as complete (if not stdout)
-#	move($prog->{filepart}, $prog->{filename}) if ! $opt->{stdout};
-#	# Create symlink if required
-#	$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
-	return 0;
-}
-
-
-
-package Streamer::3gp;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-
-# Generic
-# Actually do the 3gp / N95 h.264 streaming
-sub get {
-	my ( $stream, $ua, $url, $prog ) = @_;
-
-	# Resolve URL if required
-	if ( $url =~ /^http/ ) {
-		my $url1 = main::request_url_retry($ua, $url, 2, '', '');
-		chomp($url1);
-		$url = $url1;
-	}
-
-	my @opts;
-	@opts = @{ $binopts->{vlc} } if $binopts->{vlc};
-
-	main::logger "INFO: URL = $url\n" if $opt->{verbose};
-	if ( ! $opt->{stdout} ) {
-		main::logger "INFO: Recording Low Quality H.264 stream\n";
-		my @cmd = (
-			$bin->{vlc},
-			@opts,
-			'--sout', 'file/ts:'.$prog->{filepart},
-			$url,
-			'vlc://quit',
-		);
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			return 'next';
-		}
-
-	# to STDOUT
+	if ( $prog->{type} eq "tv" && ! $opt->{audioonly} ) {
+		return $self->postproc($prog, $audio_file, $video_file, $ua);
 	} else {
-		main::logger "INFO: Streaming Low Quality H.264 stream to stdout\n";
-		my @cmd = (
-			$bin->{vlc},
-			@opts,
-			'--sout', 'file/ts:-',
-			$url,
-			'vlc://quit',
-		);
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			return 'next';
-		}
+		return $self->postproc($prog, $audio_file, undef, $ua);
 	}
-	main::logger "INFO: Recorded $prog->{filename}\n";
-	# Moving file into place as complete (if not stdout)
-	move($prog->{filepart}, $prog->{filename}) if $prog->{filepart} ne $prog->{filename} && ! $opt->{stdout};
-
-	$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
-
-	return 0;
 }
 
-
-
-package Streamer::http;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use HTML::Entities;
-use HTTP::Cookies;
-use HTTP::Headers;
-use IO::Seekable;
-use IO::Socket;
-use LWP::ConnCache;
-use LWP::UserAgent;
-use POSIX qw(mkfifo);
-use strict;
-use Time::Local;
-use URI;
-
-# Generic
-# Actually do the http streaming
-sub get {
-	my ( $stream, $ua, $url, $prog ) = @_;
-	my $start_time = time();
-
-	# Set user agent
-	$ua->agent('get_iplayer');
-
-	main::logger "INFO: URL = $url\n" if $opt->{verbose};
-
-	# Resume partial recording?
-	my $start = 0;
-	if ( -f $prog->{filepart} ) {
-		$start = stat($prog->{filepart})->size;
-		main::logger "INFO: Resuming recording from $start\n";
-	}
-
-	my $fh = main::open_file_append($prog->{filepart});
-
-	if ( main::download_block($prog->{filepart}, $url, $ua, $start, undef, undef, $fh) != 0 ) {
-		main::logger "\rERROR: Recording failed\n";
-		close $fh;
-		return 'next';
-	} else {
-		close $fh;
-		# end marker
-		my $end_time = time() + 0.0001;
-		# Final file size
-		my $size = stat($prog->{filepart})->size;
-		# Calculate average speed, duration and total bytes downloaded
-		main::logger sprintf("\rINFO: Recorded %.2fMB in %s at %5.0fkbps to %s\n", 
-			($size - $start) / (1024.0 * 1024.0),
-			sprintf("%02d:%02d:%02d", ( gmtime($end_time - $start_time))[2,1,0] ), 
-			( $size - $start ) / ($end_time - $start_time) / 1024.0 * 8.0, 
-			$prog->{filename} );
-		move $prog->{filepart}, $prog->{filename} if $prog->{filepart} ne $prog->{filename};
-		# re-symlink file
-		$prog->create_symlink( $prog->{symlink}, $prog->{filename} ) if $opt->{symlink};
+sub postproc {
+	my ( $self, $prog, $audio_file, $video_file, $ua ) = @_;
+	my @cmd;
+	my $return;
+	my $media_file = main::encode_fs(File::Spec->catfile($prog->{dir}, "$prog->{fileprefix}.dash.ts"));
+	$prog->ffmpeg_init();
+	if ( ! main::exists_in_path('ffmpeg') ) {
+		main::logger "WARNING: Required ffmpeg utility not found - cannot convert to MPEG-TS\n";
+		return 'stop';
+	}
+	my $audio_ok = $audio_file && -f $audio_file;
+	my $video_ok = $video_file && -f $video_file;
+	return 0 unless ( $audio_ok || $video_ok);
+	my @global_opts = ( '-y' );
+	my @input_opts;
+	push @input_opts, ( '-i', $audio_file ) if $audio_ok;
+	push @input_opts, ( '-i', $video_file ) if $video_ok;
+	my @codec_opts;
+	if ( ! $opt->{ffmpegobsolete} ) {
+		push @codec_opts, ( '-c:v', 'copy', '-c:a', 'copy' );
+	} else {
+		push @codec_opts, ( '-vcodec', 'copy', '-acodec', 'copy' );
+	}
+	my @stream_opts;
+	push @stream_opts, ( '-map', '0:a:0', '-map', '1:v:0' ) if $audio_ok && $video_ok;
+	my @filter_opts;
+	if ( ! $opt->{ffmpegobsolete} ) {
+		push @filter_opts, ( '-bsf:v', 'h264_mp4toannexb' );
+	} else {
+		push @filter_opts, ( '-vbsf', 'h264_mp4toannexb' );
+	}
+	@cmd = (
+		$bin->{ffmpeg},
+		@{ $binopts->{ffmpeg} },
+		@global_opts,
+		@input_opts,
+		@codec_opts,
+		@stream_opts,
+		@filter_opts,
+		$media_file,
+	);
+	main::logger "INFO: Converting to MPEG-TS\n";
+	$return = main::run_cmd( 'STDERR', @cmd );
+	my $min_download_size = main::progclass($prog->{type})->min_download_size();
+	if ( (! $return) && -f $media_file && stat($media_file)->size > $min_download_size ) {
+		unlink( $audio_file, $video_file );
+	} else {
+		unlink $media_file;
+		main::logger "ERROR: Conversion failed - retaining audio file: $audio_file\n" if $audio_ok;
+		main::logger "ERROR: Conversion failed - retaining video file: $video_file\n" if $video_ok;
+		return 'stop';
 	}
-
-	return 0;
-}
-
-
-
-package Streamer::filestreamonly;
-
-# Inherit from Streamer class
-use base 'Streamer';
-
-use Env qw[@PATH];
-use Fcntl;
-use File::Copy;
-use File::Path;
-use File::stat;
-use strict;
-
-# Generic
-# Actually do the file streaming
-sub get {
-	my ( $stream, $ua, $url, $prog ) = @_;
-	my $start_time = time();
-
-	main::logger "INFO: URL = $url\n" if $opt->{verbose};
-
-	# Just remove any existing file
-	unlink $prog->{filepart};
-	
-	# Streaming
-	if ( $opt->{stdout} && $opt->{nowrite} ) {
-		main::logger "INFO: Streaming $url to STDOUT\n" if $opt->{verbose};
-		if ( ! open(FH, "< $url") ) {
-			main::logger "ERROR: Cannot open $url: $!\n";
-			return 'next';
-		}
-		# Fix for binary - needed for Windows
-		binmode STDOUT;
-
-		# Read each char from command output and push to STDOUT
-		my $char;
-		my $bytes;
-		my $size = 200000;
-		while ( $bytes = read( FH, $char, $size ) ) {
-			if ( $bytes <= 0 ) {
-				close FH;
-				last;
-			} else {
-				print STDOUT $char;
-			}
-			last if $bytes < $size;
-		}
-		close FH;
-		main::logger "DEBUG: streaming $url completed\n" if $opt->{debug};
-
-	# Recording - disabled
+	if ( $prog->{type} eq "tv" && ! $opt->{audioonly} ) {
+		return $prog->postproc(undef, $media_file, $ua);
 	} else {
-		main::logger "\rERROR: Recording failed - this is a stream-only programme\n";
-		return 'next';
+		return $prog->postproc($media_file, undef, $ua);
 	}
-
-	return 0;
 }
 
 
-
 ############# PVR Class ##############
 package Pvr;
 
@@ -9028,20 +8407,20 @@
 sub opt_format {
 	return {
 		pvr		=> [ 0, "pvr|pvrrun|pvr-run!", 'PVR', '--pvr [pvr search name]', "Runs the PVR using all saved PVR searches (intended to be run every hour from cron etc). The list can be limited by adding a regex to the command. Synonyms: --pvrrun, --pvr-run"],
-		pvrexclude	=> [ 0, "pvrexclude|pvr-exclude=s", 'PVR', '--pvr-exclude <string>', "Exclude the PVR searches to run by search name (regex or comma separated values). Synonyms: --pvrexclude"],
+		pvrexclude	=> [ 0, "pvrexclude|pvr-exclude=s", 'PVR', '--pvr-exclude <string>', "Exclude the PVR searches to run by search name (comma-separated regex list). Defaults to substring match. Synonyms: --pvrexclude"],
 		pvrsingle	=> [ 0, "pvrsingle|pvr-single=s", 'PVR', '--pvr-single <search name>', "Runs a named PVR search. Synonyms: --pvrsingle"],
-		pvradd		=> [ 0, "pvradd|pvr-add=s", 'PVR', '--pvr-add <search name>', "Save the named PVR search with the specified search terms.  Search terms required. Use --search=.* to force download of all available programmes. Synonyms: --pvradd"],
+		pvradd		=> [ 0, "pvradd|pvr-add=s", 'PVR', '--pvr-add <search name>', "Save the named PVR search with the specified search terms. Search terms required unless --pid specified. Synonyms: --pvradd"],
 		pvrdel		=> [ 0, "pvrdel|pvr-del=s", 'PVR', '--pvr-del <search name>', "Remove the named search from the PVR searches. Synonyms: --pvrdel"],
 		pvrdisable	=> [ 1, "pvrdisable|pvr-disable=s", 'PVR', '--pvr-disable <search name>', "Disable (not delete) a named PVR search. Synonyms: --pvrdisable"],
 		pvrenable	=> [ 1, "pvrenable|pvr-enable=s", 'PVR', '--pvr-enable <search name>', "Enable a previously disabled named PVR search. Synonyms: --pvrenable"],
 		pvrlist		=> [ 0, "pvrlist|pvr-list!", 'PVR', '--pvr-list', "Show the PVR search list. Synonyms: --pvrlist"],
-		pvrqueue	=> [ 0, "pvrqueue|pvr-queue!", 'PVR', '--pvr-queue', "Add currently matched programmes to queue for later one-off recording using the --pvr option. Search terms required unless --pid specified. Use --search=.* to force download of all available programmes. Synonyms: --pvrqueue"],
+		pvrqueue	=> [ 0, "pvrqueue|pvr-queue!", 'PVR', '--pvr-queue', "Add currently matched programmes to queue for later one-off recording using the --pvr option. Search terms required unless --pid specified. Synonyms: --pvrqueue"],
 		pvrscheduler	=> [ 0, "pvrscheduler|pvr-scheduler=n", 'PVR', '--pvr-scheduler <seconds>', "Runs the PVR using all saved PVR searches every <seconds>. Synonyms: --pvrscheduler"],
+		pvrseries		=> [ 0, "pvrseries|pvr-series!", 'PVR', '--pvr-series', "Create PVR search for each unique series name in search results. Search terms required. Synonyms: --pvrseries"],
 		comment		=> [ 1, "comment=s", 'PVR', '--comment <string>', "Adds a comment to a PVR search"],
 	};
 }
 
-
 # Constructor
 # Usage: $pvr = Pvr->new();
 sub new {
@@ -9058,7 +8437,6 @@
 	bless $self, $type;
 }
 
-
 # Use to bind a new options ref to the class global $opt_ref var
 sub add_opt_object {
 	my $self = shift;
@@ -9075,7 +8453,6 @@
 	$Pvr::opt_cmdlineref = shift;
 }
 
-
 # Use to bind a new options ref to the class global $optref var
 sub setvar {
 	my $self = shift;
@@ -9089,7 +8466,6 @@
 	return $vars{$varname};
 }
 
-
 # $opt->{<option>} access method
 sub opt {
 	my $self = shift;
@@ -9097,7 +8473,6 @@
 	return $opt->{$optname};
 }
 
-
 # Load all PVR searches and run one-by-one
 # Usage: $pvr->run( [pvr search name] )
 sub run {
@@ -9118,16 +8493,26 @@
 	# For each PVR search (or single one if specified)
 	my @names = ( grep !/$exclude_regex/i, grep /$pvr_name_regex/i, sort {lc $a cmp lc $b} keys %{$pvr} );
 
+	my $retcode = 0;
 	main::logger "Running PVR Searches:\n";
 	for my $name ( @names ) {
+		main::print_divider;
 		# Ignore if this search is disabled
 		if ( $pvr->{$name}->{disable} ) {
-			main::logger "\nSkipping '$name' (disabled)\n" if $opt->{verbose};
+			main::logger "INFO: Skipping PVR search: '$name' (disabled)\n" if $opt->{verbose};
 			next;
 		}
-		main::logger "$name\n";
+		main::logger "INFO: PVR Run: '$name'\n";
 		# Clear then Load options for specified pvr search name
+		my $opt_backup;
+		my @backup_opts = grep /^(encoding|myap|myffmpeg|nowarn)/, keys %{$opt};
+		foreach ( @backup_opts ) {
+			$opt_backup->{$_} = $opt->{$_} if defined $opt->{$_};
+		}
 		my @search_args = $pvr->load_options($name);
+		foreach ( @backup_opts ) {
+			$opt->{$_} = $opt_backup->{$_} if defined $opt_backup->{$_};
+		}
 
 		## Display all options used for this pvr search
 		#$opt->display('Default Options', '(help|debug|get|^pvr)');
@@ -9135,26 +8520,35 @@
 		# Switch on --hide option
 		$opt->{hide} = 1;
 		# Switch off --future option (no point in checking future programmes)
-		$opt->{future} = '';
-		# Dont allow --refresh with --pvr
-		$opt->{refresh} = '';
+		$opt->{future} = 0;
+		# Don't allow --refresh with --pvr
+		$opt->{refresh} = 0;
+		# Don't allow --info with --pvr
+		$opt->{info} = 0;
 		# Do the recording (force --get option)
-		$opt->{get} = 1 if ! $opt->{test};
-
-		# If this is a one-off queue pid entry then delete the PVR entry upon successful recording(s)
-		if ( $pvr->{$name}->{pid} && $name =~ /^ONCE_/ ) {
-			my $failcount = main::find_pid_matches( $hist );
-			$pvr->del( $name ) if not $failcount;
+		$opt->{get} = 1;
 
+		my $failcount = 0;
+		if ( $pvr->{$name}->{pid} ) {
+			my @pids = split( /,/, $pvr->{$name}->{pid} );
+			$failcount = main::download_pid_matches( $hist, main::find_pid_matches( $hist, @pids ) );
 		# Just make recordings of matching progs
 		} else {
-			main::download_matches( $hist, main::find_matches( $hist, @search_args ) );
+			$failcount = main::download_matches( $hist, main::find_matches( $hist, @search_args ) );
+		}
+		# If this is a one-off queue entry then delete the PVR entry upon successful recording(s)
+		if ( $name =~ /^ONCE_/ && ! $failcount && ! $opt->{test} ) {
+			$pvr->del( $name );
+		}
+		if ( $failcount ) {
+			main::logger "WARNING: PVR Run: '$name': $failcount download failure(s)\n";
 		}
+		$retcode += $failcount;
 	}
+	main::purge_warning( $hist, 30 );
+	return $retcode;
 }
 
-
-
 sub run_scheduler {
 	my $pvr = shift;
 	my $interval = $opt->{pvrscheduler};
@@ -9164,7 +8558,14 @@
 	while ( 1 ) {
 		my $start_time = time();
 		$opt_cmdline->{pvr} = 1;
-		$pvr->run();
+		# empty mem cache before each run to force cache file refresh
+		for ( keys %$memcache ) {
+			delete $memcache->{$_};
+		}
+		my $retcode = $pvr->run();
+		if ( $retcode ) {
+			main::logger "WARNING: PVR Scheduler: ".localtime().": $retcode download failure(s) \n";
+		}
 		my $remaining = $interval - ( time() - $start_time );
 		if ( $remaining > 0 ) {
 			main::logger "INFO: Sleeping for $remaining secs\n";
@@ -9173,8 +8574,6 @@
 	}
 }
 
-
-
 # If queuing, only add pids because the index number might change by the time the pvr runs
 # If --pid and --type <type> is specified then add this prog also
 sub queue {
@@ -9187,10 +8586,10 @@
 
 	# PID and TYPE specified
 	if ( $opt_cmdline->{pid} ) {
-		# ensure we only have one prog type defined
-		if ( $opt->{type} && $opt->{type} !~ /,/ ) {
-			# Add to PVR if not already in history (unless multimode specified)
-			$pvr->add( "ONCE_$opt_cmdline->{pid}" ) if ( ! $hist->check( $opt_cmdline->{pid} ) ) || $opt->{multimode};
+		# ensure we only have one prog type defined (or none)
+		if ( $opt_cmdline->{type} !~ /,/ ) {
+			# Add to PVR if not already in history
+			$pvr->add( "ONCE_$opt_cmdline->{pid}" ) if ( ! $hist->check( $opt_cmdline->{pid} ) );
 		} else {
 			main::logger "ERROR: Cannot add a pid to the PVR queue without a single --type specified\n";
 			return 1;
@@ -9210,8 +8609,6 @@
 	return 0;
 }
 
-
-
 # Save the options on the cmdline as a PVR search with the specified name
 sub add {
 	my $pvr = shift;
@@ -9219,12 +8616,12 @@
 	my @search_args = @_;
 	my @options;
 	# validate name
-	if ( $name !~ m{[\w\-\+]+} ) {
+	if ( $name !~ m{[\w\-\+]+} || $name =~ m{^\-+} ) {
 		main::logger "ERROR: Invalid PVR search name '$name'\n";
 		return 1;
 	}
 	# Parse valid options and create array (ignore options from the options files that have not been overriden on the cmdline)
-	for ( grep !/(webrequest|future|nocopyright|^test|metadataonly|subsonly|thumbonly|tagonly|stdout|^get|refresh|^save|^prefs|help|expiry|nowrite|tree|terse|streaminfo|listformat|^list|showoptions|hide|info|pvr.*)$/, sort {lc $a cmp lc $b} keys %{$opt_cmdline} ) {
+	for ( grep !/(^cache|profiledir|encoding.*|silent|webrequest|future|nocopyright|^test|metadataonly|subsonly|thumbonly|tracklistonly|creditsonly|tagonly|^get|refresh|^save|^prefs|help|expiry|tree|terse|streaminfo|listformat|^list|showoptions|hide|info|pvr.*|^purge|markdownloaded)$/, sort {lc $a cmp lc $b} keys %{$opt_cmdline} ) {
 		if ( defined $opt_cmdline->{$_} ) {
 				push @options, "$_ $opt_cmdline->{$_}";
 				main::logger "DEBUG: Adding option $_ = $opt_cmdline->{$_}\n" if $opt->{debug};
@@ -9240,8 +8637,6 @@
 	return 0;
 }
 
-
-
 # Delete the named PVR search
 sub del {
 	my $pvr = shift;
@@ -9251,9 +8646,10 @@
 		main::logger "ERROR: Invalid PVR search name '$name'\n";
 		return 1;
 	}
+	my $pvr_file = File::Spec->catfile($vars{pvr_dir}, $name);
 	# Delete pvr search file
-	if ( -f $vars{pvr_dir}.$name ) {
-		unlink $vars{pvr_dir}.$name;
+	if ( -f $pvr_file ) {
+		unlink $pvr_file;
 		main::logger "INFO: Deleted PVR search '$name'\n";
 	} else {
 		main::logger "ERROR: PVR search '$name' does not exist\n";
@@ -9262,8 +8658,6 @@
 	return 0;
 }
 
-
-
 # Display all the PVR searches
 sub display_list {
 	my $pvr = shift;
@@ -9286,8 +8680,6 @@
 	return 0;
 }
 
-
-
 # Load all the PVR searches into %{$pvr}
 sub load_list {
 	my $pvr = shift;
@@ -9307,10 +8699,10 @@
 	# Close the directory
 	closedir DIR;
 	# process each file
-	for my $file (@files) {
-		chomp($file);
+	for my $name (@files) {
+		chomp($name);
 		# Re-add the dir
-		$file = "$vars{pvr_dir}/$file";
+		my $file = File::Spec->catfile($vars{pvr_dir}, $name);
 		next if ! -f $file;
 		if ( ! open (PVR, "< $file") ) {
 			main::logger "WARNING: Cannot read PVR search file $file\n";
@@ -9318,9 +8710,6 @@
 		}
 		my @options = <PVR>;
 		close PVR;
-		# Get search name from filename
-		my $name = $file;
-		$name =~ s/^.*\/([^\/]+?)$/$1/g;
 		for (@options) {
 			/^\s*([\w\-_]+?)\s+(.*)\s*$/;
 			main::logger "DEBUG: PVR search '$name': option $1 = $2\n" if $opt->{debug};
@@ -9332,8 +8721,6 @@
 	return 0;
 }
 
-
-
 # Clear all the PVR searches in %{$pvr}
 sub clear_list {
 	my $pvr = shift;
@@ -9342,21 +8729,20 @@
 	return 0;
 }
 
-
-
 # Save the array options specified as a PVR search
 sub save {
 	my $pvr = shift;
 	my $name = shift;
 	my @options = @_;
 	# Sanitize name
-	$name = StringUtils::sanitize_path( $name );
+	$name = StringUtils::sanitize_path( $name, 0, 1 );
 	# Make dir if not existing
 	mkpath $vars{pvr_dir} if ! -d $vars{pvr_dir};
 	main::logger "INFO: Saving PVR search '$name':\n";
 	# Open file
-	if ( ! open (PVR, "> $vars{pvr_dir}/${name}") ) { 
-		main::logger "ERROR: Cannot save PVR search to $vars{pvr_dir}.$name\n";
+	my $pvr_file = File::Spec->catfile($vars{pvr_dir}, $name);
+	if ( ! open (PVR, "> $pvr_file") ) {
+		main::logger "ERROR: Cannot save PVR search to $pvr_file\n";
 		return 1;
 	}
 	# Write options array to file
@@ -9368,7 +8754,6 @@
 	return 0;
 }
 
-
 # Uses globals: $profile_dir, $optfile_system, $optfile_default
 # Uses class globals: %opt, %opt_file, %opt_cmdline
 # Returns @search_args
@@ -9392,7 +8777,7 @@
 
 	# Load options from $optfile_preset into $opt (uses $opt_cmdline as readonly options for debug/verbose etc)
 	$opt->load( $opt_cmdline, $optfile_preset );
-	
+
 	# Clear search args
 	@search_args = ();
 	# Set each option from the search
@@ -9414,8 +8799,6 @@
 	return @search_args;
 }
 
-
-
 # Disable a PVR search by adding 'disable 1' option
 sub disable {
 	my $pvr = shift;
@@ -9431,8 +8814,6 @@
 	return 0;
 }
 
-
-
 # Re-enable a PVR search by removing 'disable 1' option
 sub enable {
 	my $pvr = shift;
@@ -9444,17 +8825,20 @@
 	}
 	# Remove the disable option
 	@options = grep !/^disable\s/, @options;
-	$pvr->save( $name, @options );	
+	$pvr->save( $name, @options );
 	return 0;
 }
 
-
+############# Tagger Class ##############
 package Tagger;
+
 use Encode;
 use File::stat;
+use constant FB_EMPTY => sub { '' };
 
 # already in scope
 # my ($opt, $bin);
+my $ap_check;
 
 # constructor
 sub new {
@@ -9463,10 +8847,30 @@
 	bless($self, $class);
 }
 
+# class command line options
+sub opt_format {
+	return {
+		atomicparsley	=> [ 0, "atomicparsley|atomic-parsley=s", 'External Program', '--atomicparsley <path>', "Location of AtomicParsley binary"],
+		noartwork => [ 1, "noartwork|no-artwork!", 'Tagging', '--no-artwork', "Do not embed thumbnail image in output file. Also removes existing artwork. All other metadata values will be written."],
+		notag => [ 1, "notag|no-tag!", 'Tagging', '--no-tag', "Do not tag downloaded programmes."],
+		tag_credits => [ 1, "tagcredits|tag-credits!", 'Tagging', '--tag-credits', "Add programme credits (if available) to lyrics field."],
+		tag_formatshow		=> [ 1, "tagformatshow|tag-format-show=s", 'Tagging', '--tag-format-show', "Format template for programme name in tag metadata. Use substitution parameters in template (see docs for list). Default: <name>"],
+		tag_formattitle		=> [ 1, "tagformattitle|tag-format-title=s", 'Tagging', '--tag-format-title', "Format template for episode title in tag metadata. Use substitution parameters in template (see docs for list). Default: <episodeshort>"],
+		tag_isodate		=> [ 1, "tagisodate|tag-isodate!", 'Tagging', '--tag-isodate', "Use ISO8601 dates (YYYY-MM-DD) in album/show names and track titles"],
+		tag_podcast => [ 1, "tagpodcast|tag-podcast!", 'Tagging', '--tag-podcast', "Tag downloaded radio and tv programmes as iTunes podcasts"],
+		tag_podcast_radio => [ 1, "tagpodcastradio|tag-podcast-radio!", 'Tagging', '--tag-podcast-radio', "Tag only downloaded radio programmes as iTunes podcasts"],
+		tag_podcast_tv => [ 1, "tagpodcasttv|tag-podcast-tv!", 'Tagging', '--tag-podcast-tv', "Tag only downloaded tv programmes as iTunes podcasts"],
+		tag_tracklist => [ 1, "tagtracklist|tag-tracklist!", 'Tagging', '--tag-tracklist', "Add track list of music played in programme (if available) to lyrics field."],
+		tag_utf8 => [ 1, "tagutf8|tag-utf8!", 'Tagging', '--tag-utf8', "Use UTF-8 encoding for non-ASCII characters in AtomicParsley parameter values (Linux/Unix/macOS only). Use only if auto-detect fails."],
+	};
+}
+
 # map metadata values to tags
 sub tags_from_metadata {
 	my ($self, $meta) = @_;
 	my $tags;
+	($tags->{title} = $meta->{title}) =~ s/[\s\-]+$//;
+	$tags->{title} ||= $meta->{show};
 	# iTunes media kind
 	$tags->{stik} = 'Normal';
 	if ( $meta->{ext} =~ /(mp4|m4v)/i) {
@@ -9475,28 +8879,15 @@
 	$tags->{advisory} = $meta->{guidance} ? 'explicit' : 'remove';
 	# copyright message from download date
 	$tags->{copyright} = substr($meta->{dldate}, 0, 4)." British Broadcasting Corporation, all rights reserved";
-	# select version of of episode title to use
-	if ( $opt->{tag_fulltitle} ) {
-		$tags->{title} = $meta->{title};
-	} else {
-		# fix up episode if necessary
-		(my $title = $meta->{episode}) =~ s/[\s\-]+$//;
-		$tags->{title} = $title ? $title : $meta->{name};
-	}
 	$tags->{artist} = $meta->{channel};
 	# album artist from programme type
 	($tags->{albumArtist} = "BBC " . ucfirst($meta->{type})) =~ s/tv/TV/i;
-	$tags->{album} = $meta->{name};
+	$tags->{album} = $meta->{show};
 	$tags->{grouping} = $meta->{categories};
 	# composer references iPlayer
 	$tags->{composer} = "BBC iPlayer";
 	# extract genre as first category, use second if first too generic
-	my @ignore = ("Films", "Sign Zone", "Audio Described", "Northern Ireland", "Scotland", "Wales", "England");
-	my ($genre, $genre2) = split(/\s*,\s*/, $meta->{categories}, 3);
-	if ( $genre && $genre2 && grep(/$genre/i, @ignore) ) { $genre = $genre2; }
-	# fallback genre
-	$genre ||= "get_iplayer";
-	$tags->{genre} = $genre;
+	$tags->{genre} = $meta->{category};
 	$tags->{comment} = $meta->{descshort};
 	# fix up firstbcast if necessary
 	$tags->{year} = $meta->{firstbcast};
@@ -9506,21 +8897,14 @@
 		$utc[5] += 1900;
 		$tags->{year} = sprintf("%4d-%02d-%02dT%02d:%02d:%02dZ", reverse @utc[0..5]);
 	}
-	# extract date components for ID3v2.3
-	my @date = split(//, $tags->{year});
-	$tags->{tyer} = join('', @date[0..3]);
-	$tags->{tdat} = join('', @date[8,9,5,6]);
-	$tags->{time} = join('', @date[11,12,14,15]);
 	$tags->{tracknum} = $meta->{episodenum};
 	$tags->{disk} = $meta->{seriesnum};
 	# generate lyrics text with links if available
-	$tags->{lyrics} = $meta->{desc};
-	$tags->{lyrics} .= "\n\nEPISODE\n$meta->{player}" if $meta->{player};
-	$tags->{lyrics} .= "\n\nSERIES\n$meta->{web}" if $meta->{web};
-	$tags->{description} = $meta->{descshort};
-	$tags->{longDescription} = $meta->{desc};
+	$tags->{lyrics} = $meta->{desclong};
+	$tags->{lyrics} .= "\n\nPLAY: $meta->{player}" if $meta->{player};
+	$tags->{lyrics} .= "\n\nINFO: $meta->{web}" if $meta->{web};
 	$tags->{hdvideo} = $meta->{mode} =~ /hd/i ? 'true' : 'false';
-	$tags->{TVShowName} = $meta->{name};
+	$tags->{TVShowName} = $meta->{show};
 	$tags->{TVEpisode} = $meta->{senum} ? $meta->{senum} : $meta->{pid};
 	$tags->{TVSeasonNum} = $tags->{disk};
 	$tags->{TVEpisodeNum} = $tags->{tracknum};
@@ -9535,13 +8919,48 @@
 	# tvshow flag
 	$tags->{is_tvshow} = $tags->{stik} eq 'TV Show';
 	# podcast flag
-	$tags->{is_podcast} = $meta->{type} =~ /podcast/i || $opt->{tag_podcast}
+	$tags->{is_podcast} = $opt->{tag_podcast}
 		|| ( $opt->{tag_podcast_radio} && ! $tags->{is_video} )
 		|| ( $opt->{tag_podcast_tv} && $tags->{is_video} );
+	$tags->{pid} = $meta->{pid};
+	if ( $opt->{tag_isodate} ) {
+		for my $field ( 'title', 'album', 'TVShowName' ) {
+			$tags->{$field} =~ s|(\d\d)[/_](\d\d)[/_](20\d\d)|$3-$2-$1|g;
+		}
+	}
+	if ( $opt->{tag_tracklist} ) {
+		if ( -f $meta->{tracklist} ) {
+			my $tracklist = do { local(@ARGV, $/) = $meta->{tracklist}; <> };
+			if ( $tracklist ) {
+				$tags->{lyrics} .= "\n\nTRACKLIST\n$tracklist";
+			} else {
+				main::logger "WARNING: --tag-tracklist specified but tracklist file empty: $meta->{tracklist}\n";
+			}
+		} else {
+			main::logger "WARNING: --tag-tracklist specified but tracklist file not found: $meta->{tracklist}\n";
+		}
+	}
+	if ( $opt->{tag_credits} ) {
+		if ( -f $meta->{credits} ) {
+			my $credits = do { local(@ARGV, $/) = $meta->{credits}; <> };
+			if ( $credits ) {
+				$tags->{lyrics} .= "\n\nCREDITS\n$credits";
+			} else {
+				main::logger "WARNING: --tag-credits specified but credits file empty: $meta->{credits}\n";
+			}
+		} else {
+			main::logger "WARNING: --tag-credits specified but credits file not found: $meta->{credits}\n";
+		}
+	}
+	$tags->{description} = $tags->{comment};
+	$tags->{longDescription} = $tags->{lyrics};
+	while ( my ($key, $val) = each %{$tags} ) {
+		$tags->{$key} = StringUtils::convert_punctuation($val);
+	}
 	return $tags;
 }
 
-# escape/enclose embedded quotes in command line parameters
+# in-place escape/enclose embedded quotes in command line parameters
 sub tags_escape_quotes {
 	my ($tags) = @_;
 	# only necessary for Windows
@@ -9555,227 +8974,162 @@
 	}
 }
 
-# add metadata tag to file
-sub tag_file {
-	my ($self, $meta) = @_;
-	my $tags = $self->tags_from_metadata($meta);
-	# dispatch to appropriate tagging function
-	if ( $meta->{filename} =~ /\.(mp3)$/i ) {
-		return $self->tag_file_id3($meta, $tags);
-	} elsif ( $meta->{filename} =~ /\.(mp4|m4v|m4a)$/i ) {
-		return $self->tag_file_mp4($meta, $tags);
-	} else {
-		main::logger "WARNING: Don't know how to tag \U$meta->{ext}\E file\n" if $opt->{verbose};
+# in-place encode metadata values to iso-8859-1
+sub tags_encode {
+	my ($tags) = @_;
+	while ( my ($key, $val) = each %{$tags} ) {
+		$tags->{$key} = encode("iso-8859-1", $val, FB_EMPTY);
 	}
 }
 
-# add full ID3 tag with MP3::Tag
-sub tag_file_id3 {
-	my ($self, $meta, $tags) = @_;
-	# look for required module
-	eval 'use MP3::Tag';
-	if ( $@ ) {
-		if ( $opt->{verbose} ) {
-			main::logger "INFO: Install the MP3::Tag module for full taggging of \U$meta->{ext}\E files\n";
-			main::logger "INFO: Falling back to ID3 BASIC taggging of \U$meta->{ext}\E files\n";
+# add metadata tag to programme
+sub tag_prog {
+	my ($self, $prog) = @_;
+	my $rc;
+	# download thumbnail if necessary
+	my $thumb_found = -f $prog->{thumbfile};
+	$prog->download_thumbnail() unless $opt->{noartwork} || $thumb_found;
+	# download tracklist if necessary
+	my $tracklist_found = -f $prog->{tracklist};
+	$prog->download_tracklist() unless ! $opt->{tag_tracklist} || $tracklist_found;
+	# download credits if necessary
+	my $credits_found = -f $prog->{credits};
+	$prog->download_credits() unless ! $opt->{tag_credits} || $credits_found;
+	# create metadata for tagging
+	my $meta;
+	while ( my ($key, $val) = each %{$prog} ) {
+		if ( ref($val) eq 'HASH' ) {
+			$meta->{$key} = $prog->{$key}->{$prog->{version}};
+		} else {
+			$meta->{$key} = $val;
 		}
-		return $self->tag_file_id3_basic($meta, $tags);
 	}
-	eval {
-		main::logger "INFO: ID3 tagging \U$meta->{ext}\E file\n";
-		# translate podcast flag
-		$tags->{podcastFlag} = "\x01";
-		# remove existing tag(s) to avoid decoding errors
-		my $mp3 = MP3::Tag->new($meta->{filename});
-		$mp3->get_tags();
-		$mp3->{ID3v1}->remove_tag() if exists $mp3->{ID3v1};
-		$mp3->{ID3v2}->remove_tag() if exists $mp3->{ID3v2};
-		$mp3->close();
-		# add metadata
-		$mp3 = MP3::Tag->new($meta->{filename});
-		$mp3->select_id3v2_frame_by_descr('TCOP', $tags->{copyright});
-		$mp3->select_id3v2_frame_by_descr('TIT2', $tags->{title});
-		$mp3->select_id3v2_frame_by_descr('TPE1', $tags->{artist});
-		$mp3->select_id3v2_frame_by_descr('TPE2', $tags->{albumArtist});
-		$mp3->select_id3v2_frame_by_descr('TALB', $tags->{album});
-		$mp3->select_id3v2_frame_by_descr('TIT1', $tags->{grouping});
-		$mp3->select_id3v2_frame_by_descr('TCOM', $tags->{composer});
-		$mp3->select_id3v2_frame_by_descr('TCON', $tags->{genre});
-		$mp3->select_id3v2_frame_by_descr('COMM(eng,#0)[]', $tags->{comment});
-		$mp3->select_id3v2_frame_by_descr('TYER', $tags->{tyer});
-		$mp3->select_id3v2_frame_by_descr('TDAT', $tags->{tdat});
-		$mp3->select_id3v2_frame_by_descr('TIME', $tags->{time});
-		$mp3->select_id3v2_frame_by_descr('TRCK', $tags->{tracknum});
-		$mp3->select_id3v2_frame_by_descr('TPOS', $tags->{disk});
-		$mp3->select_id3v2_frame_by_descr('USLT', $tags->{lyrics});
-		# tag iTunes podcast
-		if ( $tags->{is_podcast} ) {
-			# ID3v2.4 only, but works in iTunes
-			$mp3->select_id3v2_frame_by_descr('TDRL', $tags->{year});
-			# ID3v2.3 and ID3v2.4
-			$mp3->select_id3v2_frame_by_descr('TIT3', $tags->{description});
-			# Neither ID3v2.3 nor ID3v2.4, but work in iTunes
-			$mp3->select_id3v2_frame_by_descr('TDES', $tags->{longDescription});
-			$mp3->{ID3v2}->add_raw_frame('PCST', $tags->{podcastFlag});
-			$mp3->select_id3v2_frame_by_descr('TCAT', $tags->{category});
-			$mp3->select_id3v2_frame_by_descr('TKWD', $tags->{keyword});
-			$mp3->select_id3v2_frame_by_descr('TGID', $tags->{podcastGUID});
-		}
-		# add artwork if available
-		if ( -f $meta->{thumbfile} ) {
-			my $data;
-			open(THUMB, $meta->{thumbfile});
-			binmode(THUMB);
-			read(THUMB, $data, stat($meta->{thumbfile})->size());
-			close(THUMB);
-			$mp3->select_id3v2_frame_by_descr('APIC', $data);
-		}
-		# write metadata to file
-		$mp3->update_tags();
-		$mp3->close();
-	};
-	if ( $@ ) {
-		main::logger "ERROR: Failed to tag \U$meta->{ext}\E file\n";
-		main::logger "ERROR: $@" if $opt->{verbose};
-		# clean up thumbnail if necessary
-		unlink $meta->{thumbfile} if ! $opt->{thumb};
-		return 4;
-	}
-}
-
-# add basic ID3 tag with id3v2
-sub tag_file_id3_basic {
-	my ($self, $meta, $tags) = @_;
-	if ( main::exists_in_path('id3v2') ) {
-		main::logger "INFO: ID3 BASIC tagging \U$meta->{ext}\E file\n";
-		# notify about limitations of basic tagging
-		if ( $opt->{verbose} ) {
-			main::logger "INFO: ID3 BASIC tagging cannot add artwork to \U$meta->{ext}\E files\n";
-			main::logger "INFO: ID3 BASIC tagging cannot add podcast metadata to \U$meta->{ext}\E files\n" if $tags->{is_podcast};
-		}
-		# colons are parsed as frame field separators by id3v2
-		# so replace them to make safe comment text
-		$tags->{comment} =~ s/:/_/g;
-		# make safe lyrics text as well
-		# can't use $tags->{lyrics} because of colons in links
-		$tags->{longDescription} =~ s/:/_/g;
-		# handle embedded quotes
-		tags_escape_quotes($tags);
-		# encode for id3v2
-		while ( my ($key, $val) = each %{$tags} ) {
-			$tags->{$key} = encode("iso-8859-1", $val);
-		}
-		# build id3v2 command
-		my @cmd = (
-			$bin->{id3v2},
-			'--TCOP', $tags->{copyright},
-			'--TIT2', $tags->{title},
-			'--TPE1', $tags->{artist},
-			'--TPE2', $tags->{albumArtist},
-			'--TALB', $tags->{album},
-			'--TIT1', $tags->{grouping},
-			'--TCOM', $tags->{composer},
-			'--TCON', $tags->{genre},
-			'--COMM', $tags->{comment},
-			'--TYER', $tags->{tyer},
-			'--TDAT', $tags->{tdat},
-			'--TIME', $tags->{time},
-			'--TRCK', $tags->{tracknum},
-			'--TPOS', $tags->{disk},
-			'--USLT', $tags->{longDescription},
-			$meta->{filename},
-		);
-		# run id3v2 command
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			main::logger "WARNING: Failed to tag \U$meta->{ext}\E file\n";
-			return 2;
-		}
+	my $fmt_show = $opt->{tag_formatshow} || "<name>";
+	my $fmt_title = $opt->{tag_formattitle} || "<episodeshort>";
+	$meta->{show} = $prog->substitute($fmt_show, 99);
+	$meta->{title} = $prog->substitute($fmt_title, 99);
+	# do tagging
+	my $tags = $self->tags_from_metadata($meta);
+	if ( $meta->{filename} =~ /\.(mp4|m4v|m4a)$/i ) {
+		$rc = $self->tag_file_mp4($meta, $tags);
 	} else {
-		main::logger "WARNING: Cannot tag \U$meta->{ext}\E file\n" if $opt->{verbose};
+		main::logger "WARNING: Don't know how to tag \U$meta->{ext}\E file\n" if $opt->{verbose};
 	}
+	# clean up thumbnail if necessary
+	unlink $prog->{thumbfile} unless $opt->{thumb} || $thumb_found;
+	# clean up tracklist if necessary
+	unlink $prog->{tracklist} unless $opt->{tracklist} || $tracklist_found;
+	# clean up credits if necessary
+	unlink $prog->{credits} unless $opt->{credits} || $credits_found;
+	return $rc;
+}
+
+sub ap_init {
+	return if $ap_check;
+	$bin->{atomicparsley} = $opt->{atomicparsley} || 'AtomicParsley';
+	if ( ! main::exists_in_path( 'atomicparsley' ) ) {
+		if ( $bin->{atomicparsley} ne 'AtomicParsley' ) {
+			$bin->{atomicparsley} = 'AtomicParsley';
+			if ( ! main::exists_in_path( 'atomicparsley' ) ) {
+				$ap_check = 1;
+				return;
+			}
+		} else {
+			$ap_check = 1;
+			return;
+		}
+	}
+	# determine AtomicParsley features
+	my $ap_help = `"$bin->{atomicparsley}" --help 2>&1`;
+	$opt->{myaphdvideo} = 1 if $ap_help =~ /--hdvideo/;
+	$opt->{myaplongdesc} = 1 if $ap_help =~ /--longdesc/;
+	$opt->{myaplongdescription} = 1 if $ap_help =~ /--longDescription/;
+	$opt->{myaputf8} = 1 if ! defined($opt->{tag_utf8}) and ( $^O ne "MSWin32" or $bin->{atomicparsley} =~ /-utf8/i );
+	$ap_check = 1;
 }
 
 # add MP4 tag with atomicparsley
 sub tag_file_mp4 {
 	my ($self, $meta, $tags) = @_;
+	ap_init();
 	# Only tag if the required tool exists
-	if ( main::exists_in_path( 'atomicparsley' ) ) {
-		main::logger "INFO: MP4 tagging \U$meta->{ext}\E file\n";
-		# pretty copyright for MP4
-		$tags->{copyright} = "\xA9 $tags->{copyright}" if $tags->{copyright};
-		# handle embedded quotes
-		tags_escape_quotes($tags);
-		# encode metadata for atomicparsley
-		my $encoding = $opt->{tag_utf8} ? "utf8" : "iso-8859-1";
-		while ( my ($key, $val) = each %$tags ) {
-			$tags->{$key} = encode($encoding, $val);
-		}
-		# build atomicparsley command
-		my @cmd = (
-			$bin->{atomicparsley},
-			$meta->{filename},
-			'--freefree',
-			'--overWrite',
-			'--stik', $tags->{stik},
-			'--advisory', $tags->{advisory},
-			'--copyright', $tags->{copyright},
-			'--title', $tags->{title},
-			'--artist', $tags->{artist},
-			'--albumArtist', $tags->{albumArtist},
-			'--album', $tags->{album},
-			'--grouping', $tags->{grouping},
-			'--composer', $tags->{composer},
-			'--genre', $tags->{genre},
-			'--comment', $tags->{comment},
-			'--year', $tags->{year},
-			'--tracknum', $tags->{tracknum},
-			'--disk', $tags->{disk},
-			'--lyrics', $tags->{lyrics},
-		);
-		# add descriptions to audio podcasts and video
-		if ( $tags->{is_video} || $tags->{is_podcast}) {
-			push @cmd, ('--description', $tags->{description} );
-			if ( $opt->{tag_longdescription} ) {
-				push @cmd, ( '--longDescription', $tags->{longDescription} );
-			} elsif ( $opt->{tag_longdesc} ) {
-				push @cmd, ( '--longdesc', $tags->{longDescription} );
-			}
-		}
-		# video only
-		if ( $tags->{is_video} ) {
-			# all video
-			push @cmd, ( '--cnID', 3004 ) if $opt->{tag_cnid};
-			push @cmd, ( '--hdvideo', $tags->{hdvideo} ) if $opt->{tag_hdvideo};
-			# tv only
-			if ( $tags->{is_tvshow} ) {
-				push @cmd, (
-					'--TVShowName', $tags->{TVShowName},
-					'--TVEpisode', $tags->{TVEpisode},
-					'--TVSeasonNum', $tags->{TVSeasonNum},
-					'--TVEpisodeNum', $tags->{TVEpisodeNum},
-					'--TVNetwork', $tags->{TVNetwork},
-				);
-			}
+	if ( ! main::exists_in_path( 'atomicparsley' ) ) {
+		main::logger "WARNING: Required AtomicParsley utility not found - cannot tag \U$meta->{ext}\E file\n";
+		return 1;
+	}
+	main::logger "INFO: Tagging \U$meta->{ext}\E\n";
+	# handle embedded quotes
+	tags_escape_quotes($tags);
+	# encode metadata for atomicparsley
+	tags_encode($tags) unless $opt->{tag_utf8} || $opt->{myaputf8};
+	# build atomicparsley command
+	my @cmd = (
+		$bin->{atomicparsley},
+		$meta->{filename},
+		'--metaEnema',
+		'--freefree',
+		'--overWrite',
+		'--stik', $tags->{stik},
+		'--advisory', $tags->{advisory},
+		'--copyright', $tags->{copyright},
+		'--title', $tags->{title},
+		'--artist', $tags->{artist},
+		'--albumArtist', $tags->{albumArtist},
+		'--album', $tags->{album},
+		'--grouping', $tags->{grouping},
+		'--composer', $tags->{composer},
+		'--genre', $tags->{genre},
+		'--comment', $tags->{comment},
+		'--year', $tags->{year},
+		'--tracknum', $tags->{tracknum},
+		'--disk', $tags->{disk},
+		'--lyrics', $tags->{lyrics},
+	);
+	# add descriptions to audio podcasts and video
+	if ( $tags->{is_video} || $tags->{is_podcast}) {
+		push @cmd, ('--description', $tags->{description} );
+		if ( $opt->{myaplongdescription} ) {
+			push @cmd, ( '--longDescription', $tags->{longDescription} );
+		} elsif ( $opt->{myaplongdesc} ) {
+			push @cmd, ( '--longdesc', $tags->{longDescription} );
 		}
-		# tag iTunes podcast
-		if ( $tags->{is_podcast} ) {
+	}
+	# video only
+	if ( $tags->{is_video} ) {
+		# all video
+		push @cmd, ( '--hdvideo', $tags->{hdvideo} ) if $opt->{myaphdvideo};
+		# tv only
+		if ( $tags->{is_tvshow} ) {
 			push @cmd, (
-				'--podcastFlag', $tags->{podcastFlag},
-				'--category', $tags->{category},
-				'--keyword', $tags->{keyword},
-				'--podcastGUID', $tags->{podcastGUID},
+				'--TVShowName', $tags->{TVShowName},
+				'--TVEpisode', $tags->{TVEpisode},
+				'--TVSeasonNum', $tags->{TVSeasonNum},
+				'--TVEpisodeNum', $tags->{TVEpisodeNum},
+				'--TVNetwork', $tags->{TVNetwork},
 			);
 		}
-		# add artwork if available
+	}
+	# tag iTunes podcast
+	if ( $tags->{is_podcast} ) {
+		push @cmd, (
+			'--podcastFlag', $tags->{podcastFlag},
+			'--category', $tags->{category},
+			'--keyword', $tags->{keyword},
+			'--podcastGUID', $tags->{podcastGUID},
+		);
+	}
+	# add artwork if available
+	unless ( $opt->{noartwork} ) {
 		push @cmd, ( '--artwork', $meta->{thumbfile} ) if -f $meta->{thumbfile};
-		# run atomicparsley command
-		if ( main::run_cmd( 'STDERR', @cmd ) ) {
-			main::logger "WARNING: Failed to tag \U$meta->{ext}\E file\n";
-			return 2;
-		}
-	} else {
-		main::logger "WARNING: Cannot tag \U$meta->{ext}\E file\n" if $opt->{verbose};
 	}
+	# run atomicparsley command
+	my $run_mode = main::hide_progress() || ! $opt->{verbose} ? 'QUIET_STDOUT' : 'STDERR';
+	if ( main::run_cmd( $run_mode, @cmd ) ) {
+		main::logger "WARNING: Failed to tag \U$meta->{ext}\E file\n";
+		return 2;
+	}
+	# remove images left behind by AtomicParsley
+	unlink glob qq("$meta->{dir}/$meta->{fileprefix}-resized-*");
 }
 
 ############## End OO ##############

get_iplayer-2.82.tar.gz/get_iplayer.1 -> get_iplayer-3.20.tar.gz/get_iplayer.1 Changed

@@ -1,63 +1,70 @@
-.TH GET_IPLAYER "1" "June 2012" "Phil Lewis" "get_iplayer Manual"
+.TH GET_IPLAYER "1" "February 2019" "Phil Lewis" "get_iplayer Manual"
 .SH NAME
-get_iplayer \- Stream Recording tool and PVR for BBC iPlayer, BBC Podcasts and more
+get_iplayer \- Stream Recording tool and PVR for BBC iPlayer
 .SH SYNOPSIS
 \fBget_iplayer\fR [<options>] [<regex|index> ...]
 .PP
 \fBget_iplayer\fR \fB\-\-get\fR [<options>] <regex|index> ...
-.br
-\fBget_iplayer\fR <url> \fB\-\-type\fR=<type> [<options>]
 .PP
-\fBget_iplayer\fR <pid|url> [\fB\-\-type\fR=<type> <options>]
+\fBget_iplayer\fR <url> [\fB\-\-type\fR=<type> <options>]
 .PP
-\fBget_iplayer\fR \fB\-\-stream\fR [<options>] <regex|index> | mplayer \fB\-cache\fR 3072 \-
+\fBget_iplayer\fR <pid> [\fB\-\-type\fR=<type> <options>]
 .PP
-\fBget_iplayer\fR \fB\-\-stream\fR [<options>] \fB\-\-type\fR=<type> <pid|url> | mplayer \fB\-cache\fR 3072 \-
-.PP
-\fBget_iplayer\fR \fB\-\-stream\fR [<options>] \fB\-\-type\fR=livetv,liveradio <regex|index> \fB\-\-player\fR="mplayer \-cache 128 \-"
-.PP
-\fBget_iplayer\fR \fB\-\-refresh\fR
+\fBget_iplayer\fR \fB\-\-refresh\fR [\fB\-\-type\fR=<type> <options>]
 .SH DESCRIPTION
-\fBget_iplayer\fR lists, searches and records BBC iPlayer TV/Radio, BBC Podcast programmes. Other 3rd\-Party plugins may be available.
+\fBget_iplayer\fR lists, searches and records BBC iPlayer TV and radio programmes.
 .PP
-\fBget_iplayer\fR has three modes: recording a complete programme for later playback, streaming a programme
-directly to a playback application, such as mplayer; and as a Personal Video Recorder (PVR), subscribing to
-search terms and recording programmes automatically. It can also stream or record live BBC iPlayer output
+\fBget_iplayer\fR has two modes: recording a complete programme for later playback, and as a Personal Video Recorder (PVR), subscribing to
+search terms and recording programmes automatically.
 .PP
-If given no arguments, \fBget_iplayer\fR updates and displays the list of currently available programmes.
-Each available programme has a numerical identifier, \fBpid\fR.
-\fBget_iplayer\fR utilises the \fBrtmpdump\fR tool to record BBC iPlayer programmes from RTMP flash streams at various qualities.
+If given the regex ".*" (incl. quotes), \fBget_iplayer\fR updates and displays the list of currently available TV programmes.
+Use \-\-type=radio for radio programmes. Each available programme has an alphanumeric identifier (\fBPID\fR).
 .PP
-In PVR mode, \fBget_iplayer\fR can be called from cron to record programmes to a schedule.
+In PVR mode, \fBget_iplayer\fR can be called from cron to record programmes on a schedule.
 .SH "OPTIONS"
+.PP
+Boolean options can be negated by adding a "no\-" prefix, e.g., \-\-no\-subtitles or \-\-no\-whitespace.
+This applies even if the base option name already begins with "no\-", e.g., \-\-no\-no\-tag or \-\-no\-no\-artwork
 .SS "Search Options:"
 .TP
-\fB\-\-before
-Limit search to programmes added to the cache before N hours ago
+\fB\-\-available\-before <hours>
+Limit search to programmes that became available before <hours> hours ago
+.TP
+\fB\-\-available\-since <hours>
+Limit search to programmes that have become available in the last <hours> hours
+.TP
+\fB\-\-before <hours>
+Limit search to programmes added to the cache before <hours> hours ago
 .TP
 \fB\-\-category <string>
-Narrow search to matched categories (regex or comma separated values)
+Narrow search to matched categories (comma\-separated regex list).  Defaults to substring match.  Only works with \-\-history.
 .TP
 \fB\-\-channel <string>
-Narrow search to matched channel(s) (regex or comma separated values)
+Narrow search to matched channel(s) (comma\-separated regex list).  Defaults to substring match.
 .TP
 \fB\-\-exclude <string>
-Narrow search to exclude matched programme names (regex or comma separated values)
+Narrow search to exclude matched programme names (comma\-separated regex list).  Defaults to substring match.
 .TP
 \fB\-\-exclude\-category <string>
-Narrow search to exclude matched categories (regex or comma separated values)
+Narrow search to exclude matched categories (comma\-separated regex list).  Defaults to substring match.  Only works with \-\-history.
 .TP
 \fB\-\-exclude\-channel <string>
-Narrow search to exclude matched channel(s) (regex or comma separated values)
+Narrow search to exclude matched channel(s) (comma\-separated regex list).  Defaults to substring match.
+.TP
+\fB\-\-expires\-after <hours>
+Limit search to programmes that will expire after <hours> hours from now
+.TP
+\fB\-\-expires\-before <hours>
+Limit search to programmes that will expire before <hours> hours from now
 .TP
-\fB\-\-fields <field1>,<field2>,..
-Searches only in the specified comma separated fields
+\fB\-\-fields <field1>,<field2>,...
+Searches only in the specified fields. The fields are concatenated with spaces in the order specified and the search term is applied to the resulting string.
 .TP
 \fB\-\-future
-Search future programme schedule if it has been indexed (refresh cache with: \-\-refresh \-\-refresh\-future).
+Additionally search future programme schedule if it has been indexed (refresh cache with: \-\-refresh \-\-refresh\-future).
 .TP
 \fB\-\-history
-Search/show recordings history
+Search recordings history (requires search term)
 .TP
 \fB\-\-long, \-l
 Additionally search in programme descriptions and episode names (same as \-\-fields=name,episode,desc )
@@ -65,21 +72,18 @@
 \fB\-\-search <search term>
 GetOpt compliant way of specifying search args
 .TP
-\fB\-\-since
-Limit search to programmes added to the cache in the last N hours
+\fB\-\-since <hours>
+Limit search to programmes added to the cache in the last <hours> hours
 .TP
-\fB\-\-type <type>
-Only search in these types of programmes: livetv,tv,liveradio,radio,all (tv is default)
-.TP
-\fB\-\-versions <versions>
-Version of programme to search or record.  List is processed from left to right and first version found is downloaded.  Example: '\-\-versions signed,audiodescribed,default' will prefer signed and audiodescribed programmes if available.  Default: 'default'
+\fB\-\-type <type>,<type>,...
+Only search in these types of programmes: tv,radio,all (tv is default)
 .SS "Display Options:"
 .TP
 \fB\-\-conditions
 Shows GPLv3 conditions
 .TP
 \fB\-\-debug
-Debug output
+Debug output (very verbose and rarely useful)
 .TP
 \fB\-\-dump\-options
 Dumps all options with their internal option key names
@@ -97,19 +101,16 @@
 Hide previously recorded programmes
 .TP
 \fB\-\-info, \-i
-Show full programme metadata and availability of modes and subtitles (max 50 matches)
+Show full programme metadata and availability of modes and subtitles (max 40 matches)
 .TP
-\fB\-\-list <categories|channel>
-Show a list of available categories/channels for the selected type and exit
+\fB\-\-list <element>
+Show a list of distinct element values (with counts) for the selected programme type(s) and exit.  Valid elements are: 'channel'
 .TP
 \fB\-\-listformat <format>
-Display programme data based on a user\-defined format string (such as <pid>, <name> etc)
-.TP
-\fB\-\-listplugins
-Display a list of currently available plugins or programme types
+Display search results with a custom format. Use substitution parameters in format string (see docs for list).
 .TP
 \fB\-\-long, \-l
-Show long programme info
+Show extended programme info
 .TP
 \fB\-\-manpage <file>
 Create man page based on current help text
@@ -124,16 +125,19 @@
 Number of matches displayed on a page for multipage output
 .TP
 \fB\-\-quiet, \-q
-No logging output
+Reduce logging output
 .TP
 \fB\-\-series
-Display Programme series names only with number of episodes
+Display programme series names only with number of episodes
 .TP
 \fB\-\-show\-cache\-age
-Displays the age of the selected programme caches then exit
+Display the age of the selected programme caches then exit
 .TP
 \fB\-\-show\-options
-Shows options which are set and where they are defined
+Show options which are set and where they are defined
+.TP
+\fB\-\-silent
+No logging output except PVR download report.  Cannot be saved in preferences or PVR searches.
 .TP
 \fB\-\-sort <fieldname>
 Field to use to sort displayed matches
@@ -142,16 +146,16 @@
 Reverse order of sorted matches
 .TP
 \fB\-\-streaminfo
-Returns all of the media stream urls of the programme(s)
+Returns all of the media stream URLs of the programme(s)
 .TP
 \fB\-\-terse
 Only show terse programme info (does not affect searching)
 .TP
 \fB\-\-tree
-Display Programme listings in a tree view
+Display programme listings in a tree view
 .TP
 \fB\-\-verbose, \-v
-Verbose
+Show additional output (useful for diagnosing problems)
 .TP
 \fB\-\-warranty
 Displays warranty section of GPLv3
@@ -160,219 +164,204 @@
 Show get_iplayer version and exit.
 .SS "Recording Options:"
 .TP
-\fB\-\-aactomp3
-Transcode AAC audio to MP3 with ffmpeg (CBR 128k unless \-\-mp3vbr is specified)
-.TP
 \fB\-\-attempts <number>
-Number of attempts to make or resume a failed connection
+Number of attempts to make or resume a failed connection.  \-\-attempts is applied per\-stream, per\-mode.  Many modes have two or more streams available.
+.TP
+\fB\-\-audio\-only
+Only download audio stream for TV programme. 'hls' recording modes are not supported and ignored. Produces .m4a file. Implies \-\-force.
 .TP
-\fB\-\-bandwidth
-In radio realaudio mode specify the link bandwidth in bps for rtsp streaming (default 512000)
+\fB\-\-download\-abortonfail
+Exit immediately if stream for any recording mode fails to download. Use to avoid repeated failed download attempts if connection is dropped or access is blocked.
+.TP
+\fB\-\-exclude\-supplier <supplier>,<supplier>,...
+Comma\-separated list of media stream suppliers to skip.  Possible values: akamai,limelight,bidi
 .TP
 \fB\-\-force
-Ignore programme history (unsets \-\-hide option also). Forces a script update if used with \-u
+Ignore programme history (unsets \-\-hide option also).
+.TP
+\fB\-\-fps25
+Use only 25fps streams for TV programmes (HD video not available).
 .TP
 \fB\-\-get, \-g
-Start recording matching programmes. Search terms required unless \-\-pid specified. Use  \-\-search=.* to force download of all available programmes.
+Start recording matching programmes. Search terms required.
 .TP
 \fB\-\-hash
 Show recording progress as hashes
 .TP
-\fB\-\-liveradiomode <mode>,<mode>,..
-Live Radio Recording modes: flashaac,realaudio,wma. Use \-\-liveradiomode=best to automatically select highest quality available.
+\fB\-\-hls\-lq\-audio
+Use default lower\-quality audio for 'hvf' modes (TV only). Instead of 320k audio, output file will contain 128k or 96k audio, depending on the stream downloaded.
 .TP
-\fB\-\-livetvmode <mode>,<mode>,...
-Live TV Recoding modes: flashhd,flashvhigh,flashhigh,flashstd,flashnormal (default: flashhd,flashvhigh,flashhigh,flashstd,flashnormal). Use \-\-livetvmode=best to automatically select highest quality available.
+\fB\-\-include\-supplier <supplier>,<supplier>,...
+Comma\-separated list of media stream suppliers to use if not included by default.  Possible values: akamai,limelight,bidi
 .TP
-\fB\-\-metadata\-only
-Create specified metadata info file without any recording or streaming (can also be used with thumbnail option).
+\fB\-\-log\-progress
+Force HLS/DASH download progress display to be captured when screen output is redirected to file.  Progress display is normally omitted unless writing to terminal.
 .TP
-\fB\-\-mmsnothread
-Disable parallel threaded recording for mms
+\fB\-\-mark\-downloaded
+Mark programmes in search results or specified with \-\-pid/\-\-url as downloaded by inserting records in download history.
 .TP
 \fB\-\-modes <mode>,<mode>,...
-Recording modes: flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi,flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma.  Use \-\-modes=best to automatically select highest quality available.
+Recording modes.  See \-\-tvmode and \-\-radiomode (with \-\-long\-help) for available modes and defaults.  Shortcuts: tvbest,tvbetter,tvgood,tvworst,radiobest,radiobetter,radiogood,radioworst (default=default for programme type).
 .TP
-\fB\-\-mp3vbr
-Set LAME VBR mode to N (0 to 9) for AAC transcoding. 0 = target bitrate 245 Kbit/s, 9 = target bitrate 65 Kbit/s (requires \-\-aactomp3)
+\fB\-\-no\-merge\-versions
+Do not merge programme versions with same name and duration.
 .TP
-\fB\-\-multimode
-Allow the recording of more than one mode for the same programme \- WARNING: will record all specified/default modes!!
+\fB\-\-no\-proxy
+Ignore \-\-proxy setting in preferences and/or http_proxy environment variable.
+.TP
+\fB\-\-no\-resume
+Do not resume partial HLS/DASH downloads.
+.TP
+\fB\-\-no\-verify
+Do not verify size of downloaded HLS/DASH file segments or file resize upon resume.
 .TP
 \fB\-\-overwrite
 Overwrite recordings if they already exist
 .TP
 \fB\-\-partial\-proxy
-Only uses web proxy where absolutely required (try this extra option if your proxy fails)
+Only uses web proxy where absolutely required (try this extra option if your proxy fails).
+.TP
+\fB\-\-pid <pid>,<pid>,...
+Record arbitrary PIDs that do not necessarily appear in the index.
 .TP
-\fB\-\-pid <pid>
-Record an arbitrary pid that does not necessarily appear in the index.
+\fB\-\-pid\-index
+Update (if necessary) and use programme index cache with \-\-pid. Cache is not searched for programme by default with \-\-pid. Synonym: \-\-pid\-refresh.
 .TP
 \fB\-\-pid\-recursive
-When used with \-\-pid record all the embedded pids if the pid is a series or brand pid.
+Record all related episodes if value of \-\-pid is a series or brand PID.  Requires \-\-pid.
+.TP
+\fB\-\-pid\-recursive\-list
+If value of \-\-pid is a series or brand PID, list available episodes but do not download. Implies \-\-pid\-recursive. Requires \-\-pid.
 .TP
 \fB\-\-proxy, \-p <url>
-Web proxy URL e.g. 'http://USERNAME:PASSWORD@SERVER:PORT' or 'http://SERVER:PORT'
+Web proxy URL, e.g., http://username:password@server:port or http://server:port.  Value of http_proxy environment variable (if present) will be used unless \-\-proxy is specified. Used for both HTTP and HTTPS. Overridden by \-\-no\-proxy.
 .TP
 \fB\-\-radiomode <mode>,<mode>,...
-Radio Recording mode(s): flashaac,flashaachigh,flashaacstd,flashaaclow,flashaudio,realaudio,wma (default: flashaachigh,flashaacstd,flashaudio,realaudio,flashaaclow). Use \-\-radiomode=best to automatically select highest quality available.
-.TP
-\fB\-\-raw
-Don't transcode or change the recording/stream in any way (i.e. radio/realaudio, rtmp/flv)
-.TP
-\fB\-\-rtmp\-liveradio\-opts <options>
-Add custom options to flvstreamer for liveradio
-.TP
-\fB\-\-rtmp\-livetv\-opts <options>
-Add custom options to flvstreamer for livetv
-.TP
-\fB\-\-rtmp\-radio\-opts <options>
-Add custom options to flvstreamer for radio
+Radio recording modes (overrides \-\-modes): dafhigh,dafstd,dafmed,daflow,hafhigh,hafstd,hafmed,haflow,hlahigh,hlastd,hlsmed,hlalow. Shortcuts: best,better,good,worst,haf,hla,daf,hls,dash,high,std,med,low (default=hafhigh,hlahigh,dafhigh,hafstd,hlastd,dafstd,hafmed,hlamed,dafmed,haflow,hlalow,daflow).
 .TP
-\fB\-\-rtmp\-tv\-opts <options>
-Add custom options to flvstreamer for tv
+\fB\-\-start <secs|hh:mm:ss>
+Recording/streaming start offset (actual start may be several seconds earlier for HLS and DASH streams)
 .TP
-\fB\-\-rtmpport <port>
-Override the RTMP port (e.g. 443)
+\fB\-\-stop <secs|hh:mm:ss>
+Recording/streaming stop offset (actual stop may be several seconds later for HLS and DASH streams)
 .TP
-\fB\-\-start <secs>
-Recording/streaming start offset (rtmp and realaudio only)
-.TP
-\fB\-\-stop <secs>
-Recording/streaming stop offset (can be used to limit live rtmp recording length) rtmp and realaudio only
-.TP
-\fB\-\-suboffset <offset>
-Offset the subtitle timestamps by the specified number of milliseconds
-.TP
-\fB\-\-subsraw
-Additionally save the raw subtitles file
-.TP
-\fB\-\-subtitles
-Download subtitles into srt/SubRip format if available and supported
-.TP
-\fB\-\-subtitles\-only
-Only download the subtitles, not the programme
-.TP
-\fB\-\-tag\-only
-Only update the programme tag and not download the programme (can also be used with \-\-history)
+\fB\-\-subtitles\-required
+Do not download TV programme if subtitles are not available.
 .TP
 \fB\-\-test, \-t
-Test only \- no recording (will show programme type)
-.TP
-\fB\-\-thumb
-Download Thumbnail image if available
-.TP
-\fB\-\-thumbnail\-only
-Only Download Thumbnail image if available, not the programme
+Test only \- no recording (only shows search results with \-\-pvr and \-\-pid\-recursive)
 .TP
 \fB\-\-tvmode <mode>,<mode>,...
-TV Recoding modes: rtmp,flashhd,flashvhigh,flashhigh,flashstd,flashnormal,flashlow,n95_wifi (default: flashhigh,flashstd,flashnormal). Use \-\-tvmode=best to automatically select highest quality available.
+TV recording modes (overrides \-\-modes): dvfhd,dvfsd,dvfxsd,dvfhigh,dvfxhigh,dvflow,hlshd,hvfhd,hvfsd,hvfxsd,hvfhigh,hvfxhigh,hvflow. Shortcuts: best,better,good,worst,dvf,hvf,dash,hls,hd,sd,high,low. 50fps streams (if available) preferred unless \-\-fps25 specified (default=hvfhd,dvfhd,hvfsd,dvfsd,hvfxsd,dvfxsd,hvfhigh,dvfhigh,hvfxhigh,dvfxhigh,hvflow,dvflow).
 .TP
-\fB\-\-url "<url>"
-Record the embedded media player in the specified URL. Use with \-\-type=<type>.
+\fB\-\-url <url>,<url>,...
+Record the PIDs contained in the specified iPlayer episode URLs.
 .TP
-\fB\-\-wav
-In radio realaudio mode output as wav and don't transcode to mp3
+\fB\-\-versions <versions>
+Version of programme to record. List is processed from left to right and first version found is downloaded.  Example: '\-\-versions=audiodescribed,default' will prefer audiodescribed programmes if available.
 .SS "Output Options:"
 .TP
 \fB\-\-command, \-c <command>
-Run user command after successful recording using args such as <pid>, <name> etc
+User command to run after successful recording of programme. Use substitution parameters in command string (see docs for list).
 .TP
-\fB\-\-email <address>
-Email HTML index of matching programmes to specified address
+\fB\-\-command\-radio <command>
+User command to run after successful recording of radio programme. Use substitution parameters in command string (see docs for list). Overrides \-\-command.
 .TP
-\fB\-\-email\-sender <address>
-Optional email sender address
+\fB\-\-command\-tv <command>
+User command to run after successful recording of TV programme. Use substitution parameters in command string (see docs for list). Overrides \-\-command.
 .TP
-\fB\-\-email\-smtp <hostname>
-SMTP server IP address to use to send email (default: localhost)
+\fB\-\-credits
+Download programme credits, if available.
 .TP
-\fB\-\-fatfilename
-Omit characters forbidden by FAT filesystems from filenames but keep whitespace
+\fB\-\-credits\-only
+Only download programme credits (if available), not programme.
 .TP
 \fB\-\-file\-prefix <format>
-The filename prefix (excluding dir and extension) using formatting fields. e.g. '<name>\-<episode>\-<pid>'
-.TP
-\fB\-\-fxd <file>
-Create Freevo FXD XML of matching programmes in specified file
+The filename prefix template (excluding dir and extension). Use substitution parameters in template (see docs for list). Default: <name> \- <episode> <pid> <version>
 .TP
-\fB\-\-html <file>
-Create basic HTML index of matching programmes in specified file
+\fB\-\-limitprefixlength <length>
+The maximum length for a file prefix.  Defaults to 240 to allow space within standard 256 limit.
 .TP
-\fB\-\-isodate
-Use ISO8601 dates (YYYY\-MM\-DD) in filenames
+\fB\-\-metadata
+Create metadata info file after recording.
 .TP
-\fB\-\-metadata <type>
-Create metadata info file after recording. Valid types are: xbmc, xbmc_movie, freevo, generic
-.TP
-\fB\-\-mkv
-Output video in MKV container instead of MP4. Currently no tagging supported from get_iplayer for MKV output
+\fB\-\-metadata\-only
+Create specified metadata info file without any recording or streaming.
 .TP
-\fB\-\-mythtv <file>
-Create Mythtv streams XML of matching programmes in specified file
+\fB\-\-no\-metadata
+Do not create metadata info file after recording (overrides \-\-metadata).
 .TP
-\fB\-\-nowrite, \-n
-No writing of file to disk (use with \-x to prevent a copy being stored on disk)
+\fB\-\-no\-sanitise
+Do not sanitise output file and directory names. Implies \-\-whitespace. Invalid characters for Windows ("*:<>?|) and macOS (:) will be removed.
 .TP
 \fB\-\-output, \-o <dir>
 Recording output directory
 .TP
-\fB\-\-outputliveradio <dir>
-Output directory for live radio recordings
+\fB\-\-outputradio <dir>
+Output directory for radio recordings (overrides \-\-output)
 .TP
-\fB\-\-outputlivetv <dir>
-Output directory for live tv recordings
+\fB\-\-outputtv <dir>
+Output directory for tv recordings (overrides \-\-output)
 .TP
-\fB\-\-outputlocalfiles <dir>
-Output directory for localfiles recordings
+\fB\-\-raw
+Don't remux or change the recording in any way.  Saves output file in native container format (HLS\->MPEG\-TS, DASH\->MP4)
 .TP
-\fB\-\-outputpodcast <dir>
-Output directory for podcast recordings
+\fB\-\-subdir, \-s
+Save recorded files into subdirectory of output directory.  Default: same name as programme (see \-\-subdir\-format).
 .TP
-\fB\-\-outputradio <dir>
-Output directory for radio recordings
+\fB\-\-subdir\-format <format>
+The format to be used for subdirectory naming.  Use substitution parameters in format string (see docs for list).
 .TP
-\fB\-\-outputtv <dir>
-Output directory for tv recordings
+\fB\-\-suboffset <offset>
+Offset the subtitle timestamps by the specified number of milliseconds.  Requires \-\-subtitles.
 .TP
-\fB\-\-player '<command> <options>'
-Use specified command to directly play the stream
+\fB\-\-subs\-embed
+Embed soft subtitles in MP4 output file. Ignored with \-\-audio\-only and \-\-ffmpeg\-obsolete. Requires \-\-subtitles.
 .TP
-\fB\-\-stdout, \-x
-Additionally stream to STDOUT (so you can pipe output to a player)
+\fB\-\-subs\-mono
+Create monochrome titles, with leading hyphen used to denote change of speaker. Requires \-\-subtitles.
 .TP
-\fB\-\-stream
-Stream to STDOUT (so you can pipe output to a player)
+\fB\-\-subs\-raw
+Additionally save the raw subtitles file.  Requires \-\-subtitles.
 .TP
-\fB\-\-subdir, \-s
-Put Recorded files into Programme name subdirectory
+\fB\-\-subtitles
+Download subtitles into srt/SubRip format if available and supported
 .TP
-\fB\-\-subdir\-format <format>
-The format to be used for the subdirectory naming using formatting fields. e.g. '<nameshort>\-<seriesnum>'
+\fB\-\-subtitles\-only
+Only download the subtitles, not the programme
+.TP
+\fB\-\-tag\-only
+Only update the programme metadata tag and not download the programme. Use with \-\-history or \-\-tag\-only\-filename.
 .TP
-\fB\-\-symlink <file>
-Create symlink to <file> once we have the header of the recording
+\fB\-\-tag\-only\-filename <filename>
+Add metadata tags to specified file (ignored unless used with \-\-tag\-only)
+.TP
+\fB\-\-thumb
+Download thumbnail image if available
 .TP
 \fB\-\-thumb\-ext <ext>
 Thumbnail filename extension to use
 .TP
-\fB\-\-thumbsize <index|width>
-Default thumbnail size/index to use for the current recording and metadata (see \-\-info for thumbnailN: to get size/index)
+\fB\-\-thumbnail\-only
+Only download thumbnail image if available, not the programme
+.TP
+\fB\-\-thumbnail\-series
+Force use of series/brand thumbnail (series preferred) instead of episode thumbnail
 .TP
-\fB\-\-thumbsizecache <index|width>
-Default thumbnail size/index to use when building cache and index (see \-\-info for thumbnailN: to get size/index)
+\fB\-\-thumbnail\-size <width>
+Thumbnail size to use for the current recording and metadata. Specify width: 192,256,384,448,512,640,704,832,960,1280,1920. Invalid values will be mapped to nearest available. Default: 192
 .TP
-\fB\-\-whitespace, \-w
-Keep whitespace (and escape chars) in filenames
+\fB\-\-thumbnail\-square
+Download square version of thumbnail image.
 .TP
-\fB\-\-xml\-alpha
-Create freevo/Mythtv menu sorted alphabetically by programme name
+\fB\-\-tracklist
+Download track list of music played in programme, if available. Track times and durations may be missing or incorrect.
 .TP
-\fB\-\-xml\-channels
-Create freevo/Mythtv menu of channels \-> programme names \-> episodes
+\fB\-\-tracklist\-only
+Only download track list of music played in programme (if available), not programme.
 .TP
-\fB\-\-xml\-names
-Create freevo/Mythtv menu of programme names \-> episodes
+\fB\-\-whitespace, \-w
+Keep whitespace in file and directory names.  Default behaviour is to replace whitespace with underscores.
 .SS "PVR Options:"
 .TP
 \fB\-\-comment <string>
@@ -382,7 +371,7 @@
 Runs the PVR using all saved PVR searches (intended to be run every hour from cron etc). The list can be limited by adding a regex to the command. Synonyms: \-\-pvrrun, \-\-pvr\-run
 .TP
 \fB\-\-pvr\-add <search name>
-Save the named PVR search with the specified search terms.  Search terms required. Use \-\-search=.* to force download of all available programmes. Synonyms: \-\-pvradd
+Save the named PVR search with the specified search terms. Search terms required unless \-\-pid specified. Synonyms: \-\-pvradd
 .TP
 \fB\-\-pvr\-del <search name>
 Remove the named search from the PVR searches. Synonyms: \-\-pvrdel
@@ -394,38 +383,35 @@
 Enable a previously disabled named PVR search. Synonyms: \-\-pvrenable
 .TP
 \fB\-\-pvr\-exclude <string>
-Exclude the PVR searches to run by search name (regex or comma separated values). Synonyms: \-\-pvrexclude
+Exclude the PVR searches to run by search name (comma\-separated regex list). Defaults to substring match. Synonyms: \-\-pvrexclude
 .TP
 \fB\-\-pvr\-list
 Show the PVR search list. Synonyms: \-\-pvrlist
 .TP
 \fB\-\-pvr\-queue
-Add currently matched programmes to queue for later one\-off recording using the \-\-pvr option. Search terms required unless \-\-pid specified. Use \-\-search=.* to force download of all available programmes. Synonyms: \-\-pvrqueue
+Add currently matched programmes to queue for later one\-off recording using the \-\-pvr option. Search terms required unless \-\-pid specified. Synonyms: \-\-pvrqueue
 .TP
 \fB\-\-pvr\-scheduler <seconds>
 Runs the PVR using all saved PVR searches every <seconds>. Synonyms: \-\-pvrscheduler
 .TP
+\fB\-\-pvr\-series
+Create PVR search for each unique series name in search results. Search terms required. Synonyms: \-\-pvrseries
+.TP
 \fB\-\-pvr\-single <search name>
 Runs a named PVR search. Synonyms: \-\-pvrsingle
 .SS "Config Options:"
 .TP
+\fB\-\-cache\-rebuild
+Rebuild cache with full 30\-day programme index. Use \-\-refresh\-limit to restrict cache window.
+.TP
 \fB\-\-expiry, \-e <secs>
 Cache expiry in seconds (default 4hrs)
 .TP
 \fB\-\-limit\-matches <number>
 Limits the number of matching results for any search (and for every PVR search)
 .TP
-\fB\-\-localfilesdirs <dir>[,dir,]
-Directories/Folders to scan for new files
-.TP
 \fB\-\-nopurge
-Don't ask to delete programmes recorded over 30 days ago
-.TP
-\fB\-\-packagemanager <string>
-Tell the updater that we were installed using a package manager and don't update (use either: apt,rpm,deb,yum,disable)
-.TP
-\fB\-\-plugins\-update
-Update get_iplayer plugins to the latest
+Don't show warning about programmes recorded over 30 days ago
 .TP
 \fB\-\-prefs\-add
 Add/Change specified saved user or preset options
@@ -446,87 +432,140 @@
 Show all valid presets
 .TP
 \fB\-\-profile\-dir <dir>
-Override the user profile directory/folder
+Override the user profile directory
 .TP
 \fB\-\-refresh, \-\-flush, \-f
 Refresh cache
 .TP
-\fB\-\-refresh\-exclude <string>
-Exclude matched channel(s) when refreshing cache (regex or comma separated values)
+\fB\-\-refresh\-abortonerror
+Abort cache refresh for programme type if data for any channel fails to download.  Use \-\-refresh\-exclude to temporarily skip failing channels.
+.TP
+\fB\-\-refresh\-exclude <channel>,<channel>,...
+Exclude matched channel(s) when refreshing cache (comma\-separated regex list).  Defaults to substring match.  Overrides \-\-refresh\-include\-groups[\-{tv,radio}] status for specified channel(s)
+.TP
+\fB\-\-refresh\-exclude\-groups <group>,<group>,...
+Exclude channel groups when refreshing radio or TV cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
+.TP
+\fB\-\-refresh\-exclude\-groups\-radio <group>,<group>,...
+Exclude channel groups when refreshing radio cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
+.TP
+\fB\-\-refresh\-exclude\-groups\-tv <group>,<group>,...
+Exclude channel groups when refreshing TV cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
 .TP
 \fB\-\-refresh\-future
-Obtain future programme schedule when refreshing cache (between 7\-14 days)
+Obtain future programme schedule when refreshing cache
 .TP
-\fB\-\-refresh\-include <string>
-Include matched channel(s) when refreshing cache (regex or comma separated values)
+\fB\-\-refresh\-include <channel>,<channel>,...
+Include matched channel(s) when refreshing cache (comma\-separated regex list).  Defaults to substring match.  Overrides \-\-refresh\-exclude\-groups[\-{tv,radio}] status for specified channel(s)
 .TP
-\fB\-\-skipdeleted
-Skip the download of metadata/thumbs/subs if the media file no longer exists. Use with \-\-history & \-\-metadataonly/subsonly/thumbonly.
+\fB\-\-refresh\-include\-groups <group>,<group>,...
+Include channel groups when refreshing radio or TV cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
+.TP
+\fB\-\-refresh\-include\-groups\-radio <group>,<group>,...
+Include channel groups when refreshing radio cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
+.TP
+\fB\-\-refresh\-include\-groups\-tv <group>,<group>,...
+Include channel groups when refreshing TV cache (comma\-separated values).  Valid values: 'national', 'regional', 'local'
 .TP
-\fB\-\-update, \-u
-Update get_iplayer if a newer one exists
+\fB\-\-refresh\-limit <days>
+Minimum number of days of programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30
+.TP
+\fB\-\-refresh\-limit\-radio <days>
+Number of days of radio programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30
+.TP
+\fB\-\-refresh\-limit\-tv <days>
+Number of days of TV programmes to cache.  Makes cache updates slow.  Default: 7 Min: 1 Max: 30
+.TP
+\fB\-\-skipdeleted
+Skip the download of metadata/thumbs/subs if the media file no longer exists.  Use with \-\-history & \-\-metadataonly/subsonly/thumbonly.
 .TP
 \fB\-\-webrequest <urlencoded string>
 Specify all options as a urlencoded string of "name=val&name=val&..."
 .SS "External Program Options:"
 .TP
 \fB\-\-atomicparsley <path>
-Location of AtomicParsley tagger binary
+Location of AtomicParsley binary
 .TP
 \fB\-\-ffmpeg <path>
-Location of ffmpeg binary
-.TP
-\fB\-\-flvstreamer <path>
-Location of flvstreamer binary
-.TP
-\fB\-\-id3v2 <path>
-Location of id3v2 or id3tag binary
+Location of ffmpeg binary. Assumed to be ffmpeg 3.0 or higher unless \-\-ffmpeg\-obsolete is specified.
 .TP
-\fB\-\-lame <path>
-Location of lame binary
+\fB\-\-ffmpeg\-force
+Bypass version checks and assume ffmpeg is version 3.0 or higher
 .TP
-\fB\-\-mplayer <path>
-Location of mplayer binary
+\fB\-\-ffmpeg\-loglevel <level>
+Set logging level for ffmpeg. Overridden by \-\-quiet and \-\-silent. Default: 'fatal'
 .TP
-\fB\-\-vlc <path>
-Location of vlc or cvlc binary
+\fB\-\-ffmpeg\-obsolete
+Indicates you are using an obsolete version of ffmpeg (<1.0) that may not support certain options. Without this option, MP4 conversion may fail with obsolete versions of ffmpeg.
 .SS "Tagging Options:"
 .TP
-\fB\-\-no\-tag
-Do not tag downloaded programmes
+\fB\-\-no\-artwork
+Do not embed thumbnail image in output file. Also removes existing artwork. All other metadata values will be written.
 .TP
-\fB\-\-tag\-cnid
-AtomicParsley supports \-\-cnID argument to add catalog ID used for combining HD and SD versions in iTunes
+\fB\-\-no\-tag
+Do not tag downloaded programmes.
 .TP
-\fB\-\-tag\-fulltitle
-Use complete title (including series) instead of shorter episode title
+\fB\-\-tag\-credits
+Add programme credits (if available) to lyrics field.
 .TP
-\fB\-\-tag\-hdvideo
-AtomicParsley supports \-\-hdvideo argument for HD video flag
+\fB\-\-tag\-format\-show
+Format template for programme name in tag metadata. Use substitution parameters in template (see docs for list). Default: <name>
 .TP
-\fB\-\-tag\-longdesc
-AtomicParsley supports \-\-longdesc argument for long description text
+\fB\-\-tag\-format\-title
+Format template for episode title in tag metadata. Use substitution parameters in template (see docs for list). Default: <episodeshort>
 .TP
-\fB\-\-tag\-longdescription
-AtomicParsley supports \-\-longDescription argument for long description text
+\fB\-\-tag\-isodate
+Use ISO8601 dates (YYYY\-MM\-DD) in album/show names and track titles
 .TP
 \fB\-\-tag\-podcast
-Tag downloaded radio and tv programmes as iTunes podcasts (requires MP3::Tag module for AAC/MP3 files)
+Tag downloaded radio and tv programmes as iTunes podcasts
 .TP
 \fB\-\-tag\-podcast\-radio
-Tag only downloaded radio programmes as iTunes podcasts (requires MP3::Tag module for AAC/MP3 files)
+Tag only downloaded radio programmes as iTunes podcasts
 .TP
 \fB\-\-tag\-podcast\-tv
 Tag only downloaded tv programmes as iTunes podcasts
 .TP
+\fB\-\-tag\-tracklist
+Add track list of music played in programme (if available) to lyrics field.
+.TP
 \fB\-\-tag\-utf8
-AtomicParsley accepts UTF\-8 input
+Use UTF\-8 encoding for non\-ASCII characters in AtomicParsley parameter values (Linux/Unix/macOS only). Use only if auto\-detect fails.
+.SS "Misc Options:"
+.TP
+\fB\-\-encoding\-console\-in <name>
+Character encoding for standard input (currently unused).  Encoding name must be known to Perl Encode module.  Default (only if auto\-detect fails): Linux/Unix/OSX = UTF\-8, Windows = cp850
+.TP
+\fB\-\-encoding\-console\-out <name>
+Character encoding used to encode search results and other output.  Encoding name must be known to Perl Encode module.  Default (only if auto\-detect fails): Linux/Unix/OSX = UTF\-8, Windows = cp850
+.TP
+\fB\-\-encoding\-locale <name>
+Character encoding used to decode command\-line arguments.  Encoding name must be known to Perl Encode module.  Default (only if auto\-detect fails): Linux/Unix/OSX = UTF\-8, Windows = cp1252
+.TP
+\fB\-\-encoding\-locale\-fs <name>
+Character encoding used to encode file and directory names.  Encoding name must be known to Perl Encode module.  Default (only if auto\-detect fails): Linux/Unix/OSX = UTF\-8, Windows = cp1252
+.TP
+\fB\-\-index\-maxconn <number>
+Maximum number of connections to use for concurrent programme indexing.  Default: 5 Min: 1 Max: 10
+.TP
+\fB\-\-purge\-files
+Delete downloaded programmes more than 30 days old
+.TP
+\fB\-\-throttle <Mb/s>
+Bandwidth limit (in Mb/s) for media file download. Default: unlimited. Synonym: \-\-bw
+.TP
+\fB\-\-trim\-history <# days to retain>
+Remove download history entries older than number of days specified in option value.  Cannot specify 0 \- use 'all' to completely delete download history
+.SS "Deprecated Options:"
+.TP
+\fB\-\-no\-index\-concurrent
+Do not use concurrent indexing to update programme cache.  Cache updates will be very slow.
 .SH AUTHOR
-get_iplayer was written by Phil Lewis <iplayer2 (at sign) linuxcentre.net> and is now maintained by the contributors at http://www.infradead.org/get_iplayer/html/get_iplayer.html
+get_iplayer was written by Phil Lewis <iplayer2 (at sign) linuxcentre.net> and is now maintained by the contributors at https://github.com/get\-iplayer/get_iplayer
 .PP
 This manual page was originally written by Jonathan Wiltshire <jmw@debian.org> for the Debian project (but may be used by others).
 .SH COPYRIGHT NOTICE
-get_iplayer v2.82, Copyright (C) 2008\-2010 Phil Lewis
+get_iplayer v3.20, Copyright (C) 2008\-2010 Phil Lewis
   This program comes with ABSOLUTELY NO WARRANTY; for details use \-\-warranty.
   This is free software, and you are welcome to redistribute it under certain
   conditions; use \-\-conditions for details.

get_iplayer-2.82.tar.gz/get_iplayer.cgi -> get_iplayer-3.20.tar.gz/get_iplayer.cgi Changed

@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # The world's most insecure web-based PVR manager and streaming proxy for get_iplayer
 # ** WARNING ** Never run this in an untrusted environment or facing the internet
@@ -20,31 +20,41 @@
 #
 # Author: Phil Lewis
 # Email: iplayer2 (at sign) linuxcentre.net
-# Web: http://linuxcentre.net/iplayer
+# Web: https://github.com/get-iplayer/get_iplayer/wiki
 # License: GPLv3 (see LICENSE.txt)
 #
 
-my $VERSION = 2.82;
+my $VERSION = 3.20;
+my $VERSION_TEXT;
+$VERSION_TEXT = sprintf("v%.2f", $VERSION) unless $VERSION_TEXT;
 
-use strict;
-use CGI ':all';
+use CGI qw(-utf8 :all);
 use CGI::Cookie;
-use IO::File;
+use Cwd 'abs_path';
+use Encode qw(:DEFAULT :fallback_all);
+use Getopt::Long;
+use File::Basename;
 use File::Copy;
 use HTML::Entities;
-use URI::Escape;
+use IO::File;
+use IO::Handle;
+use IPC::Open3;
 use LWP::ConnCache;
 #use LWP::Debug qw(+);
 use LWP::UserAgent;
-use IO::Handle;
-use Getopt::Long;
-use Cwd 'abs_path';
-use File::Basename;
+use PerlIO::encoding;
+use strict;
 use constant IS_WIN32 => $^O eq 'MSWin32' ? 1 : 0;
+use constant DEFAULT_THUMBNAIL => "https://ichef.bbci.co.uk/images/ic/480xn/p01tqv8z.png";
+$PerlIO::encoding::fallback = XMLCREF;
+# suppress Perl 5.22/CGI 4 warning
+$CGI::LIST_CONTEXT_WARN = 0;
 $| = 1;
+
 my $fh;
 # Send log messages to this fh
 my $se = *STDERR;
+binmode $se, ':utf8';
 
 my $opt_cmdline;
 $opt_cmdline->{debug} = 0;
@@ -55,9 +65,11 @@
 	"help|h"			=> \$opt_cmdline->{help},
 	"listen|address|l=s"		=> \$opt_cmdline->{listen},
 	"port|p=n"			=> \$opt_cmdline->{port},
-	"ffmpeg=s"			=> \$opt_cmdline->{ffmpeg},
 	"getiplayer|get_iplayer|g=s"	=> \$opt_cmdline->{getiplayer},
+	"ffmpeg=s"			=> \$opt_cmdline->{ffmpeg},
+	"encodinglocalefs|encoding-locale-fs=s"	=> \$opt_cmdline->{encodinglocalefs},
 	"debug"				=> \$opt_cmdline->{debug},
+	"baseurl|base-url|b=s"		=> \$opt_cmdline->{baseurl},
 ) || die usage();
 
 # Display usage if old method of invocation is used or --help
@@ -66,33 +78,34 @@
 
 # Usage
 sub usage {
-	my $text = sprintf "get_iplayer Web PVR Manager v%.2f, ", $VERSION;
+	my $text = "get_iplayer Web PVR Manager $VERSION_TEXT, ";
 	$text .= <<'EOF';
 Copyright (C) 2009-2010 Phil Lewis
-  This program comes with ABSOLUTELY NO WARRANTY; This is free software, 
-  and you are welcome to redistribute it under certain conditions; 
+  This program comes with ABSOLUTELY NO WARRANTY; This is free software,
+  and you are welcome to redistribute it under certain conditions;
   See the GPLv3 for details.
 
 Options:
- --listen,-l       Use the built-in web server and listen on this interface address (default: 0.0.0.0)
- --port,-p         Use the built-in web server and listen on this TCP port
- --getiplayer,-g   Path to the get_iplayer script
- --ffmpeg          Path to the ffmpeg binary
- --debug           Debug mode
- --help,-h         This help text
+ --listen,-l        Use the built-in web server and listen on this interface address (default: 0.0.0.0)
+ --port,-p          Use the built-in web server and listen on this TCP port
+ --getiplayer,-g    Path to the get_iplayer script
+ --ffmpeg           Path to the ffmpeg binary
+ --encodinglocalefs Encoding for file names (default: Linux/Unix/OSX = UTF-8, Windows = cp1252)
+ --debug            Debug mode
+ --baseurl,-b       Base URL for link generation. Set to full proxy URL if running behind reverse proxy.
+ --help,-h          This help text
 EOF
 	print $text;
 	exit 1;
-}	
+}
 
 
 # Some defaults
-my $default_modes = 'flashaachigh,flashaacstd,flash,realaudio,flashaaclow';
-$opt_cmdline->{ffmpeg} = 'ffmpeg' if ! $opt_cmdline->{ffmpeg};
+my $default_modes = 'default';
 $opt_cmdline->{listen} = '0.0.0.0' if ! $opt_cmdline->{listen};
 # Search for get_iplayer
 if ( ! $opt_cmdline->{getiplayer} ) {
-	for ( './get_iplayer', './get_iplayer.cmd', './get_iplayer.pl', '/usr/bin/get_iplayer' ) {
+	for ( './get_iplayer', './get_iplayer.cmd', './get_iplayer.pl', '/usr/bin/get_iplayer', '/usr/local/bin/get_iplayer' ) {
 		$opt_cmdline->{getiplayer} = $_ if -x $_;
 	}
 }
@@ -100,6 +113,9 @@
 	print "ERROR: Cannot find get_iplayer, please specify its location using the --getiplayer option.\n";
 	exit 2;
 }
+$opt_cmdline->{encodinglocalefs} ||= (IS_WIN32 ? 'cp1252' : 'utf8');
+$opt_cmdline->{ffmpeg} ||= 'ffmpeg';
+$opt_cmdline->{baseurl} .= "/" if $opt_cmdline->{baseurl} && $opt_cmdline->{baseurl} !~ m{/$};
 
 # Path to get_iplayer (+ set HOME env var cos apache seems to not set it)
 my $home = $ENV{HOME};
@@ -109,11 +125,12 @@
 my @displaycols;
 
 # Field names to be grabbed from get_iplayer
-my @headings = qw( 
+my @headings = qw(
 	index
 	thumbnail
 	pid
 	available
+	expires
 	type
 	name
 	episode
@@ -132,13 +149,14 @@
 );
 
 # Default Displayed headings
-my @headings_default = qw( thumbnail type name episode desc channel categories timeadded );
+my @headings_default = qw( thumbnail type name episode desc channel timeadded );
 
 # Lookup table for nice field name headings
 my %fieldname = (
 	index			=> 'Index',
 	pid			=> 'Pid',
 	available		=> 'Availability',
+	expires		=> 'Expires',
 	type			=> 'Type',
 	name			=> 'Name',
 	episode			=> 'Episode',
@@ -166,42 +184,14 @@
 
 my %prog_types = (
 	tv	=> 'BBC TV',
-	radio	=> 'BBC Radio',
-	podcast	=> 'BBC Podcast',
-	livetv	=> 'Live BBC TV',
-	liveradio => 'Live BBC Radio',
+	radio	=> 'BBC Radio'
 );
 
 my %prog_types_order = (
 	1	=> 'tv',
-	2	=> 'radio',
-	3	=> 'podcast',
-	4	=> 'livetv',
-	5	=> 'liveradio',
+	2	=> 'radio'
 );
 
-# Get list of currently valid and prune %prog types and add new entry
-chomp( my @plugins = split /,/, join "\n", get_cmd_output( $opt_cmdline->{getiplayer}, '--nopurge', '--nocopyright', '--listplugins' ) );
-for my $type (keys %prog_types) {
-	if ( $prog_types{$type} && not grep /$type/, @plugins ) {
-		# delete from %prog_types hash
-		delete $prog_types{$type};
-		# Delete from %prog_types_order hash
-		for ( keys %prog_types_order ) {
-			delete $prog_types_order{$_} if $prog_types_order{$_} eq $type; 
-		}
-	}
-}
-for my $type ( @plugins ) {
-	if ( not $prog_types{$type} ) {
-		$prog_types{$type} = $type;
-		# Add to %prog_types_order hash
-		my $max = scalar( keys %prog_types_order ) + 1;
-		$prog_types_order{$max} = $type;
-	}
-}
-#print "DEBUG: prog_types_order: $_ => $prog_types_order{$_}\n" for sort keys %prog_types_order;
-
 my $icons_base_url = './icons/';
 
 my $cgi;
@@ -222,7 +212,6 @@
 	'record_now'		=> \&record_now,
 	'show_info'		=> \&show_info,
 	'refresh'		=> \&refresh,
-	'update_script'		=> \&update_script,
 );
 
 
@@ -238,7 +227,7 @@
 
 $layout->{SEARCHTAB}->{title} = 'Advanced Search';
 $layout->{SEARCHTAB}->{heading} = 'Advanced Search Options:';
-$layout->{SEARCHTAB}->{order} = [ qw/ VERSIONLIST EXCLUDE CATEGORY EXCLUDECATEGORY CHANNEL EXCLUDECHANNEL SINCE BEFORE FUTURE / ],
+$layout->{SEARCHTAB}->{order} = [ qw/ EXCLUDE CATEGORY EXCLUDECATEGORY CHANNEL EXCLUDECHANNEL SINCE BEFORE FUTURE / ],
 
 $layout->{DISPLAYTAB}->{title} = 'Display';
 $layout->{DISPLAYTAB}->{heading} = 'Display Options:';
@@ -250,7 +239,7 @@
 
 $layout->{RECORDINGTAB}->{title} = 'Recording';
 $layout->{RECORDINGTAB}->{heading} = 'Recording Options:';
-$layout->{RECORDINGTAB}->{order} = [ qw/ OUTPUT MODES PROXY SUBTITLES METADATA THUMB PVRHOLDOFF FORCE AUTOWEBREFRESH AUTOPVRRUN REFRESHFUTURE / ];
+$layout->{RECORDINGTAB}->{order} = [ qw/ OUTPUT VERSIONLIST MODES PROXY SUBTITLES METADATA THUMB PVRHOLDOFF FORCE AUTOWEBREFRESH AUTOPVRRUN REFRESHFUTURE FPS25 / ];
 
 $layout->{STREAMINGTAB}->{title} = 'Streaming';
 $layout->{STREAMINGTAB}->{heading} = 'Streaming Options:';
@@ -269,6 +258,7 @@
 ### Perl CGI Web Server ###
 use Socket;
 use IO::Socket;
+use POSIX ":sys_wait_h";
 my $IGNOREEXIT = 0;
 # If the port number is specified then run embedded web server
 if ( $opt_cmdline->{port} > 0 ) {
@@ -288,6 +278,7 @@
 		$server or die "Unable to create server socket: $!";
 		print $se "INFO: Listening on $opt_cmdline->{listen}:$opt_cmdline->{port}\n";
 		print $se "WARNING: Insecure Remote access is allowed, use --listen=127.0.0.1 to limit to this host only\n" if $opt_cmdline->{listen} ne '127.0.0.1';
+		print $se "INFO: Using base URL $opt_cmdline->{baseurl}\n" if $opt_cmdline->{baseurl};
 		# Await requests and handle them as they arrive
 		while (my $client = $server->accept()) {
 			my $procid = fork();
@@ -295,9 +286,14 @@
 			# Parent
 			if ( $procid ) {
 				close $client;
+				# must call waitpid() on Windows
+				if ( IS_WIN32 ) {
+					while ( abs(waitpid(-1, WNOHANG)) > 1 ) {}
+				}
 				next;
 			}
 			# Child
+			binmode $se, IS_WIN32 ? ":encoding(cp1252)" : ':encoding(UTF-8)';
 			$client->autoflush(1);
 			my %request = ();
 			my $query_string;
@@ -338,11 +334,11 @@
 					$query_string = $request{CONTENT};
 				}
 				$data{"_method"} = "GET";
-	
+
 			} elsif ($request{METHOD} eq 'POST') {
 				$query_string = parse_post_form_string( $request{CONTENT} );
 				$data{"_method"} = "POST";
-	
+
 			} else {
 				$data{"_method"} = "ERROR";
 			}
@@ -351,7 +347,7 @@
 			print $se "$data{_method}: $request{URL}\n";
 
 			# Is this the CGI or some other file request?
-			if ( $request{URL} =~ /^\/?(iplayer|stream|recordings_delete|playlist.*|genplaylist.*|opml|)\/?$/ ) {
+			if ( $request{URL} =~ /^\/?(iplayer|recordings_delete|playlist.*|genplaylist.*|opml|)\/?$/ ) {
 				# remove any vars that might affect the CGI
 				#%ENV = ();
 				@ARGV = ();
@@ -361,10 +357,15 @@
 				$ENV{'REQUEST_URI'} = $request{URL};
 				$ENV{'COOKIE'} = $request{cookie};
 				$ENV{'SERVER_PORT'} = $opt_cmdline->{port};
+				my $request_host = "http://$request{host}/";
+				if ( $opt_cmdline->{baseurl} ) {
+					$ENV{'REQUEST_URI'} = $opt_cmdline->{baseurl};
+					$request_host = $opt_cmdline->{baseurl};
+				}
 				# respond OK to browser
 				print $client "HTTP/1.1 200 OK", Socket::CRLF;
 				# Invoke CGI
-				run_cgi( $client, $query_string, $request{URL}, 'http://'.$request{host}.'/' );
+				run_cgi( $client, $query_string, $request{URL}, $request_host );
 
 			# Else 404
 			} else {
@@ -420,6 +421,12 @@
 }
 
 
+# wrap HTML::Entities::encode_entities to limit encoding
+sub encode_entities {
+	my $value = shift;
+	return HTML::Entities::encode_entities( $value, '&<>"\'' );
+}
+
 
 sub parse_post_form_string {
 	my $form = $_[0];
@@ -435,7 +442,8 @@
 		# Decode entities first
 		decode_entities($val);
 		# url encode each entry
-		$val =~ s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+		# $val =~ s/([^A-Za-z0-9])/sprintf("%%%02X", ord($1))/seg;
+		$val = CGI::escape($val);
 		push @data, "$key=$val";
 	}
 	return join '&', @data;
@@ -446,6 +454,7 @@
 sub run_cgi {
 	# Get filehandle for output
 	$fh = shift;
+	binmode $fh, ':utf8';
 	my $query_string = shift;
 	my $request_uri = shift;
 	my $request_host = shift;
@@ -475,77 +484,8 @@
 	# e.g. http://server/stream?args -> http://server/get_iplayer.cgi?ACTION=stream&args
 
 	# Stream from get_iplayer STDOUT (optionally transcoding if required)
-	if ( $action eq 'stream' ) {
-		my $ext = $cgi->param( 'OUTTYPE' ) || 'flv';
-		# Remove fileprefix
-		$ext =~ s/^.*\.//g;
-		# lowecase
-		$ext = lc( $ext );
-		# Stream mime types (tweaked to work well in vlc)
-		my %mimetypes = (
-			wav 	=> 'audio/x-wav',
-			flac	=> 'audio/x-flac',
-			mp3 	=> 'audio/mpeg',
-			aac	=> 'audio/mpeg',
-			m4a	=> 'audio/mpeg',
-			rm	=> 'audio/x-pn-realaudio',
-			mov 	=> 'video/quicktime',
-			mp4	=> 'video/x-flv',
-			avi	=> 'video/x-flv',
-			flv	=> 'video/x-flv',
-			asf	=> 'video/x-ms-asf',
-		);
-
-		# Default mime type depending on mode
-		####$ext = 'flv' if $opt->{MODES}->{current} =~ /^flash/ && ! $ext;
-
-		# Streamtype overrides any outtype
-		$ext = $opt->{STREAMTYPE}->{current} if $opt->{STREAMTYPE}->{current} !~ /(none|^$)/i;
-
-		# If mimetype is defined
-		if ( $mimetypes{$ext} ) {
-			my $notranscode = 0;
-
-			# flv audio
-			$mimetypes{flv} = 'audio/x-flv' if $opt->{PROGTYPES}->{current} =~ m{^(radio|liveradio|podcast)$};
-
-			# Output headers to stream 
-			# This will enable seekable: -Accept_Ranges=>'bytes',
-			my $headers = $cgi->header( -type => $mimetypes{$ext}, -Connection => 'close' );
-
-			# Send the headers to the browser
-			print $se "\r\nHEADERS:\n$headers\n"; #if $opt_cmdline->{debug};
-			print $fh $headers;
-
-			# Default Recipies
-			# Need to determine --type and then set the default --modes and default outtype for conversion if required
-			if ( $opt->{PROGTYPES}->{current} eq 'livetv' ) {
-				print $se "INFO: Transcoding disabled for livetv\n";
-				$notranscode = 1;
-				$ext = 'flv';
-			}
-			# No conversion for iphone radio as mp3
-			$ext = undef if $opt->{MODES}->{current} eq 'iphone' && $ext eq 'mp3';
-			# No conversion for realaudio radio as rm
-			$ext = undef if $opt->{MODES}->{current} eq 'realaudio' && $ext eq 'rm';
-			# stream mp3 natively
-			$ext = undef if $ext eq 'mp3';
-			# No conversion for flv
-			## $ext = undef if $ext eq 'flv';
-			# Disable transcoing if none is specified as OUTTYPE/STREAMTYPE - no point in doing this as we have then no idea of the mimetype
-			### Need a way to disable transcoding here - pass and check STREAMTYPE?
-			if ( $opt->{STREAMTYPE}->{current} =~ /none/i ) {
-				print $se "INFO: Transcoding disabled (OUTTYPE=none)\n";
-				$ext = undef;
-				$notranscode = 1;
-			}
-			# no transcode if $ext is undefined
-			stream_prog( $mimetypes{$ext}, $cgi->param( 'PID' ), $cgi->param( 'PROGTYPES' ), $opt->{MODES}->{current}, $ext, $notranscode, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} );
-		} else {
-			print $se "ERROR: Aborting client thread - output mime type is undetermined\n";
-		}
-
-	} elsif ( $action eq 'direct' ) {
+	if ( $action eq 'direct' ) {
+		binmode $fh, ':raw';
 		# get filename first
 		my $progtype = $cgi->param( 'PROGTYPES' );
 		my $pid = $cgi->param( 'PID' );
@@ -587,7 +527,7 @@
 		# cannot stream mp4/avi so transcode to flv
 		# Add types here which you want re-muxed into flv
 		#if ( $src_ext =~ m{^(mp4|avi|mov|mp3|aac)$} && ! $ext ) {
-		} elsif ( $src_ext =~ m{^(mp4|avi|mov)$} && ! $ext ) {
+		} elsif ( $src_ext =~ m{^(mp4|m4a|aac|avi|mov)$} && ! $ext ) {
 			$ext = 'flv';
 
 		# Else Default to no transcoding
@@ -601,7 +541,7 @@
 		if ( $mimetypes{$ext} ) {
 
 			# Output headers
-			# to stream 
+			# to stream
 			# This will enable seekable -Accept_Ranges=>'bytes',
 			my $headers = $cgi->header( -type => $mimetypes{$ext}, -Connection => 'close' );
 
@@ -628,7 +568,7 @@
 		$outtype = $cgi->param('STREAMTYPE') || $cgi->param('OUTTYPE') || 'flv' if $action eq 'playlistdirect';
 
 		# ( host, outtype, modes, progtype, bitrate, search, searchfields, action )
-		print $fh create_playlist_m3u_single( $request_host, $outtype, $opt->{MODES}->{current}, $opt->{PROGTYPES}->{current} , $cgi->param('BITRATE') || '', $opt->{SEARCH}->{current}, $opt->{SEARCHFIELDS}->{current} || 'name', $action );
+		print $fh create_playlist_m3u_single( $request_host, $outtype, $opt->{MODES}->{current}, $opt->{PROGTYPES}->{current} , $cgi->param('BITRATE') || '', $opt->{SEARCH}->{current}, $opt->{SEARCHFIELDS}->{current} || 'name', $opt->{VERSIONLIST}->{current}, $action );
 
 	# Get a playlist for a specified 'PROGTYPES'
 	} elsif ( $action eq 'opml' ) {
@@ -651,7 +591,7 @@
 		# Send the headers to the browser
 		print $se "\r\nHEADERS:\n$headers\n"; #if $opt_cmdline->{debug};
 		print $fh $headers;
-		
+
 		# determine output type
 		my $outtype = $cgi->param('OUTTYPE') || 'flv';
 		$outtype = $cgi->param('STREAMTYPE') || $cgi->param('OUTTYPE') if $action eq 'genplaylistdirect';
@@ -671,7 +611,7 @@
 			print $fh $cgi->Dump();
 			#for my $key (sort keys %ENV) {
 			#    print $fh $key, " = ", $ENV{$key}, "\n";
-			#}    
+			#}
 		}
 		if ($nextpages{$nextpage}) {
 			# call the correct subroutine
@@ -690,10 +630,14 @@
 
 sub pvr_run {
 	print $fh "<strong><p>The PVR will auto-run every $opt->{AUTOPVRRUN}->{current} hour(s) if you leave this page open</p></strong>" if $opt->{AUTOPVRRUN}->{current};
+	if ( IS_WIN32 ) {
+		print $fh "<strong><p>Windows users: You may encounter errors if you perform other tasks in the Web PVR Manager while this page is reloading</p></strong>" if $opt->{AUTOPVRRUN}->{current};
+	}
 	print $se "INFO: Starting PVR Run\n";
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
-		'--nopurge',
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--hash',
 		'--pvr',
@@ -701,7 +645,7 @@
 	#print $se "DEBUG: running: $cmd\n";
 	print $fh '<pre>';
 	# Redirect both STDOUT and STDERR to client browser socket
-	run_cmd( $fh, $fh, 1, @cmd );
+	run_cmd_autorefresh( $fh, $fh, 1, @cmd );
 	print $fh '</pre>';
 	print $fh p("PVR Run complete");
 
@@ -748,7 +692,7 @@
 	my $out;
 
 	# If a URL was specified by the User (assume auto mode list is OK):
-	if ( $opt->{URL}->{current} =~ m{^http://} ) {
+	if ( $opt->{URL}->{current} =~ m{^https?://} ) {
 		push @record, "$opt->{PROGTYPES}->{current}|$opt->{URL}->{current}|$opt->{URL}->{current}|-";
 	}
 
@@ -785,7 +729,8 @@
 		my $comment = "$name - $episode";
 		my @cmd = (
 			$opt_cmdline->{getiplayer},
-			'--nopurge',
+			'--encoding-locale=UTF-8',
+			'--encoding-console-out=UTF-8',
 			'--nocopyright',
 			'--expiry=999999999',
 			'--hash',
@@ -793,13 +738,13 @@
 			get_iplayer_webrequest_args(
 				"pid=$pid",
 				"type=$type",
-				build_cmd_options( grep !/^(HISTORY|SINCE|BEFORE|HIDEDELETED|FUTURE|SEARCH|SEARCHFIELDS|VERSIONLIST|PROGTYPES|EXCLUDEC.+)$/, @params )
+				build_cmd_options( grep !/^(HISTORY|SINCE|BEFORE|HIDEDELETED|FUTURE|SEARCH|SEARCHFIELDS|PROGTYPES|EXCLUDEC.+)$/, @params )
 			),
 		);
 		print $fh p("Command: ".( join ' ', @cmd ) ) if $opt_cmdline->{debug};
 		print $fh '<pre>';
 		# Redirect both STDOUT and STDERR to client browser socket
-		run_cmd( $fh, $fh, 1, @cmd );
+		run_cmd_autorefresh( $fh, $fh, 1, @cmd );
 		print $fh '</pre>';
 	}
 	print $fh p("Recording complete");
@@ -808,71 +753,17 @@
 
 
 
-sub stream_prog {
-	my ( $mimetype, $pid , $type, $modes, $ext, $notranscode, $abitrate, $vsize, $vfr ) = ( @_ );
-	# Default modes to try
-	$modes = $default_modes if ! $modes;
-	
-	print $se "INFO: Start Streaming $pid to browser using modes '$modes', output ext '$ext', audio bitrate '$abitrate', video size '$vsize', video fram rate '$vfr'\n";
-
-	my @cmd = (
-		$opt_cmdline->{getiplayer},
-		'--nocopyright',
-		'--hash',
-		'--expiry=999999999',
-		'--webrequest',
-		get_iplayer_webrequest_args( 'nopurge=1', "modes=$modes", 'stream=1', "pid=$pid", "type=$type" ),
-	);
-
-	# If transcoding on the fly then use shell method of calling processes with a pipe
-	if ( $ext && ! $notranscode ) {
-
-		# workaround to add quotes around the args because we are using a shell here
-		for ( @cmd ) {
-			s/^(.+)$/"$1"/g if ! m{^[\-\"]};
-		}
-		my $command = join(' ', @cmd);
-		open(STDOUT, ">&", $fh ) || die "can't dup client to stdout";
-
-		# Enable buffering
-		STDOUT->autoflush(0);
-		$fh->autoflush(0);
-
-		# add ffmpeg command pipe
-		my @ffcmd = build_ffmpeg_args( '-', $mimetype, $ext, $abitrate, $vsize, $vfr );
-
-		# quote the ffmpeg binary
-		$ffcmd[0] = "\"$ffcmd[0]\"";
-
-		# Prepend the pipe
-		unshift @ffcmd, '|';
-		$command .= ' '.join ' ', @ffcmd;
-
-		print $se "DEBUG: Command: $command\n";
-		system( $command );
-
-	} else {
-		run_cmd( $fh, $se, 100000, @cmd );
-	}
-
-	print $se "INFO: Finished Streaming $pid to browser\n";
-
-	return 0;
-}
-
-
-			
 # Stream a file to browser/client
 sub stream_file {
 	my ( $filename, $mimetype, $src_ext, $ext, $notranscode, $abitrate, $vsize, $vfr ) = ( @_ );
 
-	print $se "INFO: Start Direct Streaming $filename to browser using mimetype '$mimetype', output ext '$ext', audio bitrate '$abitrate', video size '$vsize', video fram rate '$vfr'\n";
+	print $se "INFO: Start Direct Streaming $filename to browser using mimetype '$mimetype', output ext '$ext', audio bitrate '$abitrate', video size '$vsize', video frame rate '$vfr'\n";
 
 	# If transcoding required (i.e. output ext != source ext) - OR, if one of the transcoing options is set
 	if ( ( ! $notranscode ) && ( lc( $ext ) ne lc( $src_ext ) || $abitrate || $vsize || $vfr ) ) {
 		$fh->autoflush(0);
 
-		my @cmd = build_ffmpeg_args( $filename, $mimetype, $ext, $abitrate, $vsize, $vfr );
+		my @cmd = build_ffmpeg_args( $filename, $mimetype, $ext, $abitrate, $vsize, $vfr, $src_ext );
 		run_cmd( $fh, $se, 100000, @cmd );
 		print $se "INFO: Finished Streaming and transcoding $filename to browser\n";
 
@@ -909,31 +800,32 @@
 
 
 sub build_ffmpeg_args {
-		my ( $filename, $mimetype, $ext, $abitrate, $vsize, $vfr ) = ( @_ );
+		my ( $filename, $mimetype, $ext, $abitrate, $vsize, $vfr, $src_ext ) = ( @_ );
 		my @cmd_aopts;
+		my $src_mimetype = $mimetype;
+		# mime type override for audio->flv conversion
+		if ( lc( $src_ext ) =~ m{^(aac|m4a|mp3)$} ) {
+			$src_mimetype = 'audio/mpeg';
+		}
+
 		if ( $abitrate =~ m{^\d+$} ) {
-			# if this is flv stream output then use the AAC codec
-			if ( lc( $ext ) =~ m{^(flv|aac|m4a)$} ) {
-				# Tweak: ffmpeg cannot understand aac or m4a as audio output formats - force flash audio
-				$ext = 'flv' if lc( $ext ) =~ m{^(aac|m4a)$} && $mimetype =~ m{^audio};
-				push @cmd_aopts, ( '-acodec', 'libfaac', '-ab', "${abitrate}k" );
-			# else just copy  the codec?
+			if ( lc( $ext ) eq 'flv' ) {
+				push @cmd_aopts, ( '-ar', '44100', '-ab', "${abitrate}k" );
 			} else {
 				push @cmd_aopts, ( '-ab', "${abitrate}k" );
 			}
 		} else {
 			if ( lc( $ext ) eq 'flv' ) {
-				# 160k is the max for libfaac!
-				push @cmd_aopts, ( '-acodec', 'libfaac', '-ab', '160k' );
+				push @cmd_aopts, ( '-ar', '44100' );
 			}
-			# cannot copy code if for example we have an aac stream output as WAV (e.g. squeezebox liveradio flashaac)
+			# cannot copy code if for example we have an aac stream output as WAV (e.g. squeezebox flashaac)
 			#push @cmd_aopts, ( '-acodec', 'copy' );
 		}
 
 		my @cmd;
 		# If conversion is necessary
 		# Video
-		if ( $mimetype =~ m{^video} ) {
+		if ( $src_mimetype =~ m{^video} ) {
 			my @cmd_vopts;
 
 			# Apply video size
@@ -941,7 +833,7 @@
 
 			# Apply video framerate - caveat - bitrate defaults to 200k if only vfr is set
 			push @cmd_vopts, ( '-r', $vfr ) if $vfr =~ m{^\d$};
-			
+
 			# -sameq is bad
 			## Apply sameq if framerate only and no bitrate
 			#push @cmd_vopts, '-sameq' if $vfr =~ m{^\d$} && $vsize !~ m{^\d+x\d+$};
@@ -958,7 +850,7 @@
 				#'-f', $src_ext, # not required?
 				'-i', $filename,
 				@cmd_aopts,
-				@cmd_vopts,					
+				@cmd_vopts,
 				'-f', $ext,
 				'-',
 			);
@@ -982,7 +874,7 @@
 
 
 sub create_playlist_m3u_single {
-	my ( $request_host, $outtype, $modes, $type, $bitrate, $search, $searchfields, $request ) = ( @_ );
+	my ( $request_host, $outtype, $modes, $type, $bitrate, $search, $searchfields, $versionlist, $request ) = ( @_ );
 	my @playlist;
 	$outtype =~ s/^.*\.//g;
 
@@ -997,14 +889,16 @@
 	} else {
 		$searchterm =~ s|([\/\.\?\+\-\*\^\[\]\{\}])|\\$1|g;
 	}
-		
+
 	print $se "INFO: Getting playlist for type '$type' using modes '$modes' and bitrate '$bitrate'\n";
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
-		get_iplayer_webrequest_args( 'nopurge=1', "type=$type", 'listformat=ENTRY|<pid>|<name>|<episode>|<desc>|<filename>|<mode>', "fields=$searchfields", "search=$searchterm" ),
+		get_iplayer_webrequest_args( 'nopurge=1', "type=$type", 'listformat=ENTRY|<pid>|<name>|<episode>|<desc>|<filename>|<mode>', "fields=$searchfields", "search=$searchterm", "versionlist=$versionlist" ),
 	);
 	# Only add history search if the request is of this type or is a PlayFile from localfiles type
 	if ( ( $request eq 'playlistfiles' || $request eq 'playlistdirect' ) && ! ( $search =~ m{^/} && $searchfields eq 'pid' ) ) {
@@ -1028,7 +922,7 @@
 		# playlist with direct streaming for files through webserver
 		if ( $request eq 'playlistdirect' ) {
 			next if ! ( $pid && $type && $mode );
-			$url = build_url_direct( $request_host, $type, $pid, $mode, basename( $filename ), $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} );
+			$url = build_url_direct( $request_host, $type, $pid, $mode, basename( $filename ), $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} );
 
 		# If pid is actually a filename then use it cos this is a local file type programme
 		} elsif ( $request eq 'playlistfiles' && $pid =~ m{^/} ) {
@@ -1044,14 +938,14 @@
 		} else {
 			next if ! ( $type && $pid );
 			my $suffix = "${pid}.${outtype}";
-			$url = build_url_stream( $request_host, $type, $pid, $mode || $modes, $suffix, $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} );
+			$url = build_url_stream( $request_host, $type, $pid, $mode || $modes, $suffix, $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} );
 		}
 
 		# Format required, e.g.
 		##EXTINF:-1,BBC Radio - BBC Radio One (High Quality Stream)
 		push @playlist, "#EXTINF:-1,$type - $channel - $name - $episode - $desc";
 		push @playlist, "$url\n";
-		
+
 	}
 	print $se join ("\n", @playlist);
 	return join ("\n", @playlist);
@@ -1067,7 +961,7 @@
 	my @record = ( $cgi->param( 'PROGSELECT' ) );
 
 	# If a URL was specified by the User (assume auto mode list is OK):
-	if ( $opt->{URL}->{current} =~ m{^http://} ) {
+	if ( $opt->{URL}->{current} =~ m{^https?://} ) {
 		push @record, "$opt->{PROGTYPES}->{current}|$opt->{URL}->{current}|$opt->{URL}->{current}|-";
 	}
 
@@ -1080,7 +974,7 @@
 
 		# playlist with direct streaming fo files through webserver
 		if ( $request eq 'genplaylistdirect' ) {
-			$url = build_url_direct( $request_host, $type, $pid, $mode, $outtype, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} );
+			$url = build_url_direct( $request_host, $type, $pid, $mode, $outtype, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} );
 
 		# playlist with local files
 		} elsif ( $request eq 'genplaylistfile' ) {
@@ -1104,12 +998,12 @@
 		# playlist of proxied urls for streaming online prog via web server
 		} else {
 			my $suffix = "${pid}.${outtype}";
-			$url = build_url_stream( $request_host, $type, $pid, $mode || $opt->{MODES}->{current}, $suffix, $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} );
+			$url = build_url_stream( $request_host, $type, $pid, $mode || $opt->{MODES}->{current}, $suffix, $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} );
 		}
 
 		# Skip empty urls
 		next if ! $url;
-		
+
 		# Format required, e.g.
 		##EXTINF:-1,BBC Radio - BBC Radio One (High Quality Stream)
 		#http://localhost:1935/stream?PID=liveradio:bbc_radio_one&MODES=flashaac&OUTTYPE=bbc_radio_one.wav
@@ -1155,6 +1049,8 @@
 		# Extract and rewrite into playlist format
 		my @out = get_cmd_output(
 			$opt_cmdline->{getiplayer},
+			'--encoding-locale=UTF-8',
+			'--encoding-console-out=UTF-8',
 			'--nocopyright',
 			'--expiry=999999999',
 			'--webrequest',
@@ -1172,8 +1068,6 @@
 	# Top-level Menu
 	} elsif ( lc($list) eq 'menu' ) {
 		my %menu = (
-			'BBC Live Radio (National)' 	=> "${request_host}?ACTION=opml&PROGTYPES=liveradio&SEARCH=%20\\d&OUTTYPE=wav",
-			'BBC Live Radio (All)' 		=> "${request_host}?ACTION=opml&PROGTYPES=liveradio&OUTTYPE=wav",
 			'BBC iPlayer Radio Listen Again'=> "${request_host}?ACTION=opml&PROGTYPES=radio&LIST=channel",
 		);
 
@@ -1185,10 +1079,10 @@
 			#http://localhost:1935/opml?PROGTYPES=<type>SEARCH=bbc+radio+1&MODES=${modes}&OUTTYPE=a.wav
 			push @playlist, "\t\t<outline URL=\"".encode_entities( $item_url )."\" text=\"".encode_entities( "$item" )."\" />";
 		}
-		
+
 	# Channels/Names etc
 	} elsif ($list) {
-	
+
 		# Header
 		push @playlist, "\t<head>\n\t\t\n\t</head>";
 		push @playlist, "\t<body>";
@@ -1196,6 +1090,8 @@
 		# Extract and rewrite into playlist format
 		my @out = get_cmd_output(
 			$opt_cmdline->{getiplayer},
+			'--encoding-locale=UTF-8',
+			'--encoding-console-out=UTF-8',
 			'--nocopyright',
 			'--expiry=999999999',
 			'--webrequest',
@@ -1231,27 +1127,27 @@
 
 ### Playlist URL builders
 sub build_url_direct {
-	my ( $request_host, $progtypes, $pid, $modes, $outtype, $streamtype, $history, $bitrate, $vsize, $vfr ) = ( @_ );
+	my ( $request_host, $progtypes, $pid, $modes, $outtype, $streamtype, $history, $bitrate, $vsize, $vfr, $versionlist ) = ( @_ );
 	# Sanity check
 	#print $se "DEBUG: building direct playback request using:  PROGTYPES=${progtypes}  PID=${pid}  MODES=${modes}  OUTTYPE=${outtype}\n";
 	# CGI::escape
 	$_ = CGI::escape($_) for ( $progtypes, $pid, $modes, $outtype, $streamtype, $history, $bitrate, $vsize );
 	#print $se "DEBUG: building direct playback request using:  PROGTYPES=${progtypes}  PID=${pid}  MODES=${modes}  OUTTYPE=${outtype}  BITRATE=${bitrate}  VSIZE=${vsize}  VFR=${vfr}\n";
 	# Build URL
-	return "${request_host}?ACTION=direct&PROGTYPES=${progtypes}&PID=${pid}&MODES=${modes}&HISTORY=${history}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}";
+	return "${request_host}?ACTION=direct&PROGTYPES=${progtypes}&PID=${pid}&MODES=${modes}&HISTORY=${history}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}&VERSIONLIST=${versionlist}";
 }
 
 
 # "${request_host}?ACTION=stream&PROGTYPES=${type}&PID=${pid}&MODES=${modes}&OUTTYPE=${suffix}";
 sub build_url_stream {
-	my ( $request_host, $progtypes, $pid, $modes, $outtype, $streamtype, $bitrate, $vsize, $vfr ) = ( @_ );
+	my ( $request_host, $progtypes, $pid, $modes, $outtype, $streamtype, $bitrate, $vsize, $vfr, $versionlist ) = ( @_ );
 	# Sanity check
 	#print $se "DEBUG: building stream playback request using:  PROGTYPES=${progtypes}  PID=${pid}  MODES=${modes}  OUTTYPE=${outtype}\n";
 	# CGI::escape
 	$_ = CGI::escape($_) for ( $progtypes, $pid, $modes, $outtype, $streamtype, $bitrate, $vsize, $vfr );
 	#print $se "DEBUG: building stream playback request using:  PROGTYPES=${progtypes}  PID=${pid}  MODES=${modes}  OUTTYPE=${outtype}\n";
 	# Build URL
-	return "${request_host}?ACTION=stream&PROGTYPES=${progtypes}&PID=${pid}&MODES=${modes}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}";
+	return "${request_host}?ACTION=stream&PROGTYPES=${progtypes}&PID=${pid}&MODES=${modes}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}&VERSIONLIST=${versionlist}";
 }
 
 
@@ -1261,88 +1157,18 @@
 ## 'PlayWeb' - not on vlc
 # Play from file on web server/'PlayWeb' ?ACTION=playlistdirect	&SEARCHFIELDS=pid	&SEARCH=$pid	&MODES=${modes}
 sub build_url_playlist {
-	my ( $request_host, $action, $searchfields, $search, $modes, $progtypes, $outtype, $streamtype, $bitrate, $vsize, $vfr ) = ( @_ );
+	my ( $request_host, $action, $searchfields, $search, $modes, $progtypes, $outtype, $streamtype, $bitrate, $vsize, $vfr, $versionlist ) = ( @_ );
 	# Sanity check
 	#print $se "DEBUG: building $action request using:  SEARCHFIELDS=${searchfields}  SEARCH=${search}  MODES=${modes}  PROGTYPES=${progtypes}  OUTTYPE=${outtype}\n";
 	# CGI::escape
 	$_ = CGI::escape($_) for ( $action, $searchfields, $search, $modes, $progtypes, $outtype, $streamtype, $bitrate, $vsize, $vfr );
 	#print $se "DEBUG: building $action request using:  SEARCHFIELDS=${searchfields}  SEARCH=${search}  MODES=${modes}  PROGTYPES=${progtypes}  OUTTYPE=${outtype}\n";
 	# Build URL
-	return "${request_host}?ACTION=${action}&SEARCHFIELDS=${searchfields}&SEARCH=${search}&MODES=${modes}&PROGTYPES=${progtypes}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}";
+	return "${request_host}?ACTION=${action}&SEARCHFIELDS=${searchfields}&SEARCH=${search}&MODES=${modes}&PROGTYPES=${progtypes}&OUTTYPE=${outtype}&STREAMTYPE=${streamtype}&BITRATE=${bitrate}&VSIZE=${vsize}&VFR=${vfr}&VERSIONLIST=${versionlist}";
 }
 
 
 
-# Update script
-# Generic
-# Updates and overwrites this script - makes backup as <this file>.old
-# Update logic:
-# If the get_iplayer.cgi script is unwritable then quit
-# update script
-sub update_script {
-	my $update_url	= 'http://www.infradead.org/get_iplayer/latest/get_iplayer.cgi';
-	# Get version URL
-	my $script_file = $0;
-	my $ua = create_ua('update');
-
-	# If the get_iplayer script is unwritable then quit - makes it harder for deb/rpm installed scripts to be overwritten
-	if ( ! -w $script_file ) {
-		print $se "ERROR: $script_file is not writable - aborting update\n";
-		exit 1;
-	}
-
-	print $se "INFO: Updating $script_file (from $VERSION)\n";
-	print $fh p("Updating $script_file (from $VERSION)");
-	if ( update_file( $ua, $update_url, $script_file ) ) {
-		print $fh p("Updating Web PVR Manager Failed");
-	} else {
-		print $fh p("Updating Web PVR Manager Succeeded - please restart the get_iplayer Web PVR Manager service");
-	}
-
-	print $se "INFO: Updating get_iplayer\n";
-	my @cmd = (
-		$opt_cmdline->{getiplayer},
-		'--nocopyright',
-		'--expiry=999999999',
-		'--nopurge',
-		'--update',
-	);
-	print $fh '<pre>';
-	run_cmd( $fh, $se, 1, @cmd );
-	print $fh '</pre>';
-	print $fh p("Updated get_iplayer");
-
-	# Render options actions
-	print $fh div( { -class=>'action' },
-		ul( { -class=>'action' },
-			li( { -class=>'action' }, [
-				a(
-					{
-						-class=>'action',
-						-title => 'Go Back',
-						-onClick  => "history.back()",
-					},
-					'Back'
-				),
-			]),
-		),
-	);
-
-	return 0;
-}
-
-
-
-sub create_ua {
-	my $ua = LWP::UserAgent->new;
-	$ua->timeout( 10 );
-	$ua->agent( "get_iplayer Web PVR Manager updater version $VERSION" );
-	$ua->conn_cache(LWP::ConnCache->new());
-	return $ua;
-};	
-
-
-
 # Generic
 # Gets the contents of a URL and retries if it fails, returns '' if no page could be retrieved
 # Usage <content> = request_url_retry(<ua>, <url>, <retries>, <succeed message>, [<fail message>]);
@@ -1351,12 +1177,12 @@
 	my %OPTS = @LWP::Protocol::http::EXTRA_SOCK_OPTS;
 	$OPTS{SendTE} = 0;
 	@LWP::Protocol::http::EXTRA_SOCK_OPTS = %OPTS;
-	
+
 	my ($ua, $url, $retries, $succeedmsg, $failmsg) = @_;
 	my $res;
 
 	# Malformed URL check
-	if ( $url !~ m{^\s*http\:\/\/}i ) {
+	if ( $url !~ m{^\s*https?\:\/\/}i ) {
 		print $se "ERROR: Malformed URL: '$url'\n";
 		return '';
 	}
@@ -1380,42 +1206,6 @@
 
 
 
-# Updates a file:
-# Usage: update_file( <ua>, <url>, <dest filename> )
-sub update_file {
-	my $ua = shift;
-	my $url = shift;
-	my $dest_file = shift;
-	my $res;
-	# Download the file
-	if ( not $res = request_url_retry($ua, $url, 3) ) {
-		print $se "ERROR: Could not download update for ${dest_file} - Update aborted\n";
-		return 1;
-	}
-	# If the download was successful then copy over this file and make executable after making a backup of this script
-	if ( -f $dest_file ) {
-		if ( ! copy($dest_file, $dest_file.'.old') ) {
-			print $se "ERROR: Could not create backup file ${dest_file}.old - Update aborted\n";
-			return 1;
-		}
-	}
-	# Check if file is writable
-	if ( not open( FILE, "> $dest_file" ) ) {
-		print $se "ERROR: $dest_file is not writable by the current user - Update aborted\n";
-		return 1;
-	}
-	# Windows needs this
-	binmode FILE;
-	# Write contents to file
-	print FILE $res;
-	close FILE;
-	chmod 0755, $dest_file;
-	print $se "INFO: Downloaded $dest_file\n";
-	return 0;
-}
-
-
-
 # Invokes command in @args as a system call (hopefully) without using a shell
 #  Can also redirect all stdout and stderr to either: STDOUT, STDERR or unchanged
 # Usage: run_cmd( <''|STDOUTFH>, <''|STDERRFH>, @args )
@@ -1430,25 +1220,14 @@
 
 	print $se "INFO: Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
 
-	# Check if we have IPC::Open3 otherwise fallback on system()
-	eval "use IPC::Open3";
-	
-	# probably only likely in win32
-	if ($@) {
-		print $se "ERROR: Please download and run latest installer - 'IPC::Open3' is not available\n";
-		exit 1;
+	#print $se "INFO: open3( 0, \">&".fileno($fh_child_out).", \">&".fileno($fh_child_err).", <cmd> )\n";
+	# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
+	my $procid = open3( 0, ">&".fileno($fh_child_out), ">&".fileno($fh_child_err), @cmd );
+	# Wait for child to complete
+	waitpid( $procid, 0 );
+	$rtn = $?;
 
-	# Use open3()
-	} else {
-		#print $se "INFO: open3( 0, \">&".fileno($fh_child_out).", \">&".fileno($fh_child_err).", <cmd> )\n";
-		# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
-		my $procid = open3( 0, ">&".fileno($fh_child_out), ">&".fileno($fh_child_err), @cmd );
-		# Wait for child to complete
-		waitpid( $procid, 0 );
-		$rtn = $?;
-	}
-
-	# Interpret return code	      
+	# Interpret return code
 	return interpret_return_code( $rtn );
 }
 
@@ -1472,87 +1251,115 @@
 	my $from = new IO::Handle;
 	my $err = new IO::Handle;
 	my @cmd = ( @_ );
+	my $direct = grep(/$opt_cmdline->{ffmpeg}/, @cmd);
+	my $is_hls = grep(/modes%3Dhl(s|x)/, @cmd);
+	my $stdout_raw = $direct;
 	my $rtn;
 
 	$fh_cmd_out->autoflush(1);
 	$fh_cmd_err->autoflush(1);
-	
-	print $se "INFO: Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
 
-	# Check if we have IPC::Open3 otherwise fallback on system()
-	eval "use IPC::Open3";
-	
-	# probably only likely in win32
-	if ($@) {
-		print $se "ERROR: Please download and run latest installer - 'IPC::Open3' is not available\n";
-		exit 1;
+	print $se "INFO: Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
 
-	# Use open3()
-	} else {
-		my $procid;
-		# Setup signal handlers so that when the browser is closed the SIGPIPE results in sending a SIGTERM to the forked command.
-		local $SIG{PIPE} = sub {
-			my $signal = shift;
-			print $se "\nINFO: $$ Cleaning up (signal = $signal), killing cmd PID=$procid:\n";
-			for my $sig ( qw/INT PIPE TERM KILL/ ) {
-				# Kill process with SIGs
-				print $se "INFO: $$ killing cmd PID=$procid with SIG${sig}\n";
-				kill $sig, $procid;
-				sleep 1;
-				if ( ! kill 0, $procid ) {
-					print $se "INFO: $$ killed cmd PID=$procid\n";
-					last;
-				}
-				sleep 4;
+	my $procid;
+	# Setup signal handlers so that when the browser is closed the SIGPIPE results in sending a SIGTERM to the forked command.
+	local $SIG{PIPE} = sub {
+		my $signal = shift;
+		print $se "\nINFO: $$ Cleaning up (signal = $signal), killing cmd PID=$procid:\n";
+		for my $sig ( qw/INT PIPE TERM KILL/ ) {
+			# Kill process with SIGs
+			print $se "INFO: $$ killing cmd PID=$procid with SIG${sig}\n";
+			kill $sig, $procid;
+			sleep 1;
+			if ( ! kill 0, $procid ) {
+				print $se "INFO: $$ killed cmd PID=$procid\n";
+				last;
 			}
-			exit 0;
-		};
+			sleep 4;
+		}
+		exit 0;
+	};
 
-		# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
-		$procid = open3( gensym, $from, $err, @cmd ) || print $se "ERROR: Could not execute command: $!\n";
+	# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
+	$procid = open3( gensym, $from, $err, @cmd ) || print $se "ERROR: Could not execute command: $!\n";
 
-		my $childpidout = fork();
+	my $childpidout = fork();
 
-		# Fork a child process to read from the indirect (STDOUT) fh of the spawned command and write it to the selected fh (browser client)
-		if ( $childpidout <= 0 ) {
-			# Not sure if these are necessary:
-			$fh_cmd_out->autoflush(1);
-			$from->autoflush(1);
-			# Read each char from command output and push to socket fh
-			my $char;
-			my $bytes;
-			while ( $bytes = read( $from, $char, $size ) ) {
+	# Fork a child process to read from the indirect (STDOUT) fh of the spawned command and write it to the selected fh (browser client)
+	if ( $childpidout <= 0 ) {
+		# Not sure if these are necessary:
+		$fh_cmd_out->autoflush(1);
+		$from->autoflush(1);
+		if ( $stdout_raw)  {
+			binmode $from, ':raw';
+		} else {
+			binmode $from, ':utf8';
+		}
+		# Read each char from command output and push to socket fh
+		my $char;
+		my $bytes;
+		while ( $bytes = read( $from, $char, $size ) ) {
+			if ( $bytes <= 0 ) {
+				print $se "DEBUG: STDOUT fd closed - exiting thread\n";
+				exit 0;
+			} else {
+				print $fh_cmd_out $char;
+			}
+			last if $bytes < $size;
+		}
+		#print $se "CMD STDOUT FH EMPTY\n";
+		exit 0;
+	# Parent continues here
+	} elsif ( defined $childpidout ) {
+		print $se "DEBUG: Forked STDOUT reader with PID $childpidout\n";
+	# Failed to fork
+	} else {
+		print $se "ERROR: Failed to fork STDOUT reader process: $!\n";
+		exit 1;
+	}
+
+	my $childpiderr = fork();
+
+	# Fork a child process to read from the indirect (STDERR) fh of the spawned command and write it to the selected fh (browser client)
+	if ( $childpiderr <= 0 ) {
+		# Not sure if these are necessary:
+		$fh_cmd_err->autoflush(1);
+		$err->autoflush(1);
+		binmode $err, ':utf8';
+		# Read each char from command output and push to socket fh
+		my $char;
+		my $bytes;
+		# Assume that we don't want to buffer STDERR output of the command
+		$size = 1;
+		if ( $is_hls ) {
+			my ($count, $buf);
+			while ( $bytes = read( $err, $char, $size ) ) {
 				if ( $bytes <= 0 ) {
-					print $se "DEBUG: STDOUT fd closed - exiting thread\n";
+					print $se "DEBUG: STDERR fd closed - exiting thread\n";
 					exit 0;
 				} else {
-					print $fh_cmd_out $char;
+					if ( $char eq "#" ) {
+						print $fh_cmd_err $char;
+					} elsif ( $char =~ /[\r\n]/ ) {
+						if ( $buf =~ /size=/ ) {
+							$count++;
+							print $fh_cmd_err "#";
+							print $fh_cmd_err "\n" if ! ($count % 100);
+						} else {
+							print $fh_cmd_err $buf;
+							print $fh_cmd_err "\n";
+						}
+						$buf = '';
+					} else {
+						$buf .= $char;
+					}
+				}
+				if ( $bytes < $size ) {
+					print $fh_cmd_err "$buf\n" if $buf;
+					last;
 				}
-				last if $bytes < $size;
 			}
-			#print $se "CMD STDOUT FH EMPTY\n";
-			exit 0;
-		# Parent continues here
-		} elsif ( defined $childpidout ) {
-			print $se "DEBUG: Forked STDOUT reader with PID $childpidout\n";
-		# Failed to fork
 		} else {
-			print $se "ERROR: Failed to fork STDOUT reader process: $!\n";
-			exit 1;
-		}
-		
-		my $childpiderr = fork();
-
-		# Fork a child process to read from the indirect (STDERR) fh of the spawned command and write it to the selected fh (browser client)
-		if ( $childpiderr <= 0 ) {
-			# Not sure if these are necessary:
-			$fh_cmd_err->autoflush(1);
-			$err->autoflush(1);
-			# Read each char from command output and push to socket fh
-			my $char;
-			my $bytes;
-			# Assume that we don't want to buffer STDERR output of the command
-			$size = 1;
 			while ( $bytes = read( $err, $char, $size ) ) {
 				if ( $bytes <= 0 ) {
 					print $se "DEBUG: STDERR fd closed - exiting thread\n";
@@ -1562,30 +1369,30 @@
 				}
 				last if $bytes < $size;
 			}
-			#print $se "CMD STDERR FH EMPTY\n";
-			exit 0;
-		# Parent continues here
-		} elsif ( defined $childpiderr ) {
-			print $se "DEBUG: Forked STDERR reader with PID $childpiderr\n";
-		# Failed to fork
-		} else {
-			print $se "ERROR: Failed to fork STDERR reader process: $!\n";
-			exit 1;
 		}
+		#print $se "CMD STDERR FH EMPTY\n";
+		exit 0;
+	# Parent continues here
+	} elsif ( defined $childpiderr ) {
+		print $se "DEBUG: Forked STDERR reader with PID $childpiderr\n";
+	# Failed to fork
+	} else {
+		print $se "ERROR: Failed to fork STDERR reader process: $!\n";
+		exit 1;
+	}
 
-		# Reap reader processes
-		waitpid( $childpidout, 0 );
-		waitpid( $childpiderr, 0 );
-
-		# Reap command child
-		waitpid( $procid, 0 );
-		$rtn = $?;
+	# Reap reader processes
+	waitpid( $childpidout, 0 );
+	waitpid( $childpiderr, 0 );
+
+	# Reap command child
+	waitpid( $procid, 0 );
+	$rtn = $?;
 
-		# Restore sigpipe handler for reader and writer processes
-		$SIG{PIPE} = 'DEFAULT';
-	}
+	# Restore sigpipe handler for reader and writer processes
+	$SIG{PIPE} = 'DEFAULT';
 
-	# Interpret return code	      
+	# Interpret return code
 	return interpret_return_code( $rtn );
 }
 
@@ -1615,11 +1422,51 @@
 
 	$rtn = system( @cmd );
 
-	# Interpret return code	      
+	# Interpret return code
 	return interpret_return_code( $rtn );
 }
 
+# PVR Run and Refresh Cache pages will not auto-refresh if client socket
+# is dup()-ed to STDOUT (as in run_cmd_win32).  Run command in shell and
+# copy get_iplayer output to client socket instead.
+sub run_cmd_autorefresh {
+	return run_cmd( @_ ) unless IS_WIN32;
+	# Define what to do with STDOUT and STDERR of the child process
+	my $fh_child_out = shift;
+	my $fh_child_err = shift;
+	my $size = shift;
+	my @cmd = ( @_ );
+	# workaround to add quotes around the args because we are using a shell here
+	for ( @cmd ) {
+		s/^(.+)$/"$1"/g if ! m{^[\-\"]};
+	}
+	# eek! - works around win32 inability to redirect STDERR nicely
+	# If the stderr is supposed to go to the same fh and stdout then add '2>&1'
+	push @cmd, '2>&1' if fileno($fh_child_out) == fileno($fh_child_err);
+
+	# Disable buffering
+	$fh_child_out->autoflush(1);
 
+	print $se "INFO: Win32 Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
+
+	my $buf;
+	my $bytes;
+	open( CMD, ( join ' ', @cmd ).'|' ) || die "can't open pipe: $!\n";
+	binmode CMD, ':utf8';
+	while ( $bytes = read( CMD, $buf, $size ) ) {
+		if ( $bytes <= 0 ) {
+			print $se "DEBUG: pipe fd closed - exiting thread\n";
+			exit 0;
+		} else {
+			print $fh_child_out $buf;
+		}
+		last if $bytes < $size;
+	}
+	close(CMD);
+
+	# Interpret return code
+	return interpret_return_code( $? );
+}
 
 # Same as backticks but without needing a shell
 # sets $?
@@ -1641,72 +1488,64 @@
 	#$to->autoflush(1);
 	$from->autoflush(1);
 	$error->autoflush(1);
-	
-	print $se "INFO: Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
-
-	# Check if we have IPC::Open3 otherwise fallback on system()
-	eval "use IPC::Open3";
 
-	# probably only likely in win32
-	if ($@) {
-		print $se "ERROR: Please download and run latest installer - 'IPC::Open3' is not available\n";
-		exit 1;
+	print $se "INFO: Command: ".(join ' ', @cmd)."\n"; # if $opt->{verbose};
 
-	# Use open3()
-	} else {
-		my $procid;
-		# Setup signal handlers so that when the browser is closed the SIGPIPE results in sending a SIGTERM to the forked command.
-		local $SIG{PIPE} = sub {
-			my $signal = shift;
-			print $se "\nINFO: $$ Cleaning up (signal = $signal), killing cmd PID=$procid:\n";
-			for my $sig ( qw/INT PIPE TERM KILL/ ) {
-				# Kill process with SIGs
-				print $se "INFO: $$ killing cmd PID=$procid with SIG${sig}\n";
-				kill $sig, $procid;
-				sleep 1;
-				if ( ! kill 0, $procid ) {
-					print $se "INFO: $$ killed cmd PID=$procid\n";
-					last;
-				}
-				sleep 4;
+	my $procid;
+	# Setup signal handlers so that when the browser is closed the SIGPIPE results in sending a SIGTERM to the forked command.
+	local $SIG{PIPE} = sub {
+		my $signal = shift;
+		print $se "\nINFO: $$ Cleaning up (signal = $signal), killing cmd PID=$procid:\n";
+		for my $sig ( qw/INT PIPE TERM KILL/ ) {
+			# Kill process with SIGs
+			print $se "INFO: $$ killing cmd PID=$procid with SIG${sig}\n";
+			kill $sig, $procid;
+			sleep 1;
+			if ( ! kill 0, $procid ) {
+				print $se "INFO: $$ killed cmd PID=$procid\n";
+				last;
 			}
-			exit 0;
-		};
+			sleep 4;
+		}
+		exit 0;
+	};
 
-		#print $se "INFO: open3( 0, \">&".fileno($fh_child_out).", \">&".fileno($fh_child_err).", <cmd> )\n";
-		# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
-		$procid = open3( gensym, $from, $error, @cmd );
-		# Wait for child to complete
-
-		my $childpid = fork();
-		# Child
-		if ( $childpid == 0 ) {
-			while ( <$error> ) {
-				print $se "CMD STDERR: $_";
-			}
-			#print $se "CMD STDERR EMPTY\n";
-			exit 0;
-		# Parent
-		} elsif ( defined $childpid ) {
-			while ( <$from> ) {
-				push @out_from, $_;
-			}
-		} else {
-			print $se "ERROR: Could not fork STDERR reader process\n";
-			exit 1;
+	#print $se "INFO: open3( 0, \">&".fileno($fh_child_out).", \">&".fileno($fh_child_err).", <cmd> )\n";
+	# Don't use NULL for the 1st arg of open3 otherwise we end up with a messed up STDIN once it returns
+	$procid = open3( gensym, $from, $error, @cmd );
+	# Wait for child to complete
+
+	my $childpid = fork();
+	binmode $se, IS_WIN32 ? ":encoding(cp1252)" : ':encoding(UTF-8)';
+	# Child
+	if ( $childpid == 0 ) {
+		binmode $error, ':utf8';
+		while ( <$error> ) {
+			print $se "CMD STDERR: $_";
+		}
+		#print $se "CMD STDERR EMPTY\n";
+		exit 0;
+	# Parent
+	} elsif ( defined $childpid ) {
+		binmode $from, ':utf8';
+		while ( <$from> ) {
+			push @out_from, $_;
 		}
-		waitpid( $childpid, 0 );
+	} else {
+		print $se "ERROR: Could not fork STDERR reader process\n";
+		exit 1;
+	}
+	waitpid( $childpid, 0 );
 
-		waitpid( $procid, 0 );
-		$rtn = $?;
+	waitpid( $procid, 0 );
+	$rtn = $?;
 
-		# Restore sigpipe handler for reader and writer processes
-		$SIG{PIPE} = 'DEFAULT';
-	}
+	# Restore sigpipe handler for reader and writer processes
+	$SIG{PIPE} = 'DEFAULT';
 
-	# Interpret return code	      
+	# Interpret return code
 	interpret_return_code( $rtn );
-	
+
 	return @out_from;
 }
 
@@ -1723,10 +1562,11 @@
 
 	print $se "DEBUG: Command: ".( join ' ', @cmd )."\n";
 	open( CMD, ( join ' ', @cmd ).'|' ) || print $se "ERROR: echo failed: $!\n";
+	binmode CMD, ':utf8';
 	my @out = <CMD>;
 	close CMD;
 
-	# Interpret return code	      
+	# Interpret return code
 	interpret_return_code( $? );
 
 	return @out;
@@ -1735,10 +1575,12 @@
 
 
 sub interpret_return_code {
-	my $rtn = $_;
-	# Interpret return code	and force return code 2 upon error      
+	my $rtn = shift;
+	# Interpret return code and force return code 2 upon error
 	my $return = $rtn >> 8;
-	if ( $rtn == -1 ) {
+	if ( $rtn == -1 && $IGNOREEXIT ) {
+		$return = 0;
+	} elsif ( $rtn == -1 ) {
 		print $se "ERROR: Command failed to execute: $!\n";
 		$return = 2 if ! $return;
 	} elsif ( $rtn & 128 ) {
@@ -1758,6 +1600,8 @@
 	my $pvrsearch;
 	my $out = join "\n", get_cmd_output(
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--pvrlist',
@@ -1820,30 +1664,30 @@
 					{
 						-class => 'action',
 						-title => 'Delete selected programmes from PVR search list',
-						-onClick => "if(! check_if_selected(document.form, 'PVRSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form); form.NEXTPAGE.value='pvr_del'; form.submit(); RestoreFormVars(form);",
+						-onClick => "if(! check_if_selected(document.form1, 'PVRSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form1); form1.NEXTPAGE.value='pvr_del'; form1.submit(); RestoreFormVars(form1);",
 					},
 					'Delete'
 				),
 			]),
 		),
 	);
-	
+
 	my @html;
 	my @displaycols = ( 'pvrsearch', ( grep !/pvrsearch/, ( sort keys %fields ) ) );
 	# Build header row
 	push @html, "<tr class=\"search\" >";
-	push @html, th( { -class => 'search' }, checkbox( -class=>'search', -title=>'Select/Unselect All PVR Searches', -onClick=>"check_toggle(document.form, 'PVRSELECT')", -name=>'SELECTOR', -value=>'1', -label=>'' ) );
+	push @html, th( { -class => 'search' }, checkbox( -class=>'search', -title=>'Select/Unselect All PVR Searches', -onClick=>"check_toggle(document.form1, 'PVRSELECT')", -name=>'SELECTOR', -value=>'1', -label=>'' ) );
 	# Display data in nested table
 	for my $heading (@displaycols) {
 
-	        # Sort by column click and change display class (colour) according to sort status
-	        my ($title, $class, $onclick);
-	        if ( $sort_field eq $heading && not $reverse ) {
-                  ($title, $class, $onclick) = ("Sort by Reverse $fieldname{$heading}", 'sorted pointer', "BackupFormVars(form); form.NEXTPAGE.value='pvr_list'; form.PVRSORT.value='$heading'; form.PVRREVERSE.value=1; form.submit(); RestoreFormVars(form);");
-                } else {
-                  ($title, $class, $onclick) = ("Sort by $fieldname{$heading}", 'unsorted pointer', "BackupFormVars(form); form.NEXTPAGE.value='pvr_list'; form.PVRSORT.value='$heading'; form.submit(); RestoreFormVars(form); ");
-                }
-                $class = 'sorted_reverse pointer' if $sort_field eq $heading && $reverse;
+		# Sort by column click and change display class (colour) according to sort status
+		my ($title, $class, $onclick);
+		if ( $sort_field eq $heading && not $reverse ) {
+			($title, $class, $onclick) = ("Sort by Reverse $fieldname{$heading}", 'sorted pointer', "BackupFormVars(form1); form1.NEXTPAGE.value='pvr_list'; form1.PVRSORT.value='$heading'; form1.PVRREVERSE.value=1; form1.submit(); RestoreFormVars(form1);");
+		} else {
+			($title, $class, $onclick) = ("Sort by $fieldname{$heading}", 'unsorted pointer', "BackupFormVars(form1); form1.NEXTPAGE.value='pvr_list'; form1.PVRSORT.value='$heading'; form1.submit(); RestoreFormVars(form1); ");
+		}
+		$class = 'sorted_reverse pointer' if $sort_field eq $heading && $reverse;
 
 		push @html, th( { -class => 'search' },
 			label( {
@@ -1853,8 +1697,8 @@
 				},
 				$fieldname{$heading} || $heading,
 			)
-                );
-        }
+		);
+	}
 	push @html, "</tr>";
 
 	# Build each row
@@ -1871,11 +1715,11 @@
 			)
 		);
 		for ( @displaycols ) {
-			push @row, td( {-class=>'search'}, 
+			push @row, td( {-class=>'search'},
 				label( {
 					-title		=> "Click to Edit",
 					-class		=> 'search',
-					-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='pvr_edit'; form.PVRSEARCH.value='$name'; form.submit(); RestoreFormVars(form);",
+					-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='pvr_edit'; form1.PVRSEARCH.value='$name'; form1.submit(); RestoreFormVars(form1);",
 					},
 					$pvrsearch->{$name}->{$_},
 				)
@@ -1884,10 +1728,10 @@
 		push @html, Tr( {-class=>'search'}, @row );
 	}
 
-	
+
 	# Search form
 	print $fh start_form(
-		-name   => "form",
+		-name   => "form1",
 		-method => "POST",
 	);
 	print $fh p("Click to Edit any PVR Search");
@@ -1963,7 +1807,7 @@
 
 	# Editing form
 	print $fh start_form(
-		-name   => "form",
+		-name   => "form1",
 		-method => "POST",
 	);
 
@@ -1985,7 +1829,7 @@
 					{
 						-class => 'action',
 						-title => 'Save changes',
-						-onClick => "BackupFormVars(form); form.NEXTPAGE.value='pvr_save'; form.submit(); RestoreFormVars(form);",
+						-onClick => "BackupFormVars(form1); form1.NEXTPAGE.value='pvr_save'; form1.submit(); RestoreFormVars(form1);",
 					},
 					'Save Changes'
 				),
@@ -2026,6 +1870,7 @@
 		timeadded	=> 'numeric',
 		seriesnum	=> 'numeric',
 		episodenum	=> 'numeric',
+		expires	=> 'numeric',
 	);
 
 	# Insert search '<key>~~~<sort_field>' for each prog in hash
@@ -2049,7 +1894,7 @@
 			@sorted = sort { lc $a cmp lc $b } @unsorted;
 		}
 	}
-	# Strip off seach key at beginning of each line
+	# Strip off search key at beginning of each line
 	s/^.*~~~// for @sorted;
 
 	return @sorted;
@@ -2066,6 +1911,8 @@
 		chomp();
 		my @cmd = (
 			$opt_cmdline->{getiplayer},
+			'--encoding-locale=UTF-8',
+			'--encoding-console-out=UTF-8',
 			'--nocopyright',
 			'--expiry=999999999',
 			'--webrequest',
@@ -2098,6 +1945,8 @@
 	chomp();
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -2112,10 +1961,11 @@
 		$out .= "$key: $val\n";
 		$prog{$pid}->{$key} = $val;
 		# Make into a link if this value is a URL
-		$val = a( { -class=>'info', -title=>'Open URL', -href=>$val }, $val ) if $val =~ m{^http://.+};
+		$val = a( { -class=>'info', -title=>'Open URL', -href=>$val, -target=>'_new' }, $val ) if $val =~ m{^https?://.+};
 		push @html, Tr( { -class => 'info' }, th( { -class => 'info' }, $key ).td( { -class => 'info' }, $val ) );
 	}
 	# Show thumb if one exists
+	$prog{$pid}->{thumbnail} ||= DEFAULT_THUMBNAIL;
 	print $fh img( { -class=>'action', -src=>$prog{$pid}->{thumbnail} } ) if $prog{$pid}->{thumbnail};
 	# Set optional output dir for pvr queue if set
 	my $outdir;
@@ -2127,18 +1977,10 @@
 				a(
 					{
 						-class=>'action',
-						-title => 'Go Back',
-						-onClick  => "history.back()",
-					},
-					'Back'
-				),
-				a(
-					{
-						-class => 'action',
-						-title => "Play '$prog{$pid}->{name} - $prog{$pid}->{episode}' Now",
-						-href => build_url_playlist( '', 'playlist', 'pid', $pid, $prog{$pid}->{mode} || $default_modes, $prog{$pid}->{type}, $cgi->param( 'OUTTYPE' ) || 'out.flv', $cgi->param( 'STREAMTYPE' ), $cgi->param( 'BITRATE' ), $cgi->param( 'VSIZE' ), $cgi->param( 'VFR' ) ),
+						-title => 'Close',
+						-onClick  => "window.close()",
 					},
-					'Play'
+					'Close'
 				),
 			]),
 		),
@@ -2160,7 +2002,7 @@
 	my $history = 1;
 
 	print $se "DEBUG: Looking up filename for MODE=$mode TYPE=$type PID=$pid\n";
-	
+
 	# set this flag if required and unset history if pid is a file
 	if ( -f $pid ) {
 		print $se "DEBUG: PID is a valid filename\n";
@@ -2184,6 +2026,8 @@
 	# Get the 'filename' entry from --history --info for this pid
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -2201,7 +2045,9 @@
 	} else {
 		$filename = $1 if $match =~ m{^filename: .+?\|\s*(.+?)\|$mode\s*$};
 	}
-
+	if ( $filename && $opt_cmdline->{encodinglocalefs} !~ /UTF-?8/i ) {
+		$filename = encode($opt_cmdline->{encodinglocalefs}, $filename, sub { '' });
+	}
 	return search_absolute_path( $filename );
 }
 
@@ -2213,14 +2059,17 @@
 	my $abs_path;
 
 	# win32 doesn't seem to like abs_path
+	# abs_path croaks on cygwin if file not found
 	# rewrite win32 paths
-	if ( IS_WIN32 ) {
+	if ( IS_WIN32 || $^O eq "cygwin" ) {
 		# add a hardcoded prefix for now if relative path (assume relative to local get_iplayer script)
-		if ( $filename !~ m{^[A-Za-z]:} && $filename =~ m{^(\.|\.\.|[A-Za-z])} ) {
+		if ( $filename !~ m{^[A-Za-z]:} && $filename =~ m{^(\.|\.\.|[A-Za-z_])} ) {
 			$filename = dirname( abs_path( $opt_cmdline->{getiplayer} ) ).'/'.$filename;
 		}
-		# twiddle the / to \
-		$filename =~ s!(\\/|/|\/)!\\!g;
+		if ( IS_WIN32 ) {
+			# twiddle the / to \
+			$filename =~ s!(\\/|/|\/)!\\!g;
+		}
 		return $filename;
 	}
 
@@ -2229,6 +2078,10 @@
 	# Try using CWD
 	if ( -f abs_path($filename) ) {
 		$abs_path = abs_path($filename);
+		# repair abs_path decomposition of UTF-8 filename
+		if ( $abs_path && $opt_cmdline->{encodinglocalefs} =~ /UTF-?8/i ) {
+			$abs_path = decode($opt_cmdline->{encodinglocalefs}, $abs_path, sub { '' });
+		}
 
 	# else try dir of get_iplayer
 	} elsif ( -f dirname( abs_path( $opt_cmdline->{getiplayer} ) ).'/'.$filename ) {
@@ -2242,9 +2095,9 @@
 	} else {
 		$abs_path = $filename;
 	}
-	
+
 	#print $se "  ->  ABSPATH='$abs_path'\n";
-	
+
 	return $abs_path;
 }
 
@@ -2264,7 +2117,7 @@
 	my $out;
 
 	# If a URL was specified by the User (assume auto mode list is OK):
-	if ( $opt->{URL}->{current} =~ m{^http://} ) {
+	if ( $opt->{URL}->{current} =~ m{^https?://} ) {
 		push @record, "$opt->{PROGTYPES}->{current}|$opt->{URL}->{current}|$opt->{URL}->{current}|-";
 	}
 
@@ -2288,6 +2141,8 @@
 		$comment =~ s/_*$//g;
 		my @cmd = (
 			$opt_cmdline->{getiplayer},
+			'--encoding-locale=UTF-8',
+			'--encoding-console-out=UTF-8',
 			'--nocopyright',
 			'--expiry=999999999',
 			'--webrequest',
@@ -2296,7 +2151,7 @@
 				"pid=$pid",
 				"comment=$comment (queued: ".localtime().')',
 				"type=$type",
-				build_cmd_options( grep !/^(HISTORY|SINCE|BEFORE|HIDEDELETED|FUTURE|SEARCH|SEARCHFIELDS|VERSIONLIST|PROGTYPES|EXCLUDEC.+)$/, @params )
+				build_cmd_options( grep !/^(HISTORY|SINCE|BEFORE|HIDEDELETED|FUTURE|SEARCH|SEARCHFIELDS|PROGTYPES|EXCLUDEC.+)$/, @params )
 			),
 		);
 		print $fh p("Command: ".( join ' ', @cmd ) ) if $opt_cmdline->{debug};
@@ -2362,8 +2217,11 @@
 		my $fileregex = basename( $filename );
 		# get the filename less the ext
 		$fileregex =~ s/\.\w+$//g;
+		# escape regex metachars
+		$fileregex =~ s/([\\\^\$\.\|\?\*\+\[\]])/\\$1/g;
 		$fileregex .= '\.\w+$';
 		# Find matching files <filename>.*
+		my $deleted;
 		if ( opendir DIR, $dir ) {
 			for my $file ( grep { /$fileregex/ } readdir(DIR) ) {
 				# Use absolute path
@@ -2371,12 +2229,17 @@
 				if ( -f $file ) {
 					if ( ! unlink( $file ) ) {
 						print $fh p("ERROR: Failed to delete $file");
+					} else {
+						$deleted = 1;
+						print $fh p("Successfully deleted: $type: '$name - $episode', MODE: $mode, PID: $pid");
 					}
 				} else {
 					print $fh p("ERROR: File does not exist for: $type: '$name - $episode', MODE: $mode, PID: $pid, FILENAME: $filename");
 				}
 			}
-			print $fh p("Successfully deleted: $type: '$name - $episode', MODE: $mode, PID: $pid");
+			if ( ! $deleted ) {
+				print $fh p("No files deleted: $type: '$name - $episode', MODE: $mode, PID: $pid");
+			}
 			closedir(DIR);
 		} else {
 			print $fh p("ERROR: Cannot open dir '$dir' for file deletion\n");
@@ -2435,11 +2298,13 @@
 
 	# Only allow alphanumerics,_,-,. here for security reasons
 	my $searchname = "$opt->{SEARCH}->{current}_$opt->{SEARCHFIELDS}->{current}_$opt->{PROGTYPES}->{current}";
-	$searchname =~ s/[^\w\-\. \+]/_/g;
+	$searchname =~ s/[^\w]+/_/g;
 
 	# Remove a few options from leaking into a PVR search
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -2494,6 +2359,8 @@
 	my $searchname = $cgi->param( 'PVRSEARCH' );
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -2508,6 +2375,8 @@
 	# Add the new pvr entry
 	@cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -2533,7 +2402,7 @@
 # Build templated HTML for an option specified by passed hashref
 sub build_option_html {
 	my $arg = shift;
-	
+
 	my $title = $arg->{title};
 	my $tooltip = $arg->{tooltip};
 	my $webvar = $arg->{webvar};
@@ -2557,7 +2426,7 @@
 
 	# On/Off
 	} elsif ( $type eq 'boolean' ) {
-		push @html, th( { -class => 'options', -title => $tooltip }, $title ).
+		push @html, th( { -class => 'options', -title => $tooltip, -id => "label_option_$webvar" }, $title ).
 		td( { -class => 'options', -title => $tooltip },
 			checkbox(
 				-class		=> 'options',
@@ -2567,6 +2436,7 @@
 				#-value 	=> 1,
 				-checked	=> $current,
 				-override	=> 1,
+				"aria-labelledby"	=> "label_option_$webvar",
 			)
 		);
 
@@ -2577,9 +2447,10 @@
 			radio_group(
 				-class		=> 'options',
 				-name		=> $webvar,
-				-values		=> { 0=>'Off' , 1=>'On' },
+				-values => [ 0 , 1 ],
+				-labels		=> { 0=>'Off' , 1=>'On' },
 				-default	=> $current,
-				-override	=> 1,				
+				-override	=> 1,
 			)
 		);
 
@@ -2595,7 +2466,7 @@
 			my $val = $value->{shift @keylist};
 			$element .=
 				td( { -class => 'options' },
-					table ( { -class => 'options_embedded', -title => $tooltip }, Tr( { -class => 'options_embedded' }, td( { -class => 'options_embedded' }, [
+					table ( { -class => 'options_embedded', -title => $tooltip, -role=>'presentation' }, Tr( { -class => 'options_embedded' }, td( { -class => 'options_embedded' }, [
 						checkbox(
 							-class		=> 'options',
 							-name		=> $webvar,
@@ -2604,8 +2475,9 @@
 							-value 		=> $val,
 							-checked	=> $status->{$val},
 							-override	=> 1,
+							"aria-labelledby"		=> "label_option_${webvar}_$val",
 						),
-						$label->{$val}
+						span({ -id=> "label_option_${webvar}_$val" }, $label->{$val})
 					] ) ) )
 				);
 			# Spread over more rows if there are many elements
@@ -2617,13 +2489,13 @@
 		my $inner_table = table ( { -class => 'options_embedded' }, Tr( { -class => 'options_embedded' },
 			$element
 		) );
-			
+
 		push @html, th( { -class => 'options', -title => $tooltip }, $title ).td( { -class => 'options' }, $inner_table );
 	# Popup type
 	} elsif ( $type eq 'popup' ) {
 		my @value = $arg->{value};
-		push @html, th( { -class => 'options', -title => $tooltip }, $title ).
-		td( { -class => 'options', -title => $tooltip }, 
+		push @html, th( { -class => 'options', -title => $tooltip, -id => "label_option_$webvar" }, $title ).
+		td( { -class => 'options', -title => $tooltip },
 			popup_menu(
 				-class		=> 'options',
 				-name		=> $webvar,
@@ -2632,12 +2504,13 @@
 				-labels		=> $label,
 				-default	=> $current,
 				-onChange	=> $arg->{onChange},
+				"aria-labelledby"	=> "label_option_$webvar",
 			)
 		);
 
 	# text field
 	} elsif ( $type eq 'text' ) {
-		push @html, th( { -class => 'options', -title => $tooltip }, $title ).
+		push @html, th( { -class => 'options', -title => $tooltip, -id => "label_option_$webvar" }, $title ).
 		td( { -class => 'options', -title => $tooltip },
 			textfield(
 				-class		=> 'options',
@@ -2645,6 +2518,7 @@
 				-value		=> $current,
 				-size		=> $value,
 				-onKeyDown	=> 'return submitonEnter(event);',
+				"aria-labelledby"	=> "label_option_$webvar",
 			)
 		);
 
@@ -2659,15 +2533,21 @@
 	my $typelist = join(",", $cgi->param( 'PROGTYPES' )) || 'tv';
 	my $refreshfuture = $cgi->param( 'REFRESHFUTURE' ) || 0;
 	print $fh "<strong><p>The cache will auto-refresh every $opt->{AUTOWEBREFRESH}->{current} hour(s) if you leave this page open</p></strong>" if $opt->{AUTOWEBREFRESH}->{current};
+	if ( IS_WIN32 ) {
+		print $fh "<strong><p>Windows users: You may encounter errors if you perform other tasks in the Web PVR Manager while this page is reloading</p></strong>" if $opt->{AUTOWEBREFRESH}->{current};
+	}
 	print $se "INFO: Refreshing\n";
 	my @cmd = (
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
+		'--refresh',
 		'--webrequest',
-		get_iplayer_webrequest_args( 'expiry=30', 'nopurge=1', "type=$typelist", "refreshfuture=$refreshfuture", "search=no search just refresh" ),
+		get_iplayer_webrequest_args( 'nopurge=1', "type=$typelist", "refreshfuture=$refreshfuture" ),
 	);
 	print $fh '<pre>';
-	run_cmd( $fh, $se, 1, @cmd );
+	run_cmd_autorefresh( $fh, $se, 1, @cmd );
 	print $fh '</pre>';
 	print $fh p("Flushed Programme Caches for Types: $typelist");
 
@@ -2730,7 +2610,7 @@
 
 	#for my $key (sort keys %ENV) {
 	#	print $fh $key, " = ", $ENV{$key}, "\n<br>";
-	#}    
+	#}
 
 	# Get prog data
 	my @params = get_search_params();
@@ -2739,13 +2619,13 @@
 		print $fh p("ERROR: get_iplayer returned non-zero:").br().p( join '<br>', $response );
 		return 1;
 	}
-
+	$matchcount ||= 0;
 	my ($first, $last, @pagetrail) = pagetrail( $opt->{PAGENO}->{current}, $opt->{PAGESIZE}->{current}, $matchcount, 7 );
 
 	# Default displaycols
 	my @html;
 	push @html, "<tr>";
-	push @html, th( { -class => 'search' }, checkbox( -class=>'search', -title=>'Select/Unselect All Programmes', -onClick=>"check_toggle(document.form, 'PROGSELECT')", -name=>'SELECTOR', -value=>'1', -label=>'' ) );
+	push @html, th( { -class => 'search' }, checkbox( -class=>'search', -title=>'Select/Unselect All Programmes', -onClick=>"check_toggle(document.form1, 'PROGSELECT')", -name=>'SELECTOR', -value=>'1', -label=>'' ) );
 
 	# Pad empty column for R/S
 	push @html, th( { -class => 'search' }, 'Actions' );
@@ -2757,16 +2637,16 @@
 		my ($title, $class, $onclick);
 
 		if ( $opt->{SORT}->{current} eq $heading && not $opt->{REVERSE}->{current} ) {
-			($title, $class, $onclick) = ("Sort by Reverse $heading", 'sorted pointer', "form.NEXTPAGE.value='search_progs'; form.SORT.value='$heading'; form.REVERSE[0].checked=true; form.submit();");
+			($title, $class, $onclick) = ("Sort by Reverse $heading", 'sorted pointer', "form1.NEXTPAGE.value='search_progs'; form1.SORT.value='$heading'; form1.REVERSE[1].checked=true; form1.submit();");
 		} else {
-			($title, $class, $onclick) = ("Sort by $heading", 'unsorted pointer', "form.NEXTPAGE.value='search_progs'; form.SORT.value='$heading'; form.REVERSE[1].checked=true; form.submit();");
+			($title, $class, $onclick) = ("Sort by $heading", 'unsorted pointer', "form1.NEXTPAGE.value='search_progs'; form1.SORT.value='$heading'; form1.REVERSE[0].checked=true; form1.submit();");
 		}
 		$class = 'sorted_reverse pointer' if $opt->{SORT}->{current} eq $heading && $opt->{REVERSE}->{current};
 
-		push @html, 
+		push @html,
 			th( { -class => 'search' },
-				table( { -class => 'searchhead' },
-					Tr( { -class => 'search' }, [ 
+				table( { -class => 'searchhead', -role=>'presentation' },
+					Tr( { -class => 'search' }, [
 						th( { -class => 'search' },
 							label( {
 								-title		=> $title,
@@ -2790,11 +2670,14 @@
 	my $time = time();
 	for ( my $i = 0; $i <= $#pids; $i++ ) {
 		my $search_class = 'search';
-		my $pid = $pids[$i]; 
+		my $pid = $pids[$i];
 		my @row;
 
 		# Grey-out history lines which files have been deleted or where the history doesn't have a filename mentioned
 		if ( $opt->{HISTORY}->{current} && ! $opt->{HIDEDELETED}->{current} ) {
+			if ( $prog{$pid}->{filename} && $opt_cmdline->{encodinglocalefs} !~ /UTF-?8/i ) {
+				$prog{$pid}->{filename} = encode($opt_cmdline->{encodinglocalefs}, $prog{$pid}->{filename}, sub { '' });
+			}
 			if ( ( ! $prog{$pid}->{filename} ) || ! -f $prog{$pid}->{filename} ) {
 					$search_class = 'search darker';
 			}
@@ -2812,15 +2695,6 @@
 			)
 		);
 		# Record and stream links
-		# Fix output type and mode per prog type
-		my %streamopts = (
-			radio		=> '&MODES=iphone&OUTTYPE=mp3',
-			tv		=> '&MODES=iphone&OUTTYPE=mov',
-			livetv		=> '&MODES=flash&OUTTYPE=flv',
-			liveradio	=> '&MODES=flash&BITRATE=320&OUTTYPE=mp3',
-			itv		=> '&OUTTYPE=asf',
-			localfiles	=> '&OUTTYPE=mp3',
-		);
 
 		my $links;
 		# 'Play'
@@ -2828,36 +2702,36 @@
 		if ( $pid =~ m{^/} ) {
 			if ( -f $pid ) {
 				# Play
-				$links .= a( { -class=>$search_class, -title=>"Play from file on web server", -href=>build_url_playlist( '', 'playlist', 'pid', $pid, $opt->{MODES}->{current} || $default_modes, $prog{$pid}->{type}, basename( $pid ) , $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} ) }, 'Play' ).'<br />';
+ 				$links .= a( { -class=>$search_class, -title=>"Play from file on web server", -href=>build_url_playlist( '', 'playlist', 'pid', $pid, $opt->{MODES}->{current} || $default_modes, $prog{$pid}->{type}, basename( $pid ) , $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} ) }, 'Play' ).'<br />';
 				# PlayFile
-				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from local file", -href=>build_url_playlist( '', 'playlistfiles', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, undef, undef ) }, 'PlayFile' ).'<br />';
+				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from local file", -href=>build_url_playlist( '', 'playlistfiles', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, undef, undef ) }, 'Play File' ).'<br />';
 				# PlayDirect
-				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Stream file into browser", -href=>build_url_direct( '', $prog{$pid}->{type}, $pid, $prog{$pid}->{mode}, $opt->{STREAMTYPE}->{current}, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} ) }, 'PlayDirect' ).'<br />';
+				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Stream file into browser", -href=>build_url_direct( '', $prog{$pid}->{type}, $pid, $prog{$pid}->{mode}, $opt->{STREAMTYPE}->{current}, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} ) }, 'Play Direct' ).'<br />';
 			}
 		# History mode
 		} elsif ( $opt->{HISTORY}->{current} ) {
 			if ( $opt->{HIDEDELETED}->{current} || -f $prog{$pid}->{filename} ) {
 				# Play (Play Remote)
-				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from file on web server", -href=>build_url_playlist( '', 'playlistdirect', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, 'flv', 'flv', $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} ) }, 'Play' ).'<br />';
+				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from file on web server", -href=>build_url_playlist( '', 'playlistdirect', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, 'flv', 'flv', $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} ) }, 'Play' ).'<br />';
 				# PlayFile
-				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from local file", -href=>build_url_playlist( '', 'playlistfiles', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, undef ) }, 'PlayFile' ).'<br />';
+				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Play from local file", -href=>build_url_playlist( '', 'playlistfiles', 'pid', $pid, $prog{$pid}->{mode}, $prog{$pid}->{type}, undef ) }, 'Play File' ).'<br />';
 				# PlayDirect - depends on browser support
-				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Stream file into browser", -href=>build_url_direct( '', $prog{$pid}->{type}, $pid, $prog{$pid}->{mode}, $opt->{STREAMTYPE}->{current}, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} ) }, 'PlayDirect' ).'<br />';
+				$links .= a( { -id=>'nowrap', -class=>$search_class, -title=>"Stream file into browser", -href=>build_url_direct( '', $prog{$pid}->{type}, $pid, $prog{$pid}->{mode}, $opt->{STREAMTYPE}->{current}, $opt->{STREAMTYPE}->{current}, $opt->{HISTORY}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current}, $opt->{VERSIONLIST}->{current} ) }, 'Play Direct' ).'<br />';
 			}
 		# Search mode
 		} else {
-			# Play
-			$links .= a( { -class=>$search_class, -title=>"Play from Internet", -href=>build_url_playlist( '', 'playlist', 'pid', $pid, $opt->{MODES}->{current} || $default_modes, $prog{$pid}->{type}, 'out.flv', $opt->{STREAMTYPE}->{current}, $opt->{BITRATE}->{current}, $opt->{VSIZE}->{current}, $opt->{VFR}->{current} ) }, 'Play' ).'<br />';
 			# Record
-			$links .= label( { -id=>'nowrap', -class=>$search_class, -title=>"Record '$prog{$pid}->{name} - $prog{$pid}->{episode}' Now", -onClick => "BackupFormVars(form); form.NEXTPAGE.value='record_now'; form.SEARCH.value='".encode_entities("$prog{$pid}->{type}|$pid|$prog{$pid}->{name}|$prog{$pid}->{episode}|$prog{$pid}->{mode}")."'; form.target='_newtab_$pid'; form.submit(); RestoreFormVars(form); form.target='';" }, 'Record' ).'<br />';
+			$links .= label( { -id=>'nowrap', -class=>$search_class, -title=>"Record '$prog{$pid}->{name} - $prog{$pid}->{episode}' Now", -onClick => "BackupFormVars(form1); form1.NEXTPAGE.value='record_now'; form1.SEARCH.value='".encode_entities("$prog{$pid}->{type}|$pid|$prog{$pid}->{name}|$prog{$pid}->{episode}|$prog{$pid}->{mode}")."'; form1.target='_newtab_$pid'; form1.submit(); RestoreFormVars(form1); form1.target='';" }, 'Record' ).'<br />';
 			# Queue
-			$links .= label( { -id=>'nowrap', -class=>$search_class, -title=>"Queue '$prog{$pid}->{name} - $prog{$pid}->{episode}' for PVR Recording", -onClick => "BackupFormVars(form); form.NEXTPAGE.value='pvr_queue'; form.SEARCH.value='".encode_entities("$prog{$pid}->{type}|$pid|$prog{$pid}->{name}|$prog{$pid}->{episode}|$prog{$pid}->{mode}")."'; form.submit(); RestoreFormVars(form);" }, 'Queue' ).'<br />';
+			$links .= label( { -id=>'nowrap', -class=>$search_class, -title=>"Queue '$prog{$pid}->{name} - $prog{$pid}->{episode}' for PVR Recording", -onClick => "BackupFormVars(form1); form1.NEXTPAGE.value='pvr_queue'; form1.SEARCH.value='".encode_entities("$prog{$pid}->{type}|$pid|$prog{$pid}->{name}|$prog{$pid}->{episode}|$prog{$pid}->{mode}")."'; form1.submit(); RestoreFormVars(form1);" }, 'Queue' ).'<br />';
 			# Add Series
+			# escape regex metacharacters in programme name
+			(my $escaped_name = $prog{$pid}->{name}) =~ s/([\\\^\$\.\|\?\*\+\[\]])/\\\\$1/g;
 			$links .= label( {
-				-id=>'nowrap', 
+				-id=>'nowrap',
 				-class=>'search pointer_noul',
-				-title=>"Add Series '$prog{$pid}->{name}' to PVR", 
-				-onClick=>"BackupFormVars(form); form.NEXTPAGE.value='pvr_add'; form.SEARCH.value='".encode_entities("^$prog{$pid}->{name}\$")."'; form.SEARCHFIELDS.value='name'; form.PROGTYPES.value='$prog{$pid}->{type}'; form.HISTORY.value='0'; form.SINCE.value=''; form.BEFORE.value=''; form.submit(); RestoreFormVars(form);" }, 'Add Series' );
+				-title=>"Add Series '$prog{$pid}->{name}' to PVR",
+				-onClick=>"BackupFormVars(form1); form1.NEXTPAGE.value='pvr_add'; form1.SEARCH.value='".encode_entities("^$escaped_name\$")."'; form1.SEARCHFIELDS.value='name'; form1.PROGTYPES.value='$prog{$pid}->{type}'; form1.HISTORY.value='0'; form1.SINCE.value=''; form1.BEFORE.value=''; form1.submit(); RestoreFormVars(form1);" }, 'Add Series' );
 		}
 
 		# Add links to row
@@ -2867,50 +2741,55 @@
 		for ( @displaycols ) {
 			# display thumb if defined (will have to use proxy to get file:// thumbs)
 			if ( /^thumbnail$/ ) {
-				# Assume a thumbnail prefix if one is missing for BBC iPlayer
-				if ( $pid =~ m{^[wpb]0[a-z0-9]{6}$} && $prog{$pid}->{type} =~ /^(tv|radio)$/ ) {
-					$prog{$pid}->{$_} = "http://www.bbc.co.uk/iplayer/images/episode/${pid}_150_84.jpg";
-				}
-				if ( $prog{$pid}->{$_} =~ m{^http://} ) {
-					push @row, td( {-class=>$search_class}, a( { -title=>"Open original web URL", -class=>$search_class, -href=>$prog{$pid}->{web} }, img( { -class=>$search_class, -height=>40, -src=>$prog{$pid}->{$_} } ) ) );
-				} else {
-					push @row, td( {-class=>$search_class}, a( { -title=>"Open original web URL", -class=>$search_class, -href=>$prog{$pid}->{web} }, 'Open URL' ) );
+				if ( $prog{$pid}->{$_} !~ m{^https?://} ) {
+					$prog{$pid}->{$_} = DEFAULT_THUMBNAIL;
 				}
+				push @row, td( {-class=>$search_class}, a( { -title=>"Open original web URL", -class=>$search_class, -href=>$prog{$pid}->{web}, -target => "_new" }, img( { -class=>$search_class, -height=>40, -src=>$prog{$pid}->{$_} } ) ) );
+			} elsif ( /^web$/ ) {
+					push @row, td( {-class=>$search_class}, a( { -title=>"Open original web URL", -class=>$search_class, -href=>$prog{$pid}->{$_}, -target => "_new" }, 'Open URL' ) );
 			# Calculate the seconds difference between epoch_now and epoch_datestring and convert back into array_time
 			} elsif ( /^timeadded$/ ) {
 				my @t = gmtime( $time - $prog{$pid}->{$_} );
 				my $years = ($t[5]-70)."y " if ($t[5]-70) > 0;
-				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form); form.NEXTPAGE.value='show_info'; form.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form.submit(); RestoreFormVars(form);" }, "${years}$t[7]d $t[2]h ago" ) );
+				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form1); form1.NEXTPAGE.value='show_info'; form1.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form1.target='_blank'; form1.submit(); RestoreFormVars(form1); form1.target='';" }, "${years}$t[7]d $t[2]h ago" ) );
+			} elsif ( /^expires$/ ) {
+				my $expires;
+				if ( $prog{$pid}->{$_} && $prog{$pid}->{$_} > $time ) {
+					my @t = gmtime( $prog{$pid}->{$_} - $time );
+					my $years = ($t[5]-70)."y " if ($t[5]-70) > 0;
+					$expires = "in ${years}$t[7]d $t[2]h";
+				}
+				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form1); form1.NEXTPAGE.value='show_info'; form1.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form1.target='_blank'; form1.submit(); RestoreFormVars(form1); form1.target='';" }, $expires ) );
 			# truncate the description if it is too long
 			} elsif ( /^desc$/ ) {
 				my $text = $prog{$pid}->{$_};
 				$text = substr($text, 0, 256).'...[more]' if length( $text ) > 256;
-				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form); form.NEXTPAGE.value='show_info'; form.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form.submit(); RestoreFormVars(form);" }, $text ) );
+				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form1); form1.NEXTPAGE.value='show_info'; form1.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form1.target='_blank'; form1.submit(); RestoreFormVars(form1); form1.target='';" }, $text ) );
 			# Name / Series link
 			} elsif ( /^name$/ ) {
 				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -id=>'underline', -title=>"Click to list '$prog{$pid}->{$_}'",
 					-onClick=>"
-						BackupFormVars(form);
-						form.NEXTPAGE.value='search_progs';
-						form.SEARCHFIELDS.value='name';
-						form.SEARCH.value='".encode_entities('^'.$prog{$pid}->{$_}.'$')."';
-						form.PAGENO.value=1;
-						form.submit();
-						RestoreFormVars(form);
+						BackupFormVars(form1);
+						form1.NEXTPAGE.value='search_progs';
+						form1.SEARCHFIELDS.value='name';
+						form1.SEARCH.value='".encode_entities('^'.$prog{$pid}->{$_}.'$')."';
+						form1.PAGENO.value=1;
+						form1.submit();
+						RestoreFormVars(form1);
 					"}, $prog{$pid}->{$_} )
 				);
 			# Channel link
 			} elsif ( /^channel$/ ) {
 				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -id=>'underline', -title=>"Click to list '$prog{$pid}->{$_}'",
 					-onClick=>"
-						BackupFormVars(form);
-						form.NEXTPAGE.value='search_progs';
-						form.CHANNEL.value='".encode_entities('^'.$prog{$pid}->{$_}.'$')."';
-						form.EXCLUDECHANNEL.value='';
-						form.SEARCH.value='.*';
-						form.PAGENO.value=1;
-						form.submit();
-						RestoreFormVars(form);
+						BackupFormVars(form1);
+						form1.NEXTPAGE.value='search_progs';
+						form1.CHANNEL.value='".encode_entities('^'.$prog{$pid}->{$_}.'$')."';
+						form1.EXCLUDECHANNEL.value='';
+						form1.SEARCH.value='.*';
+						form1.PAGENO.value=1;
+						form1.submit();
+						RestoreFormVars(form1);
 					"}, $prog{$pid}->{$_} )
 				);
 			# Category links
@@ -2918,24 +2797,24 @@
 				my @cats = split /,/, $prog{$pid}->{$_};
 				for ( @cats ) {
 					my $category = $_;
-					$_ = label( { -class=>$search_class, -id=>'underline', -title=>"Click to list '$category'", 
+					$_ = label( { -class=>$search_class, -id=>'underline', -title=>"Click to list '$category'",
 						-onClick=>"
-							BackupFormVars(form);
-							form.NEXTPAGE.value='search_progs';
-							form.EXCLUDE.value='';
-							form.CATEGORY.value='".encode_entities($category)."';
-							form.EXCLUDECATEGORY.value='';
-							form.SEARCH.value='.*';
-							form.PAGENO.value=1;
-							form.submit();
-							RestoreFormVars(form);
+							BackupFormVars(form1);
+							form1.NEXTPAGE.value='search_progs';
+							form1.EXCLUDE.value='';
+							form1.CATEGORY.value='".encode_entities($category)."';
+							form1.EXCLUDECATEGORY.value='';
+							form1.SEARCH.value='.*';
+							form1.PAGENO.value=1;
+							form1.submit();
+							RestoreFormVars(form1);
 						"},
 					$category );
 				}
 				push @row, td( {-class=>$search_class}, @cats );
 			# Every other column type
 			} else {
-				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form); form.NEXTPAGE.value='show_info'; form.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form.submit(); RestoreFormVars(form);" }, $prog{$pid}->{$_} ) );
+				push @row, td( {-class=>$search_class}, label( { -class=>$search_class, -title=>"Click for full info", -onClick=>"BackupFormVars(form1); form1.NEXTPAGE.value='show_info'; form1.INFO.value='".encode_entities("$prog{$pid}->{type}|$pid")."'; form1.target='_blank'; form1.submit(); RestoreFormVars(form1); form1.target='';" }, $prog{$pid}->{$_} ) );
 			}
 		}
 		push @html, Tr( {-class=>$search_class}, @row );
@@ -2943,7 +2822,7 @@
 
 	# Search form
 	print $fh start_form(
-		-name   => "form",
+		-name   => "form1",
 		-method => "POST",
 	);
 
@@ -2958,10 +2837,8 @@
 		my $label = $layout->{$tabname}->{title};
 
 		# Set the colour to grey and change tab appearance if it is selected
-		my $style = 'color: #ADADAD;';
 		my $class = 'options_tab';
 		if ( defined $opt->{$tabname}->{current} && $opt->{$tabname}->{current} eq 'yes' ) {
-			$style = 'color: #F54997;';
 			$class = 'options_tab_sel';
 		}
 		push @optrows_nav, li( { -class=>$class, -id=>"li_${tabname}" },
@@ -2969,7 +2846,6 @@
 				-class		=> 'options_outer pointer_noul',
 				-id		=> 'button_'.$tabname,
 				-title		=> "Show $label tab",
-				-style		=> $style,
 				-onClick	=> "show_options_tab( '$tabname', [ '".(join "', '", @tablist )."' ] );",
 			},
 			$label ),
@@ -2983,7 +2859,8 @@
 			label( {
 				-class		=> 'options_outer pointer_noul',
 				-title		=> 'Apply Current Options',
-				-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=1; form.submit(); RestoreFormVars(form);",
+				-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=1; form1.submit(); RestoreFormVars(form1);",
+				-role	=> "button",
 				},
 				'Apply Settings',
 			),
@@ -2991,7 +2868,8 @@
 			label( {
 				-class		=> 'options_outer pointer_noul',
 				-title		=> 'Remember Current Options as Default',
-				-onClick	=> "BackupFormVars(form); form.SAVE.value=1; form.submit(); RestoreFormVars(form);",
+				-onClick	=> "BackupFormVars(form1); form1.SAVE.value=1; form1.submit(); RestoreFormVars(form1);",
+				-role	=> "button",
 				},
 				'Save As Default',
 			),
@@ -3017,23 +2895,23 @@
 		}
 		# Set the basic search tab to be rowspan=3
 		if ( $tabname eq 'BASICTAB' ) {
-			push @opt_td_basic, td( { -class=>'options_outer', -id=>"tab_${tabname}", -rowspan=>3, -style=>"$tab->{style}" },
+			push @opt_td_basic, td( { -class=>'options_outer', -id=>"tab_${tabname}", -rowspan=>3, -style=>"$tab->{style}", -role=>'search' },
 				table( { -class=>'options' }, Tr( { -class=>'options' }, [ @optrows ] ) )
 			);
 		} else {
 			push @opt_td, td( { -class=>'options_outer', -id=>"tab_${tabname}", -style=>"$tab->{style}" },
 				table( { -class=>'options' }, Tr( { -class=>'options' }, [ @optrows ] ) )
-			);		
+			);
 		}
 	}
 
 	# Render outer options table frame (keeping some tabs hidden)
 	print $fh table( { -class=>'options_outer' },
-		Tr( { -class=>'options_outer' }, (join '', @opt_td_basic). td( { -class=>'options_outer' }, ul( { -class=>'options_tab' }, @optrows_nav ) ) ).
+		Tr( { -class=>'options_outer' }, (join '', @opt_td_basic). td( { -class=>'options_outer' }, ul( { -class=>'options_tab', -role=>'navigation', 'aria-label'=>'Settings' }, @optrows_nav ) ) ).
 		Tr( { -class=>'options_outer' }, (join '', @opt_td) ).
 		Tr( { -class=>'options_outer' }, td( { -class=>'options_outer' }, $options_buttons ) )
 	);
-	
+
 	# Grey-out 'Add Current Search to PVR' button if too many programme matches
 	my $add_search_class_suffix;
 	$add_search_class_suffix = ' darker' if $matchcount > 30;
@@ -3042,7 +2920,7 @@
 		{
 			-class => 'action',
 			-title => 'Perform search based on search options',
-			-onClick => "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=1; form.submit(); RestoreFormVars(form);",
+			-onClick => "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=1; form1.submit(); RestoreFormVars(form1);",
 		},
 		'Search'
 	);
@@ -3050,7 +2928,7 @@
 		{
 			-class => 'action',
 			-title => 'Queue selected programmes (or Quick URL) for one-off recording',
-			-onClick => "if(! ( check_if_selected(document.form, 'PROGSELECT') ||  form.URL.value ) ) { alert('No Quick URL or programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.NEXTPAGE.value='pvr_queue'; form.submit(); RestoreFormVars(form); form.URL.value=''; disable_selected_checkboxes(document.form, 'PROGSELECT');",
+			-onClick => "if(! ( check_if_selected(document.form1, 'PROGSELECT') ||  form1.URL.value ) ) { alert('No Quick URL or programmes were selected'); return false; } BackupFormVars(form1); form1.SEARCH.value=''; form1.NEXTPAGE.value='pvr_queue'; form1.submit(); RestoreFormVars(form1); form1.URL.value=''; disable_selected_checkboxes(document.form1, 'PROGSELECT');",
 		},
 		'Queue'
 	);
@@ -3058,7 +2936,7 @@
 		{
 			-class => 'action',
 			-title => 'Immediately Record selected programmes (or Quick URL) in a new tab',
-			-onClick => "if(! ( check_if_selected(document.form, 'PROGSELECT') ||  form.URL.value ) ) { alert('No Quick URL or programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.NEXTPAGE.value='record_now'; var random=Math.floor(Math.random()*99999); form.target='_newtab_'+random; form.submit(); RestoreFormVars(form); form.target=''; form.URL.value=''; disable_selected_checkboxes(document.form, 'PROGSELECT');",
+			-onClick => "if(! ( check_if_selected(document.form1, 'PROGSELECT') ||  form1.URL.value ) ) { alert('No Quick URL or programmes were selected'); return false; } BackupFormVars(form1); form1.SEARCH.value=''; form1.NEXTPAGE.value='record_now'; var random=Math.floor(Math.random()*99999); form1.target='_newtab_'+random; form1.submit(); RestoreFormVars(form1); form1.target=''; form1.URL.value=''; disable_selected_checkboxes(document.form1, 'PROGSELECT');",
 		},
 		'Record'
 	);
@@ -3066,15 +2944,15 @@
 		{
 			-class => 'action',
 			-title => 'Permanently delete selected recorded files',
-			-onClick => "if(! check_if_selected(document.form, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.NEXTPAGE.value='recordings_delete'; form.submit(); RestoreFormVars(form);",
+			-onClick => "if(! check_if_selected(document.form1, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form1); form1.SEARCH.value=''; form1.NEXTPAGE.value='recordings_delete'; form1.submit(); RestoreFormVars(form1);",
 		},
 		'Delete'
 	);
 	$action_button{'Play'} = a(
 		{
 			-class => 'action',
-			-title => 'Get a Playlist based on selected programmes (or Quick URL) to stream in your media player',
-			-onClick => "if(! ( check_if_selected(document.form, 'PROGSELECT') ||  form.URL.value ) ) { alert('No Quick URL or programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.ACTION.value='genplaylist'; form.submit(); form.ACTION.value=''; RestoreFormVars(form); form.URL.value='';",
+			-title => 'Get a Playlist based on selected programmes for remote file streaming in your media player',
+			-onClick => "if(! check_if_selected(document.form1, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form1); form1.SEARCH.value=''; form1.ACTION.value='genplaylistdirect'; form1.submit(); RestoreFormVars(form1);",
 		},
 		'Play'
 	);
@@ -3082,18 +2960,10 @@
 		{
 			-class => 'action',
 			-title => 'Get a Playlist based on selected programmes for local file streaming in your media player',
-			-onClick => "if(! check_if_selected(document.form, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.ACTION.value='genplaylistfile'; form.submit(); RestoreFormVars(form);",
+			-onClick => "if(! check_if_selected(document.form1, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form1); form1.SEARCH.value=''; form1.ACTION.value='genplaylistfile'; form1.submit(); RestoreFormVars(form1);",
 		},
 		'Play Files'
 	);
-	$action_button{'Play Remote'} = a(
-		{
-			-class => 'action',
-			-title => 'Get a Playlist based on selected programmes for remote file streaming in your media player',
-			-onClick => "if(! check_if_selected(document.form, 'PROGSELECT')) { alert('No programmes were selected'); return false; } BackupFormVars(form); form.SEARCH.value=''; form.ACTION.value='genplaylistdirect'; form.submit(); RestoreFormVars(form);",
-		},
-		'Play Remote'
-	);
 	# check for an non-whitespace advanced search entries
 	# excluding Programme Version and Search Future Schedule
 	my $num_adv_srch = grep /\S/, (
@@ -3105,11 +2975,12 @@
 		$opt->{SINCE}->{current},
 		$opt->{BEFORE}->{current}
 	);
+	(my $escaped_search = $opt->{SEARCH}->{current}) =~ s/'/\\'/g;
 	$action_button{'Add Search to PVR'} = a(
 		{
 			-class => 'action'.$add_search_class_suffix,
 			-title => 'Create a persistent PVR search using the current search terms (i.e. all below programmes)',
-			-onClick => "var version = '$opt->{VERSIONLIST}->{current}'; if ('$opt->{SEARCH}->{current}' == '.*' && $num_adv_srch == 0 && version.toLowerCase().indexOf('default') != -1) { alert('Search = .* will download all available programmes.  Please enter a more specific search term or additional advanced search criteria (excluding $opt->{FUTURE}->{title}).'); return false; } if ('$opt->{SEARCH}->{current}' == '' ) { alert('Please enter a search term. Use Search = .* to record all programmes matching advanced search criteria.'); return false; } if ( $matchcount > 30 ) { alert('Please limit your search to result in no more than 30 current programmes'); return false; }  BackupFormVars(form); form.NEXTPAGE.value='pvr_add'; form.submit(); RestoreFormVars(form);",
+			-onClick => "if ('".$escaped_search."' == '.*' && $num_adv_srch == 0) { alert('Search = .* will download all available programmes.  Please enter a more specific search term or additional advanced search criteria (excluding $opt->{VERSIONLIST}->{title} and $opt->{FUTURE}->{title}).'); return false; } if ('".$escaped_search."' == '' ) { alert('Please enter a search term. Use Search = .* to record all programmes matching advanced search criteria.'); return false; } if ( $matchcount > 30 ) { alert('Please limit your search to result in no more than 30 current programmes'); return false; }  BackupFormVars(form1); form1.NEXTPAGE.value='pvr_add'; form1.submit(); RestoreFormVars(form1);",
 		},
 		'Add Search to PVR'
 	);
@@ -3118,7 +2989,7 @@
 		{
 			-class => 'action',
 			-title => 'Refresh the list of programmes - can take a while',
-			-onClick => "BackupFormVars(form); form.target='_newtab_refresh'; form.NEXTPAGE.value='refresh'; form.submit(); RestoreFormVars(form); form.target=''; form.NEXTPAGE.value=''; ",
+			-onClick => "BackupFormVars(form1); form1.target='_newtab_refresh'; form1.NEXTPAGE.value='refresh'; form1.submit(); RestoreFormVars(form1); form1.target=''; form1.NEXTPAGE.value=''; ",
 			#-onClick => "window.frames['dataframe'].window.location.replace('?NEXTPAGE=refresh&AUTOWEBREFRESH=$autorefresh')",
 		},
 		'Refresh Cache'
@@ -3127,37 +2998,33 @@
 	# Render action bar
 	my @actionbar;
 	if ( $opt->{HISTORY}->{current} ) {
-		push @actionbar, div( { -class=>'action' },
+		push @actionbar, div( { -class=>'action', -role=>'navigation', 'aria-label'=>'Actions' },
 			ul( { -class=>'action' },
 				li( { -class=>'action' }, [
 					$action_button{'Search'},
 					$action_button{'Delete'},
 					$action_button{'Play'},
 					$action_button{'Play Files'},
-					$action_button{'Play Remote'},
-					$action_button{'Add Search to PVR'},
 				]),
 			),
 		);
 	} else {
-		push @actionbar, div( { -class=>'action' },
+		push @actionbar, div( { -class=>'action', -role=>'navigation', 'aria-label'=>'Actions' },
 			ul( { -class=>'action' },
 				li( { -class=>'action' }, [
 					$action_button{'Search'},
 					$action_button{'Record'},
-					$action_button{'Play'},
 					$action_button{'Queue'},
-					$action_button{'Play Remote'},
 					$action_button{'Add Search to PVR'},
 					$action_button{'Refresh Cache'},
 				]),
 			),
 		);
 	}
-	
+
 	print $fh @actionbar;
 	print $fh @pagetrail;
-	print $fh table( {-class=>'search' }, @html );
+	print $fh table( {-class=>'search', -role=>'main' }, @html );
 	print $fh @pagetrail;
 	print $fh @actionbar;
 
@@ -3190,24 +3057,24 @@
 	push @pagetrail, td( { -class=>'pagetrail pointer' }, label( {
 		-title		=> "Previous Page",
 		-class		=> 'pagetrail pointer',
-		-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=$page-1; form.submit(); RestoreFormVars(form);",},
+		-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=$page-1; form1.submit(); RestoreFormVars(form1);",},
 		"<<",
 	)) if $page > 1;
 
 	push @pagetrail, td( { -class=>'pagetrail pointer' }, label( {
 		-title		=> "Page 1",
 		-class		=> 'pagetrail pointer',
-		-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=1; form.submit(); RestoreFormVars(form);",},
+		-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=1; form1.submit(); RestoreFormVars(form1);",},
 		"1",
 	)) if $page > 1;
 
 	push @pagetrail, td( { -class=>'pagetrail' }, '...' ) if $page > $trailsize+2;
 
- 	for (my $pn=$page-$trailsize; $pn <= $page+$trailsize; $pn++) {
+	for (my $pn=$page-$trailsize; $pn <= $page+$trailsize; $pn++) {
 		push @pagetrail, td( { -class=>'pagetrail pointer' }, label( {
 			-title		=> "Page $pn",
 			-class		=> 'pagetrail pointer',
-			-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value='$pn'; form.submit(); RestoreFormVars(form);",},
+			-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value='$pn'; form1.submit(); RestoreFormVars(form1);",},
 			"$pn",
 		)) if $pn > 1 && $pn != $page && $pn < $pages;
 		push @pagetrail, td( { -class=>'pagetrail' }, label( {
@@ -3221,14 +3088,14 @@
 	push @pagetrail, td( { -class=>'pagetrail pointer' }, label( {
 		-title		=> "Page ".$pages,
 		-class		=> 'pagetrail pointer',
-		-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=$pages; form.submit(); RestoreFormVars(form);",},
+		-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=$pages; form1.submit(); RestoreFormVars(form1);",},
 		"$pages",
 	)) if $page < $pages;
 
 	push @pagetrail, td( { -class=>'pagetrail pointer' }, label( {
 		-title		=> "Next Page",
 		-class		=> 'pagetrail pointer',
-		-onClick	=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=$page+1; form.submit(); RestoreFormVars(form);",},
+		-onClick	=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=$page+1; form1.submit(); RestoreFormVars(form1);",},
 		">>",
 	)) if $page < $pages;
 
@@ -3263,6 +3130,8 @@
 	# Run command
 	my @list = get_cmd_output(
 		$opt_cmdline->{getiplayer},
+		'--encoding-locale=UTF-8',
+		'--encoding-console-out=UTF-8',
 		'--nocopyright',
 		'--expiry=999999999',
 		'--webrequest',
@@ -3290,7 +3159,7 @@
 		my $search_class = 'search';
 
 		# get the real path if file is defined
-		$record->{filename} = search_absolute_path( $record->{filename} ) if $record->{filename};
+		$record->{filename} = search_absolute_path( $record->{filename} ) if $record->{filename} && $record->{filename} ne "<filename>";
 
 		# store record in the prog global hash (prog => pid)
 		$prog{ $record->{'pid'} } = $record;
@@ -3351,7 +3220,7 @@
 
 #############################################
 #
-# Form Header 
+# Form Header
 #
 #############################################
 sub form_header {
@@ -3362,16 +3231,6 @@
 			-name   => "formheader",
 			-method => "POST",
 	);
-	
-	# Only highlight the 'Update Software' option if the script is writable or is not win32
-	my $update_element = a( { -class=>'nav darker' }, 'Update Software' );
-	$update_element = a(
-		{
-			-class=>'nav',
-			-title=>'Update the Web PVR Manager and get_iplayer software - please restart Web PVR Manager after updating',
-			-onClick => "if (! confirm('Please restart the Web PVR Manager service once the update has completed') ) { return false; } BackupFormVars(formheader); formheader.NEXTPAGE.value='update_script'; formheader.submit(); RestoreFormVars(formheader);",
-		},
-		'Update Software' ) if -w $0 && ! IS_WIN32;
 
 	# set $class for tab selection in nav bar
 	my $class = {};
@@ -3379,49 +3238,37 @@
 	$class->{recordings}	= 'nav_tab';
 	$class->{pvrlist}	= 'nav_tab';
 	$class->{pvrrun}	= 'nav_tab';
-	$class->{update}	= 'nav_tab';
 	$class->{search}	= 'nav_tab_sel' if ( $nextpage eq 'search_progs' || ! $nextpage ) && ! $opt->{HISTORY}->{current};
 	$class->{recordings}	= 'nav_tab_sel' if $nextpage eq 'search_history' || $opt->{HISTORY}->{current};
 	$class->{pvrrun}	= 'nav_tab_sel' if $nextpage eq 'pvr_run';
 	$class->{pvrlist}	= 'nav_tab_sel' if $nextpage =~ m{^(pvr_list|pvr_queue|pvr_del)$};
-	$class->{update}	= 'nav_tab_sel' if $nextpage eq 'update_script';
 
-	print $fh div( { -class=>'nav' },
+	print $fh div( { -class=>'nav', -role=>'navigation' },
 		ul( { -class=>'nav' },
 			li( { -id=>'logo', -class=>'nav_tab' },
-				a( { -class=>'nav', -href=>$request_host },
-					img({
-						-class => 'nav',
-						-title => 'get_iplayer Web PVR Manager',
-						-width => 174,
-						-height => 32,
-						-src => "http://linuxcentre.net/get_iplayer/contrib/iplayer_logo.gif",
-						-href => $request_host,
-					}),
-				),
+				span( { -class=>'logotext' }, 'get_iplayer' )
 			).
-			li( { -class=>$class->{search} }, a( { -class=>'nav', -title=>'Main search page', -href => $request_host }, 'Search' ) ).
+			li( { -class=>$class->{search} }, a( { -class=>'nav', -title=>'Main search page', -onClick => "BackupFormVars(formheader); formheader.NEXTPAGE.value='search_progs'; formheader.submit(); RestoreFormVars(formheader);" }, 'Search' ) ).
 			li( { -class=>$class->{recordings} }, a( { -class=>'nav', -title=>'History search page', -onClick => "BackupFormVars(formheader); formheader.NEXTPAGE.value='search_history'; formheader.submit(); RestoreFormVars(formheader);" }, 'Recordings' ) ).
 			li( { -class=>$class->{pvrlist} }, a( { -class=>'nav', -title=>'List all saved PVR searches', -onClick => "BackupFormVars(formheader); formheader.NEXTPAGE.value='pvr_list'; formheader.submit(); RestoreFormVars(formheader);" }, 'PVR List' ) ).
 			li( { -class=>$class->{pvrrun} }, a( { -class=>'nav', -title=>'Run the PVR now - wait for the PVR to complete', -onClick => "BackupFormVars(formheader); formheader.NEXTPAGE.value='pvr_run'; formheader.target='_newtab_pvrrun'; formheader.submit(); RestoreFormVars(formheader); formheader.target='';" }, 'Run PVR' ) ).
-			li( { -class=>$class->{update} }, $update_element ).
-			li( { -class=>'nav_tab' }, a( { -class=>'nav', -title=>'Show help and instructions', -href => "http://linuxcentre.net/projects/get_iplayer-pvr-manager/" }, 'Help' ) )
+			li( { -class=>'nav_tab' }, a( { -class=>'nav', -title=>'Show help and instructions', -href => "https://github.com/get-iplayer/get_iplayer/wiki/webpvr", -target => "_new" }, 'Help' ) )
 		),
 	);
 	print $fh hidden( -name => 'AUTOPVRRUN', -value => $opt->{AUTOPVRRUN}->{current}, -override => 1 );
 	print $fh hidden( -name => 'NEXTPAGE', -value => 'search_progs', -override => 1 );
-	print $fh $cgi->end_form();	
+	print $fh $cgi->end_form();
 }
 
 
 
-# Form Footer 
+# Form Footer
 sub form_footer {
 	#print $fh "<iframe src=\"about:blank\" height=\"100\" width=\"95%\" name=\"dataframe\"></iframe>";
 	#print $fh "<iframe src=\"about:blank\" height=\"0\" width=\"0\" name=\"dataframe\"></iframe>";
 	# <script type=\"text/javascript\">window.frames['dataframe'].window.location.replace('loadData.html');</script>
 	print $fh p( b({-class=>"footer"},
-		sprintf( "get_iplayer Web PVR Manager v%.2f, &copy;2009-2010 Phil Lewis - Licensed under GPLv3", $VERSION )
+		"get_iplayer Web PVR Manager $VERSION_TEXT, &copy;2009-2010 Phil Lewis - Licensed under GPLv3"
 	));
 }
 
@@ -3449,7 +3296,7 @@
 		value	=> 20, # width values
 		save	=> 0,
 	};
-	
+
 	$opt->{URL} = {
 		title	=> 'Quick URL', # Title
 		tooltip	=> "Enter your URL for Recording (then click 'Record' or 'Play')", # Tooltip
@@ -3459,7 +3306,7 @@
 		value	=> 36, # width values
 		save	=> 0,
 	};
-	
+
 	$opt->{SEARCHFIELDS} = {
 		title	=> 'Search in', # Title
 		tooltip	=> 'Select which column you wish to search', # Tooltip
@@ -3477,9 +3324,9 @@
 		tooltip	=> 'Select the number of search results displayed on each page', # Tooltip
 		webvar	=> 'PAGESIZE', # webvar
 		type	=> 'popup', # type
-		default	=> 20, # default
+		default	=> 10, # default
 		value	=> ['10','25','50','100','200','400'], # values
-		onChange=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.PAGENO.value=1; form.submit(); RestoreFormVars(form);",
+		onChange=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.PAGENO.value=1; form1.submit(); RestoreFormVars(form1);",
 		save	=> 1,
 	};
 
@@ -3491,7 +3338,7 @@
 		label	=> \%fieldname, # labels
 		default	=> 'index', # default
 		value	=> [@headings], # values
-		onChange=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.submit(); RestoreFormVars(form);",
+		onChange=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.submit(); RestoreFormVars(form1);",
 		save	=> 1,
 	};
 
@@ -3500,7 +3347,7 @@
 		tooltip	=> 'Reverse the sort order', # Tooltip
 		webvar	=> 'REVERSE', # webvar
 		type	=> 'radioboolean', # type
-		#onChange=> "BackupFormVars(form); form.NEXTPAGE.value='search_progs'; form.submit(); RestoreFormVars(form);",
+		#onChange=> "BackupFormVars(form1); form1.NEXTPAGE.value='search_progs'; form1.submit(); RestoreFormVars(form1);",
 		default	=> '0', # value
 		save	=> 1,
 	};
@@ -3520,15 +3367,15 @@
 
 	$opt->{MODES} = {
 		title	=> 'Recording Modes', # Title
-		tooltip	=> 'Comma separated list of recording modes which should be tried in order', # Tooltip
+		tooltip	=> 'Comma separated list of recording modes which should be tried in order. Default is "best" for HD TV (if available, with fallback to SD TV). Set to "better" (without quotes) for best available SD TV.  Set to "good" (without quotes) for lower-quality SD TV.', # Tooltip
 		webvar	=> 'MODES', # webvar
 		optkey	=> 'modes', # option
 		type	=> 'text', # type
-		default	=> 'flashaachigh,flashaacstd,flashaudio,flashhigh,flashstd,flashnormal,realaudio,flashaaclow', # default
+		default	=> '', # default
 		value	=> 30, # width values
 		save	=> 1,
 	};
-	
+
 	$opt->{OUTPUT} = {
 		title	=> 'Override Recordings Folder', # Title
 		tooltip	=> 'Folder on the server where recordings should be saved', # Tooltip
@@ -3539,7 +3386,7 @@
 		value	=> 30, # width values
 		save	=> 1,
 	};
-	
+
 	$opt->{PROXY} = {
 		title	=> 'Web Proxy URL', # Title
 		tooltip	=> 'e.g. http://192.168.1.2:8080', # Tooltip
@@ -3550,21 +3397,21 @@
 		value	=> 30, # width values
 		save	=> 1,
 	};
-	
+
 	$opt->{VERSIONLIST} = {
 		title	=> 'Programme Version', # Title
-		tooltip	=> 'Comma separated list of versions to try to record in order (e.g. default,signed,audiodescribed)', # Tooltip
+		tooltip	=> 'Comma separated list of versions to try to record in order (e.g., "signed,default" or "audiodescribed,default")', # Tooltip
 		webvar	=> 'VERSIONLIST', # webvar
 		optkey	=> 'versionlist', # option
 		type	=> 'text', # type
-		default	=> 'default', # default
+		default	=> '', # default
 		value	=> 30, # width values
 		save	=> 1,
 	};
 
 	$opt->{EXCLUDE} = {
 		title	=> 'Exclude Programmes', # Title
-		tooltip	=> 'Comma separated list of programmes to exclude. Partial word matches are supported', # Tooltip
+		tooltip	=> 'Comma separated list of programmes to exclude. Partial word matches and regular expressions are supported', # Tooltip
 		webvar	=> 'EXCLUDE', # webvar
 		optkey	=> 'exclude', # option
 		type	=> 'text', # type
@@ -3575,7 +3422,7 @@
 
 	$opt->{CATEGORY} = {
 		title	=> 'Categories Containing', # Title
-		tooltip	=> 'Comma separated list of categories to match. Partial word matches are supported', # Tooltip
+		tooltip	=> 'Comma separated list of categories to match. Partial word matches and regular expressions are supported.  Only works in Recordings tab.', # Tooltip
 		webvar	=> 'CATEGORY', # webvar
 		optkey	=> 'category', # option
 		type	=> 'text', # type
@@ -3586,7 +3433,7 @@
 
 	$opt->{EXCLUDECATEGORY} = {
 		title	=> 'Exclude Categories Containing', # Title
-		tooltip	=> 'Comma separated list of categories to exclude. Partial word matches are supported', # Tooltip
+		tooltip	=> 'Comma separated list of categories to exclude. Partial word matches and regular expressions are supported. Only works in Recordings tab.', # Tooltip
 		webvar	=> 'EXCLUDECATEGORY', # webvar
 		optkey	=> 'excludecategory', # option
 		type	=> 'text', # type
@@ -3597,7 +3444,7 @@
 
 	$opt->{CHANNEL} = {
 		title	=> 'Channels Containing', # Title
-		tooltip	=> 'Comma separated list of channels to match. Partial word matches are supported', # Tooltip
+		tooltip	=> 'Comma separated list of channels to match. Partial word matches and regular expressions are supported', # Tooltip
 		webvar	=> 'CHANNEL', # webvar
 		optkey	=> 'channel', # option
 		type	=> 'text', # type
@@ -3608,7 +3455,7 @@
 
 	$opt->{EXCLUDECHANNEL} = {
 		title	=> 'Exclude Channels Containing', # Title
-		tooltip	=> 'Comma separated list of channels to exclude. Partial word matches are supported', # Tooltip
+		tooltip	=> 'Comma separated list of channels to exclude. Partial word matches and regular expressions are supported', # Tooltip
 		webvar	=> 'EXCLUDECHANNEL', # webvar
 		optkey	=> 'excludechannel', # option
 		type	=> 'text', # type
@@ -3647,9 +3494,19 @@
 		save	=> 1,
 	};
 
-	my %metadata_labels = ( ''=>'Off', xbmc=>'XBMC Episode nfo format', xbmc_movie=>'XBMC Movie nfo format', generic=>'Generic XML', freevo=>'Freevo FXD' );
+	$opt->{FPS25} = {
+		title	=> 'Use only 25fps streams',
+		tooltip	=> "Use only 25fps media streams. HD video not available.",
+		webvar	=> 'FPS25',
+		optkey	=> 'fps25',
+		type	=> 'radioboolean',
+		default	=> '0',
+		save	=> 1,
+	};
+
+	my %metadata_labels = ( ''=>'Off', generic=>'Generic XML' );
 	$opt->{METADATA} = {
-		title	=> 'Download Meta-data', # Title
+		title	=> 'Download Metadata', # Title
 		tooltip	=> 'Format of metadata file to create when recording', # Tooltip
 		webvar	=> 'METADATA', # webvar
 		optkey	=> 'metadata', # option
@@ -3657,7 +3514,7 @@
 		#label	=> \%fieldname, # labels
 		label	=> \%metadata_labels, # labels
 		default	=> '', # default
-		value	=> [ ( '', 'xbmc', 'xbmc_movie', 'generic', 'freevo' ) ], # values
+		value	=> [ ( '', 'generic' ) ], # values
 		save	=> 1,
 	};
 
@@ -3686,7 +3543,7 @@
 		tooltip	=> 'Automatically refresh the default caches in another browser tab (hours)', # Tooltip
 		webvar	=> 'AUTOWEBREFRESH', # webvar
 		type	=> 'text', # type
-		default	=> 1, # default
+		default	=> 4, # default
 		value	=> 3, # width values
 		save	=> 1,
 	};
@@ -3795,7 +3652,7 @@
 		label	=> , \%streamtype_labels, # labels
 		default	=> '', # default
 		value	=> [ '', 'none', 'flv', 'mov', 'asf', 'avi', 'mp3', 'aac', 'wav', 'flac' ], # values
-		onChange=> "form.submit();",
+		onChange=> "form1.submit();",
 		save	=> 1,
 	};
 
@@ -3847,7 +3704,7 @@
 		save	=> 0,
 	};
 
-	# Remeber the status of the tab options display
+	# Remember the status of the tab options display
 	for my $tabname ( grep !/BASICTAB/, @{ $layout->{taborder} } ) {
 		my $default = 'no';
 		# By default only show advanced search tab
@@ -3891,7 +3748,7 @@
 				$opt->{$_}->{current} =  join ",", $opt->{$_}->{default};
 			}
 			print $se "DEBUG: Using $_ = $opt->{$_}->{current}\n--\n" if $opt_cmdline->{debug};
-			
+
 		} else {
 			$opt->{$_}->{current} = join(",", $cgi->param($_) ) || $opt->{$_}->{default} if not defined $opt->{$_}->{current};
 		}
@@ -3903,7 +3760,7 @@
 ######################################################################
 #
 #   begin_html
-# 
+#
 #   Send HTTP headers to browser
 #   Sets "title", Sends <HTML> and <BODY> flags
 #
@@ -3911,7 +3768,7 @@
 sub begin_html {
 	my $request_host = shift;
 	my $mimetype = 'text/html';
-	
+
 	# Save settings if selected
 	my @cookies;
 	if ( $cgi->param('SAVE') ) {
@@ -3941,15 +3798,15 @@
 	my $title;
 	my $autorefresh = $cgi->cookie( 'AUTOWEBREFRESH' ) || $cgi->param( 'AUTOWEBREFRESH' );
 	my $autopvrrun  = $cgi->cookie( 'AUTOPVRRUN' ) || $cgi->param( 'AUTOPVRRUN' );
-	if ( $autorefresh && $cgi->param( 'NEXTPAGE' ) eq 'refresh' ) {
+	if ( $autorefresh > 0 && $cgi->param( 'NEXTPAGE' ) eq 'refresh' ) {
 		$body_element = "<BODY onLoad=\"javascript:RefreshTab( '${request_host}?NEXTPAGE=refresh&AUTOWEBREFRESH=$autorefresh&PROGTYPES=$opt->{PROGTYPES}->{current}', ".(1000*3600*$autorefresh)." );\">";
 		$title = 'Refreshing Cache: get_iplayer Web PVR Manager';
-	} elsif ( $autopvrrun && $cgi->param( 'NEXTPAGE' ) eq 'pvr_run' ) {
+	} elsif ( $autopvrrun > 0 && $cgi->param( 'NEXTPAGE' ) eq 'pvr_run' ) {
 		$body_element = "<BODY onLoad=\"javascript:RefreshTab( '${request_host}?NEXTPAGE=pvr_run&AUTOPVRRUN=$autopvrrun', ".(1000*3600*$autopvrrun)." );\">";
 		$title = 'Running PVR: get_iplayer Web PVR Manager';
 	} else {
 		$body_element = "<body>\n";
-		$title = sprintf "get_iplayer Web PVR Manager v%.2f", $VERSION;
+		$title = "get_iplayer Web PVR Manager $VERSION_TEXT";
 	}
 
 	# Write out the page http and html headers
@@ -3957,6 +3814,7 @@
 	print $fh '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'."\n";
 	print $fh "<html>";
 	print $fh "<HEAD><TITLE>$title</TITLE>\n";
+	print $fh "<base href=\"$opt_cmdline->{baseurl}\">\n" if $opt_cmdline->{baseurl};
 	insert_stylesheet();
 	print $fh "</HEAD>\n";
 	insert_javascript();
@@ -3975,44 +3833,47 @@
 	print $fh <<EOF;
 
 	<script type="text/javascript">
-	
+
 	function RefreshTab(url, time, force ) {
 		if ( force ) {
 			window.location.href = url;
 		}
+		if ( time <= 0 ) {
+			return;
+		}
 		setTimeout( "RefreshTab('" + url + "'," + time + ", 1 )", time );
 	}
 
 
 	// global hash table for saving copy of form
 	var form_backup = {};
-	
+
 	//
 	// Copy all non-grouped form values into a global hash
 	//
-	function BackupFormVars( form ) {
+	function BackupFormVars( f ) {
 		// empty out array
 		for(var key in form_backup) {
 			delete( form_backup[key] );
 		}
 
 		// copy forms elements
-		var elem = form.elements;
+		var elem = f.elements;
 		for(var i = 0; i < elem.length; i++) {
 			// exclude radio and checkbox types - can be duplicate names in groups...
 			if ( elem[i].type != "checkbox" && elem[i].type != "radio" ) {
 				form_backup[ elem[i].name ] = elem[i].value;
 			}
-		} 
+		}
 	}
 
 	//
 	// Copy all form values in the global hash into the specified form
-	//	
-	function RestoreFormVars( form ) {
+	//
+	function RestoreFormVars( f ) {
 		// copy form elements
 		for(var key in form_backup) {
-			form.elements[ key ].value = form_backup[key];
+			f.elements[ key ].value = form_backup[key];
 			// delete element
 			delete( form_backup[key] );
 		}
@@ -4044,7 +3905,7 @@
 				tab.style.visibility = 'visible';
 				option.value = 'yes';
 				//button.innerHTML = '- ' + button.innerHTML.substring(2);
-				button.style.color = '#F54997';
+				//button.style.color = '#F54997';
 				//li.style.borderBottom = '0px solid #666';
 				li.className = 'options_tab_sel';
 			} else {
@@ -4052,14 +3913,14 @@
 				tab.style.visibility = 'collapse';
 				option.value = 'no';
 				//button.innerHTML = '+ ' + button.innerHTML.substring(2);
-				button.style.color = '#ADADAD';
+				//button.style.color = '#ADADAD';
 				//li.style.borderBottom = '1px solid #666';
 				li.className = 'options_tab';
 			}
 		}
 		return true;
 	}
-	
+
 	//
 	// Check/Uncheck all checkboxes named <name>
 	//
@@ -4137,9 +3998,9 @@
 	function submitonEnter(evt){
 		var charCode = (evt.which) ? evt.which : event.keyCode
 		if ( charCode == "13" ) {
-			document.form.NEXTPAGE.value='search_progs';
-			document.form.PAGENO.value=1;
-			document.form.submit();
+			document.form1.NEXTPAGE.value='search_progs';
+			document.form1.PAGENO.value=1;
+			document.form1.submit();
 		}
 	}
 
@@ -4158,120 +4019,185 @@
 	print $fh <<EOF;
 
 	<STYLE type="text/css">
+
+	body {
+		background: #000;
+		color: #fff;
+		font-family: Arial,Helvetica,sans-serif;
+		font-size: 100%;
+	}
+
+	img	{
+		border: 0;
+	}
 	
-	.pointer		{ cursor: pointer; cursor: hand; }
-	.pointer:hover		{ text-decoration: underline; }
+	input, select {
+		background: #ddd; 
+		border: 0; 
+	}
+	
+	input {
+		font-size: 1em;
+	}
+
+	a { 
+		color: #fff; 
+		text-decoration: none; 
+	}
+
+	a[href], a[onclick], label[onclick], :link, :visited {
+		cursor: pointer;
+	}
+	
+	ul.nav,
+	ul.options_tab,
+	ul.action {
+		list-style: none;
+		margin: 8px 0;
+		padding: 0;
+	}
+	
+	ul.nav, ul.action {
+		font-size: 1em;
+	}
+
+	ul.nav {
+		border-bottom: 4px solid #888;
+	}
+
+	ul.options_tab {
+		border-bottom: 2px solid #888;
+	}
+	
+	ul.nav > li,
+	ul.options_tab > li,
+	ul.action > li {
+		background: #444;
+		display: inline-block;
+		vertical-align: bottom;
+		margin: 0 4px;
+	}
+	
+	ul.nav > li, 
+	ul.action > li {
+		padding: 4px 16px;
+	}
+	
+	ul.options_tab > li {
+		padding: 2px 8px;
+	}
+
+	ul.nav > li:hover,
+	ul.options_tab > li:hover,
+	ul.action > li:hover {
+		background: #666;
+	}
+	
+	ul.nav > li.nav_tab_sel,
+	ul.options_tab > li.options_tab_sel {
+		background: #888;
+	}
+	
+	table.options_outer > tbody > tr {
+		font-size: 0.875em;
+	}
 
-	.pointer_noul		{ cursor: pointer; cursor: hand; }
+	table.options_outer td, 
+	table.options_outer th,
+	table.info td, 
+	table.info th {
+		vertical-align: top;
+		text-align: left;
+	}
+
+	table.options,
+	table_options_embedded {
+		border-spacing: 1;
+	}
+
+	table.pagetrail {
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: 8px;
+		margin-bottom: 8px;
+		font-size: 1em;
+		font-weight: bold; 
+		border-spacing: 10px 0; 
+		padding: 0px;
+	}
+	
+	label.pagetrail-current	{
+		color: #F54997;
+	}
+	
+	table.search,
+	table.info {
+		border: 2px solid #333;
+		border-collapse: collapse;
+		width: 100%;
+	}
 
-	.extra_border		{ border-left: 2px solid #666; }
-	.all_borders		{ border-left: 2px solid #666; border-right: 2px solid #666; border-top: 2px solid #666; border-bottom: 2px solid #666; }
+	table.search > tbody > tr,
+	table.info > tbody > tr {
+		background: #444;
+		font-size: 0.875em;
+	}
 
-	.darker			{ color: #7D7D7D; }
-	#logo			{ width: 190px; border-width: 0 0 1px 0; }
-	#underline		{ text-decoration: underline; }
-	#nowrap			{ white-space: nowrap; }
-	#smaller80pc		{ font-size: 80%; }
-
-	BODY			{ color: #FFF; background: black; font-size: 90%; font-family: verdana, sans-serif; }
-	IMG			{ border: 0; }
-	INPUT			{ border: 0 none; background: #ddd; }
-	A			{ color: #FFF; text-decoration: none; }
-	A:hover			{ text-decoration: none; }
-
-	TABLE.title 		{ font-size: 150%; border-spacing: 0px; padding: 0px; }
-	A.title			{ color: #F54997; font-weight: bold; font-family: Arial,Helvetica,sans-serif; }
-
-	/* Nav bar */
-	DIV.nav			{ font-family: Arial,Helvetica,sans-serif; background-color: #000; color: #FFF; }
-	UL.nav			{ cursor: pointer; cursor: hand; padding-left: 0px; background-color: #000; font-size: 100%; font-weight: bold; height: 44px; margin: 0; margin-left: 0px; list-style-image: none; overflow: hidden; }
-	LI.nav_tab		{ padding-left: 0px; border-top: 1px solid #444; border-left: 1px solid #444; border-right: 1px solid #444; border-bottom: 1px solid #888; display: inline; float: left; height: 42px; margin: 0; width: 13%; }
-	LI.nav_tab_sel		{ padding-left: 0px; border-top: 1px solid #888; border-left: 1px solid #888; border-right: 1px solid #888; border-bottom: 0px solid #888; display: inline; float: left; height: 42px; margin: 0; width: 13%; }
-	A.nav			{ display: block; height: 42px; line-height: 42px; text-align: center; }
-	IMG.nav			{ padding: 7px; display: block; text-align: center; text-decoration: none; }
-	A.nav:hover		{ color: #ADADAD; }
-
-	TABLE.header		{ font-size: 80%; border-spacing: 1px; padding: 0; }
-	INPUT.header		{ font-size: 80%; } 
-	SELECT.header		{ font-size: 80%; } 
-
-	TABLE.types		{ font-size: 70%; text-align: left; border-spacing: 0px; padding: 0; }
-	TR.types		{ white-space: nowrap; }
-	TD.types		{ width: 20px }
+	table.search > tbody > tr:hover,
+	table.info > tbody > tr:hover {
+		background: #666;
+	}
+
+	table.search > tbody > tr > th,
+	table.info > tbody > tr > th {
+		background: #000; 
+		text-align: center; 
+	}
 	
-	TABLE.options_embedded	{ font-size: 100%; text-align: left; border-spacing: 0px; padding: 0; white-space: nowrap; }
-	TR.options_embedded	{ white-space: nowrap; }
-	TH.options_embedded	{ width: 20px }
-	TD.options_embedded	{ width: 20px }
-
-	/*DIV.options		{ padding-top: 10px; padding-bottom: 10px; font-family: Arial,Helvetica,sans-serif; background-color: #000; color: #FFF; }*/
-	/* options_tab */
-	UL.options_tab		{ text-align: left; cursor: pointer; cursor: hand; list-style-type: none; display: inline; padding-left: 0px; background-color: #000; font-size: 100%; font-weight: bold; height: 24px; margin: 0; margin-left: 0px; list-style-image: none; overflow: hidden; }
-	/* selected tab button */
-	LI.options_tab_sel	{ padding-left: 10px; padding-right: 10px; padding-bottom: 2px; padding-top: 2px; border-top: 1px solid #888; display: inline; float: left; border-left: 1px solid #888; border-right: 1px solid #888; border-bottom: 0px solid #888; margin: 0; margin-left: 0px; margin-bottom: 5px; }
-	/* unselected tab button */
-	LI.options_tab		{ padding-left: 10px; padding-right: 10px; padding-bottom: 2px; padding-top: 2px; border-top: 1px solid #444; display: inline; float: left; border-left: 1px solid #444; border-right: 1px solid #444; border-bottom: 1px solid #888; margin: 0; margin-left: 0px; margin-bottom: 5px; }
-	/* unselected tab button */
-	LI.options_button	{ padding-left: 10px; padding-right: 10px; padding-bottom: 2px; padding-top: 2px; border-top: 1px solid #888; display: inline; float: left; border-left: 1px solid #888; border-right: 1px solid #888; border-bottom: 1px solid #888; margin: 0; margin-right: 5px; margin-bottom: 5px; }
-
-	TABLE.options		{ font-size: 100%; text-align: left; border-spacing: 0px; padding: 0; white-space: nowrap; }
-	TR.options		{ white-space: nowrap; }
-	TH.options		{ padding-right: 4px; text-align: left; }
-	TD.options		{ }
-	LABEL.options		{ font-size: 100%; } 
-	INPUT.options[type="radio"],INPUT.options[type="checkbox"] { font-size: 100%; background:none; }
-	INPUT.options		{ font-size: 100%; } 
-	SELECT.options		{ font-size: 100%; } 
-
-	TABLE.options_outer	{ font-size: 70%; text-align: left; border-spacing: 0px 0px; padding: 0; white-space: nowrap; overflow: visible; table-layout: fixed; }
-	TR.options_outer	{ vertical-align: top; white-space: nowrap; }
-	TH.options_outer	{ }
-	TD.options_outer	{ padding-right: 50px; }
-	LABEL.options_outer	{ font-weight: bold; font-size: 120%; color: #F54997; font-family: Arial,Helvetica,sans-serif; } 
-	LABEL.options_heading	{ font-weight: bold; font-size: 110%; color: #CCC; } 
+	table.search > tbody > tr > td, 
+	table.search > tbody > tr > th,
+	table.info > tbody > tr > td, 
+	table.info > tbody > tr > th {
+		border: 1px solid #333;
+		padding: 4px 8px;
+	}
 	
-	/* Action bar */
-	DIV.action		{ padding-top: 10px; padding-bottom: 10px; font-family: Arial,Helvetica,sans-serif; background-color: #000; color: #FFF; }
-	UL.action		{ padding-left: 0px; background-color: #000; font-size: 100%; font-weight: bold; height: 24px; margin: 0; margin-left: 0px; list-style-image: none; overflow: hidden; }
-	LI.action		{ cursor: pointer; cursor: hand; padding-left: 0px; border-top: 1px solid #888; border-left: 1px solid #666; border-right: 1px solid #666; border-bottom: 1px solid #666; display: inline; float: left; height: 22px; margin: 0; margin-left: 2px; width: 13.0%; }
-	A.action		{ color: #FFF; display: block; height: 42px; line-height: 22px; text-align: center; }
-	IMG.action		{ padding: 7px; display: block; text-align: center; text-decoration: none; }
-	A.action:hover		{ color: #ADADAD; }
-
-	TABLE.pagetrail		{ font-size: 70%; text-align: center; font-weight: bold; border-spacing: 10px 0; padding: 0px; }
-	#centered		{ height:20px; margin:0px auto 0; position: relative; }
-	LABEL.pagetrail		{ color: #FFF; }
-	LABEL.pagetrail-current	{ color: #F54997; }
-
-	TABLE.colselect		{ font-size: 70%; color: #fff; background: #333; border-spacing: 2px; padding: 0; }
-	TR.colselect		{ text-align: left; }
-	TH.colselect		{ font-weight: bold; }
-	INPUT.colselect		{ font-size: 70%; }
-	LABEL.colselect		{ font-size: 70%; }
+	table.searchhead {
+		width: 100%; 
+	}
+
+	label.sorted {
+		color: #CFC;
+	}
+	
+	label.sorted_reverse {
+		color: #FCC;
+	}
+	
+	b.footer {
+		color: #777;
+		font-size: 0.75em;
+		font-weight: normal;
+	}
+
+	#nowrap {
+		white-space: nowrap;
+	}
+
+	#logo {
+		background: none;
+		margin: 0;
+	}
 	
-	TABLE.search		{ font-size: 70%; color: #fff; background: #333; border-spacing: 2px; padding: 0; width: 100%; }
-	TABLE.searchhead	{ font-size: 110%; border-spacing: 0px; padding: 0; width: 100%; }
-	TR.search		{ background: #444; }
-	TR.search:hover		{ background: #555; }
-	TH.search		{ color: #FFF; text-align: center; background: #000; text-align: center; }
-	TD.search		{ text-align: left; }
-	A.search		{ }
-	LABEL.search		{ text-decoration: none; }
-	INPUT.search		{ font-size: 70%; background: none; }
-	LABEL.sorted            { color: #CFC; }
-	LABEL.unsorted          { color: #FFF; }
-	LABEL.sorted_reverse    { color: #FCC; }
-	INPUT.edit		{ font-size: 100%; background: #DDD; }
-
-	TABLE.info		{ font-size: 70%; color: #fff; background: #333; border-spacing: 2px; padding: 0; }
-	TR.info			{ background: #444; }
-	TR.info:hover		{ background: #555; }
-	TH.info			{ color: #FFF; text-align: center; background: #000; text-align: center; }
-	TD.info			{ text-align: left; }
-	A.info			{ text-decoration: underline; }
-	A.info:hover		{ }
+	#logo .logotext {
+		color: #F54997;
+		font-family: "Courier New", monospace;
+	}
+
+	.darker {
+		color: #7D7D7D;
+	}
 
-	B.footer		{ font-size: 70%; color: #777; font-weight: normal; }
 	</STYLE>
 EOF