organo 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7145d1efb8ac5804c2c0d786c2854dd9d92b209fceb33ca02192ae86fe0e65a
-  data.tar.gz: 77ff5845dd17c7ec583cbe5dace3833e52c3ca02e3d36b1b479d2140a97d908e
+  metadata.gz: 1babd85ffac4bb77177ade8a0a7f568ef67715df76d4ec2bf224ce016a973ba1
+  data.tar.gz: 967d6eafa28f342d82032a70a8452595239f01deb43525c211c56bba6f7ee6d8
 SHA512:
-  metadata.gz: 03c4f273847259ab1af9319ec390df5badfdcf448a9208bb20992b5e1b3d8d06bd7a22580a1c54bdd7268e0595825d560ae9269bf8556b1c9178967e03aa9a26
-  data.tar.gz: 5003d8cbac8a154dbcb57c2698504b86faef172a705d20b9d070f786a70c0ac53013e7ac5e24dac9699fec73808bcc244e1721531a43a47d5364459f3560213e
+  metadata.gz: 8f7a73df4cdb8163e61a720434693a2411500d087bc4da5fcddd61c4e7272ae0c65aee956b640a79afeba3bc96c3045f97f0a476d037d584e1632036ddc0298b
+  data.tar.gz: 7331b6d1abf07bf24d521efd5babcc552f38d9df151108c731f4a0b1c8035c729b7267ecbe43ae4e433b1ccb65d8d90c3424017e7fed4ffedd63dff04cb535ce

data/doc/anime.md

@@ -2,27 +2,49 @@
 
 ## add
 
-Add anime entry to files.
+Add anime entry to database.
 ```shell
 organo anime add MAL_ID
 ```
 
-## add sequel
+## set_sequel
 
-Add anime sequel entry to anime in file.
+Sets anime as sequel and creates a sequel entry to database.
 ```shell
-organo anime add sequel ANIME_MAL_ID SEQUEL_MAL_ID
+organo anime set_sequel PARENT_MAL_ID CHILD_MAL_ID
 ```
 
-## get broken_links
+## find_broken_links
 
 Get list of anime IDs that have broken links.
 ```shell
-organo anime get broken_links
+organo anime find_broken_links
 ```
 
 ## remove
-## search
+
+Remove anime entry from database.
+```shell
+organo anime remove MAL_ID
+```
+
 ## show
+
+Shows anime database entry in console.
+```shell
+organo anime show MAL_ID
+```
+
 ## update image
-## update query
+
+Updates the `img_url` column of one or more anime to URL from the API.
+```shell
+organo anime update image MAL_ID [...]
+```
+
+## update query
+
+Updates the `search_query` column of anime to specified string.
+```shell
+organo anime update query MAL_ID SEARCH_QUERY
+```

data/doc/readme.md

@@ -3,9 +3,9 @@
 The tool is broken into 4 main subcommands.
 
 - [Anime](anime.md)
-  - Manage and browse the local data files.
+  - Manage and browse the database.
 - [API](api.md)
-  - Get data from Jikan API.
+  - Get data from APIs.
 - [Remote](remote.md)
   - Add FTP remote information to push the data to the website.
 - [Schedule](schedule.md)

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

@@ -1,35 +1,40 @@
-require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
-require_relative '../../tools/local_search'
+# frozen_string_literal: true
+
+require_relative '../../query'
+require_relative '../../tools/string_utils'
+require 'sequel'
 
 module Organo
   module CLI
     module Commands
       module Anime
-        module Add
 
-          class AnimeEntry < Dry::CLI::Command
-            desc 'Add anime entry to files'
-            argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
+        class AddEntry < Dry::CLI::Command
+          desc 'Add anime entry'
+          argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
-            def call(mal_id:, **)
-              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}) in #{file_path}"
-              else
-                puts 'Cannot add an already existing anime'
-              end
+          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
           end
-
         end
+
       end
     end
   end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'httparty'
+require 'sequel'
+
+module Organo
+  module CLI
+    module Commands
+      module Anime
+
+        class FindBrokenLinks < Dry::CLI::Command
+          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
+            puts broken_list.join(' ') unless broken_list.empty?
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,24 +1,24 @@
-require_relative '../../config'
+# frozen_string_literal: true
+
+require 'sequel'
 
 module Organo
   module CLI
     module Commands
       module Anime
-
-        class Remove < Dry::CLI::Command
+        class RemoveEntry < Dry::CLI::Command
           desc 'Remove anime entry from files'
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
-            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 }
-              next unless show_index >= 0
-
-              show = shows_list.delete_at(show_index)
-              Writer.to_file(shows_list, file_path)
-              puts "Removed anime \"#{show.title}\" (#{mal_id})"
-              break
+            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
           end
         end

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

@@ -0,0 +1,49 @@
+# 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_show.rb

@@ -1,26 +1,24 @@
-require_relative '../../config'
+# frozen_string_literal: true
+
+require 'sequel'
 
 module Organo
   module CLI
     module Commands
       module Anime
 
-        class Show < Dry::CLI::Command
-          desc 'Show anime entry from files'
+        class ShowEntry < Dry::CLI::Command
+          desc 'Show anime entry'
           argument :mal_id, type: :integer, required: true, desc: 'MyAnimeList ID'
 
           def call(mal_id:, **)
-            found = false
-            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 }
-              next if show.nil?
-
-              found = true
-              puts show.to_json
-              break
+            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
-            puts 'Entry not found.' unless found
           end
         end
 

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

@@ -1,48 +1,33 @@
-require_relative '../../config'
+# frozen_string_literal: true
+
+require 'sequel'
 require_relative '../../query'
-require_relative '../../writer'
-require_relative '../../reader'
 
 module Organo
   module CLI
     module Commands
       module Anime
-        module Update
-
-          class Image < Dry::CLI::Command
-            desc 'Update cover image for the specified anime'
-            argument :mal_id_list, type: :array, required: true, desc: 'MyAnimeList ID list'
 
-            def call(mal_id_list:, **)
-              found = false
-              Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
-                shows_list = Reader.read_file(file_path)
-                mal_id_list.each_with_index do |mal_id, index|
-                  show = shows_list.find { |s| s.id.to_s == mal_id.to_s }
-                  if show.nil?
-                    shows_list.each do |s|
-                      show = s.sequels.find { |ss| ss['id'].to_s == mal_id.to_s }
-                    end
-                  end
-                  next if show.nil?
+        class UpdateImage < Dry::CLI::Command
+          desc 'Update cover image for the specified anime'
+          argument :mal_id_list, type: :array, required: true, desc: 'MyAnimeList ID list'
 
-                  found = true
-                  if show.is_a?(Hash)
-                    show['image_url'] = Query.get_anime_image(show['id'])
-                    # puts show['image_url']
-                  else
-                    show.image_url = Query.get_anime_image(show.id)
-                    # puts show.image_url
-                  end
-                  Writer.to_file(shows_list, file_path)
-                  sleep(1) if mal_id_list.size > 1 && index < (mal_id.size - 1)
-                end
+          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
-              puts found ? 'Cover image(s) has been updated.' : 'Entry not found.'
             end
           end
-
         end
+
       end
     end
   end

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

@@ -1,32 +1,31 @@
-require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
+# frozen_string_literal: true
+
+require 'sequel'
 
 module Organo
   module CLI
     module Commands
       module Anime
-        module Update
-
-          class SearchQuery < 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:, **)
-              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 }
-                next if show.nil?
+        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'
 
-                show.search_query = search_query
-                Writer.to_file(shows_list, file_path)
-                puts 'Search query has been updated.'
-              end
+          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

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
-require_relative '../../show_list'
 
 module Organo
   module CLI
@@ -8,13 +9,11 @@ module Organo
         module Get
 
           class Anime < Dry::CLI::Command
-            desc "Get anime with specific ID from API"
-            argument :mal_id, type: :integer, required: true, desc: "MyAnimeList ID"
+            desc 'Get anime with specific ID from API'
+            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'])
-              puts show.to_json
+              puts Query.get_anime_by_id(mal_id)
             end
           end
 

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
-require_relative '../../show_list'
 
 module Organo
   module CLI
@@ -8,14 +9,12 @@ 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)
-              show_list = ShowList.create_search_show_list(json_obj)
-              puts show_list.to_json
+              puts Query.get_anime_season(season, year)
             end
           end
 

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require_relative '../../query'
-require_relative '../../show_list'
 
 module Organo
   module CLI
@@ -8,12 +9,11 @@ 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))
-              puts sequels.to_json
+              puts Query.get_anime_sequel(mal_id)
             end
           end
 

data/lib/organo/commands/init.rb

@@ -1,19 +1,43 @@
+# frozen_string_literal: true
+
+require 'sequel'
+
 module Organo
   module CLI
     module Commands
 
       class Init < Dry::CLI::Command
-        desc "Initialize directory with default files and directories"
+        desc 'Initialize database'
 
         def call(*)
           Dir.mkdir './.organo' unless File.exist?('./.organo')
-          Dir.mkdir './.organo/datafiles' unless File.exist?('./.organo/datafiles')
-          File.write(
-            './shows.config.json',
-            '{"last_id":0,"schema":{"id":"integer","slug":"string","title":"string",' \
-            '"image_url":"string","sequels":"string","search_query":"string"}}'
-          )
-          puts 'Initialized organo directory'
+
+          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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
 
 module Organo
@@ -5,28 +7,26 @@ module Organo
     module Commands
       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"
+        class AddEntry < 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'
 
           def call(env:, url:, username:, password:, directory:, **)
-            config = File.exist?(Config::DEFAULT_FILE) ? JSON.parse(File.read(Config::DEFAULT_FILE)) : Array.new
+            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: []}
+              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
-              if section['entries'].find { |entry| entry['env'] == env }.nil?
-                section['entries'].push(remote)
-              else
-                puts 'Environment name is already used'
-              end
+              puts 'Environment name is already used'
             end
             File.write(Config::DEFAULT_FILE, JSON.pretty_generate(config))
           end

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

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'net/ftp'
+require_relative '../../config'
 
 module Organo
   module CLI
@@ -6,14 +9,14 @@ 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:, **)
             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?
@@ -22,11 +25,11 @@ module Organo
                 Net::FTP.open(credentials['url']) do |ftp|
                   ftp.login(credentials['username'], credentials['password'])
                   ftp.chdir(credentials['directory'])
-                  if File.exist?('shows.data.json')
-                    File.delete('shows.data.json.old') if File.exist?('shows.data.json.old')
-                    File.rename('shows.data.json', 'shows.data.json.old')
+                  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')
                   end
-                  ftp.getbinaryfile('shows.data.json')
+                  ftp.getbinaryfile('dkb_edited.db')
                 end
               end
             end