my_manga 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b196ef7ec4b300ded6dc4a9270fa49d49ff3cfd43dea8f8d233e89132cdd03ad
-  data.tar.gz: 9c6f245d09d9b6c0363f27b6f57c295e16f4f7c17bfb799c1eedb7e596528d5b
+  metadata.gz: 8048dd9700d83defc4357103548b3b358e62527c2d5d3bb9de5b1d89f716b5a2
+  data.tar.gz: 178175900d972d534d7d65313a6cfbc4c7f554879105fa3e87b153de23f2553b
 SHA512:
-  metadata.gz: 600db7c50191c5605d4a92a55fb54886a9fe43cbaae4c94e618d85fc4ba4381c5476cc72cd83f7644be0189064f5797c69b6cb75e442751016306ec98f853b74
-  data.tar.gz: 848b9553b785229c3043ae64293710d9dee26af9b629c00c25b6585b8eeb1c2891158137d235fba5db13d7a1b0877711ee1affd13051b037c189e83349e29693
+  metadata.gz: 2e3c823ad46dd4b7134aa19cd8d0141408c055624a7aa69ec00fe19ab7ad8a2b50fcdc54a34d2a4d964b10005c9d91541ca217ccb6bd2f4a783d82c9f86bf25c
+  data.tar.gz: e9505f800e91eca8f1fd55d1e5a706d9280870406d5e00879cc21acca85c046f9a37ebcd1b043da95d5455726bb4754f878df09c5e1ade8bbba6b833d5b5e7cd

data/README.md

@@ -1,145 +1,2 @@
 TODO: Don't test cli with binary. Test the lib.
-TODO: Check out http://piotrmurach.github.io/tty/gems/ to make this gem better
-
-```
-  my_manga find "assassination classroom"
-
-  Manga found for "assassination classroom"
-  =========================================
-  Name                    Url
-  Assasination Classroom  http://www.mangareader.net/assassination-classroom 
-
-  => nil
-
-  my_manga add http://www.mangareader.net/assassination-classroom
-
-  "Assassination Classroom" added to your library!
-
-  => nil
-  
-  my_manga remove "Assassination Classroom"
-
-  "Assassination Classroom" removed from your library!
-
-  => nil
-
-  my_manga list
-
-  Manga list
-  =======================================
-  Name                    Chapters (read/total)
-  Assassination Classroom  0/161 
-  Naruto                  669/700
-  Naruto Movie            10/10
-
-  => nil
-
-  my_manga download
-
-  Downloading 161 Chapters from "Assassination Classroom"
-  Downloading 1 Chapters from "Naruto"
-  ...
-  Finished Download!
-
-  => nil
-
-  my_manga download "Assassination Classroom"
-
-  Downloading 0 Chapters from "Assassination Classroom"
-  Finished Download!
-
-  => nil
-
-  my_manga download "Assassination Classroom" --from=1 --to=10
-
-  Downloading 10 Chapters from "Assassination Classroom"
-  Finished Download!
-
-  => nil
-
-  my_manga download "Assassination Classroom" --list=[11,13,15]
-
-  Downloading 3 Chapters from "Assassination Classroom"
-  Finished Download!
-
-  => nil
-
-  my_manga update
-
-  Fetching Manga
-  ...
-  Updated "Assassination Classroom": 5 new Chapters.
-
-  => nil
-
-  my_manga update "Assassination Classroom"
-
-  Fetching Manga
-  ...
-  Nothing to Update
-
-  => nil
-
-  my_manga list "Assasination Classroom"
-
-  Manga details for "Assasination Classroom"
-  =========================================
-  Name                     Chapters (read/total)
-  Assassination Classroom  161/166
-
-  Chapters Read
-  -------------
-  Assasination Classroom 1
-  Assasination Classroom 2
-  Assasination Classroom 3
-  ...
-  Assasination Classroom 161
-
-  => nil
-
-  my_manga list -a "Naruto Movie"
-
-  Manga details for "Naruto Movie"
-  =========================================
-  Name                     Chapters (read/total)
-  Naruto Movie  161/166
-
-  Chapters Read
-  -------------
-  Naruto Movie 1
-  Naruto Movie 2
-  Naruto Movie 3
-  Naruto Movie 4
-  Naruto Movie 5
-  Naruto Movie 6
-  Naruto Movie 7
-  Naruto Movie 8
-  Naruto Movie 9
-  Naruto Movie 10
-
-  => nil
-
-  my_manga mark read "Assassination Classroom" --from=162 --to=165 
-
-  Chapters 162-165 from "Assination Classroom" Marked as Read
-
-  => nil
-
-  my_manga mark unread "Naruto Movie" --list=[2,3,4,7,8]
-
-  Chapters 2, 3, 4, 7, 8 from "Naruto Movie" Marked as Unread
-
-  => nil
-
-  my_manga list
-
-  Manga list
-  =======================================
-  Name                    Chapters (read/total)
-  Assasination Classroom  165/166 
-  Naruto                  700/700
-  Naruto Movie            5/10
-
-  => nil
-
-````
+TODO: Add retries and try to heal downloads. Also add an option for zine publish to finish a failed publication

data/lib/my_manga/download.rb

@@ -39,6 +39,8 @@ module MyManga
 
           puts '...'
           puts 'Finished Download!'
+        rescue Mangdown::Error => e
+          puts "Failed to download: #{e.message}"
         end
       end
     end

data/lib/my_manga/version.rb

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

data/lib/my_manga/zine.rb

@@ -7,7 +7,7 @@ module MyManga
     module Commands
       # See desc
       class Zine < MyManga::CLI::Command
-        desc 'Build a new zine'
+        desc 'Build a new zine, or manage zine manga'
         argument :names, desc: 'Manga names (comma separated)'
 
         option :add,
@@ -18,6 +18,10 @@ module MyManga
                type: :boolean,
                default: false,
                desc: 'Remove manga from zine'
+        option :recover,
+               type: :boolean,
+               default: true,
+               desc: 'Recover failed zine'
         option :size,
                default: '10',
                desc: 'Number of chapters to include in the zine'
@@ -25,6 +29,7 @@ module MyManga
                desc: 'Filename for the zine, (default `zine-<timestamp>-<hash of chapters included>`)'
 
         TMP_DIR = File.expand_path('../../tmp', __dir__)
+        RECOVERY_FILE = File.expand_path('../../zine-recovery.yaml', __dir__)
 
         def call(names: nil, **options)
           names = manga_names(names)
@@ -36,6 +41,10 @@ module MyManga
             exit 1
           end
 
+          if options[:recover] == false && File.exist?(RECOVERY_FILE)
+            File.delete(RECOVERY_FILE)
+          end
+
           if options[:add]
             MyManga.add_to_zine(names)
             puts %("#{names.join(', ')}" added to the zine!)
@@ -50,30 +59,48 @@ module MyManga
         private
 
         def publish(filename, size)
-          FileUtils.rm_r(TMP_DIR) if Dir.exist?(TMP_DIR)
-          Dir.mkdir(TMP_DIR)
+          Dir.mkdir(TMP_DIR) unless Dir.exist?(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}"
+          File.write(RECOVERY_FILE, YAML.dump(zine.map(&:id)))
+
+          Chapter.transaction do
+            serialized_name = []
+            zine.each do |chapter|
+              serialized_name << chapter.id
+              MyManga.download_chapter(chapter, 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)
+            dir = File.join(MyManga.download_dir, filename)
 
-          cbz(dir)
+            cbz(dir)
+          end
 
           FileUtils.rm_r(TMP_DIR)
+          File.delete(RECOVERY_FILE)
 
           puts "Pushlished a new zine (#{filename}) in #{MyManga.download_dir}"
+        rescue Mangdown::Error => e
+          puts "Failed to publish zine: #{e.message}"
+        end
+
+        def zine_content(size)
+          return new_zine_content(size) unless File.exist?(RECOVERY_FILE)
+
+          puts 'Recovering failed publication ...'
+
+          chapter_ids = YAML.load_file(RECOVERY_FILE)
+          Chapter.where(id: chapter_ids).sort_by do |chapter|
+            chapter_ids.index(chapter.id)
+          end
         end
 
-        def zine_content(chapter_count)
+        def new_zine_content(chapter_count)
           manga = MyManga.zine
           chapters = Chapter
                      .unread

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_manga
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - jphager2
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement