X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=bin%2Fmailshears;h=01dcb30f2a2fc2d73d22f36f2f4b43ed92800f42;hp=d2894cd13db31ae86fb72758096f4a9cd1762533;hb=87c9c583caca33112f88622eed8849e98bdf3a26;hpb=955476ab737e8462bec7d87967db60a0995757ba

diff --git a/bin/mailshears b/bin/mailshears
index d2894cd..01dcb30 100755
--- a/bin/mailshears
+++ b/bin/mailshears
@@ -13,31 +13,7 @@
 # filesystem, but not the database.
 #
 
-# We need Pathname to get the real filesystem path
-# of this script (and not, for example, the path of
-# a symlink which points to it).
-require 'pathname'
-
-# This bit of magic adds the parent directory (the
-# project root) to the list of ruby load paths.
-# Thus, our require statements will work regardless of
-# how or from where the script was run.
-executable = Pathname.new(__FILE__).realpath.to_s
-$: << File.dirname(executable) + '/../'
-
-# Needed for rm_rf.
-require 'fileutils'
-
-# Load our config file.
-require 'bin/configuration'
-
-# And the necessary classes.
-require 'src/errors.rb'
-require 'src/exit_codes.rb'
-require 'src/dovecot_mailstore'
-require 'src/postfixadmin_db'
-
-dms = DovecotMailstore.new(Configuration::MAIL_ROOT)
+require 'mailshears'
 
 pgadb = PostfixadminDb.new(Configuration::DBHOST,
                            Configuration::DBPORT,
@@ -48,91 +24,86 @@ pgadb = PostfixadminDb.new(Configuration::DBHOST,
                            Configuration::DBPASS)
 
 
-# First, we find out if any domains have been removed from the
-# database but not from the filesystem.
 begin
-  # Get the list of domains according to the filesystem.
-  fs_domains = dms.get_domains_from_filesystem()
-rescue StandardError => e
-  puts "There was an error retrieving domains from the filesystem: #{e.to_s}"
-  Kernel.exit(ExitCodes::FILESYSTEM_ERROR)
-end
-
-begin
-  # ...and according to the Postfixadmin database.
+  # Get a list of domains from the Postfixadmin database.
   db_domains = pgadb.get_domains_from_db()
 rescue DatabaseError => e
   puts "There was an error connecting to the database: #{e.to_s}"
   Kernel.exit(ExitCodes::DATABASE_ERROR)
 end
 
-
-# Then, we get the list of accounts that have been removed. We did
-# the domains first so that, if a domain was removed, we can avoid
-# reporting each of its accounts individually.
 begin
-  # Get the list of accounts according to the filesystem.
-  fs_accts = dms.get_accounts_from_filesystem(db_domains)
-rescue StandardError => e
-  puts "There was an error retrieving accounts from the filesystem: #{e.to_s}"
-  Kernel.exit(ExitCodes::FILESYSTEM_ERROR)
-end
-
-begin
-  # ...and according to the Postfixadmin database.
-  db_accts = pgadb.get_accounts_from_db()
+  # And the accounts.
+  db_accounts = pgadb.get_accounts_from_db()
 rescue DatabaseError => e
   puts "There was an error connecting to the database: #{e.to_s}"
   Kernel.exit(ExitCodes::DATABASE_ERROR)
 end
 
 
-# The list of domains on the filesystem that aren't in the DB.
-dom_difference = fs_domains - db_domains
-
-# And accounts on the filesystem that aren't in the DB and don't
-# belong to a domain that was removed.
-acct_difference = fs_accts - db_accts
+Plugin.includers.each do |plugin_class|
+  plugin = plugin_class.new()
 
-# Don't output any unnecessary junk. Cron might mail it to someone.
-if dom_difference.size > 0 or acct_difference.size > 0
-  # The header that we output before the list of accounts.
-  # Just the path of this script, and the current time.
-  header = "#{$0}, "
+  begin
+    leftover_domains = plugin.get_leftover_domains(db_domains)
+  rescue StandardError => e
+    puts "There was an error retrieving domains from the filesystem: #{e.to_s}"
+    Kernel.exit(ExitCodes::FILESYSTEM_ERROR)
+  end
 
-  current_time = Time.now()
-  if current_time.respond_to?(:iso8601)
-    # Somehow this method is missing on some machines.
-    header += current_time.iso8601.to_s
-  else
-    # Fall back to whatever this looks like.
-    header += current_time.to_s
+  begin
+    leftover_accounts = plugin.get_leftover_accounts(db_accounts)
+  rescue StandardError => e
+    puts "There was an error retrieving accounts from the filesystem: #{e.to_s}"
+    Kernel.exit(ExitCodes::FILESYSTEM_ERROR)
   end
 
-  puts header
-  puts '-' * header.size # Underline the header.
+  if leftover_domains.size > 0 or leftover_accounts.size > 0
+    # The header that we output before the list of domains/accounts.
+    # Just the path of this script, the current time, and the plugin name.
+    header = "#{$0}, "
+
+    current_time = Time.now()
+    if current_time.respond_to?(:iso8601)
+      # Somehow this method is missing on some machines.
+      header += current_time.iso8601.to_s
+    else
+      # Fall back to whatever this looks like.
+      header += current_time.to_s + "\n"
+    end
 
-  dom_difference.each do |domain|
-    puts "Found: #{domain} (#{dms.get_domain_path(domain)})"
-  end
+    header += 'Plugin: ' + plugin_class.to_s + "\n"
+    puts header
+    puts '-' * header.size # Underline the header.
 
-  acct_difference.each do |account|
-    puts "Found: #{account} (#{dms.get_account_path(account)})"
-  end
+    leftover_domains.each do |domain|
+      puts "Found: #{domain} (#{plugin.describe_domain(domain)})"
+    end
 
-  if Configuration::I_MEAN_BUSINESS
-    dom_difference.each do |domain|
-      domain_path = dms.get_domain_path(domain)
-      FileUtils.rm_rf(domain_path)
-      puts "Removed: #{domain_path}"
+    leftover_accounts.each do |account|
+      puts "Found: #{account} (#{plugin.describe_account(account)})"
     end
 
-    acct_difference.each do |account|
-      account_path = dms.get_account_path(account)
-      FileUtils.rm_rf(account_path)
-      puts "Removed: #{account_path}"
+    if Configuration::I_MEAN_BUSINESS
+      # We have to delete the accounts before the domain,
+      # otherwise they'd already be gone.
+      leftover_accounts.each do |account|
+        # Get the description before we delete the domain.
+        # This can still fail if the account's domain is gone.
+        account_description = plugin.describe_account(account)
+        plugin.delete_account(account)
+        puts "Removed: #{account} (#{account_description})"
+      end
+      
+      leftover_domains.each do |domain|
+        # Get the description before we delete the domain.
+        domain_description = plugin.describe_domain(domain)
+        plugin.delete_domain(domain)
+        puts "Removed: #{domain} (#{domain_description})"
+      end
     end
+
+    puts ""
   end
 
-  puts ""
 end