Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

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.

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.

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

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>

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" />

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`
-

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

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;

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."],

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:"

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;