pidgin2adium 0.0.1 → 1.0.0

data/lib/pidgin2adium/balance-tags.rb

@@ -7,7 +7,7 @@ module Pidgin2Adium
     # @license GPL v2.0
     # @copyright November 4, 2001
     # @return string Balanced text.
-    def Pidgin2Adium.balance_tags( text )
+    def Pidgin2Adium.balanceTags( text )
 	tagstack = []
 	stacksize = 0
 	tagqueue = ''
@@ -16,14 +16,15 @@ module Pidgin2Adium
 	nestable_tags = ['blockquote', 'div', 'span'] # Tags that can be immediately nested within themselves
 	tag_regex = /<(\/?\w*)\s*([^>]*)>/
 
-	    # WP bug fix for comments - in case you REALLY meant to type '< !--'
-	    text.gsub!('< !--', '<    !--')
+	# WP bug fix for comments - in case you REALLY meant to type '< !--'
+	text.gsub!('< !--', '<    !--')
+
 	# WP bug fix for LOVE <3 (and other situations with '<' before a number)
 	text.gsub!(/<([0-9]{1})/, '&lt;\1')
 
 	while ( regex = text.match(tag_regex) )
 	    regex = regex.to_a
-	    newtext += tagqueue
+	    newtext << tagqueue
 	    i = text.index(regex[0])
 	    l = regex[0].length
 
@@ -38,7 +39,7 @@ module Pidgin2Adium
 		    #or close to be safe tag = '/' . tag
 		    # if stacktop value = tag close value then pop
 		elsif (tagstack[stacksize - 1] == tag) # found closing tag
-		    tag = '</' + tag + '>'; # Close Tag
+		    tag = '</' << tag << '>'; # Close Tag
 		    # Pop
 		    tagstack.pop
 		    stacksize -= 1
@@ -48,7 +49,7 @@ module Pidgin2Adium
 			    # add tag to tagqueue
 			    ss = stacksize - 1
 			    ss.downto(j) do |k|
-				tagqueue += '</' + tagstack.pop + '>'
+				tagqueue << '</' << tagstack.pop << '>'
 				stacksize -= 1
 			    end
 			    break
@@ -65,14 +66,14 @@ module Pidgin2Adium
 		    # If: self-closing or '', don't do anything.
 		elsif ( single_tags.include?(tag) )
 		    # ElseIf: it's a known single-entity tag but it doesn't close itself, do so
-		    regex[2] += '/'
+		    regex[2] << '/'
 		else
 		    # Push the tag onto the stack
 		    # If the top of the stack is the same as the tag we want to push, close previous tag
 		    if ((stacksize > 0) &&
 			! nestable_tags.include?(tag) &&
 			(tagstack[stacksize - 1] == tag))
-			tagqueue = '</' + tagstack.pop + '>'
+			tagqueue = '</' << tagstack.pop << '>'
 			stacksize -= 1
 		    end
 		    stacksize = tagstack.push(tag).length
@@ -81,29 +82,28 @@ module Pidgin2Adium
 		# Attributes
 		attributes = regex[2]
 		if(attributes != '')
-		    attributes = ' ' + attributes
+		    attributes = ' ' << attributes
 		end
-		tag = '<' + tag + attributes + '>'
+		tag = '<' << tag << attributes << '>'
 		#If already queuing a close tag, then put this tag on, too
 		if (tagqueue)
-		    tagqueue += tag
+		    tagqueue << tag
 		    tag = ''
 		end
 	    end
-	    newtext += text[0,i] + tag
-	    # text = substr(text,i+l)
+	    newtext << text[0,i] << tag
 	    text = text[i+l, text.length - (i+l)]
 	end
 
 	# Clear Tag Queue
-	newtext += tagqueue
+	newtext << tagqueue
 
 	# Add Remaining text
-	newtext += text
+	newtext << text
 
 	# Empty Stack
 	while(x = tagstack.pop)
-	    newtext += '</' + x + '>'; # Add remaining tags to close
+	    newtext << '</' << x << '>'; # Add remaining tags to close
 	end
 
 	# WP fix for the bug with HTML comments

data/lib/pidgin2adium/logs.rb

@@ -8,6 +8,10 @@
 #A ruby program to convert Pidgin log files to Adium log files, then place
 #them in the Adium log directory with allowances for time zone differences.
 
+require 'pidgin2adium/SrcFileParse'
+require 'pidgin2adium/ChatFileGenerator'
+require 'fileutils'
+
 class Time
     ZoneOffset = {
 	'UTC' => 0,
@@ -46,11 +50,6 @@ class Time
 end
 
 module Pidgin2Adium
-    require 'pidgin2adium/SrcFileParse'
-    require 'pidgin2adium/ChatFileGenerator'
-    require 'parsedate'
-    require 'fileutils'
-    
     # put's content. Also put's to @LOG_FILE_FH if @debug == true.
     def Pidgin2Adium.logMsg(str, isError=false)
 	content = str.to_s
@@ -66,37 +65,30 @@ module Pidgin2Adium
 	def initialize(src, out, aliases, libdir, tz=nil, debug=false)
 	    # These files/directories show up in Dir.entries(x)
 	    @BAD_DIRS = %w{. .. .DS_Store Thumbs.db .system}
-	    src = File.expand_path(src)
-	    out = File.expand_path(out)
-	    unless File.directory?(src)
-		puts "Source directory #{src} does not exist or is not a directory."
+	    @src_dir = File.expand_path(src)
+	    @out_dir = File.expand_path(out)
+	    # Whitespace is removed for easy matching later on.
+	    @my_aliases = aliases.map{|x| x.downcase.gsub(/\s+/,'') }.uniq
+	    # @libdir is the directory in
+	    # ~/Library/Application Support/Adium 2.0/Users/Default/Logs/.
+	    # For AIM, it's like "AIM.<screenname>"
+	    # FIXME: don't make the user pass in libdir - we can and SHOULD change it on a per-service/screenname basis
+	    @libdir = libdir
+	    @DEFAULT_TIME_ZONE = tz || Time.now.zone
+	    @debug = debug
+	    unless File.directory?(@src_dir)
+		puts "Source directory #{@src_dir} does not exist or is not a directory."
 		raise Errno::ENOENT
 	    end
-	    unless File.directory?(out)
+	    unless File.directory?(@out_dir)
 		begin
-		    FileUtils.mkdir_p(out)
+		    FileUtils.mkdir_p(@out_dir)
 		rescue
-		    puts "Output directory #{out} does not exist or is not a directory and could not be created."
+		    puts "Output directory #{@out_dir} does not exist or is not a directory and could not be created."
 		    raise Errno::ENOENT
 		end
 	    end
 
-	    if libdir.nil?
-		puts "You must provide libdir."
-		raise Error
-	    end
-
-	    @src_dir = src
-	    @out_dir = out
-
-	    # Whitespace is removed for easy matching later on.
-	    @my_aliases = aliases.map{|x| x.downcase.gsub(/\s+/,'') }.uniq
-	    # @libdir is the directory in
-	    # ~/Library/Application Support/Adium 2.0/Users/Default/Logs/.
-	    # For AIM, it's like "AIM.<screenname>"
-	    @libdir = libdir
-	    @debug = debug
-	    @DEFAULT_TIME_ZONE = tz || Time.now.zone
 	    # local offset, like "-0800" or "+1000"
 	    @DEFAULT_TZ_OFFSET = '%+03d00'%Time.zone_offset(@DEFAULT_TIME_ZONE)
 	end
@@ -104,16 +96,20 @@ module Pidgin2Adium
 	def start
 	    Pidgin2Adium.logMsg "Begin converting."
 	    begin
-		filesPath = getAllChatFilesPath(@src_dir)
+		filesPath = getAllChatFiles(@src_dir)
 	    rescue Errno::EACCES => bang
-		Pidgin2Adium.logMsg("Sorry, permission denied for getting chat files from #{@src_dir}.", true)
+		Pidgin2Adium.logMsg("Sorry, permission denied for getting Pidgin chat files from #{@src_dir}.", true)
 		Pidgin2Adium.logMsg("Details: #{bang.message}", true)
 		raise Errno::EACCES
 	    end
 
-	    Pidgin2Adium.logMsg(filesPath.length.to_s + " files to convert.")
-	    filesPath.each do |fname|
-		Pidgin2Adium.logMsg("Converting #{fname}...")
+	    Pidgin2Adium.logMsg("#{filesPath.length} files to convert.")
+	    totalFiles = filesPath.size
+	    filesPath.each_with_index do |fname, i|
+		Pidgin2Adium.logMsg(
+		    sprintf("[%d/%d] Converting %s...",
+			(i+1), totalFiles, fname)
+		)
 		convert(fname)
 	    end
 
@@ -164,10 +160,10 @@ module Pidgin2Adium
 		    Pidgin2Adium.logMsg("Could not create #{toCreate}: #{bang.class} #{bang.message}", true)
 		    return false
 		end
-		fileWithXmlExt = srcPath[0, srcPath.size-File.extname(srcPath).size] + ".xml"
+		fileWithXmlExt = srcPath[0, srcPath.size-File.extname(srcPath).size] << ".xml"
 		# @src_dir/log.chatlog (file) -> @out_dir/log.chatlog/log.xml
 		File.cp(srcPath, File.join(@out_dir, srcPath, fileWithXmlExt))
-		Pidgin2Adium.logMsg("Copied #{srcPath} to " + File.join(@out_dir, srcPath, fileWithXmlExt))
+		Pidgin2Adium.logMsg("Copied #{srcPath} to " << File.join(@out_dir, srcPath, fileWithXmlExt))
 		return true
 	    else
 		Pidgin2Adium.logMsg("srcPath (#{srcPath}) is not a txt, html, or chatlog file. Doing nothing.")
@@ -192,54 +188,58 @@ module Pidgin2Adium
 		end
 	end
 
-	def getAllChatFilesPath(dir)
+	def getAllChatFiles(dir)
 	    return [] if File.basename(dir) == ".system"
 	    # recurse into each subdir
-	    return (Dir.glob(File.join(@src_dir, '**', '*.{html,txt}')) - @BAD_DIRS)
+	    return (Dir.glob(File.join(@src_dir, '**', '*.{htm,html,txt}')) - @BAD_DIRS)
 	end
 
 	# Copies logs, accounting for timezone changes
 	def copyLogs
 	    Pidgin2Adium.logMsg "Copying logs with accounting for different time zones..."
-	    real_dest_dir = File.expand_path('~/Library/Application Support/Adium 2.0/Users/Default/Logs/') + '/' + @libdir + '/'
-	    real_src_dir = File.join(@out_dir, @libdir) + '/'
+	    # FIXME: not all logs are AIM logs, libdir may change
+	    realSrcDir = File.expand_path('~/Library/Application Support/Adium 2.0/Users/Default/Logs/') << "/#{@libdir}/"
+	    realDestDir = File.join(@out_dir, @libdir) << '/'
 
-	    src_entries =  Dir.entries(real_src_dir)
-	    dest_entries =  Dir.entries(real_dest_dir)
+	    src_entries =  Dir.entries(realSrcDir)
+	    dest_entries =  Dir.entries(realDestDir)
 	    both_entries = (src_entries & dest_entries) - @BAD_DIRS
 
 	    both_entries.each do |name|
-		my_src_entries = Dir.entries(real_src_dir + name) - @BAD_DIRS
-		my_dest_entries = Dir.entries(real_dest_dir + name) - @BAD_DIRS
+		my_src_entries = Dir.entries(realSrcDir << name) - @BAD_DIRS
+		my_dest_entries = Dir.entries(realDestDir << name) - @BAD_DIRS
 
 		in_both = my_src_entries & my_dest_entries
 		in_both.each do |logdir|
 		    FileUtils.cp(
-			File.join(real_src_dir, name, logdir, logdir.sub('chatlog', 'xml')),
-				 File.join(real_dest_dir, name, logdir) + '/',
+			File.join(realSrcDir, name, logdir, logdir.sub('chatlog', 'xml')),
+			File.join(realDestDir, name, logdir) << '/',
 				 :verbose => false)
 		end
-		# The logs that are only in one of the dirs are not necessarily different logs than the dest.
-		# They might just have different timestamps. Thus, we use regexes.
+		# The logs that are only in one of the dirs are not necessarily
+		# different logs than the dest.  They might just have different
+		# timestamps. Thus, we use regexes.
 		only_in_src  = my_src_entries - in_both
 		only_in_dest = my_dest_entries - in_both
-		# Move files from real_src_dir that are actually in both, but just have different time zones.
+		# Move files from realSrcDir that are actually in both, but
+		# just have different time zones.
 		only_in_src.each do |srcLogDir|
 		    # Match on everything except the timezone ("-0400.chatlog")
-		    fname_beginning_regex = Regexp.new( Regexp.escape(srcLogDir.sub(/-\d{4}.\.chatlog$/, '')) )
-		    target_chatlog_dir = only_in_dest.find{|d| d =~ fname_beginning_regex }
-		    if target_chatlog_dir.nil?
-			# Only in source, so we can copy it without fear of overwriting.
-			target_chatlog_dir = srcLogDir
-			FileUtils.mkdir_p(File.join(real_dest_dir, name, target_chatlog_dir))
+		    fileBeginRegex = Regexp.new('^'<<Regexp.escape(srcLogDir.sub(/-\d{4}.\.chatlog$/, '')) )
+		    targetChatlogDir = only_in_dest.find{|d| d =~ fileBeginRegex}
+		    if targetChatlogDir.nil?
+			# Only in source, so we can copy it without fear of
+			# overwriting.
+			targetChatlogDir = srcLogDir
+			FileUtils.mkdir_p(File.join(realDestDir, name, targetChatlogDir))
 		    end
-		    # Move to target_chatlog_dir so we overwrite the destination
+		    # Move to targetChatlogDir so we overwrite the destination
 		    # file but still use its timestamp
 		    # (if it exists; if it doesn't, then we're using our own
 		    # timestamp).
 		    FileUtils.cp(
-			File.join(real_src_dir, name, srcLogDir, srcLogDir.sub('chatlog', 'xml')),
-			File.join(real_dest_dir, name, target_chatlog_dir, target_chatlog_dir.sub('chatlog', 'xml')),
+			File.join(realSrcDir, name, srcLogDir, srcLogDir.sub('chatlog', 'xml')),
+			File.join(realDestDir, name, targetChatlogDir, targetChatlogDir.sub('chatlog', 'xml')),
 			:verbose => false
 		    )
 		end

data/lib/pidgin2adium/status.rb

@@ -8,8 +8,13 @@
 # It doesn't work in Mac OSX 10.5 (Leopard).
 # See: http://trac.adiumx.com/ticket/8863
 # It should work in Mac OSX 10.4 (Tiger), but is untested.
-
-# location of status.xml
+#
+# TODO: check adium version in
+# /Applications/Adium.app/Contents
+# with this:
+#         <key>CFBundleShortVersionString</key>
+#         <string>1.3.4</string>
+# For Mac 10.5+, needs to be 1.4; should work for 10.4 with 1.3.x
 
 require 'rubygems'
 require 'hpricot'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pidgin2adium
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors: 
 - Gabe B-W
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-09-24 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
-    version: 
+dependencies: []
+
 description: Converts Pidgin logs and statuses to Adium format and makes them available to Adium. Also installstwo shell scripts, pidgin2adium_logs and pidgin2adium_status.
 email: gbw@rubyforge.org
 executables: 
@@ -61,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pidgin2adium
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Converts Pidgin logs and statuses to Adium format and makes them available to Adium.