woops, apparently, this did not get committed last time I pushed

mnutt · May 4, 2010 · fc70323 · fc70323
1 parent 858d1f9
commit fc70323
Show file tree

Hide file tree

Showing 23 changed files with 66 additions and 86 deletions.
diff --git a/app/models/author.rb b/app/models/author.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: authors
 #

diff --git a/app/models/blacklist.rb b/app/models/blacklist.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: blacklists
 #

diff --git a/app/models/episode.rb b/app/models/episode.rb
@@ -1,11 +1,11 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: episodes
 #
 #  id                     :integer(4)    not null, primary key
 #  podcast_id             :integer(4)    
-#  summary                :text          
+#  summary                :text(16777215 
 #  published_at           :datetime      
 #  created_at             :datetime      
 #  updated_at             :datetime      

diff --git a/app/models/favorite.rb b/app/models/favorite.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: favorites
 #

diff --git a/app/models/feed_request_statistic.rb b/app/models/feed_request_statistic.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: feed_request_statistics
 #

diff --git a/app/models/podcast.rb b/app/models/podcast.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: podcasts
 #
@@ -9,6 +9,8 @@
 #  updated_at        :datetime      
 #  category_id       :integer(4)    
 #  clean_url         :string(255)   
+#  author_email      :string(255)   
+#  author_name       :string(255)   
 #  title             :string(255)   
 #  button_installed  :boolean(1)    
 #  protected         :boolean(1)    
@@ -19,7 +21,7 @@
 #  bitrate           :integer(4)    
 #  finder_id         :integer(4)    
 #  format            :string(255)   
-#  xml               :text          
+#  xml               :text(16777215 
 #  ability           :integer(4)    default(0)
 #  generator         :string(255)   
 #  xml_title         :string(255)   
@@ -31,8 +33,6 @@
 #  error             :string(255)   
 #  custom_title      :string(255)   default("")
 #  subtitle          :text(21474836 
-#  author_email      :string(255)   
-#  author_name       :string(255)   
 #
 
 require 'paperclip_file'

diff --git a/app/models/podcast_alt_url.rb b/app/models/podcast_alt_url.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: podcast_alt_urls
 #

diff --git a/app/models/queued_podcast.rb b/app/models/queued_podcast.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: queued_podcasts
 #

diff --git a/app/models/recommendation.rb b/app/models/recommendation.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: recommendations
 #

diff --git a/app/models/review.rb b/app/models/review.rb
@@ -1,11 +1,11 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: reviews
 #
 #  id             :integer(4)    not null, primary key
 #  user_id        :integer(4)    
-#  body           :text          
+#  body           :text(16777215 
 #  created_at     :datetime      
 #  updated_at     :datetime      
 #  title          :string(255)   

diff --git a/app/models/review_rating.rb b/app/models/review_rating.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: review_ratings
 #

diff --git a/app/models/source.rb b/app/models/source.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: sources
 #
@@ -14,12 +14,12 @@
 #  preview_file_name        :string(255)   
 #  preview_content_type     :string(255)   
 #  preview_file_size        :string(255)   
-#  height                   :integer(4)    
-#  width                    :integer(4)    
 #  downloaded_at            :datetime      
 #  hashed_at                :datetime      
-#  curl_info                :text          
-#  ffmpeg_info              :text          
+#  curl_info                :text(16777215 
+#  ffmpeg_info              :text(16777215 
+#  height                   :integer(4)    
+#  width                    :integer(4)    
 #  file_name                :string(255)   
 #  torrent_file_name        :string(255)   
 #  torrent_content_type     :string(255)   
@@ -32,7 +32,7 @@
 #  size_from_xml            :integer(4)    
 #  size_from_disk           :integer(4)    
 #  sha1hash                 :string(40)    
-#  torrent_info             :text          
+#  torrent_info             :text(16777215 
 #  duration_from_ffmpeg     :integer(4)    
 #  duration_from_feed       :integer(4)    
 #  extension_from_feed      :string(255)   
@@ -45,10 +45,6 @@
 #  bitrate_from_feed        :integer(4)    
 #  bitrate_from_ffmpeg      :integer(4)    
 #  created_at               :datetime      
