From dab646920df92ded07c70ab6913d1fa1a33aab2c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Fri, 8 Feb 2013 18:45:20 +0000
Subject: [PATCH] ard.lua: cleanup

* remove superfluous fsk table from test_availability()
* s/films/videos/ in test_availability()
* move the call to test_availability() into iter_formats(), so it
  gets always executed
* remove superfluous match in container_from()
---
 share/lua/website/ard.lua | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/share/lua/website/ard.lua b/share/lua/website/ard.lua
index 5afb3ba..39fb057 100644
--- a/share/lua/website/ard.lua
+++ b/share/lua/website/ard.lua
@@ -53,8 +53,6 @@ function parse(self)
     local config = Ard.get_config(self)
     local Util  = require 'quvi/util'
 
-    Ard.test_availability(config)
-
     self.host_id = 'ard'
     self.title = config:match(
                      '<meta property="og:title" content="([^"]*)'
@@ -83,14 +81,13 @@ function parse(self)
 end
 
 function Ard.test_availability(page)
-    -- some films are only scrapable at certain times
+    -- some videos are only scrapable at certain times
     local fsk_pattern =
         'Der Clip ist deshalb nur von (%d%d?) bis (%d%d?) Uhr verfügbar'
-    local fsk = {}
-    fsk.from, fsk.to = page:match(fsk_pattern)
-    if fsk.from and fsk.to then
-        error('film only available from ' ..fsk.from.. ':00 to '
-              ..fsk.to.. ':00 CET (UTC+2)')
+    local from, to = page:match(fsk_pattern)
+    if from and to then
+        error('video only available from ' ..from.. ':00 to '
+              ..to.. ':00 CET')
     end
 end
 
@@ -140,8 +137,7 @@ function Ard.height_from(suffix)
 end
 
 function Ard.container_from(suffix)
-    return suffix:match('^(...):') or suffix:match('%.(...)$')
-              or suffix:match('%.(...)$') or 'mp4'
+    return suffix:match('^(...):') or suffix:match('%.(...)$') or 'mp4'
 end
 
 function Ard.iter_formats(page)
@@ -149,6 +145,8 @@ function Ard.iter_formats(page)
     local s = 'mediaCollection%.addMediaStream'
                 .. '%(0, (%d+), "(.-)", "(.-)", "%w+"%);'
 
+    Ard.test_availability(page)
+
     for s_id, prefix, suffix in  page:gmatch(s) do
         local u = prefix .. suffix
         u = u:match('^(.-)?') or u  -- remove querystring
-- 
2.11.4.GIT