videos 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjIwOTliN2Q4YTdhYzNlOWQwMzY3YzZhZTUxM2Y2ZWU0ZmQyNTRhYQ==
+    M2UwMzM2OWI1ZDU0ODViNTMzOTJiMzIyYTlhNTQ3ZjM0YzQyNTk1Nw==
   data.tar.gz: !binary |-
-    NzdmMjQxODJlMzZkYzg2YjM3YTdiMmM2NTBmNjJjYTM2MzQ1NTM4MA==
+    NmQ1OTE0YmI0MTJiYmZkMGE3N2YyMWM4NTJlMjJiNmEwNzJhMjExOQ==
 SHA512:
   metadata.gz: !binary |-
-    YzIyNDhjOWNkYjY5NjE2MzdmYjBjYTQ5ODdkMDVhODNiZGE5NTI4NTliODcy
-    ZGFmNGVkMGUwNjE2MTMxNGQ2MmQ1NTU4ODJmZDIzM2ZhNWUwNDAxZWI4NjQx
-    ODQyZTJhNTNjNGFjZmIyNGZlMDYzYTIyMWI2NjJlOTYzZWI5MzE=
+    NjI2ZmE3NmNmNGVjZDQzMWE4Nzg5ZTFhN2RkYTI4ZWQ3YWViN2RiOTIzYjkz
+    NWU5YzJiMmI3ODA5NTYxYzhlNmFkZDY2ZGVkZjQ5MmFhZTE0ZGEzODI2NjMx
+    NTkyNDg4MzRiMTJlMWEzMWQ3NmI5NDcxYzEzZDczZDYwMjRjYWU=
   data.tar.gz: !binary |-
-    YzA4MDE0ZWJkMmRlMjY0NzYwMzAyNzVjMmRmMGYwMDhjYzQ5ZjI5MDY1MzUy
-    YmM0Y2Q2NTc0ZDEzOGM0YzZkZTFmZDA4ZDJjOTdkN2YyN2NkMjhkMjYyMDYy
-    MDZhMTI4NWM2ZjFhZDI1MWQ3YTVhZjgzNDZiMzlhOTIxN2M4MjY=
+    ZDMyMGQzMjc3OGJiYTljMTY3Y2ZjMWI2YjM4ZjQ4ZjRiZjVkMTNmOGNkM2Ux
+    NzQ0ZWJiNjVlYWMzMzIxMDU0ZWJkYmM3NDFlNGY0OTZlOThlYjE1MjI1YTM0
+    NDg2OWJmMDJiNGM3MmM0MmIzNGFlMmIxM2ZlZGNhZTU3OGI4M2Q=

data/app/css/views.index.css

@@ -31,6 +31,7 @@
 #items li .info { padding: 2px; }
 #items li .info img { vertical-align: middle; }
 #items li .info .title { padding-bottom: 3px; }
+#items li .info .labels { margin-bottom: 4px; }
 #items .tag_list { min-height: 1.2em; }
 #items .tag_list:hover { background-color: #ffffaa; }
 #items input { width: 100%; }

data/app/js/controllers.index.js

@@ -21,7 +21,7 @@ controllers.index = function(search, sort, sortDirection) {
     _.each(words, function(word) {
       regex = RegExp(word, "i");
       videos = _.filter(videos, function(video) {
-        return video.title.match(regex);
+        return video.title.match(regex) || video.resolution.match(regex);
       });
     });
   }
@@ -84,7 +84,7 @@ controllers.index = function(search, sort, sortDirection) {
 	  return a.href;
   }
 
