uva-tools 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 600ae5264d13d0c083a5ad143e01f6cd5cd3b180
-  data.tar.gz: c13486119816dc8ad210072915efac90142d6256
+  metadata.gz: 9c3615b3d3e8580d5a0bc5b202f0b193989e1aba
+  data.tar.gz: 59fca87b8834319e6034306d4fe54f77b52842bf
 SHA512:
-  metadata.gz: 5d565deb6a25120c1f19a66d640f7e060055b28ba31a6abc1ee01457ff0c5da25bf08b9678e51f309ca0c9be57fb05a7329f296e3b125638b4853711c63c9e86
-  data.tar.gz: 55be55d88c394e2570361d3508dcc506a626308f55fdc0136968ca98beed12bc8a2efa1c52cda3d9af0055b876a84a299194eb627eae2f9468d4d33657dd1d20
+  metadata.gz: 78c1fb38a554df072af6c853e2ed0b1ce0f2ef1923882bdd3d3ea77c67fdc56f0e1ef9dda434009a9e15e5f7819604bbcc2e36e91be9d9d9508a5ea70481dd25
+  data.tar.gz: e639ce24547767f5c07aa1de554cba287000b0f4718dde267cb25d4187585ad0cdc0f8de6d02a1db4eeb26618934d9977ed22440daf95214bb5d316d125a30cf

data/lib/uva-tools/problem.rb

@@ -89,10 +89,8 @@ module UVaTools
             end
           end
         end
-        puts "downloaded: #{number}"
         true
       else
-        puts "#{number} was already downloaded"
         false
       end
     end
@@ -106,9 +104,9 @@ module UVaTools
             end
           end
         end
-        puts "removed #{number}"
+        true
       else
-        puts "#{number} wasn't downloaded"
+        false
       end
     end
 
@@ -116,9 +114,27 @@ module UVaTools
       File.directory?(dir_name) && (File.exists?("#{dir_name}/#{number}.html") || File.exists?("#{dir_name}/#{number}.pdf"))
     end
 
+    def open
+      if f_path = path
+        `open #{f_path}`
+        true
+      else
+        puts "Problem not downloaded!"
+        false
+      end
+    end
+
     private
     def dir_name
-      "#{ENV['HOME']}/uva-tools/#{number/100}"
+      "#{UVaTools::ROOT_DIR}/#{number/100}"
+    end
+
+    def path
+      if downloaded?
+        "#{dir_name}/#{number}.#{File.exists?("#{dir_name}/#{number}.html") ? 'html' : 'pdf'}"
+      else
+        nil
+      end
     end
   end
 end

data/lib/uva-tools/user.rb

@@ -1,5 +1,13 @@
 module UVaTools
   class User
+    def self.load(username)
+      if File.directory?(UVaTools::USER_SAVE_LOCATION) && File.exists?("#{UVaTools::USER_SAVE_LOCATION}/#{username}")
+        Marshal.load(File.binread("#{UVaTools::USER_SAVE_LOCATION}/#{username}"))
+      else
+        nil
+      end
+    end
+
     def initialize(username)
       @username = username
     end
@@ -35,6 +43,12 @@ module UVaTools
       self
     end
 
+    def save
+      FileUtils::mkdir_p UVaTools::USER_SAVE_LOCATION
+      File.open("#{UVaTools::USER_SAVE_LOCATION}/#{@username}", 'w') {|f| f.write(Marshal.dump(self))}
+      true
+    end
+
     private
     def uid
       @uid ||= begin
@@ -76,5 +90,13 @@ module UVaTools
     def unsolved_pids
       UVaTools.problems.map(&:id) - solved_pids
     end
+
+    def marshal_load array
+      @uid, @username, @solved_pids = array
+    end
+
+    def marshal_dump
+      [uid, @username, solved_pids]
+    end
   end
 end

data/lib/uva-tools/uva-tools.rb

@@ -1,4 +1,8 @@
 module UVaTools
+  ROOT_DIR = "#{ENV['HOME']}/uva-tools"
+  SAVE_LOCATION = "#{ROOT_DIR}/save"
+  USER_SAVE_LOCATION = "#{ROOT_DIR}/save/user"
+
   class << self
     def problems
       problem_hash.values
@@ -14,13 +18,30 @@ module UVaTools
       h
     end
 
+    def save
+      FileUtils::mkdir_p UVaTools::SAVE_LOCATION
+      File.open("#{UVaTools::SAVE_LOCATION}/problems", 'w') {|f| f.write(Marshal.dump(problem_hash))}
+      true
+    end
+
+    def load
+      if File.directory?(UVaTools::SAVE_LOCATION) && File.exists?("#{UVaTools::SAVE_LOCATION}/problems")
+        @@problems = Marshal.load(File.binread("#{UVaTools::SAVE_LOCATION}/problems"))
+        true
+      else
+        false
+      end
+    end
+
     def download_multiple(prob_nums, worker_count = 4)
       to_download = Array(prob_nums).map do |prob_num|
         problems_by_number[prob_num]
       end
 
-      if to_download.length > 0
-        worker_count = [worker_count, to_download.length].min
+      length = to_download.length
+
+      if length > 0
+        worker_count = [worker_count, length].min
         workers = []
 
         worker_count.times do
@@ -34,20 +55,18 @@ module UVaTools
         finished = 0
 
         loop do
-          break if finished >= to_download.size
+          break if finished >= length
 
           ready = IO.select(reads, writes)
 
           ready[0].each do |readable|
-            data = Marshal.load(readable)
-            # assets.merge! data["assets"]
-            # files.merge! data["files"]
-            # paths_with_errors.merge! data["errors"]
+            number = Marshal.load(readable)
             finished += 1
+            puts "(#{finished}/#{length}) Finished: #{number}"
           end
 
           ready[1].each do |write|
-            break if index >= to_download.size
+            break if index >= length
 
             Marshal.dump(index, write)
             index += 1

data/lib/uva-tools/version.rb

@@ -1,3 +1,3 @@
 module UVaTools
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uva-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dave Allie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies: []
 description: Set of UVa Online tools
 email: dave@daveallie.com