organo 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7145d1efb8ac5804c2c0d786c2854dd9d92b209fceb33ca02192ae86fe0e65a
-  data.tar.gz: 77ff5845dd17c7ec583cbe5dace3833e52c3ca02e3d36b1b479d2140a97d908e
+  metadata.gz: b58779cd5ac92ef4f14f3b3abd75b221393b45d18f8268e3c967fce213d1563c
+  data.tar.gz: b16f8fe0a6b7a2a6cddfd5b49484710923aca86bd21bd6dc034143d352391652
 SHA512:
-  metadata.gz: 03c4f273847259ab1af9319ec390df5badfdcf448a9208bb20992b5e1b3d8d06bd7a22580a1c54bdd7268e0595825d560ae9269bf8556b1c9178967e03aa9a26
-  data.tar.gz: 5003d8cbac8a154dbcb57c2698504b86faef172a705d20b9d070f786a70c0ac53013e7ac5e24dac9699fec73808bcc244e1721531a43a47d5364459f3560213e
+  metadata.gz: ebe9ecb20f6aca8e4248b518a132789296c81b166a263124010d401e6bc9916577c1c9d1224eab9f0610314d634cac78482bd4cc5d474b98de8388e6ce44048e
+  data.tar.gz: 2bc797f151ee354347375d77e85f1b7ac0429ed7173a7fa1d2bbce12f4dcb01a339513851059895b251d554d5a4405b91b3995e4703e9e2ceebb3353d46702f3

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

@@ -1,7 +1,8 @@
 require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
+require_relative '../../tools/writer'
+require_relative '../../tools/reader'
 require_relative '../../tools/local_search'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -14,6 +15,7 @@ module Organo
             argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
             def call(mal_id:, **)
+              Check.init?
               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'])

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
+require_relative '../../tools/writer'
+require_relative '../../tools/reader'
 require_relative '../../tools/local_search'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -20,6 +21,7 @@ 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:, **)
+              Check.init?
               if LocalSearch.find_anime_by_id(sequel_mal_id).nil?
                 json_obj = Query.get_anime_by_id(sequel_mal_id)
                 sequel = Sequel.new(

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

@@ -1,5 +1,6 @@
 require 'httparty'
-require_relative '../../reader'
+require_relative '../../tools/reader'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -11,6 +12,7 @@ module Organo
             desc 'Get list of anime IDs that have broken links'
 
             def call(*)
+              Check.init?
               show_list = Reader.read_all_files
               broken_list = []
               show_list.each do |show|

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -10,6 +13,7 @@ module Organo
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
+            Check.init?
             Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
               shows_list = Reader.read_file(file_path)
               show_index = shows_list.find_index { |s| s.id.to_s == mal_id.to_s }

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

@@ -2,6 +2,7 @@
 
 require_relative '../../config'
 require_relative '../../tools/local_search'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -13,7 +14,8 @@ module Organo
           argument :query, type: :string, required: true, desc: 'Search query'
 
           def call(query:, **)
-            puts (LocalSearch.find_anime_by_query(query).map{ |anime| anime.to_json })
+            Check.init?
+            puts (LocalSearch.find_anime_by_query(query).map{ |anime| anime.to_json} )
           end
         end
 

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -10,6 +13,7 @@ module Organo
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
+            Check.init?
             found = false
             Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
               shows_list = Reader.read_file(file_path)

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

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
 require_relative '../../query'
-require_relative '../../writer'
-require_relative '../../reader'
+require_relative '../../tools/writer'
+require_relative '../../tools/reader'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -14,6 +17,7 @@ module Organo
             argument :mal_id_list, type: :array, required: true, desc: 'MyAnimeList ID list'
 
             def call(mal_id_list:, **)
+              Check.init?
               found = false
               Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
                 shows_list = Reader.read_file(file_path)

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
+require_relative '../../tools/writer'
+require_relative '../../tools/reader'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -14,6 +17,7 @@ module Organo
             argument :search_query, type: :string, required: true, desc: 'String query for Nyaa Torrents search'
 
             def call(mal_id:, search_query:, **)
+              Check.init?
               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 == mal_id.to_s }

data/lib/organo/commands/api/api_get_anime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
 require_relative '../../show_list'
 

data/lib/organo/commands/api/api_get_season.rb

