organo 0.3.4 → 0.4.1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../config'
 
 module Organo
@@ -6,17 +8,17 @@ 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:, **)
             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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/ftp'
 
 module Organo
@@ -6,14 +8,14 @@ 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:, **)
             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?
@@ -21,6 +23,7 @@ module Organo
               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'])

data/lib/organo/commands/statistics.rb

@@ -1,23 +1,19 @@
-require_relative '../reader'
+# frozen_string_literal: true
+
+require 'sequel'
 
 module Organo
   module CLI
     module Commands
 
       class Statistics < Dry::CLI::Command
-        desc "Merge edited seasonal files into one main file"
+        desc 'Get statistics from data'
 
         def call(*)
-          i = 0
-          total_size = 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
-            total_size += file_size
-          end
-          puts "Total count: #{i} (#{total_size} o)"
+          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}"
         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,6 @@
 
 require_relative 'jikan_api'
 require_relative 'request'
-require_relative 'search_show'
 
 module Organo
   class Query

data/lib/organo/tools/string_utils.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Organo
+  class StringUtils
+    def self.create_slug(title)
+      # strip the string
+      ret = title.strip
+
+      # blow away apostrophes
+      ret.gsub!(/['`]/, '')
+
+      # @ --> at, and & --> and
+      ret.gsub!(/\s*@\s*/, ' at ')
+      ret.gsub!(/\s*&\s*/, ' and ')
+
+      # replace all non alphanumeric with dash
+      ret.gsub!(/\s*[^A-Za-z0-9]\s*/, '-')
+
+      # convert double underscores to single
+      ret.gsub!(/-+/, '-')
+
+      # strip off leading/trailing dash
+      ret.gsub!(/\A-+|-+\z/, '')
+
+      ret.downcase
+    end
+  end
+end

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

@@ -4,11 +4,6 @@ require 'json'
 
 module Organo
   class Writer
-    def self.to_data_file(obj, file_name)
-      file_path = "./#{file_name}.data.json"
-      File.write(file_path, JSON.pretty_generate(obj))
-    end
-
     def self.to_file(obj, file_path)
       File.write(file_path, JSON.pretty_generate(obj))
     end

data/lib/organo/version.rb

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

data/lib/organo.rb

@@ -1,68 +1,54 @@
+# frozen_string_literal: true
+
 require 'dry/cli'
 
+require_relative 'organo/commands/version'
 require_relative 'organo/commands/init'
+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_add_sequel'
-require_relative 'organo/commands/anime/anime_get_broken_links'
 require_relative 'organo/commands/anime/anime_remove'
-require_relative 'organo/commands/anime/anime_show'
-require_relative 'organo/commands/anime/anime_search'
+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/api/api_get_anime'
-require_relative 'organo/commands/api/api_get_sequels'
-require_relative 'organo/commands/api/api_get_season'
-require_relative 'organo/commands/api/api_search_anime'
-require_relative 'organo/commands/api/api_get_schedule'
 require_relative 'organo/commands/remote/remote_add'
 require_relative 'organo/commands/remote/remote_remove'
 require_relative 'organo/commands/remote/remote_download'
 require_relative 'organo/commands/remote/remote_upload'
-require_relative 'organo/commands/merge'
-require_relative 'organo/commands/version'
-require_relative 'organo/commands/statistics'
-require_relative 'organo/commands/schedule/schedule_create'
+require_relative 'organo/commands/api/api_get_anime'
+require_relative 'organo/commands/api/api_get_season'
+require_relative 'organo/commands/api/api_get_sequels'
+require_relative 'organo/commands/api/api_search_anime'
 
 module Organo
   module CLI
     module Commands
       extend Dry::CLI::Registry
+      # Misc commands
+      register 'version', Organo::CLI::Commands::Version, aliases: %w[v -v --version]
+      register 'init', Organo::CLI::Commands::Init
+      register 'stats', Organo::CLI::Commands::Statistics
+
+      # Anime commands
+      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 image', Organo::CLI::Commands::Anime::UpdateImage
+      register 'anime update search_query', Organo::CLI::Commands::Anime::UpdateSearchQuery
 
-      register 'version', Version, aliases: %w[v -v --version]
-      register 'init', Init
+      # 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
 
-      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.'
-      end
+      # API commands
+      register 'api get anime', Organo::CLI::Commands::API::Get::Anime
+      register 'api get season', Organo::CLI::Commands::API::Get::Season
+      register 'api get sequels', Organo::CLI::Commands::API::Get::Sequels
     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.4.1
 platform: ruby
 authors:
 - Louis-Philippe Fortin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.74'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.74'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +94,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.44'
-description: Get JSON data from Jikan, an unofficial MyAnimeList API, that can be
-  used on an anime website
+description: Gets JSON data from different APIs to build a local database that can
+  be used in other applications
 email:
 - timemaster.lpf@gmail.com
 executables:
@@ -87,10 +115,9 @@ files:
 - lib/organo.rb
 - lib/organo/animeschedule_api.rb
 - lib/organo/commands/anime/anime_add.rb
-- lib/organo/commands/anime/anime_add_sequel.rb
-- lib/organo/commands/anime/anime_get_broken_links.rb
+- lib/organo/commands/anime/anime_find_broken_links.rb
 - lib/organo/commands/anime/anime_remove.rb
-- lib/organo/commands/anime/anime_search.rb
+- lib/organo/commands/anime/anime_set_sequel.rb
 - lib/organo/commands/anime/anime_show.rb
 - lib/organo/commands/anime/anime_update_image.rb
 - lib/organo/commands/anime/anime_update_query.rb
@@ -98,9 +125,7 @@ files:
 - 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/api/api_search_anime.rb
 - lib/organo/commands/init.rb
-- lib/organo/commands/merge.rb
 - lib/organo/commands/remote/remote_add.rb
 - lib/organo/commands/remote/remote_download.rb
 - lib/organo/commands/remote/remote_remove.rb
@@ -111,15 +136,10 @@ files:
 - lib/organo/config.rb
 - lib/organo/jikan_api.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/local_search.rb
+- lib/organo/tools/string_utils.rb
+- lib/organo/tools/writer.rb
 - lib/organo/version.rb
-- lib/organo/writer.rb
 homepage: https://gitlab.com/dkb-weeblets/organo
 licenses:
 - MIT
@@ -145,5 +165,5 @@ requirements: []
 rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
-summary: Tool to build dataset from Jikan API
+summary: Tool to build dataset from Anime database APIs
 test_files: []

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../config'
-require_relative '../../writer'
-require_relative '../../reader'
-require_relative '../../tools/local_search'
-
-module Organo
-  module CLI
-    module Commands
-      module Anime
-        module Add
-
-          class SequelEntry < Dry::CLI::Command
-            desc 'Add anime sequel entry to anime in file'
-            argument :anime_mal_id, type: :integer, required: true, desc: 'Anime MyAnimeList ID'
-            argument :sequel_mal_id, type: :integer, required: true, desc: 'Sequel MyAnimeList ID'
-            argument :season_num, type: :integer, required: false, default: 0, desc: 'Season number'
-            argument :type, type: :string, required: false, default: '', values: %w[part movie special], desc: 'Type of sequel (part, movie, special)'
-            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:, **)
-              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
-                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
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-require 'httparty'
-require_relative '../../reader'
-
-module Organo
-  module CLI
-    module Commands
-      module Anime
-        module Get
-
-          class BrokenLinks < Dry::CLI::Command
-            desc 'Get list of anime IDs that have broken links'
-
-            def call(*)
-              show_list = Reader.read_all_files
-              broken_list = []
-              show_list.each do |show|
-                response = HTTParty.get(show.image_url)
-                next unless response.code == 404
-
-                broken_list.push(show.id)
-              end
-              puts broken_list.join(' ') unless broken_list.empty?
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../config'
-require_relative '../../tools/local_search'
-
-module Organo
-  module CLI
-    module Commands
-      module Anime
-
-        class Search < Dry::CLI::Command
-          desc 'Search anime by query from files'
-          argument :query, type: :string, required: true, desc: 'Search query'
-
-          def call(query:, **)
-            puts (LocalSearch.find_anime_by_query(query).map{ |anime| anime.to_json })
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-require_relative '../../query'
-require_relative '../../show_list'
-
-module Organo
-  module CLI
-    module Commands
-      module API
-        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"
-
-            def call(query:, type:, limit:, **)
-              json_obj = Query.search_anime(query, { 'type' => type, 'limit' => limit})
-              show_list = ShowList.create_search_show_list(json_obj)
-              puts show_list.to_json
-            end
-          end
-
-        end
-      end
-    end
-  end
-end

data/lib/organo/commands/merge.rb

@@ -1,20 +0,0 @@
-require_relative '../reader'
-require_relative '../writer'
-
-module Organo
-  module CLI
-    module Commands
-
-      class Merge < Dry::CLI::Command
-        desc "Merge edited seasonal files into one main file"
-
-        def call(*)
-          show_list = Reader.read_all_files
-          Writer.to_data_file(show_list, 'shows')
-          puts 'Edited files have been merged.'
-        end
-      end
-
-    end
-  end
-end

data/lib/organo/reader.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-require_relative 'config'
-require_relative 'show'
-
-module Organo
-  class Reader
-    def self.read_all_files
-      shows = []
-      Dir["#{Config::DEFAULT_DIR}/*.json"].each do |file_path|
-        shows = shows.union(Reader.read_file(file_path))
-      end
-      shows.sort_by(&:title)
-    end
-
-    def self.read_file(file_path)
-      shows = []
-      file = File.read(file_path)
-      data = JSON.parse(file)
-      data.each do |show|
-        shows.push(
-          Show.new(
-            show['id'],
-            show['slug'],
-            show['title'],
-            show['image_url'],
-            show['search_query'],
-            show['links'],
-            show['sequels']
-          )
-        )
-      end
-      shows
-    end
-
-  end
-end

data/lib/organo/search_show.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Organo
-  class SearchShow
-    attr_accessor :id, :title, :image_url, :search_query
-
-    def initialize(id, title, image_url)
-      @id = id
-      @slug = create_slug(title)
-      @title = title.to_s
-      @image_url = image_url
-      @search_query = title
-    end
-
-    def create_slug(title)
-      # strip the string
-      ret = title.strip
-
-      # blow away apostrophes
-      ret.gsub!(/['`]/, '')
-
-      # @ --> at, and & --> and
-      ret.gsub!(/\s*@\s*/, ' at ')
-      ret.gsub!(/\s*&\s*/, ' and ')
-
-      # replace all non alphanumeric with dash
-      ret.gsub!(/\s*[^A-Za-z0-9]\s*/, '-')
-
-      # convert double underscores to single
-      ret.gsub!(/-+/, '-')
-
-      # strip off leading/trailing dash
-      ret.gsub!(/\A-+|-+\z/, '')
-
-      ret.downcase
-    end
-
-    def to_s
-      "title: #{@title}, synopsis: #{@description}, image_url: #{@image_url}"
-    end
-
-    def as_json(_options = {})
-      {
-        id: @id,
-        slug: @slug,
-        title: @title,
-        image_url: @image_url,
-        search_query: @search_query
-      }
-    end
-
-    def to_json(*options)
-      as_json(*options).to_json(*options)
-    end
-  end
-end

data/lib/organo/sequel.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Organo
-  class Sequel
-    attr_accessor :id, :type, :title, :image_url, :selector
-
-    def initialize(id, title, image_url, season_num = 0, type = "", type_num = 0, selector = -1)
-      @id = id
-      @title = title.to_s
-      @image_url = image_url
-      @season_num = season_num
-      @type = type.to_s
-      @type_num = type_num
-      @selector = selector
-    end
-
-    def to_s
-      "id: #{@id}, title: #{@title}, image_url: #{@image_url}"
-    end
-
-    def as_json(_options = {})
-      {
-        id: @id,
-        title: @title,
-        image_url: @image_url,
-        season_num: @season_num.to_i,
-        type: @type,
-        type_num: @type_num.to_i,
-        selector: @selector.to_i
-      }
-    end
-
-    def to_json(*options)
-      as_json(*options).to_json(*options)
-    end
-  end
-end