adium2gmail 0.1.2 → 0.1.3

data/README.md

@@ -16,6 +16,10 @@ Run:
 
 Open the file in Thunderbird to view all the chatlogs
 
+Copy it into your gmail
+
+![Feature Diagram](https://github.com/johnjiang/adium2gmail/raw/gh-pages/images/example.png)
+
 ## TODO
 
 1. Multiprocessing of chatlogs to improve performance
@@ -27,4 +31,4 @@ Open the file in Thunderbird to view all the chatlogs
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/adium2gmail.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency('mail')
   gem.add_dependency('nokogiri')
-  gem.add_dependency('trollop')
+  gem.add_dependency('parallel')
 
   gem.add_development_dependency('rspec')
 

data/bin/adium2gmail

@@ -2,12 +2,48 @@
 
 require 'adium2gmail'
 require 'Find'
-require 'trollop'
+require 'optparse'
+require 'ostruct'
 
-opts = Trollop::options do
-  version "adium2gmail #{Adium2Gmail::VERSION}"
-  opt :output, "Output path", :short => 'o', :default => 'chatlogs'
-  opt :input, "Input path", :short => 'i', :default => File.expand_path('~/Library/Application Support/Adium 2.0/Users/Default/Logs')
+
+options = OpenStruct.new
+options.input_path = File.expand_path('~/Library/Application Support/Adium 2.0/Users/Default/Logs')
+options.output_path = "chatlogs"
+options.parallel = false
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: adium2gmail [options]"
+
+  opts.separator ""
+  opts.separator "Specific options:"
+
+  opts.on("-i", "--input [PATH]", "Path of the adium chatlogs") do |input_path|
+    options.input_path = input_path
+  end
+
+  opts.on("-o", "--output [PATH]", "Path of the output path") do |output_path|
+    options.output_path = output_path
+  end
+
+  opts.on("-p", "--[no-]parallel", "Enable parallel processing (experimental!)") do |parallel|
+    options.parallel = parallel
+  end
+
+  opts.separator ""
+  opts.separator "Common options:"
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.on_tail("--version", "Show version") do
+    puts Adium2Gmail::VERSION
+    exit
+  end
 end
 
-Adium2Gmail::process_adium_chatlogs opts[:input], opts[:output]
+opts.parse!(ARGV)
+
+
+Adium2Gmail::process_adium_chatlogs options.input_path, options.output_path, options.parallel

data/lib/adium2gmail.rb

@@ -4,6 +4,8 @@ require 'find'
 require 'logger'
 require 'mail'
 require 'nokogiri'
+require 'ostruct'
+require 'parallel'
 
 
 module Adium2Gmail
@@ -21,19 +23,19 @@ module Adium2Gmail
       content_type 'text/html; charset=UTF-8'
       body email_body
     end
-    header = "From - " + chat_date.strftime("%a %b %d %H:%M:%S %Y")
-    header += "Date: " + chat_date.strftime("%a, %d %b %Y %H:%M:%S %z")
-    header + "\n" + mail.to_s.split("\n")[1..-1].join("\n") + "\n\n\n"
+    header = "From - " + chat_date.strftime("%a %b %d %H:%M:%S %Y\n")
+    header += "Date: " + chat_date.strftime("%a, %d %b %Y %H:%M:%S %z\n")
+    header + mail.to_s.split("\n")[1..-1].join("\n") + "\n\n\n"
   end
 
   def self.get_email_body(f)
     messages = ''
-    
+
     doc = Nokogiri::XML(File.open(f, "r"))
-    
+
     doc.remove_namespaces! #stupid namespaces
 
-    doc.xpath("//message").each do | message |
+    doc.xpath("//message").each do |message|
       datetime = DateTime.parse(message.xpath("@time").text)
       nickname = message.xpath("@alias").text
       nickname = message.xpath("@sender").text if nickname.blank?
@@ -48,7 +50,7 @@ module Adium2Gmail
     time = date.strftime("%I:%M %p")
 
     message_tag = message_tag.xpath("div/span")
-    
+
     #Not sure why I do the gsub here. I did it in python but didn't comment :(
     #But I'm sure I did it for a good reason
     message = message_tag.text.gsub("'", "'")
@@ -66,17 +68,37 @@ module Adium2Gmail
       </div>}
   end
 
-  def self.process_adium_chatlogs(input, output_path)
-    File.open output_path, "w" do |output_file|
-      Find.find(input) do |f|
-        if f.match(/\.chatlog.*?\.xml\Z/) && ! f.include?("msn chat") #skipping multiple conversations for now
-          to_email = File.basename(File.dirname(File.dirname(File.dirname(f)))).sub(/.*?\./, "") #this is somewhat hacky...
-          from_email, chat_date = File.basename(f, ".xml").split()
-          chat_date = DateTime.parse(chat_date.gsub!(".", ":"))
+  def self.find_logs(input)
+    infos = []
+    Find.find(input) do |f|
+      if f.match(/\.chatlog.*?\.xml\Z/) && !f.include?("msn chat") #skipping multiple conversations for now
+        to_email = File.basename(File.dirname(File.dirname(File.dirname(f)))).sub(/.*?\./, "") #this is somewhat hacky...
+        from_email, chat_date = File.basename(f, ".xml").split()
+        chat_date = DateTime.parse(chat_date.gsub!(".", ":"))
+
+        info = OpenStruct.new
+        info.from_email = from_email
+        info.to_email = to_email
+        info.f = f
+        info.chat_date = chat_date
+        infos.push info
+      end
+    end
 
-          output_file.puts create_email(from_email, to_email, f, chat_date)
+    return infos
+  end
+
+  def self.process_adium_chatlogs(input, output_path, parallel)
+    File.open output_path, "w" do |output_file|
+      if parallel then
+        Parallel.map(find_logs(input)) do |info|
+          output_file.puts create_email(info.from_email, info.to_email, info.f, info.chat_date)
         end
-      end 
+      else
+        find_logs(input).each do |info|
+          output_file.puts create_email(info.from_email, info.to_email, info.f, info.chat_date)
+        end
+      end
     end
-  end  
+  end
 end

data/lib/adium2gmail/version.rb

@@ -1,3 +1,3 @@
 module Adium2Gmail
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adium2gmail
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70163823546000 !ruby/object:Gem::Requirement
+  requirement: &70157516174440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163823546000
+  version_requirements: *70157516174440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70163823545280 !ruby/object:Gem::Requirement
+  requirement: &70157516173400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163823545280
+  version_requirements: *70157516173400
 - !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &70163823544520 !ruby/object:Gem::Requirement
+  name: parallel
+  requirement: &70157516172380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163823544520
+  version_requirements: *70157516172380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70163823543900 !ruby/object:Gem::Requirement
+  requirement: &70157516171940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163823543900
+  version_requirements: *70157516171940
 description: Converts Adium chatlogs to emails
 email:
 - johnjiang101@gmail.com