move_media 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96324a9faf26f71f34af9eeb59a72d440ab4c9c10cb0f30f2a1749b3c56c43b2
-  data.tar.gz: f75f768d3a3bdea408c1c0dffd31e8df0a1d7b06e02b2647724d14e0e9f2f740
+  metadata.gz: bbc3c34febc7c3534bf751850226feae655c2df7e6ed70227b78def5f50f59a0
+  data.tar.gz: a118e19ea6c2cd5bf8419ee28c94a373e34589b30fd35cf3348eaffbfb7a1dbb
 SHA512:
-  metadata.gz: 8f4195c166973d455e113afbe8712371c0ff5c8c00aafc35d08db4ff96b0bcbff5042bd872c5b07b28fafc1f39181a01f430f59debdf2dad900bb8bb5cc3c0db
-  data.tar.gz: fdcbb6978f8773bbc4bd1d5f30a27fe8c6780515387de85e79a4e74cce1e04cf99a17847127e87125ec4e1bfdc834da7f3ed08cc2344247f9feaeb0de1b066e6
+  metadata.gz: fff1c59518241eb0f1654c5e1ddeb70453a18123130ba67b1709636aab9e5ca15c51a644a52eebae77e8c63619010f1408391393b5cc25b23e8d3659b8bc5106
+  data.tar.gz: bceca00354765e350da95f24f25bc7a898215796d2a5f8e604201df1819712100793974a7fbbb8fce70daa727622f43bd95ca86ae22b0a3e8d8bc40f6d8fb44a

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+## 0.1.1 / 2022-08-20
+  * Fixed lots of bugs
+
 ## 0.1.0 / 2022-08-20
   * Initial version, described at https://www.mslinn.com/av_studio/210-sony-a7iii.html

data/README.md

@@ -4,19 +4,14 @@
 
 `move_media` moves files from Sony Camera memory cards to permanent storage.
 
-## Usage
-
-```
-move_media
-```
-
 
 ## Installation
 
 Modify the following and save as $HOME/.move_media:
 
 ```yaml
-destination: /mnt/e/media/staging
+destination_images: /mnt/e/media/staging/THMBNL
+destination_video: /mnt/e/media/staging/CLIP
 drive: 'h:'
 topic: sony
 ```
@@ -26,6 +21,21 @@ Install like this:
 $ gem install move_media
 ```
 
+
+## Usage
+Check out this project, then run
+```
+$ bin/move_media
+Moving 7.97 GB video from /mnt/h/PRIVATE/M4ROOT/CLIP/C0002.MP4 to /mnt/e/media/staging/CLIP/sony_2022-08-20_0000002.mp4
+Moving thumbnail from /mnt/h/PRIVATE/M4ROOT/THMBNL/C0002T01.JPG to /mnt/e/media/staging/THMBNL/C0002.jpg
+Moving 2.37 GB video from /mnt/h/PRIVATE/M4ROOT/CLIP/C0003.MP4 to /mnt/e/media/staging/CLIP/sony_2022-08-20_0000003.mp4
+Moving thumbnail from /mnt/h/PRIVATE/M4ROOT/THMBNL/C0003T01.JPG to /mnt/e/media/staging/THMBNL/C0003.jpg
+Moving 1.23 GB video from /mnt/h/PRIVATE/M4ROOT/CLIP/C0004.MP4 to /mnt/e/media/staging/CLIP/sony_2022-08-20_0000004.mp4
+Moving thumbnail from /mnt/h/PRIVATE/M4ROOT/THMBNL/C0004T01.JPG to /mnt/e/media/staging/THMBNL/C0004.jpg
+Moving 1.48 GB video from /mnt/h/PRIVATE/M4ROOT/CLIP/C0005.MP4 to /mnt/e/media/staging/CLIP/sony_2022-08-20_0000005.mp4
+```
+
+
 ## Additional Information
 More information is available on
 [Mike Slinn’s website](https://www.mslinn.com/av_studio/210-sony-a7iii.html).

data/bin/move_media

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require_relative '../lib/move_media'
+
+mm = MoveMedia.new
+mm.main

data/lib/mm_util.rb

@@ -14,8 +14,8 @@ class String
   end
 end
 
-def delete_mp4s(source)
-  Dir[source]
+def delete_xml_files(source)
+  Dir["#{source}/**/*.XML"].each { |file| File.delete(file) }
 end
 
 # @param mount_path [String] contains the mount path to be verified.
@@ -44,7 +44,10 @@ end
 
 # @param old_path [String] file to be moved; raises exception if not present
 def move_and_rename(old_path, new_path)
-  File.rename(old_path, new_path)
+  raise "Error: #{new_path} already exists." if File.file?(new_path)
+
+  FileUtils.cp(old_path, new_path)
+  File.delete(old_path)
 end
 
 # @param source [String] Directory containing videos.

data/lib/move_media/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MoveMediaVersion
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/move_media.rb

@@ -2,6 +2,7 @@
 
 CONFIGURATION_FILE = "#{Dir.home}/.move_media"
 
+require 'bytesize'
 require 'date'
 require_relative 'mm_util'
 
@@ -16,7 +17,11 @@ class MoveMedia
     @seq = 1
   end
 
-  def make_video_name(fn_fq)
+  def human_file_size(filename)
+    ByteSize.new(File.size(filename)).to_s
+  end
+
+  def make_name(fn_fq)
     date = File.ctime(fn_fq).to_date
     seq = @seq.to_s.rjust(SIGNIFICANT_DIGITS, '0')
     "#{@topic}_#{date}_#{seq}"
@@ -24,18 +29,24 @@ class MoveMedia
 
   # Move Sony camera thumbnail for video_filename from source to destination
   # @return new path for thumbnail
-  def move_thumbnail(video_filename_stem)
+  def process_thumbnail(fn_fq)
+    video_filename_stem = File.basename(fn_fq, '.*')
     old_path = sony_thumbnail(@source, video_filename_stem)
-    old_name = File.basename(old_path, '.*')
-    new_path = "#{@destination_images}/#{old_name}.jpg"
+    return nil if old_path.nil?
+
+    new_thumbnail_name = make_name(fn_fq)
+    new_path = "#{@destination_images}/#{new_thumbnail_name}.jpg"
+    puts "Moving thumbnail from #{old_path} to #{new_path}"
     move_and_rename(old_path, new_path)
     new_path
   end
 
   # Destination files are yyyy-mm-dd_topic_0001234.{mp4,jpg}
   def process_video(fn_fq)
-    new_name = make_video_name(fn_fq)
+    new_name = make_name(fn_fq)
     new_name_fq = "#{@destination_video}/#{new_name}.mp4"
+
+    puts "Moving #{human_file_size(fn_fq)} video from #{fn_fq} to #{new_name_fq}"
     move_and_rename(fn_fq, new_name_fq)
     @seq += 1
     new_name_fq
@@ -72,9 +83,9 @@ class MoveMedia
     scan_for_next_seq(@destination_video)
     video_filenames(@source).each do |fn_fq|
       process_video(fn_fq)
-      video_filename_stem = File.basename(fn_fq, '.*')
-      move_thumbnail(video_filename_stem)
+      process_thumbnail(fn_fq)
     end
+    delete_xml_files(@source)
     unmount_memory_card(@source) unless already_mounted
   end
 end

data/move_media.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description = <<~END_OF_DESC
     Moves files from Sony Camera memory cards to permanent storage.
   END_OF_DESC
-  spec.bindir = 'exe'
+  # spec.bindir = 'exe'
   spec.email = ['mslinn@mslinn.com']
   spec.files = Dir['.rubocop.yml', 'LICENSE.*', 'Rakefile', '{lib,spec}/**/*', '*.gemspec', '*.md']
   spec.executables = 'move_media'

data/spec/move_media_spec.rb

@@ -73,10 +73,10 @@ RSpec.describe(MoveMedia) do # rubocop:disable Metrics/BlockLength
     copy_videos_to_destination
     mm.scan_for_next_seq(destination_video)
     file_date = File.ctime(file_to_copy).to_date
-    expect(mm.make_video_name(file_to_copy)).to eq("sony_#{file_date}_0000042")
+    expect(mm.make_name(file_to_copy)).to eq("sony_#{file_date}_0000042")
 
     mm.seq = 666
-    expect(mm.make_video_name(file_to_copy)).to eq("sony_#{file_date}_0000666")
+    expect(mm.make_name(file_to_copy)).to eq("sony_#{file_date}_0000666")
   end
 
   it 'processes a video' do

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: move_media
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Slinn
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
 date: 2022-08-23 00:00:00.000000000 Z
 dependencies: []
@@ -25,7 +25,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- exe/move_media
+- bin/move_media
 - lib/mm_util.rb
 - lib/move_media.rb
 - lib/move_media/version.rb
@@ -37,7 +37,6 @@ files:
 - spec/fixtures/source/PRIVATE/M4ROOT/THMBNL/C0001T04.JPG
 - spec/move_media_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
 homepage: https://www.mslinn.com/av_studio/210-sony-a7iii.html
 licenses:
 - MIT
@@ -77,5 +76,4 @@ test_files:
 - spec/fixtures/source/PRIVATE/M4ROOT/THMBNL/C0001T04.JPG
 - spec/move_media_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
 ...

data/exe/move_media

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'move_media' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-
-bundle_binstub = File.expand_path("bundle", __dir__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("move_media", "move_media")

data/spec/status_persistence.txt

@@ -1,12 +0,0 @@
-example_id                      | status | run_time        |
-------------------------------- | ------ | --------------- |
-./spec/move_media_spec.rb[1:1]  | passed | 0.00074 seconds |
-./spec/move_media_spec.rb[1:2]  | passed | 0.00008 seconds |
-./spec/move_media_spec.rb[1:3]  | passed | 0.0214 seconds  |
-./spec/move_media_spec.rb[1:4]  | passed | 0.00024 seconds |
-./spec/move_media_spec.rb[1:5]  | passed | 0.00009 seconds |
-./spec/move_media_spec.rb[1:6]  | passed | 0.00054 seconds |
-./spec/move_media_spec.rb[1:7]  | passed | 0.00155 seconds |
-./spec/move_media_spec.rb[1:8]  | passed | 0.00093 seconds |
-./spec/move_media_spec.rb[1:9]  | passed | 0.00036 seconds |
-./spec/move_media_spec.rb[1:10] | passed | 0.03275 seconds |