@@ -5,6 +5,7 @@ class HomeController < ApplicationController def authenticate authenticate_or_request_with_http_basic(realm = 'Enter your BBC Redux login details') do |username,password| + #return true if request.host =~ /\.local$/ if Redux.valid_user?(username,password) true else app/controllers/home_controller.rb @@ -5,9 +5,9 @@ class PodcastsController < ApplicationController end def show - key = podcast_path(:guid => params[:guid]) - pid = Obscurer.unobscure(params[:guid]) - @brand = handle_fragment(key,pid) + key = podcast_path(:guid => params[:guid], :year => params[:year]) + @brand = handle_fragment(key,params) + return custom_404 if @brand.blank? respond_to do |format| format.xml @@ -18,18 +18,20 @@ class PodcastsController < ApplicationController def url return render(:status => 404, :template => 'podcasts/show') if params[:pid].blank? - @guid = Obscurer.obscure(params[:pid]) - key = podcast_path(:guid => @guid) - @brand = handle_fragment(key,params[:pid]) + key = podcast_path(:guid => Obscurer.obscure(params[:pid]), :year => params[:year]) + @brand = handle_fragment(key,params) rescue URI::InvalidURIError, OpenURI::HTTPError, SocketError, Errno::ENETUNREACH custom_404 end private - def handle_fragment(key,pid) + def handle_fragment(key,options=nil) + pid = options[:pid] if options.is_a?(Hash) && options.has_key?(:pid) + pid = pid || Obscurer.unobscure(params[:guid]) if options.is_a?(Hash) && options.has_key?(:guid) + return nil if pid.blank? expire_fragment(key) unless - brand = read_fragment(key, :expires_in => 6.hours) || write_fragment(key, Redux.data(pid)) + brand = read_fragment(key, :expires_in => 6.hours) || write_fragment(key, Redux.data(pid,options)) return brand end app/controllers/podcasts_controller.rb @@ -1,15 +1,17 @@ class Brand - attr_accessor :pid,:title, :subtitle, :episodes + attr_accessor :pid,:title, :subtitle, :episodes, :year def initialize @title = nil @subtitle = nil @pid = nil + @year = nil @episodes = [] end - def self.fetch(pid) - year = Time.now.year + def self.fetch(pid,options=nil) + year = options[:year] if options.is_a?(Hash) && options.has_key?(:year) + year = year || Time.now.year episodes = [] url = "http://www.bbc.co.uk/programmes/#{pid}/episodes/#{year}" doc = Nokogiri::XML(open(url)) @@ -18,6 +20,7 @@ class Brand brand.title = doc.search("li[@class='tleo']/a").text brand.subtitle = doc.search("h1/span[@class='desc']").text.gsub(/<\/?[^>]*>/, "").strip brand.pid = pid + brand.year = year doc.search("dd/ol[@class='episodes']/li").each do |e| episode = Episode.new @@ -52,7 +55,7 @@ class Brand File.join('http://bbc.co.uk/programmes', self.pid) end - def rss_link - File.join(self.pid, 'podcasts.xml') + def guid + Obscurer.obscure(self.pid) unless self.pid.blank? end end app/models/brand.rb @@ -12,8 +12,9 @@ class Redux !valid.nil? end - def self.data(pid) - return unless brand = Brand.fetch(pid) + def self.data(pid,options=nil) + pid = pid.strip + return unless brand = Brand.fetch(pid,options) episodes_to_use = [] brand.episodes.each do |e| @@ -21,7 +22,6 @@ class Redux url = File.join(e.redux_url) e.redux_link = url - puts e.redux_link + ' ' + e.pid res = Net::HTTP.post_form(URI.parse(url), CREDENTIALS) doc = Nokogiri::XML(res.body) results=[] app/models/redux.rb @@ -4,14 +4,14 @@ <p>Some recent subscriptions:</p> <ul> <% recent_subscriptions.each do |f| %> -<li><%= link_to(f.title + image_tag('rss14.png', :class => 'rss'), podcast_url(:guid => to_guid(f.pid))) %></li> +<li><%= link_to("#{f.title} <span>#{f.year}</span>" + image_tag('rss14.png', :class => 'rss'), podcast_url(:guid => to_guid(f.pid), :year => f.year)) %></li> <% end %> </ul> <% end %> <p>You just need a brand pid. These can be found over at <%= link_to('BBC Programmes', 'http://bbc.co.uk/programmes') %>.</p> <% form_tag(obscure_path, :method => "post") do %> <h2><label for="pid">Enter a brand pid, e.g <code>b006wkfp</code></label></h2> - <%= text_field_tag(:pid) %> - <%= submit_tag("fetch") %> + <p><%= text_field_tag(:pid) %><%= submit_tag("Make me a Feed", :id => 'submit') %></p> + <p><%= select_year(Date.today, { :start_year => 2007, :end_year => 2009 }, { :id => "year", :name => "year" }) %><label for="year">Optional, defaults to current year</em></label></p> <% end %> <p id="footer"><small>Any bugs? <strike>keep them to y...</strike> .. let me know at <em>duncan at whomwah dot com</em></p> app/views/home/index.html.erb @@ -1,7 +1,7 @@ xml.instruct! xml.rss(:version => '2.0', 'xmlns:itunes' => 'http://www.itunes.com/dtds/podcast-1.0.dtd', 'xmlns:atom' => 'http://www.w3.org/2005/Atom') do xml.channel do - xml.tag!('atom:link', :href => podcast_url(:guid => to_guid(@brand.pid)), :rel => 'self', :type => 'application/rss+xml') + xml.tag!('atom:link', :href => podcast_url(:guid => to_guid(@brand.pid), :year => @brand.year), :rel => 'self', :type => 'application/rss+xml') xml.title CGI.unescapeHTML(@brand.title) xml.link @brand.programmes_link xml.language 'en-uk' app/views/podcasts/show.xml.builder @@ -1,8 +1,8 @@ <div id="url"> <small><%= render(:partial=>'shared/home_link') -%> : Podcast link for <code><%= link_to(@brand.pid,"http://bbc.co.uk/programmes/#{@brand.pid}") %></code></small> -<h1><%= link_to(@brand.title + image_tag('rss.png', :class => 'rss'), podcast_url(:guid => @guid)) %></h1> +<h1><%= link_to("#{@brand.title} <span>#{@brand.year}</span>" + image_tag('rss.png', :class => 'rss'), podcast_url(:guid => @brand.guid, :year => @brand.year)) %></h1> <h2><%= @brand.subtitle %></h2> <%= image_tag(@brand.image, :class => 'brand') %> -<p>Use the link below in your favourite podcast reader (it's up to you to keep this secret)</p> -<%= text_field_tag( 'copy', podcast_url(:guid => @guid) ) %> +<p>Use the link below in your favourite podcast reader (<strong>NOTE:</strong> It's up to you to keep this url private!)</p> +<%= text_field_tag( 'copy', podcast_url(:guid => @brand.guid, :year => @brand.year) ) %> </div> app/views/podcasts/url.html.erb @@ -45,7 +45,7 @@ end require 'file_store_expires' CONFIG = YAML::load(File.read(File.expand_path('~')+'/configs/redux.yaml')) -MAX_EPISODES = 20 +MAX_EPISODES = 30 REDUX_URL = 'http://g.bbcredux.com' CREDENTIALS = { 'username' => CONFIG[:login][:username], config/environment.rb @@ -6,9 +6,14 @@ ActionController::Routing::Routes.draw do |map| # Keep in mind you can assign values other than :controller and :action # Sample of named route: - map.obscure 'podcasts/url', :controller => 'podcasts', :action => 'url' + map.obscure 'podcasts/url', :controller => 'podcasts', :action => 'url', + :method => :post map.connect 'podcasts/:guid', :controller => 'podcasts', :action => 'index' - map.podcast 'podcasts/:guid.xml', :controller => 'podcasts', :action => 'show' + map.connect 'podcasts/:guid.:format', :controller => 'podcasts', :action => 'index' + map.podcast 'podcasts/:year/:guid.xml', :controller => 'podcasts', :action => 'show', + :year => Time.now.year, + :requirements => { :year => /\d{4}/ } + #map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' # This route can be invoked with purchase_url(:id => product.id) @@ -41,6 +46,6 @@ ActionController::Routing::Routes.draw do |map| # Install the default routes as the lowest priority. # Note: These default routes make all actions in every controller accessible via GET requests. You should # consider removing the them or commenting them out if you're using named routes and resources. - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' + #map.connect ':controller/:action/:id' + #map.connect ':controller/:action/:id.:format' end config/routes.rb @@ -3,11 +3,11 @@ require "base64" module Obscurer def self.obscure(str) - Base64.encode64([str,SALT].join('+')).strip.gsub(/=/,'') + Base64.encode64([str.strip,SALT].join('+')).strip.gsub(/=/,'') end def self.unobscure(str) - Base64.decode64(str).split('+').first + Base64.decode64(str.strip).split('+').first end end lib/obscurer.rb @@ -19,6 +19,10 @@ h1 { line-height:0.2em; } +h1 span, li span { + font-size: 0.8em; +} + h2 { font-size: 1em; margin:0 0 0.3em 0; @@ -31,9 +35,19 @@ p,ul,pre { margin-bottom:0.8em; } -label, input { +input, select { + font-size: 1em; + padding:0.1em; + margin-right:0.3em; +} + +label { font-size: 2em; - padding:0.2em; +} + +form p label { + color:#666; + font-size: 0.7em; } input#pid { public/stylesheets/all.css 5ad48c431e8ac54b7a70e812d3b41be271ec9ff0 Duncan Robertson duncan@whomwah.com http://github.com/whomwah/redux-podcaster/commit/f6d995babab9502bdec08d08ee1d775f842d40a9 f6d995babab9502bdec08d08ee1d775f842d40a9 2009-04-06T05:33:22-07:00 2009-04-06T05:33:22-07:00 simple year support still need to work out how to handle all episodes for a year 7041c50ff970690b2e6f4303701d2a313b3651e1 Duncan Robertson duncan@whomwah.com