-  function formatLength(length) {
+  function formatLengthNumeric(length) {
     var out = [];
     if(length >= 3600) {
       out.push(Math.floor(length / 3600) + "h");
@@ -100,6 +100,21 @@ controllers.index = function(search, sort, sortDirection) {
     return out.join(" ");
   }
 
+  function formatLength(length) {
+    return '<span class="label label-default" title="Video Length"><span class="glyphicon glyphicon-expand"></span> ' + 
+      formatLengthNumeric(length) + '</span>';
+  }
+
+  function formatResolution(resolution) {
+    if(resolution == "1080p") {
+      return '<span class="label label-success" title="Video Width/Height"><span class="glyphicon ' +
+        'glyphicon-hd-video"></span> 1080p</span>';
+    }
+    else {
+      return '<span class="label label-default" title="Video Width/Height">' + resolution + '</span>';
+    }
+  }
+
   function addVideos(videos) {
     $("#items").empty();
 
@@ -114,7 +129,8 @@ controllers.index = function(search, sort, sortDirection) {
       item.append(link);
 
       item.append('<div class="info-wrapper"><div class="info"><div class="title">' + video.title + '</div>' +
-        '<img src="img/icons/film.png" title="Video Length"> ' + formatLength(video.length) + '</div>');
+        '<div class="labels">' + formatLength(video.length) + ' ' + formatResolution(video.resolution) +
+        '</div></div>');
 
       $("#items").append(item);
     });

data/lib/videos.rb

@@ -10,6 +10,7 @@ require "shellwords"
 require "addressable/uri"
 require "naturally"
 require "RMagick"
+require "nokogiri"
 
 #Core Extensions
 require "videos/core_ext/pathname"

data/lib/videos/core_ext/pathname.rb

@@ -8,7 +8,7 @@ class Pathname
   end
 
   def video?
-    file? && extname && %w(.mp4 .mkv .flv .avi .m4v .mov .wmv).include?(extname.downcase)
+    file? && extname && %w(.mp4 .mkv .flv .avi .m4v .mov .wmv .mpg).include?(extname.downcase[0..3])
   end
 
   def hidden?

data/lib/videos/update.rb

@@ -7,7 +7,7 @@ class Videos::Update
 
     @files = videos_package.root_path.descendant_files.reject { |p| p.basename.to_s[0..0] == '.' }
     @videos = []
-    load_data
+    #load_data
     process
     save_data
     puts "\nDone!"

data/lib/videos/version.rb

@@ -1,3 +1,3 @@
 module Videos
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/videos/video.rb

@@ -70,11 +70,13 @@ class Videos::Video
   end
 
   def get_metadata
-    return unless length.nil?
+    return unless metadata.keys.empty?
 
-    output = `mpv --really-quiet -identify --frames=0 --ao=null #{path.to_s.shellescape}`.encode("ASCII-8BIT", undef: :replace, invalid: :replace, replace: "?")
-    @metadata = Hash[output.split("\n").map { |l| l.gsub(/^\[identify\] /, "").split("=", 2) }]
-    @length = metadata["ID_LENGTH"].to_f
+    output = `mediainfo -f --Output=XML #{path.to_s.shellescape}`
+    doc = Nokogiri::XML.parse(output)
+    @metadata["length"] = (e = doc.search("File Duration").first) ? e.text.to_i : 0
+    @metadata["width"] = (e = doc.search("File Width").first) ? e.text.to_i : 0
+    @metadata["height"] = (e = doc.search("File Height").first) ? e.text.to_i : 0
   end
 
   def self.from_hash(videos_package, data)
@@ -89,8 +91,23 @@ class Videos::Video
       "title" => title,
       "publishedOn" => path.mtime.to_i,
       "thumbnailUrl" => thumbnail_url,
-      "length" => length,
+      "length" => (metadata["length"] / 1000.0).round,
+      "width" => metadata["width"],
+      "height" => metadata["height"],
+      "resolution" => approx_resolution,
       "key" => path_hash
     }
   end
+
+  private
+  def approx_resolution
+    if metadata["width"] == 1920 && metadata["height"] == 1080
+      "1080p"
+    elsif
+      metadata["width"] == 1280 && metadata["height"] == 720
+      "720p"
+    else
+      "#{metadata["width"]}x#{metadata["height"]}"
+    end
+  end
 end

data/lib/videos/videos.rb

@@ -3,7 +3,8 @@ class Videos::Videos
   attr_reader :videos_path
 
   def pathname_to_url(path, relative_from)
-    URI.escape(path.relative_path_from(relative_from).to_s)
+    url = path.relative_path_from(relative_from)
+    (url.dirname + URI.escape(url.basename.to_s, URI::REGEXP::PATTERN::RESERVED).force_encoding("utf-8")).to_s
   end
 
   def url_to_pathname(url)

data/videos.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "addressable", ">= 2.3.5"
   s.add_dependency "naturally", ">= 1.0.3"
   s.add_dependency "rmagick", ">= 2.13.1"
+  s.add_dependency "nokogiri", ">= 0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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'
 description: A collection of videos is a directory (the container) containing both
   video files and directories that have video files in them. Videos indexes a collection
   in this format, and generates a HTML/JS Single Page Application (SPA) that allows