propre 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 508466608a192c55cec4a9e205c7e3a804f9494b
-  data.tar.gz: 6850d63bbfcf7a44f651232b5c4b536e91ea51a9
+  metadata.gz: 57f2f551266db211c5e57019bd806e5e6f9476c5
+  data.tar.gz: d7f0dd097a80b595625a42426358d3c1826bdeb9
 SHA512:
-  metadata.gz: c13e99d81bdd8fd1a93f153eb63b7df6d92a8002690005abab1652b236e55a1ffaa169128e6c2ff7b1b1578c95b05127ce3dc75db13e821517de9d296dcacb6f
-  data.tar.gz: 319b24f926074e06c1c0a89948fd6c78627329df869db0b77ce9edb8df9bcce380aae95efe0cdc76703e2eca1cc0f172ac4808637ad3a1689f7236f0ea74a7f9
+  metadata.gz: 2a39b614ff43b084bd7c6016a9c83d2012fb69f29c9d2e9f65c1d0eb9de62001fc1de5380120d1572d8fe7a57193d1616191fd4d9af4ea0423a67e58faf254d0
+  data.tar.gz: 4beef58118355a7289ee5c2705b45667761f62d1b199577b7945a36ff03ff2d1f6a718c86d5598af9bf99c76f3ea6b3182ee9c7545749787c36c8348934d455b

data/lib/propre/dictionary.rb

@@ -0,0 +1,28 @@
+module Dictionary
+  BANNED = %w(
+    dvd
+    rip
+    xvid
+    hdtv
+    bluray
+    fastsub
+    fansub
+    vostfr
+    ac3
+    theatrical
+    unrated
+    subforced
+  )
+
+  LANGUAGES = %w(
+    truefrench
+    french
+    italian
+  )
+
+  QUALITY = %w(
+    x264
+    720p
+    1080p
+  )
+end

data/lib/propre/version.rb

@@ -1,3 +1,3 @@
 module Version
-  VERSION = "0.2.2"
+  VERSION = '0.3.0'
 end

data/lib/propre.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'colorize'
 
-require 'propre/blacklist'
+require 'propre/dictionary'
 
 module Propre
   def self.propify(arg)
@@ -23,15 +23,27 @@ module Propre
     arg.to_s
   end
 
+  def self.find_language(arg)
+    Dictionary::LANGUAGES.find { |e| arg.include?(e) } || ''
+  end
+
+  def self.find_quality(arg)
+    Dictionary::QUALITY.find { |e| arg.include?(e) } || ''
+  end
+
   def self.remove_patterns(arg)
-    arg.slice! find_urls(arg)
-    arg.slice! find_years(arg)
-    arg.slice! find_episode(arg)
+    %w(find_urls find_years find_episode find_language find_quality).each do |m|
+      arg.slice! method(m).call(arg)
+    end
     arg
   end
 
   def self.sanitize(arg)
-    arg.gsub('.', ' ').strip
+    if arg.count('.') > arg.count('-')
+      arg.gsub('.', ' ').strip
+    else
+      arg.gsub('-', ' ').strip
+    end
   end
 
   def self.ban_chars(arg)
@@ -39,8 +51,11 @@ module Propre
   end
 
   def self.ban_words(arg)
+    banned_words = Dictionary.constants.reduce([]) do |sum, e|
+      sum.concat Dictionary.const_get(e)
+    end
     arg.split.each do |word|
-      Blacklist::WORDS.select do |e|
+      banned_words.select do |e|
         arg.slice! word if word.include? e
       end
     end
@@ -52,7 +67,9 @@ module Propre
     {
       year: find_years(arg),
       episode: find_episode(arg).upcase,
-      website: find_urls(arg)
+      website: find_urls(arg),
+      language: find_language(arg),
+      quality: find_quality(arg)
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propre
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Yadomi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,7 +94,7 @@ files:
 - Rakefile
 - bin/propre
 - lib/propre.rb
-- lib/propre/blacklist.rb
+- lib/propre/dictionary.rb
 - lib/propre/version.rb
 - propre.gemspec
 homepage: 

data/lib/propre/blacklist.rb

@@ -1,15 +0,0 @@
-module Blacklist
-  WORDS = %w(
-    dvd
-    rip
-    xvid
-    hdtv
-    bluray
-    fastsub
-    fansub
-    vostfr
-    ac3
-    x264
-    french
-  )
-end