cherry_picking_moments 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0371a6dc6012d3c47ac466aaaab55a4efae9f8e029d8175103ec095850f60669
-  data.tar.gz: b5bdce31eaf889eef270b9e825630347c7a5ea26810303ea7bd967ebcc63982f
+  metadata.gz: '063860681797e56b9ead05f784706d74efe9566919df2610b21a80225be83849'
+  data.tar.gz: 66eb2e97d5c94a4383b5a5c8b6d48b9554321df637519067fcac546f7e3cf40c
 SHA512:
-  metadata.gz: 2e118ac6c83692c8fa64e7ac5f73fe7e2f61567c646de1c07641de413705c49d993ed6d65d24df15c199ac5ce05239f2057c2cfa2fafe9f99ce4c8e7f21ad8f1
-  data.tar.gz: 72bdddd9aac20294424e73da5e27cd17bc70b382dd428726ddb3a921a3164b88d89d32dfd3bb6288ce78721906c60677a55088475925a50983410dcd154a9035
+  metadata.gz: 360f890e80361ebbf064e94dc004339143f92d5153ee69fd8b6744392452b75f4308228e5885e357514164ed7d74e447cc191718a24bb998e48c93fc0a4eb776
+  data.tar.gz: a2151ff400a4579511a38dfaedb0392d500d4397637ea8c756f080a7e3cf0d1eb4acc689f6829ba3c901b3841dcbf911076f7df854f7ff1ae4d3d1b66f93d3f0

data/.travis.yml

@@ -1,17 +1,15 @@
-sudo: false
+sudo: required
 language: ruby
+os: linux
 rvm:
   - 2.6.3
 before_install:
-  - export PATH="$(pyenv root)/bin:$PATH"
-  - eval "$(pyenv init -)"
-  - gem install bundler -v 2.0.1
+  - sudo add-apt-repository ppa:mc3man/trusty-media -y
+  - sudo apt-get update -q
+  - sudo apt-get install ffmpeg -y
+  - gem update --system
+  - gem update bundler
 install:
-  - pyenv install -f miniconda-3.7.0
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  - conda info -a
-  - conda create -q -n test-environment python=3.7 imagehash
-  - source $(pyenv prefix)/bin/activate test-environment
-  - pip install --user imagehash
-  - bundle install
+  - bundle install
+script:
+  - bundle exec rspec

data/README.md

@@ -2,24 +2,15 @@
 
 [![Build Status](https://travis-ci.org/yensaki/cherry_picking_moments.svg?branch=master)](https://travis-ci.org/yensaki/cherry_picking_moments)
 
-This generates uniquish images from a movie file.
+This generates sliced images with hamming_distance from a movie file.
 
 ## Installation
 
 1. Install ffmpeg
-1. Install python
-    ```
-    $ CONFIGURE_OPTS="--enable-shared" pyenv install 3.7.1
-    ```
-1. Install imagehash from pip
-    ```
-    $ pip install ImageHash
-    ```
-
 1. gem install this
 Add this line to your application's Gemfile:
     ```ruby
-    gem 'cherry_picking_moments', github: 'yensaki/cherry_picking_moments'
+    gem 'cherry_picking_moments'
     ```
 And then execute:
 ```

data/cherry_picking_moments.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pycall", "1.2.1"
+  spec.add_dependency "phashion"
 
   spec.add_development_dependency "bundler", ">=1.17.2"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/cherry_picking_moments/image.rb

@@ -1,27 +1,18 @@
-require 'pycall/import'
-include PyCall::Import
+require 'phashion'
 
 class CherryPickingMoments::Image
   attr_reader :filepath
   attr_accessor :following_distance
-  pyfrom :PIL, import: :Image
 
   def initialize(filepath)
     @filepath = filepath
-    pyimport :imagehash
   end
 
-  def phash
-    @phash ||= imagehash.phash(pyimage).to_s
+  def distance_from(image)
+    phashion_image.distance_from(image.phashion_image)
   end
 
-  def to_binary
-    sprintf("%064b", phash.to_i(16))
-  end
-
-  private
-
-  def pyimage
-    @pyimage ||= Image.open(@filepath)
+  def phashion_image
+    @phashion_image ||= Phashion::Image.new(@filepath)
   end
 end

data/lib/cherry_picking_moments/movie.rb

@@ -13,8 +13,9 @@ class CherryPickingMoments::Movie
     @images = []
     Dir.glob(File.join(parapara!.output_path, '*.png')).sort.each do |filepath|
       image = CherryPickingMoments::Image.new(filepath)
-      prev_image = @images.last
-      prev_image.following_distance = CherryPickingMoments::HammingDistance.new(prev_image, image).hamming_distance if prev_image
+      if (prev_image = @images.last)
+        prev_image.following_distance = prev_image.distance_from(image)
+      end
 
       @images << image
     end

data/lib/cherry_picking_moments/version.rb

@@ -1,3 +1,3 @@
 module CherryPickingMoments
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cherry_picking_moments
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yensaki
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2019-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pycall
+  name: phashion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement