swallow 0.0.1 → 0.0.2

data/bin/swallow

@@ -4,4 +4,6 @@ require "swallow"
 
 admin = Swallow::Admin.new
 admin.process_junk
-admin.process_inbox
+admin.process_inbox
+admin.process_innocent
+admin.age

data/lib/email.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/ruby
 
 require 'time_extentions'
+require 'ftools'
 
 module Swallow
     class Email
@@ -34,9 +35,14 @@ module Swallow
             # modify filename to "S" on end
         end
 
+        def move_to(folder)
+            File.move(@filename, folder, true)
+        end
+
         def to_s
             File.open(@filename).read
         end
+
         def delete
             File.delete(@filename)
         end

data/lib/maildir.rb

@@ -36,11 +36,11 @@ module Swallow
         end
 
         def unread_count
-            length("new")
+            emails.find_all{ |e| e.read == false }.length
         end
 
         def read_count
-            length("cur")
+            emails.find_all{ |e| e.read == true }.length
         end
 
         def unknown_count
@@ -49,23 +49,23 @@ module Swallow
 
         def length(sub_path)
             length = 0
-            Dir.open(File.join(@folder_path,sub_path)).each { |filename|
+            Dir.open(File.join(@folder_path,sub_path)).each do |filename|
                 next if filename == "." or filename == ".."
                 length += 1
-            }
+            end
             length
         end
 
         def emails
             list = Array.new
-            @sub_folders.each { |sub_path|
+            @sub_folders.each do |sub_path|
                 path = File.join(@folder_path, sub_path)
-                Dir.open(path).each { |f|
+                Dir.open(path).each do |f|
                     filename = File.join(path,f)
                     next if File.directory?(filename)
                     list << Email.new(filename)
-                }
-            }
+                end
+            end
             return list
         end
 
@@ -75,6 +75,13 @@ module Swallow
             puts "Deleted #{count} emails"
         end
 
+        def add(emails)
+            # We'll take these emails from some other location and add them to our "cur" folder.
+            emails.each do |email|
+                email.move_to(File.join(@folder_path,"cur"))
+            end
+        end
+
         def emails_newer_than(limit)
             emails.find_all { |e| e.newer_than?(limit) }
         end
@@ -85,25 +92,16 @@ module Swallow
 
         def sweep!(limit)
           if limit.kind_of? Integer then
-            @sub_folder.each { |sub_path|
+            @sub_folder.each do |sub_path|
               Dir.open(File.join(@folder_path,sub_path)).sweep!(limit)
-            }
+            end
           end
         end
+        def status 
+            "#{@folder_path} has #{unread_count} unread messages and #{read_count} read messages (#{unknown_count})."        
+        end
         def to_s
-            "#{@folder_path} has #{unread_count} unread messages and #{read_count} read messages (#{unknown_count})."
+            "#{@folder_path}"
         end
     end
 end
-
-if $0 == __FILE__ then
-    include Swallow
-    root = "/home/#{ENV['USER']}/Maildir/"
-    m = MailDirFolder.new(root)
-    puts m.to_s
-    m.enum.each { |folder|
-    n = MailDirFolder.new(m.path+folder)
-        puts n.to_s
-    puts n.enum
-    }
-end

data/lib/swallow.rb

@@ -20,11 +20,9 @@ module Swallow
         def process_junk
             # Create Folder Objects
             junk = MailDirFolder.new(@config[:maildir] + @config[:junk])
-            corpus = MailDirFolder.new(@config[:maildir] + @config[:corpus])
 
             # Clean out the Junk Folder
             @dspam.train_and_clean_folder(junk)
-            @dspam.train_and_clean_folder(corpus)
         end
 
         def process_inbox
@@ -33,12 +31,41 @@ module Swallow
             # Feed new messages under the limit in the inbox to the filter as innocent corpus
             @dspam.train_emails_as_innocent(inbox.emails_newer_than(@config[:limit]))
         end
-    end
-end
 
-if $0 == __FILE__ then
-    admin = Swallow::Admin.new
-    admin.process_junk
-    admin.process_inbox
-end
+        def process_innocent
+            innocent = MailDirFolder.new(@config[:maildir] + @config[:innocent])
+            inbox = MailDirFolder.new(@config[:maildir] + @config[:inbox])
+            @dspam.train_emails_as_innocent(innocent.emails)
+            inbox.add(innocent.emails)
+        end
+
+        def process_folder(folder_name, is_spam)
+            folder = MailDirFolder.new(@config[:maildir] + folder_name)
+            if is_spam == true then
+                @dspam.train_and_clean_folder(folder)
+            else
+                @dspam.train_emails_as_innocent(folder.emails)
+            end
+        end  
 
+        def age_to_folder(src, dst, limit)
+            dst.add(src.emails_older_than(limit))
+        end
+
+        def age
+            puts "Aging folders..."
+            trash = MailDirFolder.new(@config[:maildir] + @config[:trash])
+            ruleset = RuleSet.new(@config[:files] + @config[:ruleset])
+            ruleset.rules.each do |rule|
+                if rule[:folder] != nil and rule[:day_limit] != nil then
+                    puts "Folder #{rule[:folder]} has a limit of #{rule[:day_limit]}"
+                    src = MailDirFolder.new(@config[:maildir] + "." + rule[:folder])
+                    emails = src.emails_older_than(rule[:day_limit])
+                    puts "Moved #{emails.length} emails"
+                    trash.add(emails)
+                end
+            end
+        end
+
+    end
+end

data/test/test_age.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'swallow'
+maildir = "#{ENV['HOME']}/Maildir/"
+
+case ARGV.length 
+  when 3
+    src = Swallow::MailDirFolder.new(maildir + ARGV[0])
+    dst = Swallow::MailDirFolder.new(maildir + ARGV[1])
+    limit = Integer(ARGV[2])
+    admin = Swallow::Admin.new
+    admin.age_to_folder(src,dst,limit)
+  else
+    admin = Swallow::Admin.new
+    admin.age
+end
+    
+
+
+
+

data/test/test_dir.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'swallow'
+
+maildir = "#{ENV['HOME']}/Maildir/"
+m = Swallow::MailDirFolder.new(maildir)
+puts m.to_s
+puts m.status
+m.enum.each do |folder|
+  n = Swallow::MailDirFolder.new(m.path+folder)
+  puts n.to_s
+  puts n.status
+  puts n.enum
+end

data/test/test_move.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+require 'swallow'
+
+exit(1) unless ARGV.length > 1
+maildir = "#{ENV['HOME']}/Maildir/"
+src = Swallow::MailDirFolder.new(maildir + ARGV[0])
+dst = Swallow::MailDirFolder.new(maildir + ARGV[1])
+
+dst.add(src.emails)

metadata

@@ -1,33 +1,34 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: swallow
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-10-29 00:00:00 -05:00
-summary: A backend IMAP/Maildir Email Sorting/Routing/Cleanup system
-require_paths: 
-- lib
-email: swallow-dev@erik.rainey.name
-homepage: http://erik.rainey.name/swallow
-rubyforge_project: 
-description: 
-autorequire: swallow
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Erik Rainey
+autorequire: swallow
+bindir: bin
+cert_chain: []
+
+date: 2008-05-26 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: gurgitate-mail
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.5
+    version: 
+description: 
+email: swallow-dev@erik.rainey.name
+executables: 
+- swallow
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - bin/swallow
 - lib/time_extentions.rb
@@ -37,27 +38,36 @@ files:
 - lib/swallow.rb
 - lib/spamdetector.rb
 - README
-test_files: 
-- test/test_spam.rb
-- test/test_ruleset.rb
-- test/test_folder.rb
+has_rdoc: false
+homepage: http://erik.rainey.name/swallow
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: 
-- README
-executables: 
-- swallow
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: gurgitate-mail
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.5
-    version: 
+rubyforge_project: 
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: A backend IMAP/Maildir Email Sorting/Routing/Cleanup system
+test_files: 
+- test/test_spam.rb
+- test/test_ruleset.rb
+- test/test_folder.rb
+- test/test_move.rb
+- test/test_age.rb
+- test/test_dir.rb