Bump version

5 files changed, 207 insertions, 197 deletions

diff --git a/HISTORY b/HISTORY
index 2908f9e..5672934 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,130 +1,130 @@
 VDR Plugin 'webvideo' Revision History
 --------------------------------------
 
-2008-06-25: Version 0.0.1
+2012-02-26: Version 0.4.6
 
-- Initial revision.
+- webvi: New option --url for downloading a single video
 
-2008-07-24: Version 0.0.2
+2012-01-29: Version 0.4.5
 
-- Italian translation (thanks to Diego Pierotto)
-- Support for mms URLs using libmms
-- Guess the file extension from the Content-Type header, not from the
-  defaultext tag
-- New video service: YLE Areena (the web service of the Finland's
-  national broadcasting company). Only partial support, some of the
-  URLs do not work with libmms.
-- Youtube: Download higher quality MPEG-4 videos
+- Fixed Youtube, Google Video breakage
+- Removed SubTV support. SubTV programs are available in Katsomo.
 
-2008-08-20: Version 0.0.3
+2011-08-08: Version 0.4.4
 
-- Support for video search
-- Updated Italian translation (thanks to Diego Pierotto)
-- Try mmsh if mms protocol fails (requires libmms 0.4 or later). Most
-  videos on YLE Areena seem to work after this fix.
-- Fix segfault when deleting the plugin at VDR exit
-- Youtube: switch back to low quality FLV videos because not all
-  videos have MP4 version
+- Fixed Youtube support
+- Minor improvements in Katsomo and ruutu.fi support
+- Disabled broken Vimeo search
 
-2008-08-21: Version 0.0.4
+2011-07-12: Version 0.4.3
+
+- Streaming works on YLE Areena and on other sources which use
+  external downloaders (playback in VLC does not work very well)
+- Prefer mplayer over VLC when playing streams
+- Fixed "Error 501: No active sockets" by properly implementing
+  timeouts
+- Improved ruutu.fi support
+
+2011-06-12: Version 0.4.2
 
+- Fixed katsomo.fi module.
+- Watch on vdr bookmarklet now works also on katsomo.fi.
+- webvi: Space in search terms was errornously replaced by plus.
+
+2011-04-17: Version 0.4.1
+
+- Fixed Youtube, Metacafe and Vimeo modules. Streaming does not work
+  on Vimeo.
+- Removed SVT Play module which was not working anymore.
+- Accept -p as alternative to --postprocess (thanks to Matti
+  Lehtimäki).
+- New option --prefermplayer prefers mplayer over xineliboutput when
+  streaming (thanks to Matti Lehtimäki).
+- Bookmarklet for saving a video from the web browser (a patch by
+  Samuli Sorvakko).
 - Updated Italian translation (thanks to Diego Pierotto)
-- Include a workaround for a bug in the libmms header file mmsx.h
-  which caused the compilation to fail
-- Fix compiler warnings
+- New option --verbose (webvi)
+- New option --vfat (or vfat in config file) generates Windows
+  compatible filenames (plugin, webvi)
 
-2008-09-08: Version 0.0.5
+2010-11-18: Version 0.4.0
 
-- New video service: SVT Play. Contributed by Lars Olsson.
-- More robust parsing of .asx files
-- Workaround for buggy servers: if the server reports the Content-Type
-  of a video file as text/plain do not use it for deciding the file
-  extension. Try to extract the extension from the URL instead.
-- Sort service names alphabetically
+- SVDRP commands for playing and downloading videos (based on a patch
+  by Matti Lehtimäki).
+- Bookmarklet for sending a video from web browser to VDR.
+- Correct template path in webvi.plugin.conf, respect user CXXFLAGS,
+  SYSLIBDIR and DESTDIR in Makefiles, fix typos (patches by Ville
+  Skyttä).
+- Support VDR 1.7 series by including Make.global.
+- Command line arguments override config file options.
+- Fixes for Youtube, Metacafe and Google modules.
 
-2008-12-06: Version 0.0.6
+2010-08-26: Version 0.3.2
 
-- French translation (Thanks to Bruno Roussel)
-- Fixed Youtube parsing to accommodate to recent changes
+- Plugin: Possibility to run a script after downloading.
+- New video service: MoonTV (contributed by Matti Lehtimäki).
+- ruutu.fi uses rtmpe for some videos.
+- Stream low bandwidth Youtube videos by default (configurable in
+  /etc/webvi.conf)
+- Fixed Google video module.
+- Disabled ruutu.fi search which is not working.
 
-2009-02-08: Version 0.1.0
+2010-07-25: Version 0.3.1
 
-- The downloader backend is now a separate server process. The user
-  interface is no longer blocked while the plugin is waiting for a web
-  server to respond.
-- Support for streaming
-- A new command line client that has the same capabilities as the plugin
-  but can be used without VDR.
-- Alternative URLs for videos. For example, Youtube module first tries
-  to download high quality version, and falls back to standard version
-  if high quality version is not available.
-- Cleaning up of the XML menu scheme. New menu items: textfields, item
-  lists, query buttons.
-- Status page that lists uncompleted downloads
-- Updated YouTube, Google, and SVTPlay modules to work with the recent
-  changes on these sites
+- Updated Italian translation (thanks to Diego Pierotto).
+- Fixed Youtube extractor.
+- Fixed Vimeo search.
+- Timers are no longer marked as "Unfinished" after the download has
+  been completed.
+- Retry failed timers again later.
 
-2009-02-24: Version 0.1.1
+2010-07-12: Version 0.3.0
 
-- Simplified building: better Makefile, fixed instructions in README
-- Updated Italian translations (thanks to Diego Pierotto)
-- German translation (contributed by Andre L.)
-- Daemon stops downloads gracefully when client disconnects
-- Fixed segfault when a menu title is NULL (this happened for
-  example on YouTube search results page)
-- sane filenames: no slashs, no dots in the beginning
-- Try to start daemon process automatically if can't open a connection
-- Removed busy polling when loading the main menu
-- Remove temporary file if the request fails
-- Ability to cancel downloads (through the status screen)
-- URLencode function in the plugin was bogus: the percent encoded
-  values should be in hex, not in decimal
-- Fixed problem with downloads never finishing if the server sends
-  shorter file than expected
-- History forward skipped over one page
-- SVTPlay: various improvements to the parsing of the web pages
+- Scheduled downloading
+- Show error details on status screen by pressing Info
+- Fix a crash when video URL is empty.
+- INI file options for controlling the download quality.
+- Add support for Finnish TV stations: MTV3 Katsomo, ruutu.fi, Subtv.
+- Make all downloads abortable.
+- Fixed Vimeo search.
 
-2009-03-07: Version 0.1.2
+2010-04-11: Version 0.2.2
 
-- Unescape the stream URL before passing it to xineliboutput to make
-  Youtube streaming work.
-- Youtube: More robust parsing of search results page. Updated
-  categories parsing according to recent changes.
-- Updated Italian translations (thanks to Diego Pierotto)
-- Fixed a typo in German translation (thanks to Halim Sahin)
+- Remember query terms and menu positions when moving in history.
+- Reduce delays when navigating the menu.
+- Install libwebvi.so* links correctly. Run ldconfig.
+- Write correct path to /etc/webvi.conf when installing to an
+  alternative location.
+- Show percentage as ??? on status page if the size is unknown.
+- Fixed Youtube module.
 
-2009-04-08: Version 0.1.3
+2010-01-23: Version 0.2.1
 
-Plugin:
-- Call libxslt.init() only it exists (old versions of libxslt don't
-  have init())
-- Update download progress indicators in the status screen at regular
-  intervals
+- Support for all Python versions.
+- Install the plugin with VDR's "make plugins". (If you use make
+  plugins, you still need to install the library separately.)
 
-webvi, the command line client:
-- Show download progress
+2010-01-17: Version 0.2.0
 
-Video site modules:
-- YLE Areena: show error message if search fails, show categories in
-  the main menu, various smaller parsing improvements
-- Youtube: show error message if no search results, fix parsing of
-  Movies category
+- The daemon is replaced by Python library with C bindings. This
+  simplifies the invocation of the VDR plugin and the command line
+  client.
+- New video service: Vimeo
+- Re-added support for YLE Areena (requires rtmpdump-yle from
+  http://users.tkk.fi/~aajanki/rtmpdump-yle/index.html).
+- Youtube: using the official API (except for video pages), this
+  should mean less breakage in the future. Various improvements on
+  the menus.
 
-2009-05-05: Version 0.1.4
+2009-10-27: Version 0.1.7
 
-- Updated Italian translation (thanks to Diego Pierotto)
-- Config file for webvi for defining player programs and the address
-  of the daemon
-- Streaming now reverts back to lower quality video if high quality
-  version is not available (like downloading already did before)
+- Compatibility fixes for Youtube and Metacafe modules.
 
-Video site modules:
-- Support for a new video site: Metacafe
-- Youtube: adapted parsing to comply with recent changes on Youtube.
-  Download HD quality video when available.
-- YLE Areena: download high quality videos by default
-- Google Video: support for videos hosted on Metacafe. Made parsing a
-  bit more robust.
+2009-08-20: Version 0.1.6
+
+- Fixed compilation on gcc4.4. Thanks to Anssi Hannula.
+- Fixed Youtube module.
+- Removed the outdated YLE Areena support.
 
 2009-05-10: Version 0.1.5
 
@@ -136,123 +136,127 @@ Video site modules:
 - Command line argument --daemoncmd specifies the command for starting
   the webvid daemon
 
-2009-08-20: Version 0.1.6
-
-- Fixed compilation on gcc4.4. Thanks to Anssi Hannula.
-- Fixed Youtube module.
-- Removed the outdated YLE Areena support.
+2009-05-05: Version 0.1.4
 
-2009-10-27: Version 0.1.7
+- Updated Italian translation (thanks to Diego Pierotto)
+- Config file for webvi for defining player programs and the address
+  of the daemon
+- Streaming now reverts back to lower quality video if high quality
+  version is not available (like downloading already did before)
 
-- Compatibility fixes for Youtube and Metacafe modules.
+Video site modules:
+- Support for a new video site: Metacafe
+- Youtube: adapted parsing to comply with recent changes on Youtube.
+  Download HD quality video when available.
+- YLE Areena: download high quality videos by default
+- Google Video: support for videos hosted on Metacafe. Made parsing a
+  bit more robust.
 
-2010-01-17: Version 0.2.0
+2009-04-08: Version 0.1.3
 
-- The daemon is replaced by Python library with C bindings. This
-  simplifies the invocation of the VDR plugin and the command line
-  client.
-- New video service: Vimeo
-- Re-added support for YLE Areena (requires rtmpdump-yle from
-  http://users.tkk.fi/~aajanki/rtmpdump-yle/index.html).
-- Youtube: using the official API (except for video pages), this
-  should mean less breakage in the future. Various improvements on
-  the menus.
+Plugin:
+- Call libxslt.init() only it exists (old versions of libxslt don't
+  have init())
+- Update download progress indicators in the status screen at regular
+  intervals
 
-2010-01-23: Version 0.2.1
+webvi, the command line client:
+- Show download progress
 
-- Support for all Python versions.
-- Install the plugin with VDR's "make plugins". (If you use make
-  plugins, you still need to install the library separately.)
+Video site modules:
+- YLE Areena: show error message if search fails, show categories in
+  the main menu, various smaller parsing improvements
+- Youtube: show error message if no search results, fix parsing of
+  Movies category
 
-2010-04-11: Version 0.2.2
+2009-03-07: Version 0.1.2
 
-- Remember query terms and menu positions when moving in history.
-- Reduce delays when navigating the menu.
-- Install libwebvi.so* links correctly. Run ldconfig.
-- Write correct path to /etc/webvi.conf when installing to an
-  alternative location.
-- Show percentage as ??? on status page if the size is unknown.
-- Fixed Youtube module.
+- Unescape the stream URL before passing it to xineliboutput to make
+  Youtube streaming work.
+- Youtube: More robust parsing of search results page. Updated
+  categories parsing according to recent changes.
+- Updated Italian translations (thanks to Diego Pierotto)
+- Fixed a typo in German translation (thanks to Halim Sahin)
 
-2010-07-12: Version 0.3.0
+2009-02-24: Version 0.1.1
 
-- Scheduled downloading
-- Show error details on status screen by pressing Info
-- Fix a crash when video URL is empty.
-- INI file options for controlling the download quality.
-- Add support for Finnish TV stations: MTV3 Katsomo, ruutu.fi, Subtv.
-- Make all downloads abortable.
-- Fixed Vimeo search.
+- Simplified building: better Makefile, fixed instructions in README
+- Updated Italian translations (thanks to Diego Pierotto)
+- German translation (contributed by Andre L.)
+- Daemon stops downloads gracefully when client disconnects
+- Fixed segfault when a menu title is NULL (this happened for
+  example on YouTube search results page)
+- sane filenames: no slashs, no dots in the beginning
+- Try to start daemon process automatically if can't open a connection
+- Removed busy polling when loading the main menu
+- Remove temporary file if the request fails
+- Ability to cancel downloads (through the status screen)
+- URLencode function in the plugin was bogus: the percent encoded
+  values should be in hex, not in decimal
+- Fixed problem with downloads never finishing if the server sends
+  shorter file than expected
+- History forward skipped over one page
+- SVTPlay: various improvements to the parsing of the web pages
 
-2010-07-25: Version 0.3.1
+2009-02-08: Version 0.1.0
 
-- Updated Italian translation (thanks to Diego Pierotto).
-- Fixed Youtube extractor.
-- Fixed Vimeo search.
-- Timers are no longer marked as "Unfinished" after the download has
-  been completed.
-- Retry failed timers again later.
+- The downloader backend is now a separate server process. The user
+  interface is no longer blocked while the plugin is waiting for a web
+  server to respond.
+- Support for streaming
+- A new command line client that has the same capabilities as the plugin
+  but can be used without VDR.
+- Alternative URLs for videos. For example, Youtube module first tries
+  to download high quality version, and falls back to standard version
+  if high quality version is not available.
+- Cleaning up of the XML menu scheme. New menu items: textfields, item
+  lists, query buttons.
+- Status page that lists uncompleted downloads
+- Updated YouTube, Google, and SVTPlay modules to work with the recent
+  changes on these sites
 
-2010-08-26: Version 0.3.2
+2008-12-06: Version 0.0.6
 
-- Plugin: Possibility to run a script after downloading.
-- New video service: MoonTV (contributed by Matti Lehtimäki).
-- ruutu.fi uses rtmpe for some videos.
-- Stream low bandwidth Youtube videos by default (configurable in
-  /etc/webvi.conf)
-- Fixed Google video module.
-- Disabled ruutu.fi search which is not working.
+- French translation (Thanks to Bruno Roussel)
+- Fixed Youtube parsing to accommodate to recent changes
 
-2010-11-18: Version 0.4.0
+2008-09-08: Version 0.0.5
 
-- SVDRP commands for playing and downloading videos (based on a patch
-  by Matti Lehtimäki).
-- Bookmarklet for sending a video from web browser to VDR.
-- Correct template path in webvi.plugin.conf, respect user CXXFLAGS,
-  SYSLIBDIR and DESTDIR in Makefiles, fix typos (patches by Ville
-  Skyttä).
-- Support VDR 1.7 series by including Make.global.
-- Command line arguments override config file options.
-- Fixes for Youtube, Metacafe and Google modules.
+- New video service: SVT Play. Contributed by Lars Olsson.
+- More robust parsing of .asx files
+- Workaround for buggy servers: if the server reports the Content-Type
+  of a video file as text/plain do not use it for deciding the file
+  extension. Try to extract the extension from the URL instead.
+- Sort service names alphabetically
 
-2011-04-17: Version 0.4.1
+2008-08-21: Version 0.0.4
 
-- Fixed Youtube, Metacafe and Vimeo modules. Streaming does not work
-  on Vimeo.
-- Removed SVT Play module which was not working anymore.
-- Accept -p as alternative to --postprocess (thanks to Matti
-  Lehtimäki).
-- New option --prefermplayer prefers mplayer over xineliboutput when
-  streaming (thanks to Matti Lehtimäki).
-- Bookmarklet for saving a video from the web browser (a patch by
-  Samuli Sorvakko).
 - Updated Italian translation (thanks to Diego Pierotto)
-- New option --verbose (webvi)
-- New option --vfat (or vfat in config file) generates Windows
-  compatible filenames (plugin, webvi)
-
-2011-06-12: Version 0.4.2
-
-- Fixed katsomo.fi module.
-- Watch on vdr bookmarklet now works also on katsomo.fi.
-- webvi: Space in search terms was errornously replaced by plus.
+- Include a workaround for a bug in the libmms header file mmsx.h
+  which caused the compilation to fail
+- Fix compiler warnings
 
-2011-07-12: Version 0.4.3
+2008-08-20: Version 0.0.3
 
-- Streaming works on YLE Areena and on other sources which use
-  external downloaders (playback in VLC does not work very well)
-- Prefer mplayer over VLC when playing streams
-- Fixed "Error 501: No active sockets" by properly implementing
-  timeouts
-- Improved ruutu.fi support
+- Support for video search
+- Updated Italian translation (thanks to Diego Pierotto)
+- Try mmsh if mms protocol fails (requires libmms 0.4 or later). Most
+  videos on YLE Areena seem to work after this fix.
+- Fix segfault when deleting the plugin at VDR exit
+- Youtube: switch back to low quality FLV videos because not all
+  videos have MP4 version
 
-2011-08-08: Version 0.4.4
+2008-07-24: Version 0.0.2
 
-- Fixed Youtube support
-- Minor improvements in Katsomo and ruutu.fi support
-- Disabled broken Vimeo search
+- Italian translation (thanks to Diego Pierotto)
+- Support for mms URLs using libmms
+- Guess the file extension from the Content-Type header, not from the
+  defaultext tag
+- New video service: YLE Areena (the web service of the Finland's
+  national broadcasting company). Only partial support, some of the
+  URLs do not work with libmms.
+- Youtube: Download higher quality MPEG-4 videos
 
-2012-01-29: Version 0.4.5
+2008-06-25: Version 0.0.1
 
-- Fixed Youtube, Google Video breakage
-- Removed SubTV support. SubTV programs are available in Katsomo.
+- Initial revision.
diff --git a/debian/changelog b/debian/changelog
index 8b36c42..be9e8d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-webvideo (0.4.6-1) unstable; urgency=low
+
+  * webvi: New option --url for downloading a single video
+
+ -- Antti Ajanki <antti.ajanki@iki.fi>  Sun, 26 Feb 2012 12:05:00 +0200
+
 vdr-plugin-webvideo (0.4.5-1) unstable; urgency=low
 
   * Fixed Youtube, Google Video support
diff --git a/src/libwebvi/webvi/version.py b/src/libwebvi/webvi/version.py
index 359b074..3055c0f 100644
--- a/src/libwebvi/webvi/version.py
+++ b/src/libwebvi/webvi/version.py
@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = '0.4.5'
+VERSION = '0.4.6'
diff --git a/src/vdr-plugin/webvideo.c b/src/vdr-plugin/webvideo.c
index 4c99af9..3d3ea87 100644
--- a/src/vdr-plugin/webvideo.c
+++ b/src/vdr-plugin/webvideo.c
@@ -24,7 +24,7 @@
 #include "common.h"
 #include "timer.h"
 
-const char *VERSION               = "0.4.5";
+const char *VERSION               = "0.4.6";
 static const char *DESCRIPTION    = trNOOP("Download video files from the web");
 static const char *MAINMENUENTRY  = "Webvideo";
 cMimeTypes *MimeTypes             = NULL;
diff --git a/src/webvicli/webvicli/client.py b/src/webvicli/webvicli/client.py
index db51aa1..3c2bd7c 100644
--- a/src/webvicli/webvicli/client.py
+++ b/src/webvicli/webvicli/client.py
@@ -38,7 +38,7 @@ from urlparse import urlparse
 from webvi.constants import WebviRequestType, WebviOpt, WebviInfo, WebviSelectBitmask, WebviConfig, WebviSelect
 from . import menu
 
-VERSION = '0.4.5'
+VERSION = '0.4.6'
 
 # Default options
 DEFAULT_PLAYERS = ['mplayer -cache-min 10 "%s"',