ytdl 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3169f52a4e14a6c0d1dbd0f750662bf5314b200c4c59608b4ee7b91e6d080b4
-  data.tar.gz: 665016380da167e6e0b04a863ae9ca0f63adb7c685f3be583b86ca1a6e27979a
+  metadata.gz: 4c0f064c711d1c5c7df4d91a6ed987af9b864d14bda66ef83b5d6940e727e06d
+  data.tar.gz: 2681213e134127435630306bc64b79e79dbd36be7bebce20ee401eba174889b3
 SHA512:
-  metadata.gz: bc039c959c5c25e0dc542f4114bb3cd28895621c2c94adadd91d40b0aacdaad775901617d99ffa295b3626c3a53179d16530184d68d18b0572d5bef056a6e13f
-  data.tar.gz: 710aae16935afdea7804d468df869b3e005b207e06bc1b3b37004549d63f03f9c38ac9b43d24fcedd1f16a2d7cda4161e10a8d98f8e8daa6c8933be51adfe8e0
+  metadata.gz: ef0726050a719d15f0851335bce6956ad7f90e21e83e9ab2aa87aa9fe839b7e17c431f6407b88d3cb83910cf8c72d0fd401599ba6b4ba0830becde1dc4de9870
+  data.tar.gz: 215f9e391841246a5e49a5bee06b57456197d693d98a12f1aeaccab85515cc79c33a7902110cbb195dad6b876c516c1268f5f3a14fad8887508a904ab9e32863

data/lib/youtube_dl/command.rb

@@ -9,9 +9,9 @@ module YoutubeDL
       self.class.config
     end
 
-    setting :executable, 'youtube-dl'
-    setting :default_options, {}
-    setting :forced_options, {
+    setting :executable, default: 'yt-dlp'
+    setting :default_options, default: {}
+    setting :forced_options, default: {
       newline: true,
       color: false,
       write_info_json: true,

data/lib/youtube_dl/output_parser.rb

@@ -20,6 +20,15 @@ module YoutubeDL
         return :destination
       end
 
+      if m[:merger]
+        state.destination = Pathname(m[:merger])
+        return :merger
+      end
+
+      if m[:deleting]
+        return :deleting
+      end
+
       if m[:info_json]
         state.info_json = Pathname(m[:info_json]) if m[:info_json]
         return :info_json
@@ -53,6 +62,8 @@ module YoutubeDL
         #{progress_regex} |
         #{destination_regex} |
         #{existing_destination_regex} |
+        #{merger_regex} |
+        #{deletion_regex} | 
         #{info_json_regex} |
         #{error_regex}
       }x
@@ -88,6 +99,20 @@ module YoutubeDL
       }x
     end
 
+    def merger_regex
+      %r{
+        \[Merger\] \s+ Merging \s+ formats \s+ into \s+
+        "(?<merger>[^"]+)"
+      }x
+    end
+
+    def deletion_regex
+      %r{
+        Deleting \s+ original \s+ file \s+
+        (?<deleting>.*)
+      }x
+    end
+
     def info_json_regex
       %r{
         \[info\] \s Writing \s video .*? \s metadata \s as \s JSON \s to: \s

data/lib/youtube_dl/state.rb

@@ -10,6 +10,8 @@ module YoutubeDL
       :error,
       :info_json,
       :info,
+      :merger,
+      :deleting,
     )
 
     def error?

data/lib/youtube_dl/version.rb

@@ -1,3 +1,3 @@
 module YoutubeDL
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ytdl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Max Hollmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A wrapper for youtube-dl with progress callbacks