q3_servers 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb8f8effc44482edebea0de3ba0a458ef03d7ebe44dabec1ecee2b2acfaa0d0
-  data.tar.gz: 68567822f194a905695e814fe158be591b1a2d852eff6d69b9f885eb959896e6
+  metadata.gz: bb4e62e7d698bb676e11016d338ba7b3baf43eb8a328d0be34eb6aa9f9b2464c
+  data.tar.gz: 1a11791880f77e36e9fec352e8a722cb564b35ec34b4d9276010c3d904f24ce4
 SHA512:
-  metadata.gz: f157543e7674b674c0f6bcfd98b01ceaf43a54552c2de5e03b8b116142bc8056715827ab394b41f4676f08f2f2e378af6aea268aeecac1f38bcc9167f01e9622
-  data.tar.gz: 59dd575a839a181cca3101a020c7e3214b9e6c6be6d98a3da47f5f9ef54340b01ecb167e6eafdbc87580ac7dfc4c5fad2ecd214500f51b42cf95b3bd525c594f
+  metadata.gz: 866cb3d062ce232545146c03864917d00c52c3fa6a5f5e010d9ecf63d3080249cecca17780ef6de30cde5b1a7a92d84adf6cd62436efdbb313afae172f35b5c5
+  data.tar.gz: 76293844f274ebaac38d4929fe33a6cb3afb55d254cca542804005c841c4119a22303871ceadc88359c300d36767494b87ec2e4784bf3cc8d4e010ad9bb29188

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    q3_servers (1.0.0)
+    q3_servers (1.0.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/q3_servers/list.rb

@@ -36,15 +36,6 @@ module Q3Servers
       fetch_info_servers(filter, use_threads)
     end
 
-    def request_server_info(server, filter, use_threads)
-      print_debug("INFO Server: Connecting to Server id => #{server.unique_index}")
-      if use_threads
-        thread_server_info(server, filter)
-      else
-        server.request_info
-      end
-    end
-
     def cached_info?(server)
       cache? && server.info? && !server_info_outdated?(server)
     end
@@ -68,16 +59,19 @@ module Q3Servers
 
     private
 
-    def thread_server_info(server, filter)
+    def thread_server_info_status(server, filter)
       @threads << Thread.new { get_server_info_status_filter(server, filter) }
     rescue ThreadError => e
       p "Can't create thread! => #{e.inspect}"
     end
 
     def get_server_info_status_filter(server, filter)
-      server.get_info_connect
-      server.request_and_get_status if server.filter_info(filter)
-      server.info
+      unless cached_info?(server)
+        print_debug("INFO Server: Connecting to Server id => #{server.unique_index}")
+        server.request_info
+        server.read_info
+      end
+      server.request_and_get_status if server.filter_info(filter) && !cached_status?(server)
     end
 
     def fill_list_favorites
@@ -99,27 +93,17 @@ module Q3Servers
     end
 
     def fetch_info_servers(filter, use_threads)
-      servers.each do |server|
-        cache_or_request_server_info(server, filter, use_threads)
-      end
-      # wait for "info servers"
       if use_threads
+        servers.each { |server| thread_server_info_status(server, filter) }
         @threads.each(&:join) # wait for threads
       else
         massive_read_info_status(servers, filter)
       end
+      
       destroy_socket_servers
       servers.select { |server| server.filter_info(filter) }
     end
 
-    def cache_or_request_server_info(server, filter, use_threads)
-      if cached_info?(server)
-        print_debug("INFO Server cached => #{server.unique_index}")
-      else
-        request_server_info(server, filter, use_threads)
-      end
-    end
-
     def servers_list_from_master
       servers.clear # #clean servers list
       print_debug("Connecting to master server: cache => #{cache} | timeout => #{timeout}")
@@ -157,15 +141,24 @@ module Q3Servers
 
     def massive_read_info_status(servers, filter)
       logger_object = debug ? logger : nil
-      massive_helper = MassiveHelper.new(servers.select(&:request_status?), logger_object)
-      alive_servers = massive_helper.read_info_servers(2, timeout) do |server|
+      requested_servers = servers.reject { |server| cached_info?(server) }
+
+      requested_servers.each do |not_cached_server|
+        print_debug("INFO Server: Connecting to Server id => #{not_cached_server.unique_index}")
+        not_cached_server.request_info
+      end
+
+      massive_helper = MassiveHelper.new(requested_servers, logger_object)
+      massive_helper.read_info_servers(2, timeout) do |server|
         server.read_info unless cached_info?(server)
       end
 
-      filtered_servers = alive_servers.select { |server| server.filter_info(filter) }
-      filtered_servers.each(&:request_status)
+      requested_servers = servers.reject { |server| cached_status?(server) }
+      filtered_servers = requested_servers.select { |server| server.filter_info(filter) }
+      filtered_servers.each { |server| server.request_status unless cached_status?(server) }
 
-      massive_helper.read_status_servers(filtered_servers, 2, timeout) do |server|
+      massive_helper.servers = filtered_servers
+      massive_helper.read_status_servers(2, timeout) do |server|
         server.read_status unless cached_status?(server)
       end
     end

data/lib/q3_servers/massive_helper.rb

@@ -2,32 +2,30 @@
 
 module Q3Servers
   class MassiveHelper
-    attr_accessor :sockets, :servers
+    attr_reader :sockets, :servers
 
     def initialize(servers, logger)
       @logger = logger
-      @servers = servers.each_with_object({}) do |server, hsh|
-        hsh[server.unique_index] = server
-      end
+      self.servers = servers
     end
-  
+
     def read_info_servers(max_retries, timeout, &block)
-      @logger.info '======== Read Info servers ========' if @logger
-      read_info(servers.map { |_unique_index, server| server.socket }, max_retries, timeout, &Proc.new)
+      @logger&.info '======== Read Info servers ========'
+      read_info(servers.map { |_unique_index, server| server.socket }, max_retries, timeout, &block)
     end
-  
-    def read_status_servers(servers, max_retries, timeout)
-      @logger.info '======== Read Status servers ========' if @logger
-      read_info(servers.map(&:socket), max_retries, timeout, &Proc.new)
+
+    def read_status_servers(max_retries, timeout, &block)
+      @logger&.info '======== Read Status servers ========'
+      read_info(servers.map { |_unique_index, server| server.socket }, max_retries, timeout, &block)
     end
-  
+
     def read_info(sockets, max_retries, timeout, &block)
       servers_with_info = []
       sockets_completed = 0
       retries = 0
       sockets.size.times do |_i|
         break if (sockets_completed >= sockets.size) || (retries >= max_retries)
-  
+
         ready_sockets = IO.select(sockets, nil, nil, timeout)
         if ready_sockets && (ready_sockets = ready_sockets[0])
           retries = 0
@@ -39,16 +37,22 @@ module Q3Servers
           end
         else
           retries += 1
-          @logger.info "Retry n #{retries}" if @logger
+          @logger&.info "Retry n #{retries}"
         end
       end
       servers_with_info
     end
-  
+
     def calculate_index(socket)
       # to determine which socket answered
       addr = socket.peeraddr(false)
       ServerConnection.new(addr.last, addr[1]).unique_index
-    end  
+    end
+
+    def servers=(new_servers)
+      @servers = new_servers.each_with_object({}) do |server, hsh|
+        hsh[server.unique_index] = server
+      end
+    end
   end
 end

data/lib/q3_servers/server.rb

@@ -29,11 +29,6 @@ module Q3Servers
       !f.empty?
     end
 
-    def get_info_connect
-      request_info
-      read_info
-    end
-
     def request_info
       self.status = :request
       puts "Requesting info to #{connection}"
@@ -102,7 +97,7 @@ module Q3Servers
     def info_status?
       info? && !info_status.empty?
     end
-    
+
     private
 
     def touch!

data/lib/q3_servers/server_connection.rb

@@ -54,6 +54,7 @@ module Q3Servers
     end
 
     def request_status_server
+      connect
       send_data("#{prepend_oob_data}getstatus") # request step 2
     end
 

data/lib/q3_servers/version.rb

@@ -1,3 +1,3 @@
 module Q3Servers
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: q3_servers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Juan Pablo Garritano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Browse servers from Quake3/Urban-Terror game