Style obsolete artist changes (fixes #1171)

2016-08-28 23:12:35 +05:00
parent 75b7e6d720
commit 23f4232bd2
3 changed files with 32 additions and 11 deletions
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -43,9 +43,13 @@ class Artist < ActiveRecord::Base
      end
    end

+    def url_array
+      urls.map(&:url)
+    end
+
    def save_url_string
      if @url_string
-        prev = urls.map(&:url)
+        prev = url_array
        curr = @url_string.scan(/\S+/).uniq

        duplicates = prev.select{|url| prev.count(url) > 1}.uniq
@@ -69,11 +73,11 @@ class Artist < ActiveRecord::Base
    end

    def url_string
-      @url_string || urls.map {|x| x.url}.join("\n")
+      @url_string || url_array.join("\n")
    end

    def url_string_changed?
-      url_string.scan(/\S+/) != urls.map(&:url)
+      url_string.scan(/\S+/) != url_array
    end
  end