unclekryon 0.4.10 → 0.4.11

data/lib/unclekryon/data/aum_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,37 +19,37 @@ module UncleKryon
     attr_accessor :timespan
     attr_accessor :filesize
     attr_accessor :filename
-    
+
     attr_accessor :url
     attr_accessor :mirrors
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @title = ''
       @subtitle = ''
       @languages = []
       @timespan = ''
       @filesize = ''
       @filename = ''
-      
+
       @url = ''
       @mirrors = {}
     end
-    
+
     # Excludes @updated_on
-    def ==(y)
-      return @title == y.title &&
-             @subtitle == y.subtitle &&
-             @languages == y.languages &&
-             @timespan == y.timespan &&
-             @filesize == y.filesize &&
-             @filename == y.filename &&
-             @url == y.url &&
-             @mirrors == y.mirrors
+    def ==(other)
+      return @title == other.title &&
+             @subtitle == other.subtitle &&
+             @languages == other.languages &&
+             @timespan == other.timespan &&
+             @filesize == other.filesize &&
+             @filename == other.filename &&
+             @url == other.url &&
+             @mirrors == other.mirrors
     end
-    
-    def to_s()
+
+    def to_s
       s = ''
       s << ('%-40s' % [@title])
       s << (' | %30s' % [@subtitle])

data/lib/unclekryon/data/base_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) 2018-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) 2018-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -28,50 +16,50 @@ require 'unclekryon/util'
 module UncleKryon
   class BaseData
     attr_accessor :updated_on
-    
-    def initialize()
-      update()
+
+    def initialize
+      update
     end
-    
+
     def initialize_copy(original)
       super(original)
-      
-      @updated_on = @updated_on.clone()
+
+      @updated_on = @updated_on.clone
     end
-    
-    def update()
-      @updated_on = Util.format_datetime(DateTime.now())
+
+    def update
+      @updated_on = Util.format_datetime(DateTime.now)
       return @updated_on
     end
-    
-    def max_updated_on()
+
+    def max_updated_on
       max = nil
-      
+
       instance_variables.each do |iv|
-        vuo = Util.parse_datetime_s(instance_variable_get(iv)) if iv.to_s() =~ /\A@updated_.+_on\z/
-        max = vuo if max.nil?() || vuo > max
+        vuo = Util.parse_datetime_s(instance_variable_get(iv)) if iv.to_s =~ /\A@updated_.+_on\z/
+        max = vuo if max.nil? || vuo > max
       end
-      
+
       return max
     end
-    
+
     def self.max_updated_on(data)
       max = nil
-      
+
       if data.is_a?(Hash)
-        data.each() do |k,v|
+        data.each do |k,v|
           vuo = Util.parse_datetime_s(v.updated_on)
-          max = vuo if max.nil?() || vuo > max
+          max = vuo if max.nil? || vuo > max
         end
       end
-      
+
       return max
     end
-    
-    def max_updated_on_s()
-      return Util.format_datetime(max_updated_on())
+
+    def max_updated_on_s
+      return Util.format_datetime(max_updated_on)
     end
-    
+
     def self.max_updated_on_s(data)
       return Util.format_datetime(max_updated_on(data))
     end

data/lib/unclekryon/data/pic_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
 #++
 
 
@@ -27,49 +15,49 @@ module UncleKryon
   class PicData < BaseData
     attr_accessor :name
     attr_accessor :filename
-    
+
     attr_accessor :alt
     attr_accessor :caption
-    
+
     attr_accessor :url
     attr_accessor :mirrors
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @name = ''
       @filename = ''
-      
+
       @alt = ''
       @caption = ''
-      
+
       @url = ''
       @mirrors = {}
     end
-    
+
     # Excludes @updated_on
-    def ==(y)
-      return @name == y.name &&
-             @filename == y.filename &&
-             @alt == y.alt &&
-             @caption == y.caption &&
-             @url == y.url &&
-             @mirrors == y.mirrors
+    def ==(other)
+      return @name == other.name &&
+             @filename == other.filename &&
+             @alt == other.alt &&
+             @caption == other.caption &&
+             @url == other.url &&
+             @mirrors == other.mirrors
     end
-    
-    def to_s()
-      s = ''.dup()
-      
-      if @name.empty?() || @name.strip().empty?()
+
+    def to_s
+      s = ''.dup
+
+      if @name.empty? || @name.strip.empty?
         s << ('%-100s' % [@url])
       else
         s << ('%-30s' % [@name])
         s << (' | %30s' % [@filename]) unless @name == @filename
-        
+
         s << (' | %30s' % [@alt]) unless @name == @alt
         s << (' | %60s' % [@caption])
       end
-      
+
       return s
     end
   end

data/lib/unclekryon/data/release_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
 #++
 
 
@@ -26,31 +14,31 @@ require 'unclekryon/data/base_data'
 module UncleKryon
   class ReleaseData < BaseData
     attr_accessor :title
-    
+
     attr_accessor :url
     attr_accessor :mirrors
-    
+
     attr_accessor :albums
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @title = ''
-      
+
       @url = ''
       @mirrors = {}
-      
+
       @albums = []
     end
-    
-    def to_mini_s()
+
+    def to_mini_s
       return to_s(true)
     end
-    
+
     def to_s(mini=false)
       s = ''
       s << ('%-10s' % [@title])
-      s << (mini ? (' | %3d' % [@albums.length()]) : ("\n- " << @albums.join("\n- ")))
+      s << (mini ? (' | %3d' % [@albums.length]) : ("\n- " << @albums.join("\n- ")))
       return s
     end
   end

data/lib/unclekryon/data/social_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) 2018-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) 2018-2021 Jonathan Bradley Whited
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 #++
 
 
@@ -28,10 +16,10 @@ module UncleKryon
   class SocialData
     attr_accessor :username
     attr_accessor :url
-    
-    def initialize()
+
+    def initialize
       super()
-      
+
       @username = ''
       @url = ''
     end

data/lib/unclekryon/data/timespan_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
 #++
 
 
@@ -30,28 +18,28 @@ module UncleKryon
     attr_accessor :hours
     attr_accessor :mins
     attr_accessor :secs
-    
+
     def initialize(time=nil)
       @hours = 0
       @mins = 0
       @secs = 0
-      
-      if !time.nil?() && !(time = time.strip()).empty?()
+
+      if !time.nil? && !(time = time.strip).empty?
         time = time.gsub(/\A[^\(]+\(/,'') # "One hour 6 minutes - (66 minutes)"
         time = time.gsub(/[^[[:digit:]]\:\.]+/,'')
         a = time.split(/[\:\.]/)
-        
+
         if a.length == 1
-          @mins = a[0].to_i()
+          @mins = a[0].to_i
         elsif a.length == 2
-          @mins = a[0].to_i()
-          @secs = a[1].to_i()
+          @mins = a[0].to_i
+          @secs = a[1].to_i
         elsif a.length >= 3
-          @hours = a[0].to_i()
-          @mins = a[1].to_i()
-          @secs = a[2].to_i()
+          @hours = a[0].to_i
+          @mins = a[1].to_i
+          @secs = a[2].to_i
         end
-        
+
         if @secs >= 60
           @mins += (@secs / 60)
           @secs = @secs % 60
@@ -62,8 +50,8 @@ module UncleKryon
         end
       end
     end
-    
-    def to_s()
+
+    def to_s
       return "#{@hours}:#{@mins}:#{@secs}"
     end
   end