unclekryon 0.4.10 → 0.4.11

data/lib/unclekryon/data/album_data.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2017-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2017-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -32,115 +20,119 @@ module UncleKryon
     attr_accessor :title
     attr_accessor :locations
     attr_accessor :languages
-    
+
     attr_accessor :url
     attr_accessor :mirrors
-    
+
     attr_accessor :desc
-    
+
     attr_accessor :pics
     attr_accessor :aums
     attr_accessor :scrolls
     attr_accessor :visions
-    
+
     attr_accessor :dump
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @date_begin = ''
       @date_end = ''
       @title = ''
       @locations = []
       @languages = []
-      
+
       @url = ''
       @mirrors = {}
-      
+
       @desc = ''
-      
+
       @pics = {}
       @aums = {}
       @scrolls = {}
       @visions = {}
-      
+
       @dump = []
     end
-    
+
     def initialize_copy(original)
       super(original)
-      
-      @date_begin = @date_begin.clone()
-      @date_end = @date_end.clone()
-      @title = @title.clone()
-      @locations = @locations.clone()
-      @languages = @languages.clone()
-      
-      @url = @url.clone()
-      @mirrors = @mirrors.clone()
-      
-      @desc = @desc.clone()
-      
-      @pics = @pics.clone()
-      @aums = @aums.clone()
-      @scrolls = @scrolls.clone()
-      @visions = @visions.clone()
-      
-      @dump = @dump.clone()
+
+      @date_begin = @date_begin.clone
+      @date_end = @date_end.clone
+      @title = @title.clone
+      @locations = @locations.clone
+      @languages = @languages.clone
+
+      @url = @url.clone
+      @mirrors = @mirrors.clone
+
+      @desc = @desc.clone
+
+      @pics = @pics.clone
+      @aums = @aums.clone
+      @scrolls = @scrolls.clone
+      @visions = @visions.clone
+
+      @dump = @dump.clone
     end
-    
-    def set_if_not_empty!(album)
+
+    def update_if_not_empty!(album)
       @date_begin = album.date_begin unless Util.empty_s?(album.date_begin)
       @date_end = album.date_end unless Util.empty_s?(album.date_end)
       @title = album.title unless Util.empty_s?(album.title)
-      @locations |= album.locations unless album.locations.nil?()
-      @languages |= album.languages unless album.languages.nil?()
-      
+      @locations |= album.locations unless album.locations.nil?
+      @languages |= album.languages unless album.languages.nil?
+
       @desc = album.desc unless Util.empty_s?(album.desc)
-      
-      @pics |= album.pics unless album.pics.nil?()
-      @aums |= album.aums unless album.aums.nil?()
-      @scrolls |= album.scrolls unless album.scrolls.nil?()
-      @visions |= album.visions unless album.visions.nil?()
-      
-      @dump |= album.dump unless album.dump.nil?()
+
+      @pics |= album.pics unless album.pics.nil?
+      @aums |= album.aums unless album.aums.nil?
+      @scrolls |= album.scrolls unless album.scrolls.nil?
+      @visions |= album.visions unless album.visions.nil?
+
+      @dump |= album.dump unless album.dump.nil?
     end
-    
+
     # Excludes @updated_on and @dump
-    def ==(y)
-      return @date_begin == y.date_begin &&
-             @date_end == y.date_end &&
-             @title == y.title &&
-             @locations == y.locations &&
-             @languages == y.languages &&
-             @url == y.url &&
-             @mirrors == y.mirrors &&
-             @desc == y.desc &&
-             @pics == y.pics &&
-             @aums == y.aums &&
-             @scrolls == y.scrolls &&
-             @visions == y.visions
+    def ==(other)
+      return @date_begin == other.date_begin &&
+             @date_end == other.date_end &&
+             @title == other.title &&
+             @locations == other.locations &&
+             @languages == other.languages &&
+             @url == other.url &&
+             @mirrors == other.mirrors &&
+             @desc == other.desc &&
+             @pics == other.pics &&
+             @aums == other.aums &&
+             @scrolls == other.scrolls &&
+             @visions == other.visions
     end
-    
-    def to_mini_s()
+
+    def to_mini_s
       return to_s(true)
     end
-    
+
     def to_s(mini=false)
       s = ''
       s << ('%-10s=>%-10s' % [@date_begin,@date_end])
       s << (' | %60s' % [@title])
       s << (' | %25s' % [@locations.join(';')])
       s << (' | %10s' % [@languages.join(';')])
-      
+
       s << "\n- #{@desc}" unless mini
-      
-      #s << (mini ? (' | pics:%3d'    % [@pics.length()])    : ("\n- Pics:\n  - "   << @pics.join("\n  - ")))
-      #s << (mini ? (' | aums:%3d'    % [@aums.length()])    : ("\n- Aums:\n  - "   << @aums.join("\n  - ")))
-      #s << (mini ? (' | scrolls:%3d' % [@scrolls.length()]) : ("\n- Scrolls:\n - " << @scrolls.join("\n  - ")))
-      #s << (mini ? (' | visions:%3d' % [@visions.length()]) : ("\n- Visions:\n - " << @visions.join("\n  - ")))
-      
-      s << (mini ? (' | dump:%3d' % [@dump.length()]) : ("\n- Dump:\n  - " << @dump.join("\n  - ")))
+
+      #s << (mini ? (' | pics:%3d'    % [@pics.length()]) :
+      #     ("\n- Pics:\n  - " << @pics.join("\n  - ")))
+      #s << (mini ? (' | aums:%3d'    % [@aums.length()]) :
+      #     ("\n- Aums:\n  - " << @aums.join("\n  - ")))
+      #s << (mini ? (' | scrolls:%3d' % [@scrolls.length()]) :
+      #     ("\n- Scrolls:\n - " << @scrolls.join("\n  - ")))
+      #s << (mini ? (' | visions:%3d' % [@visions.length()]) :
+      #     ("\n- Visions:\n - " << @visions.join("\n  - ")))
+
+      s << (mini ? (' | dump:%3d' % [@dump.length]) : ("\n- Dump:\n  - " << @dump.join("\n  - ")))
       return s
     end
   end

data/lib/unclekryon/data/artist_data.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2017-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2017-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -31,69 +19,69 @@ require 'unclekryon/data/social_data'
 module UncleKryon
   class ArtistData < BaseData
     ID = 'Artist'
-    
+
     attr_accessor :updated_releases_on
     attr_accessor :updated_albums_on
     attr_accessor :updated_aums_on
     attr_accessor :updated_scrolls_on
     attr_accessor :updated_visions_on
     attr_accessor :updated_pics_on
-    
+
     attr_accessor :id
     attr_accessor :name
     attr_accessor :long_name
     attr_accessor :desc
-    
+
     attr_accessor :url
     attr_accessor :mirrors
-    
+
     attr_accessor :facebook
     attr_accessor :twitter
     attr_accessor :youtube
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @updated_releases_on = ''
       @updated_albums_on = ''
       @updated_aums_on = ''
       @updated_scrolls_on = ''
       @updated_visions_on = ''
       @updated_pics_on = ''
-      
+
       @id = ''
       @name = ''
       @long_name = ''
       @desc = ''
-      
+
       @url = ''
       @mirrors = {}
-      
-      @facebook = SocialData.new()
-      @twitter = SocialData.new()
-      @youtube = SocialData.new()
+
+      @facebook = SocialData.new
+      @twitter = SocialData.new
+      @youtube = SocialData.new
     end
-    
+
     def self.load_file(filepath)
       y = YAML.load_file(filepath)
       artist = y[ID]
       return artist
     end
-    
+
     def save_to_file(filepath,**options)
-      raise "Empty filepath: #{filepath}" if filepath.nil?() || (filepath = filepath.strip()).empty?()
-      
+      raise "Empty filepath: #{filepath}" if filepath.nil? || (filepath = filepath.strip).empty?
+
       Util.mk_dirs_from_filepath(filepath)
       File.open(filepath,'w') do |f|
-        artist = {ID=>self}
+        artist = {ID => self}
         YAML.dump(artist,f)
       end
     end
-    
-    def to_mini_s()
+
+    def to_mini_s
       return to_s(true)
     end
-    
+
     def to_s(mini=false)
       s = ''
       s << ('%-5s' % [@id])

data/lib/unclekryon/data/artist_data_data.rb

@@ -1,23 +1,11 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 # frozen_string_literal: true
 
 #--
 # This file is part of UncleKryon-server.
-# Copyright (c) 2017-2019 Jonathan Bradley Whited (@esotericpig)
-# 
-# UncleKryon-server is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# UncleKryon-server is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with UncleKryon-server.  If not, see <https://www.gnu.org/licenses/>.
+# Copyright (c) 2017-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -43,17 +31,17 @@ module UncleKryon
     SCROLLS_ID = 'Scrolls'
     VISIONS_ID = 'Visions'
     PICS_ID = 'Pics'
-    
+
     attr_accessor :releases
     attr_accessor :albums
     #attr_accessor :aums
     #attr_accessor :scrolls
     #attr_accessor :visions
     #attr_accessor :pics
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @releases = {}
       @albums = {}
       #@aums = {}
@@ -61,12 +49,12 @@ module UncleKryon
       #@visions = {}
       #@pics = {}
     end
-    
+
     def self.load_file(filepath)
       filedata = YAML.load_file(filepath) if File.exist?(filepath)
       filedata = {} if !filedata
-      
-      artist = ArtistDataData.new()
+
+      artist = ArtistDataData.new
       Util.hash_def(filedata,[ID],{})
       artist.releases = Util.hash_def(filedata,[ID,RELEASES_ID],artist.releases)
       artist.albums = Util.hash_def(filedata,[ID,ALBUMS_ID],artist.albums)
@@ -74,28 +62,28 @@ module UncleKryon
       #artist.scrolls = Util.hash_def(filedata,[ID,SCROLLS_ID],artist.scrolls)
       #artist.visions = Util.hash_def(filedata,[ID,VISIONS_ID],artist.visions)
       #artist.pics = Util.hash_def(filedata,[ID,PICS_ID],artist.pics)
-      
+
       return artist
     end
-    
+
     def save_to_file(filepath,**options)
-      raise "Empty filepath: #{filepath}" if filepath.nil?() || (filepath = filepath.strip()).empty?()
-      
-      filedata = {ID=>{}}
+      raise "Empty filepath: #{filepath}" if filepath.nil? || (filepath = filepath.strip).empty?
+
+      filedata = {ID => {}}
       filedata[ID][RELEASES_ID] = @releases
       filedata[ID][ALBUMS_ID] = @albums
       #filedata[ID][AUMS_ID] = @aums
       #filedata[ID][SCROLLS_ID] = @scrolls
       #filedata[ID][VISIONS_ID] = @visions
       #filedata[ID][PICS_ID] = @pics
-      
+
       Util.mk_dirs_from_filepath(filepath)
       File.open(filepath,'w') do |f|
         YAML.dump(filedata,f)
       end
     end
-    
-    def max_updated_on()
+
+    def max_updated_on
       max = nil
       max = Util.safe_max(max,BaseData.max_updated_on(@releases))
       max = Util.safe_max(max,BaseData.max_updated_on(@albums))
@@ -103,26 +91,26 @@ module UncleKryon
       #max = Util.safe_max(max,BaseData.max_updated_on(@scrolls))
       #max = Util.safe_max(max,BaseData.max_updated_on(@visions))
       #max = Util.safe_max(max,BaseData.max_updated_on(@pics))
-      
+
       return Util.format_datetime(max)
     end
-    
-    def to_mini_s()
+
+    def to_mini_s
       return to_s(true)
     end
-    
+
     def to_s(mini=false)
       s = ''
-      
+
       s << "- Releases:\n"
-      @releases.each() do |k,v|
-        s << "  - " << v.to_s(mini).gsub("\n","\n    ") << "\n"
+      @releases.each do |k,v|
+        s << '  - ' << v.to_s(mini).gsub("\n","\n    ") << "\n"
       end
       s << "- Albums:\n"
-      @albums.each() do |k,v|
-        s << "  - " << v.to_s(mini).gsub("\n","\n    ") << "\n"
+      @albums.each do |k,v|
+        s << '  - ' << v.to_s(mini).gsub("\n","\n    ") << "\n"
       end
-      
+
       #s << "- Aums:\n"
       #@aums.each() do |k,v|
       #  s << "  - #{v.to_s()}\n"
@@ -139,7 +127,7 @@ module UncleKryon
       #@pics.each() do |k,v|
       #  s << "  - #{v.to_s()}\n"
       #end
-      
+
       return s
     end
   end