my_general 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ce678b6da475675e5f6804cae58a7f642367b78568cae33ff63d126b295018
-  data.tar.gz: 8a2d5d7129071b08376a85c749478b647cf215e13f06bef425e2fd43ec550a99
+  metadata.gz: f8f84cc91082b51a74ab1c8b0cc3b895841e53f3b0d25a777f9ce362733fb7c9
+  data.tar.gz: '0499ab72306d9933feca4084370219f50e9a4987f889a326303eb3dbf46f2de7'
 SHA512:
-  metadata.gz: a9c1a30e12a3f6502b28aa7a72325d003e7520f454d2dc93a4f8bd2e2a9e0abd16a1e22face9cae6c08eaf36ce72ebf94c486ad58cb0506e0ca3cf5a699f1775
-  data.tar.gz: 10287b2ca71453fc887fa1118bf4feb7fc1df6e66b93e14a0a34d2289ddc739b7a19b246f11c2435ce00110279ee03f0703427aefc90b8b39f9504462e79b39c
+  metadata.gz: e61891e2fb0b60aaa3b36b1fd0f05b5f83974ce58504e770cbd86c258a788d846ea77e64ec727fc87ea561a0b421927b8cbc0c0a57af7a0a527404f8296512c4
+  data.tar.gz: b45df2362797283c1651d37f81cb5ebd1107d1a9bf2ed4dff97925c598c3f23076af1f09e81ac4aebcce16e6103fc74d1542a0b38d8e0bd3ce32baff205bf4e2

data/lib/my_general.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'ruby-progressbar'
 require 'sequel'
 require 'yaml'

data/lib/my_general/instance.rb

@@ -2,9 +2,17 @@ class MyGeneral::Instance
   def initialize(log_file, database_file)
     @complexity = nil
     @db = nil
+    @time = nil
+    @new_command = false
+    @command = 'Query'
+    @buffer = 'SELECT 1'
+
+    @insert_count = 0
+    @success_count = 0
 
     @log_file = log_file
     @database_file = database_file
+    @progressbar = nil
   end
 
   def complexity
@@ -22,33 +30,69 @@ class MyGeneral::Instance
     puts "[2/4] 🔌  Dailing Database... OK [Connected]"
     puts '[3/4] ⏳  Importing Data...'
     run_data
-    puts "[3/4] ⏳  Importing Data... OK [#{complexity}/#{complexity}]"
+    puts "[3/4] ⏳  Importing Data... OK [#{@success_count}/#{@insert_count}]"
     puts '[4/4] 🚩  Finished!'
   end
 
   def run_data
-    progressbar = ProgressBar.create
-    progressbar.total = complexity
+    @progressbar = ProgressBar.create(format: '%t: |%B| %c/%C %E')
+    @progressbar.total = complexity
     File.open(@log_file, 'r') do |file|
+      3.times { file.readline } # Skip 3 lines
       until file.eof?
         line = file.readline
-        run_query(line, progressbar)
-        progressbar.increment
+        parse_line(line)
+        @progressbar.increment
       end
     end
   end
 
-  def run_query(line, progressbar)
-    data = line.split("\t")
-    return if data.length < 3 # A connecting message
-    return if data[-1].upcase.start_with?('CREATE DATABASE') # Ignore database scale query
-    return unless data[-2].end_with?('Query') # Ignore not query
-    return if data[-1].upcase.start_with?('SELECT')# Ignore select query
-    return if data[-1].upcase.start_with?('SHOW') # Ignore show query
-    @db.run(data[-1])
+  def parse_line(line)
+    date = line.split("\t")[0]
+    if date =~ /^[0-9]{6}/ # Is Date?
+      @time = DateTime.parse("#{20}#{date}")
+      @command = line.split("\t")[1].split(' ')[-1]
+      @new_command = true
+    elsif line.start_with?("\t\t")
+      @command = line.split("\t")[2].split(' ')[-1]
+      @new_command = true
+    else
+      @new_command = false
+    end
+
+    flush
+
+    if @command == 'Query'
+      @buffer << line.split("\t")[-1]
+    end
+  rescue => e
+    # Ignore
+  end
+
+  def flush
+    if @new_command & !@buffer.empty?
+      # Do query
+      run_query
+      # Refresh variables
+      @new_command = false
+      @buffer = ''
+    end
+  end
+
+  VERBS = ['SET', 'INSERT', 'UPDATE', 'DELETE', 'CREATE', 'ALTER', 'DROP'].freeze
+
+  def run_query
+    # return if @time < DateTime.parse("2017-05-13 07:08:00") # Ignore from last backup
+    return if @buffer.upcase.start_with?('CREATE DATABASE') # Ignore database scale query
+    return unless VERBS.map do |verb|
+      @buffer.upcase.start_with?(verb)
+    end.reduce(:|) # Ignore unless exact verb
+    @insert_count += 1
+    @db.run(@buffer)
+    @success_count += 1
   rescue => e
-    progressbar.log("When executing #{line}")
-    progressbar.log('We met a problem:')
-    progressbar.log(e.inspect)
+    @progressbar.log("When executing #{@time} #{@buffer}")
+    @progressbar.log('We met a problem:')
+    @progressbar.log(e.inspect)
   end
 end

data/lib/my_general/version.rb

@@ -1,5 +1,5 @@
 # MyGenral Module
 module MyGeneral
   # Current Version Code
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_general
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - HeckPsi Lab
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -80,6 +80,7 @@ files:
 - lib/my_general.rb
 - lib/my_general/instance.rb
 - lib/my_general/version.rb
+- test.db
 homepage: https://github.com/dsh0416/my_general
 licenses:
 - MIT