-#  ogg_preview_file_name    :string(255)   
-#  ogg_preview_content_type :string(255)   
-#  ogg_preview_file_size    :integer(4)    
-#  ogg_preview_updated_at   :datetime      
 #
 
 class Source < ActiveRecord::Base
@@ -74,9 +70,6 @@ class Source < ActiveRecord::Base
   has_attached_file :preview,
                     :url  => "/:attachment/:id/:style/:basename.:extension",
                     :path => ":rails_root/public/:attachment/:id/:style/:basename.:extension"
-  has_attached_file :ogg_preview, 
-                    :url  => "/:attachment/:id/:style/:basename.:extension",
-                    :path => ":rails_root/public/:attachment/:id/:style/:basename.:extension"
   has_attached_file :random_clip, # not currently being generated
                     :url  => "/:attachment/:id/:style/:basename.:extension",
                     :path => ":rails_root/public/:attachment/:id/:style/:basename.:extension"

diff --git a/app/models/statistic.rb b/app/models/statistic.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: statistics
 #

diff --git a/app/models/surf_episode.rb b/app/models/surf_episode.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: surf_episodes
 #

diff --git a/app/models/tag.rb b/app/models/tag.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: tags
 #

diff --git a/app/models/tagging.rb b/app/models/tagging.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: taggings
 #

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: users
 #

diff --git a/app/models/user_tagging.rb b/app/models/user_tagging.rb
@@ -1,5 +1,5 @@
 # == Schema Information
-# Schema version: 20090908160006
+# Schema version: 20100504173954
 #
 # Table name: user_taggings
 #

diff --git a/app/views/info/episodes/_video_player.html.erb b/app/views/info/episodes/_video_player.html.erb
@@ -1,7 +1,7 @@
 <% options ||= {} -%>
 <% source ||= video_player -%>
 <% attrs ||= {} %>
-<% attrs.reverse_merge! :rel => (format == :ogg ? source.ogg_preview.url : source.preview.url), 
+<% attrs.reverse_merge! :rel => (source.preview.url), 
                         :poster => source.screenshot.url, 
                         :width => source.width, :height => source.height if source %>
 <% (attrs[:class] ||= "") << " container" %>

diff --git a/app/views/info/sources/show.html.erb b/app/views/info/sources/show.html.erb
@@ -100,7 +100,7 @@
   <tr>
     <td class="key" title="Flash player presenting the video or audio preview">preview</td>
     <td class="preview">
-      <%= video_tag([@source.preview.url, @source.ogg_preview.url], 
+      <%= video_tag([@source.preview.url], 
           :poster => @source.screenshot.url, 
           :controls => true, :width => 540) if @source %>
     </td>
@@ -128,13 +128,6 @@
     </td>
   </tr>
 
-  <tr>
-    <td class="key" title="A link to the ogg preview video FFmpeg clipped from the episode, and the file size">ogg&nbsp;video&nbsp;preview</td>
-    <td>
-      <%= @source.ogg_preview.file? ? link_to("http://#{controller.request.host}#{@source.ogg_preview.url(:original, false)}", @source.ogg_preview.url(:original, false)) + " #{FileSize.new(@source.ogg_preview_file_size.to_i || 0)}" : blankness -%>
-    </td>
-  </tr>
-
   <tr><td colspan="2">&nbsp;<!-- section divider //--></td></tr>
 
   <tr>

diff --git a/config/deploy.rb b/config/deploy.rb
@@ -179,7 +179,6 @@
         mkdir #{shared_path}/podcast_logos &&
         mkdir #{shared_path}/screenshots &&
         mkdir #{shared_path}/previews &&
-        mkdir #{shared_path}/ogg_previews &&
         mkdir #{shared_path}/random_clips &&
         mkdir #{shared_path}/torrents &&
         mkdir #{shared_path}/private
@@ -225,7 +224,6 @@
                    'podcast_logos'     => 'public/podcast_logos',
                    'screenshots'       => 'public/screenshots',
                    'previews'          => 'public/previews',
-                   'ogg_previews'      => 'public/ogg_previews',
                    'random_clips'      => 'public/random_clips',
                    'torrents'          => 'public/torrents',
                    'private'           => 'private' }