@@ -8,9 +8,9 @@ module Organo
         module Get
 
           class Season < Dry::CLI::Command
-            desc "Get list of anime for a specific season"
-            argument :season, type: :string, required: true, desc: "Winter, Spring, Summer or Fall"
-            argument :year, type: :integer, required: true, desc: "Year"
+            desc 'Get list of anime for a specific season'
+            argument :season, type: :string, required: true, desc: 'Winter, Spring, Summer or Fall'
+            argument :year, type: :integer, required: true, desc: 'Year'
 
             def call(season:, year:, **)
               json_obj = Query.get_anime_season(season, year)

data/lib/organo/commands/api/api_get_sequels.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
 require_relative '../../show_list'
 
@@ -8,8 +10,8 @@ module Organo
         module Get
 
           class Sequels < Dry::CLI::Command
-            desc "Get list of sequels for a specific anime"
-            argument :mal_id, type: :integer, required: true, desc: "MyAnimeList ID"
+            desc 'Get list of sequels for a specific anime'
+            argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
             def call(mal_id:, **)
               sequels = ShowList.create_search_sequel_list(Query.get_anime_sequel(mal_id))

data/lib/organo/commands/api/api_search_anime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
 require_relative '../../show_list'
 
@@ -8,10 +10,10 @@ module Organo
         module Search
 
           class Anime < Dry::CLI::Command
-            desc "Get a list anime from query"
-            argument :query, type: :string, required: true, desc: "Search query"
-            option :type, type: :string, required: false, default: '', values: %w[tv movie ova special ona music], desc: "Type of anime"
-            option :limit, type: :integer, required: false, default: 5, desc: "Limit number of results"
+            desc 'Get a list anime from query'
+            argument :query, type: :string, required: true, desc: 'Search query'
+            option :type, type: :string, required: false, default: '', values: %w[tv movie ova special ona music], desc: 'Type of anime'
+            option :limit, type: :integer, required: false, default: 5, desc: 'Limit number of results'
 
             def call(query:, type:, limit:, **)
               json_obj = Query.search_anime(query, { 'type' => type, 'limit' => limit})

data/lib/organo/commands/init.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Organo
   module CLI
     module Commands
 
       class Init < Dry::CLI::Command
-        desc "Initialize directory with default files and directories"
+        desc 'Initialize directory with default files and directories'
 
         def call(*)
           Dir.mkdir './.organo' unless File.exist?('./.organo')

data/lib/organo/commands/merge.rb

@@ -1,14 +1,18 @@
-require_relative '../reader'
-require_relative '../writer'
+# frozen_string_literal: true
+
+require_relative '../tools/reader'
+require_relative '../tools/writer'
+require_relative '../tools/check'
 
 module Organo
   module CLI
     module Commands
 
       class Merge < Dry::CLI::Command
-        desc "Merge edited seasonal files into one main file"
+        desc 'Merge edited seasonal files into one main file'
 
         def call(*)
+          Check.init?
           show_list = Reader.read_all_files
           Writer.to_data_file(show_list, 'shows')
           puts 'Edited files have been merged.'

data/lib/organo/commands/remote/remote_add.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -6,14 +9,15 @@ module Organo
       module Remote
 
         class Add < Dry::CLI::Command
-          desc "Add remote FTP server to config file"
-          argument :env, type: :string, required: true, desc: "Remote environment name"
-          argument :url, type: :string, required: true, desc: "FTP server url"
-          option :username, type: :string, default: '', desc: "FTP account username"
-          option :password, type: :string, default: '', desc: "FTP account password"
-          option :directory, type: :string, default: '', desc: "FTP directory"
+          desc 'Add remote FTP server to config file'
+          argument :env, type: :string, required: true, desc: 'Remote environment name'
+          argument :url, type: :string, required: true, desc: 'FTP server url'
+          option :username, type: :string, default: '', desc: 'FTP account username'
+          option :password, type: :string, default: '', desc: 'FTP account password'
+          option :directory, type: :string, default: '', desc: 'FTP directory'
 
           def call(env:, url:, username:, password:, directory:, **)
+            Check.init?
             config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : Array.new
             section = config.find { |option| option['section'] == 'remotes' }
             remote = { env: env, url: url, username: username, password: password, directory: directory }

data/lib/organo/commands/remote/remote_download.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'net/ftp'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -6,14 +9,15 @@ module Organo
       module Remote
 
         class Download < Dry::CLI::Command
-          desc "Download data from website"
-          argument :env, type: :string, required: true, desc: "Environment"
+          desc 'Download data from website'
+          argument :env, type: :string, required: true, desc: 'Environment'
 
           def call(env:, **)
+            Check.init?
             config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : nil
             section = config.find { |option| option['section'] == 'remotes' }
             if section.nil?
-              puts "No remote is configured in the configuration file"
+              puts 'No remote is configured in the configuration file'
             else
               credentials = section['entries'].find { |entry| entry['env'] == env }
               if credentials.nil?

data/lib/organo/commands/remote/remote_remove.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -6,17 +9,18 @@ module Organo
       module Remote
 
         class Remove < Dry::CLI::Command
-          desc "Remove remote FTP server from config file"
-          argument :env, type: :string, required: true, desc: "Remote environment name"
+          desc 'Remove remote FTP server from config file'
+          argument :env, type: :string, required: true, desc: 'Remote environment name'
 
           def call(env:, **)
+            Check.init?
             config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : nil
             unless config.nil?
               section = config.find { |option| option['section'] == 'remotes' }
-              unless section.nil?
+              if !section.nil?
                 index = section['entries'].find_index { |entry| entry['env'] == env }
                 if index.nil?
-                  puts "Specified environment does not exist"
+                  puts 'Specified environment does not exist'
                 elsif !section['entries'].delete_at(index).nil?
                   puts "Removed \"#{env}\" entry"
                 end

data/lib/organo/commands/remote/remote_upload.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'net/ftp'
+require_relative '../../tools/check'
 
 module Organo
   module CLI
@@ -6,14 +9,15 @@ module Organo
       module Remote
 
         class Upload < Dry::CLI::Command
-          desc "Upload data to the website FTP"
-          argument :env, type: :string, required: true, desc: "Environment"
+          desc 'Upload data to the website FTP'
+          argument :env, type: :string, required: true, desc: 'Environment'
 
           def call(env:, **)
+            Check.init?
             config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : nil
             section = config.find { |option| option['section'] == 'remotes' }
             if section.nil?
-              puts "No remote is configured in the configuration file"
+              puts 'No remote is configured in the configuration file'
             else
               credentials = section['entries'].find { |entry| entry['env'] == env }
               if credentials.nil?

data/lib/organo/commands/statistics.rb

@@ -1,23 +1,34 @@
-require_relative '../reader'
+# frozen_string_literal: true
+
+require_relative '../tools/reader'
+require_relative '../tools/check'
 
 module Organo
   module CLI
     module Commands
 
       class Statistics < Dry::CLI::Command
-        desc "Merge edited seasonal files into one main file"
+        desc 'Merge edited seasonal files into one main file'
 
         def call(*)
-          i = 0
+          Check.init?
+          shows_num = 0
           total_size = 0
+          sequels_num = 0
           Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
             shows = Reader.read_file(file_path)
             file_size = File.size(file_path)
-            puts "#{File.basename(file_path)}: #{shows.count} (#{file_size} b)"
-            i += shows.count
+            puts "#{File.basename(file_path)}: #{shows.count} (#{file_size.to_f / 1000} KB)"
+            shows_num += shows.count
+            shows.each do |show|
+              sequels_num += show.sequels.size
+            end
             total_size += file_size
           end
-          puts "Total count: #{i} (#{total_size} o)"
+          puts '------------------------------'
+          puts "Shows count: #{shows_num}"
+          puts "Sequels count: #{sequels_num}"
+          puts "Total file size: #{total_size.to_f / 1000} KB"
         end
       end
 

data/lib/organo/commands/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative '../version'
 
 module Organo
   module CLI
     module Commands
       class Version < Dry::CLI::Command
-        desc "Print version"
+        desc 'Print version'
 
         def call(*)
           puts Organo::VERSION

data/lib/organo/query.rb

@@ -2,7 +2,7 @@
 
 require_relative 'jikan_api'
 require_relative 'request'
-require_relative 'search_show'
+require_relative 'model/search_show'
 
 module Organo
   class Query

data/lib/organo/show_list.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require_relative 'search_show'
-require_relative 'sequel'
+require_relative 'model/search_show'
+require_relative 'model/sequel'
 require_relative 'query'
 
 module Organo

data/lib/organo/tools/check.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Organo
+  class Check
+    def self.init?
+      unless Dir.exist?('.organo')
+        puts "Directory is not initialized.\nYou can initialize the current directory with the following command:\n$ organo init"
+        exit
+      end
+    end
+  end
+end

data/lib/organo/tools/local_search.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require_relative '../reader'
+require_relative 'reader'
 
 module Organo
   class LocalSearch

data/lib/organo/{reader.rb → tools/reader.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require_relative 'config'
-require_relative 'show'
+require_relative '../config'
+require_relative '../model/show'
 
 module Organo
   class Reader

data/lib/organo/version.rb

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

data/lib/organo.rb

@@ -30,38 +30,33 @@ module Organo
 
       register 'version', Version, aliases: %w[v -v --version]
       register 'init', Init
-
-      if Dir.exist?('.organo')
-        register 'anime' do |prefix|
-          prefix.register 'add', Anime::Add::AnimeEntry
-          prefix.register 'add sequel', Anime::Add::SequelEntry
-          prefix.register 'remove', Anime::Remove
-          prefix.register 'show', Anime::Show
-          prefix.register 'search', Anime::Search
-          prefix.register 'update image', Anime::Update::Image
-          prefix.register 'update search_query', Anime::Update::SearchQuery
-          prefix.register 'get broken_links', Anime::Get::BrokenLinks
-        end
-        register 'api' do |prefix|
-          prefix.register 'get anime', API::Get::Anime
-          prefix.register 'get season', API::Get::Season
-          prefix.register 'get sequels', API::Get::Sequels
-          prefix.register 'search anime', API::Search::Anime
-          prefix.register 'get schedule', API::Get::Schedule
-        end
-        register 'merge', Merge
-        register 'statistics', Statistics
-        register 'remote' do |prefix|
-          prefix.register 'add', Remote::Add
-          prefix.register 'remove', Remote::Remove
-          prefix.register 'download', Remote::Download
-          prefix.register 'upload', Remote::Upload
-        end
-        register 'schedule' do |prefix|
-          prefix.register 'create', Schedule::Create
-        end
-      else
-        puts 'This directory has not been initialized.'
+      register 'anime' do |prefix|
+        prefix.register 'add', Anime::Add::AnimeEntry
+        prefix.register 'add sequel', Anime::Add::SequelEntry
+        prefix.register 'remove', Anime::Remove
+        prefix.register 'show', Anime::Show
+        prefix.register 'search', Anime::Search
+        prefix.register 'update image', Anime::Update::Image
+        prefix.register 'update search_query', Anime::Update::SearchQuery
+        prefix.register 'get broken_links', Anime::Get::BrokenLinks
+      end
+      register 'api' do |prefix|
+        prefix.register 'get anime', API::Get::Anime
+        prefix.register 'get season', API::Get::Season
+        prefix.register 'get sequels', API::Get::Sequels
+        prefix.register 'search anime', API::Search::Anime
+        prefix.register 'get schedule', API::Get::Schedule
+      end
+      register 'merge', Merge
+      register 'statistics', Statistics
+      register 'remote' do |prefix|
+        prefix.register 'add', Remote::Add
+        prefix.register 'remove', Remote::Remove
+        prefix.register 'download', Remote::Download
+        prefix.register 'upload', Remote::Upload
+      end
+      register 'schedule' do |prefix|
+        prefix.register 'create', Schedule::Create
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -110,16 +110,17 @@ files:
 - lib/organo/commands/version.rb
 - lib/organo/config.rb
 - lib/organo/jikan_api.rb
+- lib/organo/model/search_show.rb
+- lib/organo/model/sequel.rb
+- lib/organo/model/show.rb
 - lib/organo/query.rb
-- lib/organo/reader.rb
 - lib/organo/request.rb
-- lib/organo/search_show.rb
-- lib/organo/sequel.rb
-- lib/organo/show.rb
 - lib/organo/show_list.rb
+- lib/organo/tools/check.rb
 - lib/organo/tools/local_search.rb
+- lib/organo/tools/reader.rb
+- lib/organo/tools/writer.rb
 - lib/organo/version.rb
-- lib/organo/writer.rb
 homepage: https://gitlab.com/dkb-weeblets/organo
 licenses:
 - MIT