rubyhexagon 0.0.1 → 0.0.5

data/bin/e621_server

@@ -21,6 +21,7 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__)+"/../lib"))
 
 require "rubyhexagon"
+require "openssl"
 require "thread"
 require "logger"
 require "socket"
@@ -35,115 +36,141 @@ E621::Config.config = File.expand_path("~/.hexagon/conf.json")
 api = API.new
 tasks = Hash.new
 mt = Mutex.new
-server = TCPServer.new(5621)
 Process.daemon
-@log = Logger.new(File.expand_path(E621::Config.paths["logging"]))
-#@log = Logger.new(STDOUT)
-#@log.level = Logger::DEBUG
-=begin
-10.times do
-  Thread.new do 
-    loop do
-      name,tclient,max,post = queue.pop
-      next unless post
-      Dir.mkdir(name) unless File.exist?(name)
-      post.download("#{name}/#{"0"*(7-post.id.to_s.length)}#{post.id}.#{post.md5}.#{post.file_ext}")
-      mt.synchronize do
-        unless tasks.has_key?(name) then
-          tasks.store(name,1)
-        else
-          tasks[name] += 1
+$0 = "e621 Proxy Server"
+Dir.chdir(File.expand_path("~/.hexagon")) do
+  @log = Logger.new(File.expand_path(E621::Config.paths["logging"]))
+  @log.formatter = proc do |sev,dat,prog,msg|
+    "#{Time.now.strftime("%b %e, %Y %I:%M:%S %p")} [#{sev.pad(5)}] #{msg}#$/"
+  end
+  begin
+    begin
+      File.open("run"){|f|Process.kill("TERM",f.read.to_i)}
+    rescue
+    end
+    sleep 2
+    File.open("run","w"){|f|f.puts $$}
+    server = TCPServer.new(5621)
+    #@log = Logger.new(STDOUT)
+    #@log.level = Logger::DEBUG
+    queue = Queue.new
+    10.times do
+      Thread.new do 
+        loop do
+          post = queue.pop
+          next if File.exist?("cache/#{post.md5[0,2]}/#{post.md5}")
+          mt.synchronize do
+            Dir.mkdir("cache") unless File.exist?("cache")
+            Dir.mkdir("cache/#{post.md5[0,2]}") unless File.exist?("cache/#{post.md5[0,2]}")
+          end
+          body = post.download_data
+          mt.synchronize do
+            File.open("cache/#{post.md5[0,2]}/#{post.md5}","w") do |f|
+              f.print body
+            end
+          end
         end
-        count = tasks[name]
-        message = "Got #{" "*(max.to_s.length+2-count.to_s.length)}#{count}/#{max}"+" "*16
-        @log.debug message
-        tclient.puts message
-        tclient.close if count >= max
       end
     end
-  end
-end
-=end
 
-@log.formatter = proc do |sev,dat,prog,msg|
-  "#{Time.now.strftime("%b %e, %Y %I:%M:%S %p")} #{msg}#$/"
-end
-@log.level = Logger::INFO
-@log.info("New server instance started.")
-Dir.chdir(File.expand_path("~/.hexagon")) do
-  Thread.new do
-    loop do
-      files,size,tm = Dir["cache/**/*"].reject{|x|!File.file?(x)},0,Array.new
-      files.each do |f|
-        size += File.size(f)
-      end
-      if size > 30*2**30 then
+    @log.level = Logger::INFO
+    @log.info("New server instance started.")
+    Thread.new do
+      loop do
+        files,size,tm = Dir["cache/**/*"].reject{|x|!File.file?(x)},0,Array.new
         files.each do |f|
-          tm << {"file"=>f,"time"=>File.atime(f),"size"=>File.size(f)}
+          size += File.size(f)
         end
-        tm = tm.sort{|f1,f2|f1["time"]<=>f2["time"]}
-        while size > 30*2**30 do
-          unlink = tm.shift
-          size -= unlink["size"]
-          File.unlink(unlink["file"])
+        if size > 30*2**30 then
+          files.each do |f|
+            tm << {"file"=>f,"time"=>File.atime(f),"size"=>File.size(f)}
+          end
+          tm = tm.sort{|f1,f2|f1["time"]<=>f2["time"]}
+          while size > 30*2**30 do
+            unlink = tm.shift
+            size -= unlink["size"]
+            File.unlink(unlink["file"])
+          end
         end
+        sleep 3600
       end
-      sleep 3600
     end
-  end
-  begin
     Dir["searches/*"].each{|f|File.unlink(f)}
     loop do
       client = server.accept
       Thread.new(client) do |c|
         begin
-          query = c.gets.parse
-        rescue
-          @log.error("[#{c.remote_address.ip_address}]: Error #$!.")
-          next
-        end
-        case query["action"]
-        when "search" then
-          name,query = query["name"],query["query"]
-          @log.info("[#{c.remote_address.ip_address}]: Search init #{name}/#{query.join("+")}.")
-          Dir.mkdir("searches") unless File.exist?("searches")
-          rid = Digest::SHA2.hexdigest(name+Time.now.strftime("%s"))
-          File.open("searches/#{rid}.json","w") do |f|
-            search = {"name"=>name,"query"=>query}
-            f.print search.to_json
+          begin
+            query = c.gets.parse
+          rescue
+            @log.error("[#{c.remote_address.ip_address}]: Error #$!.")
+            next
           end
