lib/command/remove.rb in narou-3.2.5.1 vs lib/command/remove.rb in narou-3.3.0
- old
+ new
@@ -1,6 +1,7 @@
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
#
# Copyright 2013 whiteleaf. All rights reserved.
#
require_relative "../narou"
@@ -58,23 +59,23 @@
puts "短編小説がひとつもありません"
return
end
argv += novels.map { |n| n["id"].to_s }
end
- if argv.empty?
- puts @opt.help
- return
- end
+ display_help! if argv.empty?
tagname_to_ids(argv)
argv.each_with_index do |target, i|
Helper.print_horizontal_rule if i > 0
data = Downloader.get_data_by_target(target)
unless data
error "#{target} は存在しません"
next
end
title = data["title"]
- if Narou.novel_frozen?(target)
+ if Narou.locked?(target)
+ error "#{title} は変換中なため削除出来ませんでした"
+ next
+ elsif Narou.novel_frozen?(target)
puts "#{title} は凍結中です\n削除を中止しました"
next
end
unless @options["yes"]
next unless Narou::Input.confirm("#{title} を#{(@options["with-file"] ? "“完全に”" : "")}削除しますか")