organo 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bba44699065f0d0afb4bd22c4c877243dbeeb11c5d3568d146a957f00cfb69
-  data.tar.gz: 4825637f9a142536d395f859d2309f5741f5fba336ad48eed68822c1c336f29e
+  metadata.gz: f7145d1efb8ac5804c2c0d786c2854dd9d92b209fceb33ca02192ae86fe0e65a
+  data.tar.gz: 77ff5845dd17c7ec583cbe5dace3833e52c3ca02e3d36b1b479d2140a97d908e
 SHA512:
-  metadata.gz: 6144b9c1d789c2618a18e1dcf2ce9eac84c25d5e534fdc3d444102db216657cb4bee82186170bee45f6b5346dd6d0ac0ed6a9781b3137947cd61d1eed3f2a66d
-  data.tar.gz: f3fc2a18ceb87932457bb11de19cdf3a88f15fa6a1b1665e5a19dbc8bc92459387e9fd293fa985efeabbb78909c40a4754a707c34519c4c889f40499aad2a023
+  metadata.gz: 03c4f273847259ab1af9319ec390df5badfdcf448a9208bb20992b5e1b3d8d06bd7a22580a1c54bdd7268e0595825d560ae9269bf8556b1c9178967e03aa9a26
+  data.tar.gz: 5003d8cbac8a154dbcb57c2698504b86faef172a705d20b9d070f786a70c0ac53013e7ac5e24dac9699fec73808bcc244e1721531a43a47d5364459f3560213e

data/lib/organo/commands/anime/anime_add.rb

@@ -1,6 +1,7 @@
 require_relative '../../config'
 require_relative '../../writer'
 require_relative '../../reader'
+require_relative '../../tools/local_search'
 
 module Organo
   module CLI
@@ -13,15 +14,15 @@ module Organo
             argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
             def call(mal_id:, **)
-              json_obj = Query.get_anime_by_id(mal_id)
-              show = SearchShow.new(json_obj['mal_id'], json_obj['title'], json_obj['images']['jpg']['image_url'])
-              show_type = json_obj['type']
-              file_name = (show_type == 'TV' ? "#{json_obj['year']}_#{json_obj['season']}" : show_type.downcase)
-              file_path = "#{Config::DEFAULT_DIR}/#{file_name}.json"
-              show_list = File.exist?(file_path) ? Reader.read_file(file_path) : []
-              if show_list.find_index { |s| s.id.to_s == mal_id.to_s }.nil?
+              if LocalSearch.find_anime_by_id(mal_id).nil?
+                json_obj = Query.get_anime_by_id(mal_id)
+                show = SearchShow.new(json_obj['mal_id'], json_obj['title'], json_obj['images']['jpg']['image_url'])
+                show_type = json_obj['type']
+                file_name = (show_type == 'TV' ? "#{json_obj['year']}_#{json_obj['season']}" : show_type.downcase)
+                file_path = "#{Config::DEFAULT_DIR}/#{file_name}.json"
+                show_list = File.exist?(file_path) ? Reader.read_file(file_path) : []
                 Writer.to_file(show_list.push(show).sort_by(&:title), file_path)
-                puts "Added anime \"#{show.title}\" (#{mal_id})"
+                puts "Added anime \"#{show.title}\" (#{mal_id}) in #{file_path}"
               else
                 puts 'Cannot add an already existing anime'
               end

data/lib/organo/commands/anime/anime_add_sequel.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
 require_relative '../../writer'
 require_relative '../../reader'
+require_relative '../../tools/local_search'
 
 module Organo
   module CLI
@@ -17,21 +20,25 @@ module Organo
             argument :type_num, type: :integer, required: false, default: 0, desc: 'The sequel type number'
 
             def call(anime_mal_id:, sequel_mal_id:, season_num:, type:, type_num:, **)
-              json_obj = Query.get_anime_by_id(sequel_mal_id)
-              Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
-                shows_list = Reader.read_file(file_path)
-                show = shows_list.find { |s| s.id.to_s == anime_mal_id.to_s }
-                next if show.nil?
-
-                if show.sequels.find { |s| s['id'].to_s == sequel_mal_id.to_s }
-                  puts 'Cannot add an already existing sequel.'
-                else
-                  sequel = Sequel.new(json_obj['mal_id'], json_obj['title'], json_obj['images']['jpg']['image_url'], season_num, type, type_num)
-                  show.sequels.push(sequel)
-                  Writer.to_file(shows_list, file_path)
-                  puts "Added sequel \"#{sequel.title}\" (#{sequel.id}) to anime."
+              if LocalSearch.find_anime_by_id(sequel_mal_id).nil?
+                json_obj = Query.get_anime_by_id(sequel_mal_id)
+                sequel = Sequel.new(
+                  json_obj['mal_id'],
+                  json_obj['title'],
+                  json_obj['images']['jpg']['image_url'],
+                  season_num,
+                  type,
+                  type_num
+                )
+                file_path = LocalSearch.find_file_by_anime_id(anime_mal_id)
+                show_list = Reader.read_file(file_path).each do |show|
+                  show.sequels.push(sequel) if show.id == anime_mal_id.to_i
                 end
-                break
+                show_info = show_list.find { |show| show.id == anime_mal_id.to_i }
+                Writer.to_file(show_list, file_path)
+                puts "Added sequel \"#{sequel.title}\" (#{sequel.id}) to anime \"#{show_info.title}\" (#{anime_mal_id}) in #{file_path}."
+              else
+                puts 'This sequel already exists.'
               end
             end
           end

data/lib/organo/commands/anime/anime_search.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../config'
+require_relative '../../tools/local_search'
 
 module Organo
   module CLI
@@ -12,13 +13,7 @@ module Organo
           argument :query, type: :string, required: true, desc: 'Search query'
 
           def call(query:, **)
-            found_list = []
-            Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
-              shows_list = Reader.read_file(file_path)
-              show = shows_list.find { |s| s.title.downcase.include? query }
-              found_list.push(show) unless show.nil?
-            end
-            puts found_list.to_json
+            puts (LocalSearch.find_anime_by_query(query).map{ |anime| anime.to_json })
           end
         end
 

data/lib/organo/tools/local_search.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'json'
+require_relative '../reader'
+
+module Organo
+  class LocalSearch
+
+    def self.find_anime_by_id(mal_id)
+      anime_list = Reader.read_all_files
+      get_anime_obj(mal_id, anime_list)
+    end
+
+    def self.get_anime_obj(mal_id, anime_list)
+      return_value = nil
+      anime_list.each do |anime|
+        if anime.id == mal_id.to_i || anime.sequels.find { |sequel| sequel['id'] == mal_id.to_i }
+          return_value = anime
+          break
+        end
+      end
+      return_value
+    end
+
+    def self.find_file_by_anime_id(mal_id)
+      return_value = nil
+      Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
+        anime_list = Reader.read_file(file_path)
+        unless get_anime_obj(mal_id, anime_list).nil?
+          return_value = file_path
+          break
+        end
+      end
+      return_value
+    end
+
+    def self.find_anime_by_query(query)
+      anime_list = Reader.read_all_files
+      return_value = []
+      anime_list.each do |anime|
+        if (anime.title.downcase.include? query.downcase) ||
+           (anime.sequels.find { |sequel| sequel['title'].downcase.include? query.downcase })
+          return_value.push(anime)
+        end
+      end
+      return_value
+    end
+  end
+end

data/lib/organo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Organo
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-11 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -117,6 +117,7 @@ files:
 - lib/organo/sequel.rb
 - lib/organo/show.rb
 - lib/organo/show_list.rb
+- lib/organo/tools/local_search.rb
 - lib/organo/version.rb
 - lib/organo/writer.rb
 homepage: https://gitlab.com/dkb-weeblets/organo