organo 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70b5a09a3a28bf6f802fd6a0be5026afc63013a9243242330595367d2577f4e
-  data.tar.gz: ea99ab4c465f05869b40d13b6a36df11fdf4d89eb477495a211c5f404b0cd59e
+  metadata.gz: 60bfda0078d17b33a65c93c0ce7204328fd10e55cdb64d699c03a8b5a4ab8c81
+  data.tar.gz: 5742128565877f12aa6b6b211179d79840d2b05a8858aaeda009113bd39634d5
 SHA512:
-  metadata.gz: 3ec4a7eb0cdefc58c92a44b15472a60e138c846ca27730f553ec48dc304fca6fc554d2ea5632ad6482d8e9789b73cd0fbc5ec1dc9f0f3e2c919703e894752d32
-  data.tar.gz: 8ad3e6dc015be8e8d790755b99df1a95c04327150be9dea253d0018720345e7a97c2198f34e7e0d6d452bc56a2e88e01994458b3db0d87d485adaf36a1228911
+  metadata.gz: 97934394e6a32b27014db664f8f49dab8edab63b6bec65d38a49cc47bf5ad3c598c93d33aa50ce591d11677a7bfdb48b07d9c97e83cd1c773036e135bf6053eb
+  data.tar.gz: 5a958e6cb4cc9db14f4fa612b395ed98959a6ccec21955d5aa0cd8b039e0dd62fe156ec87b9fb09ad93aa8e90f2d913dff76c9ddd2efd9efc84af237621e956e

data/doc/anime.md

@@ -46,5 +46,5 @@ organo anime update image MAL_ID [...]
 
 Updates the `search_query` column of anime to specified string.
 ```shell
-organo anime update query MAL_ID SEARCH_QUERY
+organo anime update search_query MAL_ID SEARCH_QUERY
 ```

data/lib/organo/anime_database.rb

@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require 'sequel'
+require 'httparty'
+require_relative 'query'
+require_relative 'tools/writer'
+require_relative 'tools/string_utils'
+
+module Organo
+  class AnimeDatabase
+    private_class_method :new
+
+    def self.instance
+      @instance.nil? ? new : @instance
+    end
+
+    def initialize
+      @database = Sequel.sqlite(Config::DATABASE_FILE)
+
+      unless @database.table_exists?(:shows)
+        @database.create_table(:shows) do
+          Integer :mal_id
+          String :slug, unique: true, null: true
+          String :title
+          String :img_url
+          String :search_query, null: true
+          Boolean :is_sequel
+          primary_key %i[mal_id]
+        end
+      end
+
+      unless @database.table_exists?(:sequels)
+        @database.create_table(:sequels) do
+          Integer :parent_id
+          Integer :child_id
+          String :type, default: 'season'
+          Integer :type_num, default: 0
+          String :subtype, default: ''
+          Integer :subtype_num, default: 0
+          Integer :subtype_selector, default: -1
+          primary_key %i[parent_id child_id]
+        end
+      end
+    end
+
+    ##
+    # Get database entry of show using the specified MyAnimeList ID
+    def anime_show(mal_id)
+      show_by_id(mal_id).first
+    end
+
+    ##
+    # Adds show entry to the database using the specified MyAnimeList ID
+    def anime_add(mal_id)
+      show = show_by_id(mal_id).first
+      if show.nil?
+        show_json = Query.get_anime_by_id(mal_id)
+        @database.transaction do
+          @database.after_commit do
+            puts 'Added show to the database.'
+          end
+          @database.after_rollback do
+            puts 'An error occurred. No change was made.'
+          end
+          @database.from(:shows).insert(
+            mal_id: show_json['mal_id'].to_i,
+            slug: generate_unique_slug(show_json['title']),
+            title: show_json['title'],
+            img_url: show_json['images']['jpg']['image_url'],
+            search_query: show_json['title'].gsub(':', ' -'),
+            is_sequel: false
+          )
+        end
+      else
+        puts 'This show already exists in the database.'
+      end
+      show_by_id(mal_id).first
+    end
+
+    ##
+    # Removes show entry from the database using the specified MyAnimeList ID
+    def anime_remove(mal_id)
+      show = show_by_id(mal_id).first
+      if show.nil?
+        puts 'This show doesn\'t exist in the database.'
+      else
+        @database.transaction do
+          show_by_id(mal_id).delete
+          puts 'The show was removed from the database.'
+        end
+      end
+      show
+    end
+
+    ##
+    # Edits anime entry with specified params
+    def anime_update(mal_id, params)
+      anime = show_by_id(mal_id)
+
+      if anime.first.nil?
+        puts "Specified show doesn't exist."
+      elsif params.empty?
+        puts 'No change was made.'
+      else
+        @database.transaction do
+          @database.after_commit do
+            puts 'Show values changed.'
+          end
+          @database.after_rollback do
+            puts 'An error occurred. No change was made.'
+          end
+          anime.update(params)
+        end
+      end
+      anime
+    end
+
+    def anime_update_image(mal_id_list)
+      mal_id_list.each do |mal_id|
+        show = show_by_id(mal_id)
+        api_image = Query.get_anime_image(mal_id)
+        if show.count.positive?
+          show.update(img_url: api_image)
+          puts 'Updated image.'
+          puts show.first
+        else
+          puts "MAL ID #{mal_id} doesn't exist in the database."
+        end
+      end
+    end
+
+    def anime_find_broken_links
+      shows = @database.from(:shows)
+      broken_list = []
+      shows.each do |show|
+        response = HTTParty.get(show[:img_url])
+        next unless response.code == 404
+
+        broken_list.push(show[:mal_id])
+      end
+      broken_list
+    end
+
+    ##
+    # Adds sequel entry for parent and child show
+    def sequel_set(parent_id, child_id, type, type_num, subtype, subtype_num, subtype_selector)
+      parent_show = show_by_id(parent_id)
+      child_show = show_by_id(child_id)
+      if !parent_show.first.nil? && !child_show.first.nil?
+        if @database.from(:sequels).where(parent_id: child_id).count.zero?
+          @database.from(:sequels).insert(
+            parent_id: parent_id,
+            child_id: child_id,
+            type: type,
+            type_num: type_num,
+            subtype: subtype,
+            subtype_num: subtype_num,
+            subtype_selector: subtype_selector
+          )
+          child_show.update(slug: nil, is_sequel: true)
+          puts 'Added sequel to the database.'
+        else
+          puts "Can't add sequel to database."
+          puts "#{child_show.first[:title]}(#{child_show.first[:mal_id]}) is already a parent for sequels."
+        end
+      else
+        puts "Can't add sequel to database."
+        puts "Parent MAL_ID #{parent_id} doesn't exist in the database." if parent_show.first.nil?
+        puts "Child MAL_ID #{child_id} doesn't exist in the database." if child_show.first.nil?
+      end
+      sequel_by_id(parent_id, child_id)
+    end
+
+    ##
+    # Edits sequel entry with specified params
+    def sequel_update(parent_id, child_id, params)
+      sequel = sequel_by_id(parent_id, child_id)
+
+      if sequel.first.nil?
+        puts "Specified sequel doesn't exist."
+      elsif params.empty?
+        puts 'No change was made.'
+      else
+        @database.transaction do
+          @database.after_commit do
+            puts 'Sequel values changed.'
+          end
+          @database.after_rollback do
+            puts 'An error occurred. No change was made.'
+          end
+          sequel.update(params)
+        end
+      end
+      sequel
+    end
+
+    ##
+    # Removes sequel entry from database
+    def sequel_remove(parent_id, child_id)
+      sequel = sequel_by_id(parent_id, child_id)
+      if sequel.first.nil?
+        puts "Specified sequel doesn't exist."
+      else
+        @database.transaction do
+          @database.after_commit do
+            puts 'Sequel entry was removed.'
+          end
+          @database.after_rollback do
+            puts 'An error occurred. No change was made.'
+          end
+          child_show = show_by_id(sequel.first[:child_id])
+          child_show.update(
+            slug: generate_unique_slug(child_show.first[:title]),
+            is_sequel: false
+          )
+          sequel.delete
+        end
+      end
+      sequel
+    end
+
+    def statistics
+      puts "Total show count: #{@database.from(:shows).count}"
+      puts "Non-sequel show count #{@database.from(:shows).where(is_sequel: false).count}"
+      puts "Sequel show count: #{@database.from(:sequels).count}"
+    end
+
+    private
+
+    def generate_unique_slug(title)
+      slug = StringUtils.create_slug(title)
+      slug_results_size = shows_by_slug(slug).count
+      slug += "-#{slug_results_size + 1}" if slug_results_size.positive?
+      slug
+    end
+
+    def show_by_id(mal_id)
+      @database.from(:shows).where(mal_id: mal_id)
+    end
+
+    def shows_by_slug(slug)
+      @database.from(:shows).where(slug: slug)
+    end
+
+    def sequel_by_id(parent_id, child_id)
+      @database.from(:sequels).where(parent_id: parent_id, child_id: child_id)
+    end
+
+    def sequels_by_parent_id(parent_id)
+      @database.from(:sequels).where(parent_id: parent_id)
+    end
+  end
+end

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

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../query'
-require_relative '../../tools/string_utils'
-require 'sequel'
+require_relative '../../anime_database'
 
 module Organo
   module CLI
@@ -14,27 +12,11 @@ module Organo
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
-            db = Sequel.sqlite('./dkb_edited.db')
-            shows = db.from(:shows).where(mal_id: mal_id)
-            if shows.count.zero?
-              show_json = Query.get_anime_by_id(mal_id)
-              db.from(:shows).insert(
-                mal_id: show_json['mal_id'].to_i,
-                slug: StringUtils.create_slug(show_json['title']),
-                title: show_json['title'],
-                img_url: show_json['images']['jpg']['image_url'],
-                search_query: show_json['title'].gsub(':', ' -'),
-                is_sequel: false
-              )
-              shows = db.from(:shows).where(mal_id: mal_id)
-              puts 'Show has been added to database'
-            else
-              puts 'This show already exists'
-            end
-            puts shows.first
+            anime = AnimeDatabase.instance.anime_add(mal_id)
+            puts (anime.nil? ? 'Could not add the specified show to the database.' : anime)
           end
-        end
 
+        end
       end
     end
   end

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'httparty'
-require 'sequel'
-
 module Organo
   module CLI
     module Commands
@@ -12,15 +9,7 @@ module Organo
           desc 'Get list of anime IDs that have broken links'
 
           def call(*)
-            db = Sequel.sqlite('dkb_edited.db')
-            shows = db.from(:shows)
-            broken_list = []
-            shows.each do |show|
-              response = HTTParty.get(show[:img_url])
-              next unless response.code == 404
-
-              broken_list.push(show[:mal_id])
-            end
+            broken_list = AnimeDatabase.instance.anime_find_broken_links
             puts broken_list.join(' ') unless broken_list.empty?
           end
         end

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

@@ -1,25 +1,18 @@
 # frozen_string_literal: true
 
-require 'sequel'
+require_relative '../../anime_database'
 
 module Organo
   module CLI
     module Commands
       module Anime
         class RemoveEntry < Dry::CLI::Command
-          desc 'Remove anime entry from files'
+          desc 'Remove anime entry from database'
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
-            db = Sequel.sqlite('./dkb_edited.db')
-            shows = db.from(:shows).where(mal_id: mal_id)
-            if shows.count.zero?
-              puts 'This show doesn\'t exist.'
-            else
-              puts 'Removed show.'
-              puts shows.first
-              shows.delete
-            end
+            anime = AnimeDatabase.instance.anime_remove(mal_id)
+            puts anime unless anime.nil?
           end
         end
 

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

@@ -12,13 +12,8 @@ module Organo
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
-            db = Sequel.sqlite('dkb_edited.db')
-            show = db.from(:shows).where(mal_id: mal_id)
-            if show.count.positive?
-              puts show.first
-            else
-              puts "ID #{mal_id} doesn't exist in the database."
-            end
+            anime = AnimeDatabase.instance.anime_show(mal_id)
+            puts (anime.nil? ? "MAL_ID #{mal_id} doesn't exist in the database." : anime)
           end
         end
 

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative '../../anime_database'
+
+module Organo
+  module CLI
+    module Commands
+      module Anime
+
+        class UpdateEntry < Dry::CLI::Command
+          desc 'Update anime entry'
+          argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
+          option :slug, type: :string, desc: 'Lowercase string for building website routes'
+          option :title, type: :string, desc: 'Title'
+          option :img_url, type: :string, desc: 'URL of the cover image'
+          option :search_query, type: :string, desc: 'Nyaa search query'
+
+          def call(mal_id:, **options)
+            anime = AnimeDatabase.instance.anime_update(mal_id, options)
+            puts anime.first unless anime.first.nil?
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -13,18 +13,7 @@ module Organo
           argument :mal_id_list, type: :array, required: true, desc: 'MyAnimeList ID list'
 
           def call(mal_id_list:, **)
-            db = Sequel.sqlite('dkb_edited.db')
-            mal_id_list.each do |mal_id|
-              show = db.from(:shows).where(mal_id: mal_id)
-              api_image = Query.get_anime_image(mal_id)
-              if show.count.positive?
-                show.update(img_url: api_image)
-                puts "Updated image of #{show.first[:title]} (#{mal_id})"
-                puts api_image
-              else
-                puts "ID #{mal_id} doesn't exist in the database."
-              end
-            end
+            AnimeDatabase.instance.anime_update_image(mal_id_list)
           end
         end
 

data/lib/organo/commands/init.rb

@@ -1,43 +1,14 @@
 # frozen_string_literal: true
 
-require 'sequel'
-
 module Organo
   module CLI
     module Commands
 
       class Init < Dry::CLI::Command
-        desc 'Initialize database'
+        desc 'Initialize organo directory'
 
         def call(*)
           Dir.mkdir './.organo' unless File.exist?('./.organo')
-
-          db = Sequel.sqlite('dkb_edited.db')
-          unless db.table_exists?(:shows)
-            db.create_table(:shows) do
-              Integer :mal_id
-              String :slug, unique: true, null: true
-              String :title
-              String :img_url
-              String :search_query, null: true
-              Boolean :is_sequel
-              primary_key %i[mal_id]
-            end
-          end
-
-          unless db.table_exists?(:sequels)
-            db.create_table(:sequels) do
-              Integer :parent_id
-              Integer :child_id
-              String :type, default: 'season'
-              Integer :type_num, default: 0
-              String :subtype, default: ''
-              Integer :subtype_num, default: 0
-              Integer :subtype_selector, default: -1
-              primary_key %i[parent_id child_id]
-            end
-          end
-
         end
       end
 

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

@@ -16,19 +16,27 @@ module Organo
           option :directory, type: :string, default: '', desc: 'FTP directory'
 
           def call(env:, url:, username:, password:, directory:, **)
-            config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : []
-            section = config.find { |option| option['section'] == 'remotes' }
-            remote = { env: env, url: url, username: username, password: password, directory: directory }
-            if section.nil?
-              section = { section: 'remotes', entries: [] }
-              config.push(section)
-              section[:entries].push(remote)
-            elsif section['entries'].find { |entry| entry['env'] == env }.nil?
-              section['entries'].push(remote)
+            if File.exist?('./.organo')
+              config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : []
+              section = config.find { |option| option['section'] == 'remotes' }
+              remote = {
+                env: env, url: url, username: username, password: password,
+                directory: directory, database_filename: Config::DATABASE_FILE
+              }
+              if section.nil?
+                section = { section: 'remotes', entries: [] }
+                config.push(section)
+                section[:entries].push(remote)
+              elsif section['entries'].find { |entry| entry['env'] == env }.nil?
+                section['entries'].push(remote)
+              else
+                puts 'Environment name is already used'
+              end
+              File.write(Config::DEFAULT_FILE, JSON.pretty_generate(config))
             else
-              puts 'Environment name is already used'
+              puts 'This directory is not initialized.'
+              puts 'Run command `organo init` to create the configuration directory.'
             end
-            File.write(Config::DEFAULT_FILE, JSON.pretty_generate(config))
           end
         end
 

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

@@ -13,25 +13,30 @@ module Organo
           argument :env, type: :string, required: true, desc: 'Environment'
 
           def call(env:, **)
-            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'
-            else
-              credentials = section['entries'].find { |entry| entry['env'] == env }
-              if credentials.nil?
-                puts 'Could not find the specified environment'
+            if File.exist?('./.organo')
+              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'
               else
-                Net::FTP.open(credentials['url']) do |ftp|
-                  ftp.login(credentials['username'], credentials['password'])
-                  ftp.chdir(credentials['directory'])
-                  if File.exist?('dkb_edited.db')
-                    File.delete('dkb_edited.db.old') if File.exist?('dkb_edited.db.old')
-                    File.rename('dkb_edited.db', 'dkb_edited.db.old')
+                credentials = section['entries'].find { |entry| entry['env'] == env }
+                if credentials.nil?
+                  puts 'Could not find the specified environment'
+                else
+                  Net::FTP.open(credentials['url']) do |ftp|
+                    ftp.login(credentials['username'], credentials['password'])
+                    ftp.chdir(credentials['directory'])
+                    if File.exist?(Config::DATABASE_FILE)
+                      File.delete("#{Config::DATABASE_FILE}.old") if File.exist?("#{Config::DATABASE_FILE}.old")
+                      File.rename(Config::DATABASE_FILE, "#{Config::DATABASE_FILE}.old")
+                    end
+                    ftp.getbinaryfile(credentials['database_filename'], Config::DATABASE_FILE)
                   end
-                  ftp.getbinaryfile('dkb_edited.db')
                 end
               end
+            else
+              puts 'This directory is not initialized.'
+              puts 'Run command `organo init` to create the configuration directory.'
             end
           rescue Net::FTPPermError
             puts 'Login to FTP server failed.'

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

@@ -12,21 +12,26 @@ module Organo
           argument :env, type: :string, required: true, desc: 'Remote environment name'
 
           def call(env:, **)
-            config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : nil
-            unless config.nil?
-              section = config.find { |option| option['section'] == 'remotes' }
-              if !section.nil?
-                index = section['entries'].find_index { |entry| entry['env'] == env }
-                if index.nil?
-                  puts 'Specified environment does not exist'
-                elsif !section['entries'].delete_at(index).nil?
-                  puts "Removed \"#{env}\" entry"
+            if File.exist?('./.organo')
+              config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : nil
+              unless config.nil?
+                section = config.find { |option| option['section'] == 'remotes' }
+                if !section.nil?
+                  index = section['entries'].find_index { |entry| entry['env'] == env }
+                  if index.nil?
+                    puts 'Specified environment does not exist'
+                  elsif !section['entries'].delete_at(index).nil?
+                    puts "Removed \"#{env}\" entry"
+                  end
+                else
+                  puts 'Configuration file does not have a remote'
                 end
-              else
-                puts 'Configuration file does not have a remote'
               end
+              File.write(Config::DEFAULT_FILE, JSON.pretty_generate(config))
+            else
+              puts 'This directory is not initialized.'
+              puts 'Run command `organo init` to create the configuration directory.'
             end
-            File.write(Config::DEFAULT_FILE, JSON.pretty_generate(config))
           end
         end
 

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

@@ -12,28 +12,28 @@ module Organo
           argument :env, type: :string, required: true, desc: 'Environment'
 
           def call(env:, **)
-            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'
-            else
-              credentials = section['entries'].find { |entry| entry['env'] == env }
-              if credentials.nil?
-                puts 'Could not find the specified environment'
+            if File.exist?('./.organo')
+              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'
               else
-                local_files = Dir['./*.{data,config}.json']
-                local_files.push('./schedule.json')
-                local_files.push('./dkb_edited.db')
-                Net::FTP.open(credentials['url']) do |ftp|
-                  ftp.login(credentials['username'], credentials['password'])
-                  ftp.chdir(credentials['directory'])
-                  local_files.each do |file_path|
-                    file_name = File.basename(file_path)
-                    puts "Uploading file: #{file_name}"
-                    ftp.putbinaryfile(file_name)
+                credentials = section['entries'].find { |entry| entry['env'] == env }
+                if credentials.nil?
+                  puts 'Could not find the specified environment'
+                else
+                  local_file = Config::DATABASE_FILE
+                  Net::FTP.open(credentials['url']) do |ftp|
+                    ftp.login(credentials['username'], credentials['password'])
+                    ftp.chdir(credentials['directory'])
+                    puts "Uploading file: #{local_file}"
+                    ftp.putbinaryfile(local_file, credentials['database_filename'])
                   end
                 end
               end
+            else
+              puts 'This directory is not initialized.'
+              puts 'Run command `organo init` to create the configuration directory.'
             end
           rescue Net::FTPPermError
             puts 'Login to FTP server failed.'

data/lib/organo/commands/sequel/sequel_remove.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative '../../anime_database'
+
+module Organo
+  module CLI
+    module Commands
+      module AnimeSequel
+
+        class RemoveEntry < Dry::CLI::Command
+          desc 'Remove sequel entry from database'
+          argument :parent_id, type: :integer, required: true, desc: 'Parent MyAnimeList ID'
+          argument :child_id, type: :integer, required: true, desc: 'Child MyAnimeList ID'
+
+          def call(parent_id:, child_id:, **)
+            sequel = AnimeDatabase.instance.sequel_remove(parent_id, child_id)
+            puts sequel.first unless sequel.first.nil?
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/organo/commands/sequel/sequel_set.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative '../../anime_database'
+
+module Organo
+  module CLI
+    module Commands
+      module AnimeSequel
+
+        class SetEntry < Dry::CLI::Command
+          desc 'Set show entry as sequel to another show'
+          argument :parent_id, type: :integer, required: true, desc: 'Anime MyAnimeList ID'
+          argument :child_id, type: :integer, required: true, desc: 'Sequel MyAnimeList ID'
+          argument :type, type: :string, required: false, default: 'season', values: %w[season movie ova], desc: 'Type of sequel (season, movie, ova)'
+          argument :type_num, type: :integer, required: false, default: 0, desc: 'The sequel type number'
+          argument :subtype, type: :string, required: false, default: '', values: %w[part special ova], desc: 'Type of sequel (part, special, ova)'
+          argument :subtype_num, type: :integer, required: false, default: 0, desc: 'The sequel subtype number'
+          argument :subtype_selector, type: :integer, required: false, default: -1, desc: 'The sequel subtype selector'
+
+          def call(parent_id:, child_id:, type:, type_num:, subtype:, subtype_num:, subtype_selector:, **)
+            sequel = AnimeDatabase.instance.sequel_set(parent_id, child_id, type, type_num, subtype, subtype_num, subtype_selector)
+            puts sequel.first unless sequel.first.nil?
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/organo/commands/sequel/sequel_update.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative '../../anime_database'
+
+module Organo
+  module CLI
+    module Commands
+      module AnimeSequel
+
+        class UpdateEntry < Dry::CLI::Command
+          desc 'Update sequel entry'
+          argument :parent_id, type: :integer, required: true, desc: 'Anime MyAnimeList ID'
+          argument :child_id, type: :integer, required: true, desc: 'Sequel MyAnimeList ID'
+          option :type, type: :string, values: %w[season movie ova], desc: 'Type of sequel (season, movie, ova)'
+          option :type_num, type: :integer, desc: 'The sequel type number'
+          option :subtype, type: :string, values: %w[part special ova], desc: 'Type of sequel (part, special, ova)'
+          option :subtype_num, type: :integer, desc: 'The sequel subtype number'
+          option :subtype_selector, type: :integer, desc: 'The sequel subtype selector'
+
+          def call(parent_id:, child_id:, **options)
+            sequel = AnimeDatabase.instance.sequel_update(parent_id, child_id, options)
+            puts sequel.first unless sequel.first.nil?
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/organo/commands/statistics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sequel'
+require_relative '../anime_database'
 
 module Organo
   module CLI
@@ -10,10 +10,7 @@ module Organo
         desc 'Get statistics from data'
 
         def call(*)
-          db = Sequel.sqlite('dkb_edited.db')
-          puts "Total show count: #{db.from(:shows).count}"
-          puts "Non-sequel show count #{db.from(:shows).where(is_sequel: false).count}"
-          puts "Sequel show count: #{db.from(:sequels).count}"
+          AnimeDatabase.instance.statistics
         end
       end
 

data/lib/organo/config.rb

@@ -3,6 +3,6 @@
 module Organo
   class Config
     DEFAULT_FILE = './.organo/config.json'
-    DEFAULT_DIR = './.organo/datafiles'
+    DATABASE_FILE = './organo.db'
   end
 end

data/lib/organo/version.rb

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

data/lib/organo.rb

@@ -8,10 +8,12 @@ require_relative 'organo/commands/statistics'
 require_relative 'organo/commands/anime/anime_show'
 require_relative 'organo/commands/anime/anime_add'
 require_relative 'organo/commands/anime/anime_remove'
-require_relative 'organo/commands/anime/anime_set_sequel'
 require_relative 'organo/commands/anime/anime_find_broken_links'
 require_relative 'organo/commands/anime/anime_update_image'
-require_relative 'organo/commands/anime/anime_update_query'
+require_relative 'organo/commands/anime/anime_update'
+require_relative 'organo/commands/sequel/sequel_set'
+require_relative 'organo/commands/sequel/sequel_remove'
+require_relative 'organo/commands/sequel/sequel_update'
 require_relative 'organo/commands/remote/remote_add'
 require_relative 'organo/commands/remote/remote_remove'
 require_relative 'organo/commands/remote/remote_download'
@@ -33,16 +35,20 @@ module Organo
       register 'anime show', Organo::CLI::Commands::Anime::ShowEntry
       register 'anime add', Organo::CLI::Commands::Anime::AddEntry
       register 'anime remove', Organo::CLI::Commands::Anime::RemoveEntry
-      register 'anime set_sequel', Organo::CLI::Commands::Anime::SequelEntry
       register 'anime find_broken_links', Organo::CLI::Commands::Anime::FindBrokenLinks
+      register 'anime update', Organo::CLI::Commands::Anime::UpdateEntry
       register 'anime update image', Organo::CLI::Commands::Anime::UpdateImage
-      register 'anime update search_query', Organo::CLI::Commands::Anime::UpdateSearchQuery
+
+      # Sequel commands
+      register 'sequel set', Organo::CLI::Commands::AnimeSequel::SetEntry
+      register 'sequel remove', Organo::CLI::Commands::AnimeSequel::RemoveEntry
+      register 'sequel update', Organo::CLI::Commands::AnimeSequel::UpdateEntry
 
       # Remote commands
       register 'remote add', Organo::CLI::Commands::Remote::AddEntry
       register 'remote remove', Organo::CLI::Commands::Remote::Remove
       register 'remote download', Organo::CLI::Commands::Remote::Download
-      register 'remote download', Organo::CLI::Commands::Remote::Upload
+      register 'remote upload', Organo::CLI::Commands::Remote::Upload
 
       # API commands
       register 'api get anime', Organo::CLI::Commands::API::Get::Anime

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -113,16 +113,14 @@ files:
 - doc/schedule.md
 - exe/organo
 - lib/organo.rb
-- lib/organo/animeschedule_api.rb
+- lib/organo/anime_database.rb
 - lib/organo/commands/anime/anime_add.rb
 - lib/organo/commands/anime/anime_find_broken_links.rb
 - lib/organo/commands/anime/anime_remove.rb
-- lib/organo/commands/anime/anime_set_sequel.rb
 - lib/organo/commands/anime/anime_show.rb
+- lib/organo/commands/anime/anime_update.rb
 - lib/organo/commands/anime/anime_update_image.rb
-- lib/organo/commands/anime/anime_update_query.rb
 - lib/organo/commands/api/api_get_anime.rb
-- lib/organo/commands/api/api_get_schedule.rb
 - lib/organo/commands/api/api_get_season.rb
 - lib/organo/commands/api/api_get_sequels.rb
 - lib/organo/commands/init.rb
@@ -130,7 +128,9 @@ files:
 - lib/organo/commands/remote/remote_download.rb
 - lib/organo/commands/remote/remote_remove.rb
 - lib/organo/commands/remote/remote_upload.rb
-- lib/organo/commands/schedule/schedule_create.rb
+- lib/organo/commands/sequel/sequel_remove.rb
+- lib/organo/commands/sequel/sequel_set.rb
+- lib/organo/commands/sequel/sequel_update.rb
 - lib/organo/commands/statistics.rb
 - lib/organo/commands/version.rb
 - lib/organo/config.rb

data/lib/organo/animeschedule_api.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Organo
-  class AnimeScheduleAPI
-    BASE_URL = 'https://animeschedule.net/api/'
-
-    def self.get_url(endpoint, api_version = 'v3', key = '')
-      "#{BASE_URL}#{api_version}/#{endpoint}"
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-require 'sequel'
-
-module Organo
-  module CLI
-    module Commands
-      module Anime
-
-        class SequelEntry < Dry::CLI::Command
-          desc 'Set show entry as sequel to another show'
-          argument :parent_id, type: :integer, required: true, desc: 'Anime MyAnimeList ID'
-          argument :child_id, type: :integer, required: true, desc: 'Sequel MyAnimeList ID'
-          argument :type, type: :string, required: false, default: 'season', values: %w[season movie ova], desc: 'Type of sequel (season, movie, ova)'
-          argument :type_num, type: :integer, required: false, default: 0, desc: 'The sequel type number'
-          argument :subtype, type: :string, required: false, default: '', values: %w[part special ova], desc: 'Type of sequel (part, special, ova)'
-          argument :subtype_num, type: :integer, required: false, default: 0, desc: 'The sequel subtype number'
-          argument :subtype_selector, type: :integer, required: false, default: -1, desc: 'The sequel subtype selector'
-
-          def call(parent_id:, child_id:, type:, type_num:, subtype:, subtype_num:, subtype_selector:, **)
-            db = Sequel.sqlite('dkb_edited.db')
-            parent_show = db.from(:shows).where(mal_id: parent_id)
-            child_show = db.from(:shows).where(mal_id: child_id)
-            if parent_show.count.positive? && child_show.count.positive?
-              if db.from(:sequels).where(parent_id: parent_id, child_id: child_id).count.positive?
-                puts 'This sequel entry already exist.'
-              else
-                db.from(:sequels).insert(
-                  parent_id: parent_id,
-                  child_id: child_id,
-                  type: type,
-                  type_num: type_num,
-                  subtype: subtype,
-                  subtype_num: subtype_num,
-                  subtype_selector: subtype_selector
-                )
-                child_show.update(is_sequel: true)
-                puts "#{child_show.first[:title]}(#{child_show.first[:mal_id]}) is now a sequel to #{parent_show.first[:title]}(#{parent_show.first[:mal_id]})"
-              end
-            else
-              puts "Parent or child show doesn't exist."
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'sequel'
-
-module Organo
-  module CLI
-    module Commands
-      module Anime
-
-        class UpdateSearchQuery < Dry::CLI::Command
-          desc 'Update search query for the specified anime'
-          argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
-          argument :search_query, type: :string, required: true, desc: 'String query for Nyaa Torrents search'
-
-          def call(mal_id:, search_query:, **)
-            db = Sequel.sqlite('dkb_edited.db')
-            show = db.from(:shows).where(mal_id: mal_id)
-            if show.count.positive?
-              old_query = show.first[:search_query]
-              show.update(search_query: search_query)
-              puts "Updated search query of #{show.first[:title]} (#{mal_id})"
-              puts "#{old_query} --> #{search_query}"
-            else
-              puts "ID #{mal_id} doesn't exist in the database."
-            end
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../config'
-require_relative '../../animeschedule_api'
-
-module Organo
-  module CLI
-    module Commands
-      module API
-        module Get
-
-          class Schedule < Dry::CLI::Command
-            desc 'Get anime release schedule of a specified 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:, **)
-              # Get the list of anime mal_id
-              # show_list = Reader.read_file("#{Config::DEFAULT_DIR}/#{year}-#{season.downcase}.json")
-
-              config = JSON.parse(File.read(Config::DEFAULT_FILE))
-              section = config.find { |option| option['section'] == 'api' }
-              key = (section['entries'].find { |entry| entry['name'] == 'AnimeSchedule' })['key']
-
-              count = 0
-              page = 1
-              total = 0
-              anime_list = []
-              loop do
-                data = JSON.parse(
-                  RestClient.get(
-                    "#{AnimeScheduleAPI.get_url('anime', 'v3')}?mt=all&years=#{year}&seasons=#{season}&media-types=tv&page=#{page}",
-                    { Authorization: "Bearer #{key}" }
-                  )
-                )
-                total = data['totalAmount'].to_i
-                page += 1
-                count += data['anime'].size
-                anime_list.concat(data['anime'])
-                break if count >= total
-              end
-
-              draft_schedule = []
-              anime_list.each do |anime|
-                air_time = DateTime.parse(anime['premier'])
-                draft_schedule.push(
-                  {
-                    slug: anime['route'],
-                    title: anime['title'],
-                    weekday: air_time.strftime('%A').downcase
-                  }
-                )
-              end
-
-              file = File.read('schedule.json')
-              schedule = JSON.parse(file)
-              schedule.each do |weekday|
-                draft_schedule.each do |anime|
-                  next unless anime[:weekday].eql? weekday['weekday']
-
-                  weekday['shows'].push(
-                    { slug: anime[:slug], title: anime[:title], time: '' }
-                  )
-                end
-              end
-              Writer.to_file(schedule, 'schedule.json')
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/organo/commands/schedule/schedule_create.rb

@@ -1,27 +0,0 @@
-require 'date'
-
-module Organo
-  module CLI
-    module Commands
-      module Schedule
-
-        class Create < Dry::CLI::Command
-          desc 'Initialize directory with default files and directories'
-
-          def call(*)
-            content = []
-            Date::DAYNAMES.each do |dname|
-              content.push({ 'weekday' => dname.downcase, 'shows' => [] } )
-            end
-            File.write(
-              './schedule.json',
-              JSON.pretty_generate(content)
-            )
-            puts 'Created the schedule'
-          end
-        end
-
-      end
-    end
-  end
-end