lib/command/list.rb in narou-2.0.2 vs lib/command/list.rb in narou-2.1.0

- old
+ new

@@ -160,14 +160,11 @@ if @options["tags"] next unless valid_tags?(novel, @options["tags"]) end disp_id = ((frozen ? "*" : "") + id.to_s).rjust(4) disp_id = disp_id.sub("*", "<bold><cyan>*</cyan></bold>") if frozen - flags = novel["flags"] || {} # flagコマンドは1.6.0から非推奨 tags = novel["tags"] || [] - flags["end"] ||= tags.include?("end") - flags["404"] ||= tags.include?("404") selected_lines[id] = [ disp_id, novel["last_update"].strftime("%y/%m/%d").tap { |s| if novel["new_arrivals_date"] && novel["new_arrivals_date"] + NEW_ARRIVALS_LIMIT >= now # 新着表示色 @@ -181,11 +178,11 @@ @options["author"] ? novel["author"].escape : nil, @options["site"] ? novel["sitename"].escape : nil, novel["title"].escape + (!@options["kind"] && novel_type == 2 ? " <bold><black>(#{NOVEL_TYPE_LABEL[novel_type]})</black></bold>" : "") + - (flags["end"] ? " <bold><black>(完結)</black></bold>" : "") + - (flags["404"] ? " <bold><black>(削除)</black></bold>" : ""), + (tags.include?("end") ? " <bold><black>(完結)</black></bold>" : "") + + (tags.include?("404") ? " <bold><black>(削除)</black></bold>" : ""), @options["url"] ? novel["toc_url"].escape : nil, @options["tags"] || @options["all-tags"] ? tags.empty? ? nil : tags.map{ |tag| color = Tag.get_color(tag) "<bold><#{color}>#{tag.escape}</#{color}></bold>"