videos 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFhNzZiYjE1OWQ5Mjc3Yzk3NWQ3ZWUwNTMzYTUzNWI3YzM2NDY2NQ==
+    MjIwOTliN2Q4YTdhYzNlOWQwMzY3YzZhZTUxM2Y2ZWU0ZmQyNTRhYQ==
   data.tar.gz: !binary |-
-    MmE3Mzc2MDM4YWRmN2M2MTFmOWI5NjdkNDU3ZWE2NDE0MjJjZDA5Nw==
+    NzdmMjQxODJlMzZkYzg2YjM3YTdiMmM2NTBmNjJjYTM2MzQ1NTM4MA==
 SHA512:
   metadata.gz: !binary |-
-    ZjQ5ZDYzMDEyMzk4YTEwMTk2OGU1YTMyYjc1MjVmODczMTNiOGI4N2VhZmYy
-    MjUwMDEzNjQ3MmQ4NTkwMjAwOTc5OTMwNWQxOGMxODhiOWE3NGNhZmFmMzIz
-    Y2Q2Yzg3MzQ0NjY1YjVmY2EzMWJlNzJmYWVmMWRiOGU1ZWM0Mjg=
+    YzIyNDhjOWNkYjY5NjE2MzdmYjBjYTQ5ODdkMDVhODNiZGE5NTI4NTliODcy
+    ZGFmNGVkMGUwNjE2MTMxNGQ2MmQ1NTU4ODJmZDIzM2ZhNWUwNDAxZWI4NjQx
+    ODQyZTJhNTNjNGFjZmIyNGZlMDYzYTIyMWI2NjJlOTYzZWI5MzE=
   data.tar.gz: !binary |-
-    MTA3ZThkZGIwOTE0ZWMyYTIyYTRmNWM0NDY1MGZjMDY0NGU3ZmU5ODQxNzkw
-    NDUxMzZmZmYxZWM3MTM2ZGFjNWNmOGNkNDRhMDU0MzQzODhjMjNjZDI5NTZh
-    MmZkM2Y3YWM0MzgwYTgzYThmNWMyYzczNTFiZmU3MmEyZWY4ZTY=
+    YzA4MDE0ZWJkMmRlMjY0NzYwMzAyNzVjMmRmMGYwMDhjYzQ5ZjI5MDY1MzUy
+    YmM0Y2Q2NTc0ZDEzOGM0YzZkZTFmZDA4ZDJjOTdkN2YyN2NkMjhkMjYyMDYy
+    MDZhMTI4NWM2ZjFhZDI1MWQ3YTVhZjgzNDZiMzlhOTIxN2M4MjY=

data/app/css/views.index.css

@@ -7,7 +7,7 @@
 #actions { float: right; }
 
 #header > form { 
-  width: 684px;
+  width: 691px;
   margin-left: auto;
   margin-right: auto;
 }

data/app/index.html

@@ -27,7 +27,7 @@
           <input type="text" id="search" class="form-control">
           <span class="btn-group sort">
             <button class="btn btn-default" data-sort="publishedOn" type="button">Published On</button>
-            <button class="btn btn-default" data-sort="pages" type="button">Pages</button>
+            <button class="btn btn-default" data-sort="length" type="button">Length</button>
             <button class="btn btn-default" data-sort="title" type="button">Title</button>
           </span>
           <span class="btn-group sort-direction">

data/app/js/controllers.index.js

@@ -7,9 +7,9 @@ controllers.index = function(search, sort, sortDirection) {
     if(type == "publishedOn") return function(video) {
       return video.publishedOn;
     };
-/*    if(type == "pages") return function(video) {
-      return video.pageUrls.length;
-    };*/
+    if(type == "length") return function(video) {
+      return video.length;
+    };
     if(type == "title") return function(video) {
       return video.title.toLowerCase();
     };
@@ -84,6 +84,22 @@ controllers.index = function(search, sort, sortDirection) {
 	  return a.href;
   }
 
+  function formatLength(length) {
+    var out = [];
+    if(length >= 3600) {
+      out.push(Math.floor(length / 3600) + "h");
+      length = length % 3600;
+    }
+    if(length >= 60) {
+      out.push(Math.floor(length / 60) + "m");
+      length = length % 60;
+    }
+    if(length >= 1) {
+      out.push(Math.floor(length) + "s");
+    }
+    return out.join(" ");
+  }
+
   function addVideos(videos) {
     $("#items").empty();
 
@@ -97,7 +113,8 @@ controllers.index = function(search, sort, sortDirection) {
       link.append(img);
       item.append(link);
 
-      item.append('<div class="info-wrapper"><div class="info"><div class="title">' + video.title + '</div></div>');
+      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>');
 
       $("#items").append(item);
     });

data/lib/videos/update.rb

@@ -7,14 +7,14 @@ 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!"
   end
 
   def load_data
-    self.videos = (Videos::Videos.load_json(video_package.videos_path + "data.json") || []).map { |b| Videos::Video.from_hash(video_package, b) }
+    self.videos = (Videos::Videos.load_json(videos_package.videos_path + "data.json") || []).map { |b| Videos::Video.from_hash(videos_package, b) }
   end
 
   def save_data
@@ -35,7 +35,13 @@ class Videos::Update
       $stdout.write "\rProcessing #{i + 1} of #{@files.length} (#{(((i + 1) / @files.length.to_f) * 100.0).round}%)"
       $stdout.flush
 
-      created f
+      #video = videos.find { |v| v.path.to_s == f.to_s }
+
+      #if video
+      #  updated video
+      #else
+        created f
+      #end
     end
     #handle deleted first
     #@directories.each do |d|
@@ -56,11 +62,12 @@ class Videos::Update
   def created(f)
     video = Videos::Video.new(videos_package, f)
     video.generate_thumbnail
+    video.get_metadata
     videos << video
   end
 
   def updated(video)
-    puts "updating: #{video.inspect}"
-    #
+    video.generate_thumbnail
+    video.get_metadata
   end
 end

data/lib/videos/version.rb

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

data/lib/videos/video.rb

@@ -1,10 +1,13 @@
 class Videos::Video
   attr_reader :videos_package
   attr_reader :path
+  attr_reader :metadata
+  attr_accessor :length
 
   def initialize(videos_package, path)
     @videos_package = videos_package
     @path = path
+    @metadata = {}
   end
 
   def path_hash
@@ -66,9 +69,17 @@ class Videos::Video
     FileUtils.rm_rf(temp_directory) if temp_directory
   end
 
+  def get_metadata
+    return unless length.nil?
+
+    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
+  end
+
   def self.from_hash(videos_package, data)
-    video = Videos::Video.new(videos_package)
-    video.path = videos_package.url_to_pathname(Addressable::URI.parse(data["url"]))
+    video = Videos::Video.new(videos_package, videos_package.url_to_pathname(Addressable::URI.parse(data["url"])))
+    video.length = data["length"]
     video
   end
 
@@ -78,6 +89,7 @@ class Videos::Video
       "title" => title,
       "publishedOn" => path.mtime.to_i,
       "thumbnailUrl" => thumbnail_url,
+      "length" => length,
       "key" => path_hash
     }
   end

data/lib/videos/videos.rb

@@ -9,7 +9,7 @@ class Videos::Videos
   def url_to_pathname(url)
     path = Addressable::URI.unencode_component(url.normalized_path)
     path.gsub!(/^\//, "") #Make relative, if we allow mounting at a different root URL this will need to remove the root instead of just '/'
-    root_url_path + path
+    root_path + path
   end
 
   def self.gem_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: videos
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler