my_manga 1.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8c579b52a739f5a0468d82ab037729cd63c45ef
-  data.tar.gz: 3650970a5fff6c2e24e8cc2549be74f8ef4482fd
+SHA256:
+  metadata.gz: b196ef7ec4b300ded6dc4a9270fa49d49ff3cfd43dea8f8d233e89132cdd03ad
+  data.tar.gz: 9c6f245d09d9b6c0363f27b6f57c295e16f4f7c17bfb799c1eedb7e596528d5b
 SHA512:
-  metadata.gz: 7a87ba326ae963a5489b0708bce458b183fafcd75cba61fbbfe6cb53cc285131c23014d072ca3b30b2f078a703421645de061d67236ef91973033bc78ef40dcc
-  data.tar.gz: 94a60cd4dfd2a629edc8aea1d727ae39057fa3d5f61ad34e5d39bc6c0fa48a559a68151bbbfd0d9e399117d0b83d19f9dc571f3cf873e2dd844406b8f31f6fc6
+  metadata.gz: 600db7c50191c5605d4a92a55fb54886a9fe43cbaae4c94e618d85fc4ba4381c5476cc72cd83f7644be0189064f5797c69b6cb75e442751016306ec98f853b74
+  data.tar.gz: 848b9553b785229c3043ae64293710d9dee26af9b629c00c25b6585b8eeb1c2891158137d235fba5db13d7a1b0877711ee1affd13051b037c189e83349e29693

data/db/config.yml

@@ -7,13 +7,13 @@ default: &default
   host: <%= ENV["PG_HOST"] %>
   reconnect: false
   # Set these in .bashrc or .bash_profile
-  username: <%= ENV["PG_USER"] %> 
+  username: <%= ENV["PG_USER"] %>
   password: <%= ENV["PG_PASS"] %>
 
 production:
   <<: *default
-  database: my_manga_library_database
+  database: my_manga
 
 test:
   <<: *default
-  database: my_manga_library_test_database
+  database: my_manga_test

data/db/connection.rb

@@ -1,14 +1,16 @@
 module MyManga
-  class DB 
+  module DB
     MIGRATION_PATH = File.expand_path('../migrate', __FILE__)
     CONFIG_PATH = File.expand_path('../config.yml', __FILE__)
     CONFIG = YAML.load(ERB.new(File.read(CONFIG_PATH)).result)[MyManga.env]
 
-    def self.establish_connection
+    module_function
+
+    def establish_connection
       ActiveRecord::Base.establish_connection(CONFIG)
-    end 
+    end
 
-    def self.establish_base_connection
+    def establish_base_connection
       ActiveRecord::Base.establish_connection(
         CONFIG.merge(
           {
@@ -19,26 +21,28 @@ module MyManga
       )
     end
 
-    def self.connection
+    def connection
       ActiveRecord::Base.connection
     end
 
-    def self.create_database
+    def create_database
       connection.create_database(CONFIG["database"], CONFIG)
     end
 
-    def self.drop_database
+    def drop_database
       connection.drop_database(CONFIG["database"])
     end
 
-    def self.migrate
-      ActiveRecord::Migrator.migrate(MIGRATION_PATH, nil)
+    def migrate
+      ActiveRecord::MigrationContext.new(MIGRATION_PATH).migrate
+    end
+
+    def restore
+      system("pg_restore --verbose --clean --no-acl --no-owner -d #{CONFIG["database"]} #{File.expand_path(__dir__)}/latest.dump")
     end
 
-    def self.dump
+    def dump
       system("pg_dump -Fc #{CONFIG["database"]} > #{File.expand_path(__dir__)}/latest.dump")
     end
   end
 end
-
-

data/db/migrate/002_add_zine_to_manga.rb

@@ -0,0 +1,3 @@
+class AddZineToManga < ActiveRecord::Migration[5.2]
+  add_column :manga, :zine, :boolean, null: false, default: false
+end

data/lib/my_manga.rb

@@ -30,6 +30,18 @@ module MyManga
     Manga.pluck(:name)
   end
 
+  def add_to_zine(names)
+    Manga.where(name: names).update(zine: true)
+  end
+
+  def remove_from_zine(names)
+    Manga.where(name: names).update(zine: false)
+  end
+
+  def zine
+    Manga.where(zine: true)
+  end
+
   def add(uri)
     return if Manga.find_by_uri(uri)
 

data/lib/my_manga/cli.rb

@@ -11,6 +11,7 @@ require_relative './update'
 require_relative './mark'
 require_relative './env'
 require_relative './m_clean_up'
+require_relative './zine'
 
 module MyManga
   module CLI
@@ -37,6 +38,7 @@ module MyManga
       register 'mark', Mark
       register 'env', Env, aliases: %w[-e --environment]
       register 'm:clean_up', MCleanUp, aliases: %w[purge]
+      register 'zine', Zine
     end
   end
 end

data/lib/my_manga/list.rb

@@ -13,46 +13,54 @@ module MyManga
           names.one? ? list_detail(names.first) : list(names)
         end
 
+        private
+
         def list(names)
           column_width = names.map(&:length).max || 10
 
           puts 'Manga list'
           puts '=========='
           print pad('Name', column_width)
-          puts 'Chapters read/total (unread)'
+          puts 'Zine Chapters read/total (unread)'
 
           names.sort.each do |name|
             manga = MyManga[name]
             read = manga.read_count
             total = manga.total_count
             unread = total - read
+            zine = check_box(manga.zine?)
 
             print pad(name, column_width)
-            puts "#{read}/#{total} (#{unread}) #{manga.uri}"
+            puts "#{zine} #{read}/#{total} (#{unread}) #{manga.uri}"
           end
         end
 
         def list_detail(name)
           manga = MyManga[name]
           header = %(Manga details for "#{manga.name}")
-          chapters = manga.chapters_read
+          chapters = manga.chapters.reorder(number: :desc)
           read = manga.read_count
           total = manga.total_count
           unread = total - read
+          zine = check_box(manga.zine?)
 
           puts header
           puts '=' * header.length
           print pad('Name', name.length)
-          puts 'Chapters read/total (unread)'
-          puts "#{name}  #{read}/#{total} (#{unread}) #{manga.uri}"
+          puts 'Zine Chapters read/total (unread)'
+          puts "#{name}  #{zine} #{read}/#{total} (#{unread}) #{manga.uri}"
           puts
-          puts 'Chapters Read'
-          puts '-------------'
-          chapters[0..2].each do |chapter|
-            puts chapter.name
+
+
+          puts 'Read Chapter'
+          puts '------------'
+          chapters.each do |chapter|
+            puts "#{chapter.read? ? ' [X]' : ' [ ]'} #{chapter.name}"
           end
-          puts '...' if chapters.length > 4
-          puts chapters[-1].name if chapters.length > 3
+        end
+
+        def check_box(bool)
+          bool ? ' [X]' : ' [ ]'
         end
       end
     end

data/lib/my_manga/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyManga
-  VERSION = '1.1.6'
+  VERSION = '2.0.0'
 end

data/lib/my_manga/zine.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+module MyManga
+  module CLI
+    module Commands
+      # See desc
+      class Zine < MyManga::CLI::Command
+        desc 'Build a new zine'
+        argument :names, desc: 'Manga names (comma separated)'
+
+        option :add,
+               type: :boolean,
+               default: false,
+               desc: 'Add manga to zine'
+        option :remove,
+               type: :boolean,
+               default: false,
+               desc: 'Remove manga from zine'
+        option :size,
+               default: '10',
+               desc: 'Number of chapters to include in the zine'
+        option :filename,
+               desc: 'Filename for the zine, (default `zine-<timestamp>-<hash of chapters included>`)'
+
+        TMP_DIR = File.expand_path('../../tmp', __dir__)
+
+        def call(names: nil, **options)
+          names = manga_names(names)
+          filename = options.fetch(:filename) { nil }
+          size = options.fetch(:size).to_i
+
+          if options[:add] && options[:remove]
+            puts "--add and --remove are mutually exclusive"
+            exit 1
+          end
+
+          if options[:add]
+            MyManga.add_to_zine(names)
+            puts %("#{names.join(', ')}" added to the zine!)
+          elsif options[:remove]
+            MyManga.remove_from_zine(names)
+            puts %("#{names.join(', ')}" removed from the zine!)
+          else
+            publish(filename, size)
+          end
+        end
+
+        private
+
+        def publish(filename, size)
+          FileUtils.rm_r(TMP_DIR) if Dir.exist?(TMP_DIR)
+          Dir.mkdir(TMP_DIR)
+
+          zine = zine_content(size)
+          serialized_name = []
+          zine.each do |chapter|
+            serialized_name << chapter.id
+            chapter.to_md.download_to(TMP_DIR)
+            MyManga.read!(chapter.manga, [chapter.number])
+          end
+
+          serialized_name = serialized_name.join.to_i.to_s(32)
+          filename ||= "zine-#{Time.now.to_i}-#{serialized_name}"
+
+          dir = File.join(MyManga.download_dir, filename)
+
+          cbz(dir)
+
+          FileUtils.rm_r(TMP_DIR)
+
+          puts "Pushlished a new zine (#{filename}) in #{MyManga.download_dir}"
+        end
+
+        def zine_content(chapter_count)
+          manga = MyManga.zine
+          chapters = Chapter
+                     .unread
+                     .where(manga_id: manga.map(&:id))
+                     .order(:number)
+                     .group_by(&:manga)
+                     .values
+                     .sort_by(&:length)
+                     .reverse
+
+          return if chapters.empty?
+
+          zine = chapters.first.zip(*chapters.drop(1)).flatten.compact
+          zine.first(chapter_count).sort_by do |chapter|
+            [chapter.manga_id, chapter.number]
+          end
+        end
+
+        def cbz(dir)
+          pages = Dir["#{TMP_DIR}/**/*.*"]
+
+          Dir.mkdir(dir) unless Dir.exist?(dir)
+
+          pages.each do |page|
+            filename = File.basename(page)
+            FileUtils.cp(page, File.join(dir, filename))
+          end
+
+          Mangdown::CBZ.one(dir, false)
+
+          FileUtils.rm_r(dir)
+        end
+      end
+    end
+  end
+end

data/test/features_test.rb

@@ -13,19 +13,19 @@ class FeaturesTest < Minitest::Test
           name: 'Assassination Classroom',
           read_count: 0,
           total_count: 161,
-          uri: 'http://www.mangareader.net/assassination-classroom'
+          uri: 'https://www.mangareader.net/assassination-classroom'
         },
         {
           name: 'Naruto',
           read_count: 699,
           total_count: 700,
-          uri: 'http://www.mangareader.net/naruto'
+          uri: 'https://www.mangareader.net/naruto'
         },
         {
           name: 'Naruto Movie',
           read_count: 10,
           total_count: 10,
-          uri: 'http://www.mangareader.net/naruto-movie'
+          uri: 'https://www.mangareader.net/naruto-movie'
         }
       ]
     )
@@ -63,7 +63,7 @@ class FeaturesTest < Minitest::Test
     )
     output = stdout.read
     header = 'Manga found for "assassination classroom"'
-    url = 'http://www.mangareader.net/assassination-classroom'
+    url = 'https://www.mangareader.net/assassination-classroom'
 
     assert_equal 0, wait_thr.value
     assert_includes output, header
@@ -72,7 +72,7 @@ class FeaturesTest < Minitest::Test
 
   def test_add
     _, stdout, _, wait_thr = Open3.popen3(
-      'my_manga', 'add', 'http://www.mangareader.net/nisekoi'
+      'my_manga', 'add', 'https://www.mangareader.net/nisekoi'
     )
     output = stdout.each_line.to_a
     expected = <<~EXP
@@ -106,10 +106,10 @@ class FeaturesTest < Minitest::Test
     expected = <<~EXP
       Manga list
       ==========
-      Name                     Chapters read/total (unread)
-      Assassination Classroom  0/161 (161) http://www.mangareader.net/assassination-classroom
-      Naruto                   699/700 (1) http://www.mangareader.net/naruto
-      Naruto Movie             10/10 (0) http://www.mangareader.net/naruto-movie
+      Name                     Zine Chapters read/total (unread)
+      Assassination Classroom   [ ] 0/161 (161) https://www.mangareader.net/assassination-classroom
+      Naruto                    [ ] 699/700 (1) https://www.mangareader.net/naruto
+      Naruto Movie              [ ] 10/10 (0) https://www.mangareader.net/naruto-movie
     EXP
     expected = expected.split("\n").map { |line| line << "\n" }
 
@@ -123,16 +123,21 @@ class FeaturesTest < Minitest::Test
     expected = <<~EXP
       Manga details for "Naruto Movie"
       ================================
-      Name          Chapters read/total (unread)
-      Naruto Movie  10/10 (0) http://www.mangareader.net/naruto-movie
-
-      Chapters Read
-      -------------
-      Naruto Movie 1
-      Naruto Movie 2
-      Naruto Movie 3
-      ...
-      Naruto Movie 10
+      Name          Zine Chapters read/total (unread)
+      Naruto Movie   [ ] 10/10 (0) https://www.mangareader.net/naruto-movie
+
+      Read Chapter
+      ------------
+       [X] Naruto Movie 1
+       [X] Naruto Movie 2
+       [X] Naruto Movie 3
+       [X] Naruto Movie 4
+       [X] Naruto Movie 5
+       [X] Naruto Movie 6
+       [X] Naruto Movie 7
+       [X] Naruto Movie 8
+       [X] Naruto Movie 9
+       [X] Naruto Movie 10
     EXP
     expected = expected.split("\n").map { |line| line << "\n" }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_manga
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 2.0.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: hanami-cli
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.5
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.5
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - db/connection.rb
 - db/environment.rb
 - db/migrate/001_add_tables.rb
+- db/migrate/002_add_zine_to_manga.rb
 - lib/mangdown/adapters/manga_here.rb
 - lib/my_manga.rb
 - lib/my_manga/add.rb
@@ -122,6 +123,7 @@ files:
 - lib/my_manga/remove.rb
 - lib/my_manga/update.rb
 - lib/my_manga/version.rb
+- lib/my_manga/zine.rb
 - models/chapter.rb
 - models/manga.rb
 - test/adapters_test.rb
@@ -147,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manage Manga Downloads