viddl 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed0b351b03d9f36a4e05e58e75f7888f5b00705
-  data.tar.gz: dcb78be7dda34560ebce6251209a136e959b100d
+  metadata.gz: 0a8ffecdc2be6152fcf551d440aaacf10456e35c
+  data.tar.gz: a97703c433bdc2cac2db3e05ac62dd65cd36c8d9
 SHA512:
-  metadata.gz: 0dc717bcadda5d0ddd2c3dc6b2ab3ffbc3a2006df6209354aef9d45bdec40727b7f67a354c8642f4c031e0f68ad93fd4113083bf706eb2fe3e68f5d594765225
-  data.tar.gz: ecba5952e475aa9c162e6c3f1a06a86bf4f5f892d5c96109538fe9fffe1613e17cb2ee38d4982bd98093a3472892d160357baff85987ad5a5fd5da5cba154856
+  metadata.gz: 19bb0115958d5c97d22985cb1503bb6517d85af4b5b2bad97325e9fca05e08e08485af9c7a1e33c5e38f35290fc23c7344c58e299cd86f70587e1146efa816fb
+  data.tar.gz: 281143db5b201ef2f8c2dd6b465a55ec9631e30c0119c661ee06ec2cd0d80849f548bcc61fbbdaa3194fda7f8db7ff4ede82373973ceffd191e64fc739fc270f

data/bin/viddl

@@ -67,7 +67,11 @@ opts = OptionParser.new do |opts|
 
   opts.on_tail("--help", "Show this message") { help(opts) }
 
-  # file
+  # storage
+
+  opts.on("--download-path=PATH", "Download path") do |path|
+    options[:download_path] = path
+  end
 
   opts.on("-oPATH", "--output-path=PATH", "Output path") do |path|
     options[:output_path] = path

data/lib/viddl.rb

@@ -17,6 +17,6 @@ module Viddl
 
   extend self
 
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 
 end

data/lib/viddl/video.rb

@@ -11,6 +11,8 @@ module Viddl
     # Download a video using the given url
     # @param [String] url
     # @param [Hash] options
+    # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
+    # @option options [String] :flags Flags to pass to youtube-dl
     # @return [Video::Instance]
     def download(url, options = {})
       video = Instance.new(url)

data/lib/viddl/video/download.rb

@@ -7,13 +7,16 @@ module Viddl
     class Download
 
       # download is stored to temp dir before processing
-      TEMPDIR = Dir.tmpdir
+      DEFAULT_TEMPDIR = Dir.tmpdir
       # download format is forced to mp4 to optimize for quickness
       FORMAT_ARG = "-f 'best[ext=mp4]'"
 
+      attr_reader :paths
+
       # Download the given video
       # @param [Video::Instance] video
       # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
       # @option options [String] :flags Flags to pass to youtube-dl
       # @return [Download]
       def self.process(video, options = {})
@@ -30,23 +33,53 @@ module Viddl
 
       # Download the video file
       # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
       # @option options [String] :flags Flags to pass to youtube-dl
       # @return [Boolean]
       def process(options = {})
         cmd = command_line(options)
         result = Kernel.system(cmd)
-        raise(result.to_s) unless result
+        if result
+          @paths = Dir["#{path}*"]
+        else
+          raise(result.to_s)
+        end
         true
       end
 
       private
 
+      # The path where the download should be written
+      # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
+      # @return [String]
+      def path(options = {})
+        @download_path ||= build_path(options)
+      end
+
+      # Build the download path
+      # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
+      # @return [String]
+      def build_path(options = {})
+        if options[:download_path].nil?
+          "#{DEFAULT_TEMPDIR}/#{@video.id}"
+        elsif File.directory?(options[:download_path])
+          "#{options[:download_path]}/#{@video.id}"
+        else
+          options[:download_path]
+        end
+      end
+
       # Command line to download the video file
       # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
       # @option options [String] :flags Flags to pass to youtube-dl
       # @return [String]
       def command_line(options = {})
-        "youtube-dl #{@video.source_url} #{FORMAT_ARG} #{options[:flags]} -o '#{TEMPDIR}/#{@video.id}s.%(ext)s'"
+        download_path = path(options)
+        output_flag = "-o '#{download_path}.%(ext)s'"
+        "youtube-dl #{@video.source_url} #{FORMAT_ARG} #{options[:flags]} #{output_flag}"
       end
 
     end

data/lib/viddl/video/instance.rb

@@ -31,25 +31,27 @@ module Viddl
       # @option options [Pathname, String] :output_path path where clip will be written. Can be directory or filename
       # @return [Array<Clip>]
       def create_clip(options = {})
-        source_filenames.map do |filename|
-          Clip.process(filename, options)
+        download_paths.map do |path|
+          Clip.process(path, options)
         end
       end
 
       # Download the video source
       # @param [Hash] options
+      # @option options [String, File] :download_path Path where download should be stored (default: system temp directory)
+      # @option options [String] :flags Flags to pass to youtube-dl
       # @return [Download]
       def process_download(options = {})
         @download = Download.process(self, options)
       end
 
-      # The downloaded source filenames
-      # @return [Array<String>]
-      def source_filenames
+      # The downloaded files to work from
+      # @return [Array<String>, Array<File>]
+      def download_paths
         if @download.nil?
           raise "File must be downloaded"
         else
-          @source_filenames = Dir["#{Download::TEMPDIR}/#{@id}*"]
+          @download.paths
         end
       end
 

data/spec/video/clip_spec.rb

@@ -3,7 +3,7 @@ require "helper"
 describe Viddl::Video::Clip do
 
   before(:each) do
-    @source_file = "#{Viddl::Video::Download::TEMPDIR}/6g4dkBF5anU.mkv"
+    @source_file = "#{Viddl::Video::Download::DEFAULT_TEMPDIR}/6g4dkBF5anU.mkv"
     @clip = Viddl::Video::Clip.new(@source_file)
   end
 

data/spec/video/download_spec.rb

@@ -25,16 +25,37 @@ describe Viddl::Video::Download do
 
   context "#command_line" do
 
-    before(:each) do
-      @result = @download.send(:command_line)
-    end
+    context "with no download_path specified" do
+
+      before(:each) do
+        @result = @download.send(:command_line)
+      end
+
+      it "includes url" do
+        expect(@result).to(include(@source_url))
+      end
+
+      it "includes temp dir" do
+        expect(@result).to(include("#{Viddl::Video::Download::DEFAULT_TEMPDIR}/"))
+      end
 
-    it "includes url" do
-      expect(@result).to(include(@source_url))
     end
 
-    it "includes temp dir" do
-      expect(@result).to(include("#{Viddl::Video::Download::TEMPDIR}/"))
+    context "with download_path specified" do
+
+      before(:each) do
+        @path = "assets"
+        @result = @download.send(:command_line, download_path: "assets")
+      end
+
+      it "includes url" do
+        expect(@result).to(include(@source_url))
+      end
+
+      it "includes download_path" do
+        expect(@result).to(include(@path))
+      end
+
     end
 
   end

data/spec/video/instance_spec.rb

@@ -17,14 +17,14 @@ describe Viddl::Video::Instance do
 
   end
 
-  context "#source_filenames" do
+  context "#download_paths" do
 
     context "with associated download" do
 
-      it "pulls filenames from directory" do
+      it "delegates to download" do
         @download = Viddl::Video::Download.new(@video)
-        expect(Dir).to(receive(:[]))
-        @result = @video.source_filenames
+        expect(@download).to(receive(:paths))
+        @result = @video.download_paths
       end
 
     end
@@ -33,7 +33,7 @@ describe Viddl::Video::Instance do
 
       it "raises" do
         expect {
-          @video.source_filenames
+          @video.download_paths
         }.to(raise_error(RuntimeError))
       end
 
@@ -45,7 +45,7 @@ describe Viddl::Video::Instance do
 
     before(:each) do
       @download = Viddl::Video::Download.new(@video)
-      expect(@video).to(receive(:source_filenames).and_return(["#{Viddl::Video::Download::TEMPDIR}/#{@video_id}.mkv"]))
+      expect(@video).to(receive(:download_paths).and_return(["#{Viddl::Video::Download::DEFAULT_TEMPDIR}/#{@video_id}.mkv"]))
     end
 
     context "with no options" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viddl
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake