pig-media-server 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a8c11fa4d88792c7a93d697dea3442fc44316d3
-  data.tar.gz: 8b0ad30ffb50ab03192e1254dadd8b2bba69a234
+  metadata.gz: 5d3838bed9086874fdab98b37ac20f6aa302c7a1
+  data.tar.gz: b00909265c215b3040587aa577f86df9378bc683
 SHA512:
-  metadata.gz: d965b28375598bd6e4ee27960536f058f68b8a993023b0af75defc8c0f319b1e2adebdd18c01825ebd0d3cb3b549787600cbe9100ce6b994ca2f65293796d10b
-  data.tar.gz: 06be6ced80f9ad5d62db67109866c20d1fcf31d224e1a1b699691847033384aadc110bd4690b12791e255076215d366bb6801fbc3dd830129387ea2e2158bdfa
+  metadata.gz: c9386c31cd75a9fa0f27d2a9364a61778348430506d41042c01530bf72fa7400bdbb77f47ebb462cff07b17aed368770f0f92daf62586545f99c44fee1e39c7a
+  data.tar.gz: 03079c1d8b2c179b37d6c8e9b1538fa971c553b34ea0c258c86efae16a29361adbb62ae08970426f95b3d78e29be10a9d1637fdb366280ebc4d06b15e6a55dd9

data/lib/pig-media-server/aspect.rb

@@ -0,0 +1,30 @@
+require 'pig-media-server'
+require 'pig-media-server/model/pig'
+
+module PigMediaServer
+  class Aspect
+    def run
+      pit_config = Pit.get 'Pig Media Server'
+      while true
+        GC.start
+        begin
+          q = open("#{pit_config['user_data_path']}/rate/queue.txt").read.split("\n")
+          q.each do |x|
+            next if x == ''
+            key = x.split(' ').first
+            rate = x.split(' ').last
+            pig = Pig.find key
+            if rate == '16:9'
+              system 'MP4Box', '-add', "#{pig.record.path}:par=1:1", '-new', "#{pig.record.path}.MP4"
+              FileUtils.mv "#{pig.record.path}.MP4", pig.record.path
+            end
+          end
+          open("#{pit_config['user_data_path']}/rate/queue.txt", 'w'){|x| x.puts ''}
+        rescue => e
+          p e
+        end
+        sleep 5
+      end
+    end
+  end
+end

data/lib/pig-media-server/cli.rb

@@ -18,6 +18,9 @@ when 'server'
   port = ARGV[1] ? ARGV[1].to_i : 8080
   require 'pig-media-server/web'
   PigMediaServer::Web.run! host: '0.0.0.0', port: port
+when 'aspect'
+  require 'pig-media-server/aspect'
+  PigMediaServer::Aspect.new.run
 when 'kindle-send'
   require 'pig-media-server/kindle_send'
   PigMediaServer::KindleSend.new.run

data/lib/pig-media-server/crawl.rb

@@ -12,6 +12,7 @@ module PigMediaServer
         array = Dir.glob("#{$config['path']}/**/*").sort
       end
       array.each_with_index{|x,i|
+        next unless File.exist?(x)
         next if File::ftype(x) == 'directory'
         flag = false
         $config['exclude_path'].each{|e| flag = true if x =~ /#{e.sub(/\//, '\/')}/ } if $config['exclude_path'].class.to_s == 'Array'

data/lib/pig-media-server/kindle_send.rb

@@ -6,10 +6,10 @@ require 'pig-media-server/model/pig'
 module PigMediaServer
   class KindleSend
     def run
+      pit_config = Pit.get 'Pig Media Server'
       while true
         begin
           GC.start
-          pit_config = Pit.get 'Pig Media Server'
           from_hash = Hash[*Dir.glob("#{pit_config['user_data_path']}/*.json").map{|t| JSON.parse open(t).read}.select{|t| t['kindle_to'] and t['kindle_from']}.map{|t| [t['kindle_to'], t['kindle_from']]}.select{|t| t.first != '' and t.last != ''}.flatten]
           Dir.glob("#{pit_config['user_data_path']}/kindle/queue/*").each{|x|
             begin

data/lib/pig-media-server/model/pig.rb

@@ -2,6 +2,8 @@
 require 'fileutils'
 require 'pig-media-server/model/migrate'
 
+CONFIG = Pit.get('Pig Media Server')
+
 class Pig
   attr_accessor :record, :config
   def initialize record
@@ -9,7 +11,7 @@ class Pig
       record.size = File::Stat.new(record.path).size.to_s rescue nil
     end
     self.record = record
-    self.config = $config || Pit.get("Pig Media Server")
+    self.config = CONFIG
   end
   def key; self.record._key;end
   def name; self.record.path.split('/').last; end
@@ -17,7 +19,7 @@ class Pig
   def size; self.record.size;end
   def metadata; self.record.metadata;end
   def srt; self.record.srt;end
-  def url; '/volume' + URI.encode(self.record.path.sub(/#{config['path'].sub(/\//, '\/')}/, ''));end
+  def url; 'http://'+self.config['hostname']+ '/volume' + URI.encode(self.record.path.sub(/#{config['path'].sub(/\//, '\/')}/, ''));end
   def type
     case self.name.split('.').last
     when 'mp4', 'MP4', 'webm'
@@ -50,13 +52,17 @@ str.chomp.chomp
     FileUtils.mkdir_p "#{self.config['user_data_path']}/kindle/queue"
     open("#{self.config['user_data_path']}/kindle/queue/#{self.key}_#{user_id}", 'w'){|x| x.puts ''}
   end
+  def change_aspect_rate rate
+    FileUtils.mkdir_p "#{self.config['user_data_path']}/rate"
+    open("#{self.config['user_data_path']}/rate/queue.txt", "a"){|x| x.puts "#{self.key} #{rate}"}
+  end
 
 
 
   def self.find key
     case key.class.to_s
     when 'Array'
-      return key.map{|x| self.new Groonga['Files'][x]}
+      return key.map{|x| Groonga['Files'][x]}.select{|x| x}.map{|x| self.new x}
     when 'String'
       return self.new Groonga['Files'][key]
     end

data/lib/pig-media-server/version.rb

@@ -1,3 +1,3 @@
 module PigMediaServer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/pig-media-server/views/feed.builder

@@ -0,0 +1,19 @@
+xml.instruct! :xml, :version => '1.0'
+xml.rss :version => "2.0" do
+  xml.channel do
+    xml.title "Pig Media Server -  feed - '#{h params[:query]}'"
+    xml.description "pig feed"
+    xml.link "http://#{config['hostname']}/feed?query=#{CGI.escape params[:query]}"
+
+    @list.each do |p|
+      xml.item do
+        xml.title p.name
+        xml.link p.url
+        xml.description p.name
+        xml.pubDate p.mtime.rfc822
+        xml.guid p.url
+        xml.enclosure url: p.url, title: 'Podcast'
+      end
+    end
+  end
+end

data/lib/pig-media-server/views/index.haml

@@ -23,13 +23,25 @@
     %button Search
     %a{href: '/latest'} Latest
     %a{href: '/config'} Config
+    %a#only-new{href: 'javascript:void(0)'} Only New
     -if config['custom_list'].class == Hash
       -config['custom_list'].each do |k,v|
         %a{href: "/custom?name=#{CGI.escape k}"}=k
   -if @page 
+    -if params[:query] and params[:query].empty? == false
+      %p
+        %a{href: "/feed?query=#{CGI.escape params[:query]}&sort=#{params[:sort]}"} Feed
+        %a{href: "/?query=#{CGI.escape params[:query]}"} Sort By Date
+        %a{href: "/?query=#{CGI.escape params[:query]}&sort=name"} Sort By Name
+        - if params[:order] != 'ascending'
+          %a{href: "/?"+params.merge('order' => 'ascending').map{|k,v| URI.encode(k.to_s) + "=" + URI.encode(v.to_s) }.join('&')} Ascending
+        - if params[:order] != 'descending'
+          %a{href: "/?"+params.merge('order' => 'descending').map{|k,v| URI.encode(k.to_s) + "=" + URI.encode(v.to_s) }.join('&')} Descending
+
     %p.autopagerize_page_element
       -@list.each do |l|
         -next unless l.record
+        -next unless l.record.path
         !=partial :_link, locals: {l: l}
     %p.pager
       -if params[:query] and params[:query].empty? == false
@@ -37,6 +49,7 @@
         %a{href: "/edit?query=#{CGI.escape params[:query]}"} Edit
       -elsif params[:sub]
         %a{href: "/?sub=true&page=#{@page+1}"} Next
+      -elsif @no_paging
       -else
         %a{href: "/latest?page=#{@page+1}"} Next
 

data/lib/pig-media-server/views/meta.coffee

@@ -0,0 +1,12 @@
+## coffee -csb
+$ ->
+  v = $('video').get(0)
+  v.addEventListener('canplay', ->
+    $('#aspect').text("Aspect Ratio is #{v.videoHeight/v.videoWidth}")
+    if $('#aspect').text() != "Aspect Ratio is 0.5625"
+      $('#aspect').html(
+        $('<a>').attr(href: "/change_aspect_rate/#{$('#key').text()}?rate=16:9").text("Change To 16:9")
+      )
+  )
+  v.load()
+## vim: set ft=coffee :

data/lib/pig-media-server/views/meta.haml

@@ -13,8 +13,11 @@
     %input{name: 'query', value: params[:query]}
     %button Search
     %a{href: '/latest'} Latest
-    %a{href: '/?syobo=true'} Syobocal
     %a{href: '/config'} Config
+    -if config['custom_list'].class == Hash
+      -config['custom_list'].each do |k,v|
+        %a{href: "/custom?name=#{CGI.escape k}"}=k
+
   %h2 Metadata
   %h3=@p.name
   %h4 Path

data/lib/pig-media-server/views/movie.coffee

@@ -46,6 +46,7 @@ watch = (link)->
         recents['movie/'+key] = {time: parseInt((new Date)/1000), type: 'movie'}
         window.save_recents recents
         $('.new_flag').text('')
+        $('.main_span').attr('data-new': '')
         unless $('#action').text() == 'remote'
           setTimeout ->
             window.set_new()

data/lib/pig-media-server/views/sub.haml

@@ -15,6 +15,9 @@
     %a{href: '/latest'} Latest
     %a{href: '/?syobo=true'} Syobocal
     %a{href: '/config'} Config
+    -if config['custom_list'].class == Hash
+      -config['custom_list'].each do |k,v|
+        %a{href: "/custom?name=#{CGI.escape k}"}=k
   %h2 Subtext
   %h3=@p.name
   .control

data/lib/pig-media-server/views/unread.coffee

@@ -5,10 +5,22 @@ window.set_new = ->
       key = this.getAttribute 'key'
       unless recents[key]
         $(this).text 'New!'
+        $(this).parent().attr('data-new': true)
         count += 1
     if count == 0
       $('.main_link').css('margin-left', '0')
 
 $ ->
   set_new()
+  $('#only-new').click ->
+    if $(this).attr('now') == 'only'
+      for n in $('.main_span')
+        $(n).attr 'style', ''
+      $(this).removeAttr 'now'
+      $(this).text 'Only New'
+    else
+      for n in $('.main_span')
+        $(n).attr 'style', 'display:none !important' if n.dataset.new == undefined
+      $(this).text 'All'
+      $(this).attr 'now', 'only'
 

data/lib/pig-media-server/web.rb

@@ -6,6 +6,7 @@ require 'sinatra/flash'
 require 'net/http'
 require 'sass'
 require 'haml'
+require 'builder'
 require 'fileutils'
 require 'coffee_script'
 require 'rack/csrf'
@@ -13,6 +14,7 @@ require 'redcarpet'
 require 'json'
 
 module PigMediaServer
+  CONFIG = Pit.get 'Pig Media Sever'
   class UserData
     def self.save json, user_id, path
       open("#{path}/#{user_id}.json", "w"){|f| f.puts json}
@@ -76,11 +78,18 @@ EOF
       haml :index
     end
 
+    get '/feed' do
+      @list = Pig.search params.merge(page: @page)
+      content_type :xml#'application/rss+xml'
+      builder :feed
+    end
+
     get '/custom' do
       c = config['custom_list'][params[:name]]
       @page = params[:page].to_i < 1 ? 1 : params[:page].to_i
       @action = 'list'
       @list = Pig.find JSON.parse(open(c).read)
+      @no_paging = true
       haml :index
     end
 
@@ -95,6 +104,15 @@ EOF
     get('/meta/:key'){@p = Pig.find(params[:key]);haml :meta}
     get('/sub/:key'){@p = Pig.find(params[:key]);haml :sub}
     get('/webvtt/:key'){@p = Pig.find(params[:key]); content_type :text; @p.webvtt}
+    get '/delete/:key' do
+      p = Groonga['Files'][params[:key]]
+      path = "#{config['recycle_path']}/#{Date.today}/"
+      FileUtils.mkdir_p path unless File.exist? path
+      FileUtils.mv p.path, path rescue nil
+      Groonga['Files'].delete params[:key]
+      redirect params[:href]
+    end
+
 
     get '/read/:key' do
       if request.xhr?
@@ -112,6 +130,11 @@ EOF
       image
     end
 
+    get "/change_aspect_rate/:key" do
+      Pig.find(params[:key]).change_aspect_rate(params[:rate])
+      redirect "/meta/#{params[:key]}"
+    end
+
     post '/gyazo' do
       url = PigMediaServer::Gyazo.post params[:url], params[:point]
       content_type :json
@@ -185,7 +208,8 @@ EOF
 
     helpers do
       def config
-        Pit.get "Pig Media Server"
+        $config = Pit.get("Pig Media Server") unless $config
+        $config
       end
       def h str; CGI.escapeHTML str.to_s; end
       def partial(template, *args)

data/pig-media-server.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'pony'
   gem.add_dependency 'mail'
   gem.add_dependency 'redcarpet'
+  gem.add_dependency 'builder'
   gem.add_dependency 'coffee-script'
   gem.add_dependency 'sinatra-flash'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pig-media-server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ssig33
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -192,6 +192,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +249,7 @@ files:
 - Rakefile
 - bin/pig-media-server
 - lib/pig-media-server.rb
+- lib/pig-media-server/aspect.rb
 - lib/pig-media-server/book2.erb
 - lib/pig-media-server/cli.rb
 - lib/pig-media-server/crawl.rb
@@ -256,7 +271,9 @@ files:
 - lib/pig-media-server/views/book2.erb
 - lib/pig-media-server/views/config.coffee
 - lib/pig-media-server/views/config.haml
+- lib/pig-media-server/views/feed.builder
 - lib/pig-media-server/views/index.haml
+- lib/pig-media-server/views/meta.coffee
 - lib/pig-media-server/views/meta.haml
 - lib/pig-media-server/views/movie.coffee
 - lib/pig-media-server/views/read.haml