-            rid = {"rid"=>rid}.to_json
-            c.print rid
-        when "page" then
-          page, rid = query["page"],query["rid"]
-          File.open("searches/#{rid}.json"){|f|query=f.read.parse}
-          @log.info("[#{c.remote_address.ip_address}]: Search page #{query["name"]}/#{page}.")
-          search = Search.new(query["query"])
-          search.page = page
-          posts = {"posts"=>search.posts}.to_json
-          c.print posts
-        when "show" then
-          post = Post.new(query["post"])
-          Dir.mkdir("cache") unless File.exist?("cache")
-          Dir.mkdir("cache/#{post.md5[0,2]}") unless File.exist?("cache/#{post.md5[0,2]}")
-          body = String.new
-          if File.exist?("cache/#{post.md5[0,2]}/#{post.md5}") then
-            cached = " (cached)"
-            File.open("cache/#{post.md5[0,2]}/#{post.md5}") do |f|
-              body = f.read
+          case query["action"]
+          when "search" then
+            name,query = query["name"],query["query"]
+            @log.info("[#{c.remote_address.ip_address}]: Search init #{name}/#{query.join("+")}.")
+            Dir.mkdir("searches") unless File.exist?("searches")
+            rid = Digest::SHA2.hexdigest(name+Time.now.strftime("%s"))
+            Thread.new do 
+              s = Search.new(query)
+              s.each_post do |post|
+                queue << post
+              end
             end
-          else
-            cached = ""
-            body = post.download_data
-            File.open("cache/#{post.md5[0,2]}/#{post.md5}","w") do |f|
-              f.print body
+            File.open("searches/#{rid}.json","w") do |f|
+              search = {"name"=>name,"query"=>query}
+              f.print search.to_json
+            end
+              rid = {"rid"=>rid}.to_json
+              c.print rid
+          when "page" then
+            page, rid = query["page"],query["rid"]
+            File.open("searches/#{rid}.json"){|f|query=f.read.parse}
+            @log.info("[#{c.remote_address.ip_address}]: Search page #{query["name"]}/#{page}.")
+            search = Search.new(query["query"])
+            search.page = page
+            posts = {"posts"=>search.posts}.to_json
+            c.print posts
+          when "show" then
+            post = Post.new(query["post"])
+            body = String.new
+            mt.synchronize do
+              Dir.mkdir("cache") unless File.exist?("cache")
+              Dir.mkdir("cache/#{post.md5[0,2]}") unless File.exist?("cache/#{post.md5[0,2]}")
+            end
+            if File.exist?("cache/#{post.md5[0,2]}/#{post.md5}") then
+              cached = " (cached)"
+              mt.synchronize do
+                File.open("cache/#{post.md5[0,2]}/#{post.md5}") do |f|
+                  body = f.read
+                end
+              end
+            else
+              cached = ""
+              body = post.download_data
+              mt.synchronize do
+                File.open("cache/#{post.md5[0,2]}/#{post.md5}","w") do |f|
+                  f.print body
+                end
+              end
             end
+            @log.info("[#{c.remote_address.ip_address}]: Show post #{query["post"]["id"].pad(6," ")}#{cached}.")
+            file = {"name"=>"#{post.id.pad(8)}.#{post.md5}.#{post.file_ext}","data"=>Base64.encode64(body)}
+            c.print file.to_json
+          end
+        rescue
+          @log.error("Error: #$!!")
+          raise
+          if c && !c.closed? then
+            err = {"error"=>true,"message"=> $!.to_s}
+            c.puts err.to_json
+          end
+        ensure
+          if c && !c.closed? then
+            c.close
           end
-          @log.info("[#{c.remote_address.ip_address}]: Show post #{query["post"]["id"].pad(6," ")}#{cached}.")
-          file = {"name"=>"#{post.id.pad(8)}.#{post.md5}.#{post.file_ext}","data"=>Base64.encode64(body)}
-          c.print file.to_json
         end
-        c.close
       end
     end
   rescue Errno

data/bin/set-sync

@@ -61,7 +61,7 @@ E621::Config.config = File.expand_path("~/.hexagon/conf.json")
 api = API.new("user")
 @log = Logger.new(File.expand_path(E621::Config.paths["logging"]))
 @log.formatter = proc do |sev,dat,prog,msg|
-  "#{Time.now.strftime("%b %e, %Y %I:%M:%S %p")}: #{msg}#$/"
+  "#{Time.now.strftime("%b %e, %Y %I:%M:%S %p")} [#{sev.pad(5)}] #{msg}#$/"
 end
 @log.level = Logger::INFO
 @log.info("Program #$0 started.")

data/lib/pool.rb

@@ -36,8 +36,12 @@ module E621
     def name=(name)
       @name = name
     end
+    
+    def posts=(posts)
+      @posts = posts
+    end
 
-    def to_json
+    def to_json(n=nil)
       json_hash = Hash.new
       instance_variables.each do |i|
         v = instance_variable_get(i)

data/lib/rubyhexagon.rb

@@ -30,5 +30,5 @@ require "pool"
 
 module E621
   Name = "rubyhexagon"
-  Version = "0.0.1"
+  Version = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyhexagon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: