public static string? opt_db_name = null;
public static string? opt_db_user = null;
public static string? opt_db_pass = null;
-
+ public static string? opt_scan_mailfort_only = "";
+
+
public static int opt_limit = -1;
public static int opt_age_newest = 1;
public static bool opt_scan_mailfort = false;
public static bool opt_dump = false;
public static bool opt_debug = false;
+ public static bool opt_stamp = false;
public static bool opt_debug_sql = false;
public static string? opt_replace_link = null;
{ "oldest", 0, 0, OptionArg.INT, ref opt_age_oldest, "do not replace messages older than X (default is 6 months)", null },
{ "scan-maildir", 0, 0, OptionArg.NONE, ref opt_scan_maildir, "scan an maildir tree", null },
- { "scan-mailfort", 0, 0, OptionArg.NONE, ref opt_scan_mailfort, "scan a mailfort tree", null },
+ { "stamp", 0, 0, OptionArg.NONE, ref opt_stamp, "create and honour directory stamps - flag that a folder has been scanned already", null },
+ { "scan-mailfort", 0, 0, OptionArg.NONE, ref opt_scan_mailfort, "scan a mailfort tree", null },
+ { "scan-mailfort-only", 0, 0, OptionArg.STRING, ref opt_scan_mailfort_only, "scan a mailfort Year/month eg. /2010/08", null },
{ null }
};
public StripApplication( string[] args )
return 0;
}
- strip.scan_dir(opt_path, "");
+ strip.scan_dir(opt_path, opt_scan_mailfort_only);
// initialize it with known data..
// that should wipe out dupes.
- var matches = this.execute("SELECT count(id) as nid FROM Attachment WHERE id = %d".printf(
+ var matches = this.query("SELECT count(id) FROM Attachment WHERE id = %d".printf(
int.parse(sid)));
- GLib.error("Got Matches :%s", matches);
+
- if (matches=="0") {
- GLib.error("Failed to find id :%s", sid);
- return;
+ if (matches == "0") {
+ // our old mailfort code deleted the crap out of old records...
+ // if this occurs we will need to create the record again..
+ this.fix_deleted_attachment_db(int.parse(sid),attachment);
+ return;
+
}
// initialize it with known data..
// that should wipe out dupes.
- var filesize = this.execute("SELECT filesize FROM Attachment WHERE id = %d".printf(
+ var filesize = this.query("SELECT filesize FROM Attachment WHERE id = %d".printf(
int.parse(sid)));
if (filesize=="") {
- GLib.debug("Ignoring record id (missing in database) :%s", sid);
+ GLib.error("Ignoring record id (missing in database) :%s", sid);
return;
}
if (int.parse(filesize) < 1) {
}
+ public void fix_deleted_attachment_db(int id, GMime.Part attachment)
+ {
+
+ var filename = attachment.get_header("X-strip-content-name");
+ var file_path = attachment.get_header("X-strip-path");
+ var fn = StripApplication.opt_target_path + "/" + file_path;
+
+
+ if (!FileUtils.test (fn, FileTest.EXISTS)) {
+ GLib.debug("SKIP -- file does not exist");
+ return;
+ }
+
+ var chksum = this.md5_file(fn);
+ var mime_type = attachment.get_header("X-strip-content-type");
+
+ var fileinfo = File.new_for_path(fn)
+ .query_info(GLib.FileAttribute.STANDARD_SIZE+","+GLib.FileAttribute.TIME_MODIFIED
+ ,GLib.FileQueryInfoFlags.NONE,null);
+ var file_size = (int) fileinfo.get_size();
+
+
+ this.real_query(-1, """
+
+
+ INSERT INTO Attachment (
+ id,
+
+ msgid ,
+ queue_id ,
+ mime_filename ,
+ mime_type,
+
+ stored_filename ,
+ mime_charset ,
+ mime_cdisp ,
+ mime_is_cover ,
+
+ mime_is_multi ,
+ mime_is_mail,
+ mime_size ,
+ filesize,
+
+ checksum,
+ created
+
+ ) VALUES (
+ %d, -- id
+
+ '%s' , -- msgid
+ 0,
+ '%s' , -- filename
+ '%s', -- mimetype
+
+ '%s', -- stored file anme
+ '', -- charset
+ 'attachment',
+ 0,
+ 0,
+ 0,
+ %d, -- size
+ %d, -- size
+
+ '%s', -- checkum
+ '%s' -- created:
+ )
+
+
+ """.printf(
+ id,
+ this.mysql_escape(this.active_message_exim_id),
+ this.mysql_escape(filename),
+ this.mysql_escape(mime_type),
+ this.mysql_escape(file_path),
+ file_size,
+ file_size,
+ this.mysql_escape(chksum),
+ this.created_date
+ ));
+ // this is done to fix the queue_id or maillog_id ??
+ this.query("""
+ SELECT attachment_update(
+ %d, -- in_id INT(11),
+ '', -- mime type
+ '%s', -- in_created DATETIME,
+ '%s' -- in_mailfort_sig varchar(64)
+ )
+ """.printf(
+ id,
+ this.created_date,
+ this.mysql_escape(this.active_message_x_mailfort_sig)
+
+ )
+ );
+ // GLib.error("added attachment?");
+ }
+
+
public void replace_attachment(GMime.Multipart parent, GMime.Part attachment)
{
var sid = attachment.get_header("X-strip-id");
var filename = attachment.get_filename().replace("/", "-").replace("\n", "").replace("\t", " ");
var fn = GLib.Environment.get_tmp_dir() +
- "/"+ this.active_name + "."+ filename;
+ "/"+ this.active_name + "."+ GLib.Uri.escape_string(filename,"", false);
var outfile = new GMime.StreamFile.for_path(fn, "w");
outfile.set_owner(true);
""".printf(
this.mysql_escape(this.active_message_exim_id),
chksum,
- this.mysql_escape( attachment.get_filename() ), // what is thsi is invalid?
+ this.mysql_escape( GLib.Uri.escape_string(attachment.get_filename(),"", false) ), // what is thsi is invalid?
file_size)
);
var target_fn = "";
if (StripApplication.opt_is_extracting) {
- target_fn = StripApplication.opt_target_path + "/" + this.created_dir +"/"+ file_id + "-" + filename;
+ target_fn = StripApplication.opt_target_path + "/" + this.created_dir +"/"+ file_id + "-" + GLib.Uri.escape_string(filename,"", false);
}
- var stored = "/" + this.created_dir +"/"+ file_id + "-" + filename;
+ var stored = "/" + this.created_dir +"/"+ file_id + "-" + GLib.Uri.escape_string(filename,"", false);
this.query("""
SELECT attachment_update_store(
rep.set_filename(filename);
string txt = "<html><body>"+
"<a href=\"" + StripApplication.opt_replace_link + "/" +
- file_id + "/" + this.created_dir + "/"+chksum+"/"+ GLib.Uri.escape_string( filename) +"\">" +
- GLib.Uri.escape_string( filename) + // fixme needs html escaping...
+ file_id + "/" + this.created_dir + "/"+chksum+"/"+ GLib.Uri.escape_string( filename, "", false) +"\">" +
+ GLib.Uri.escape_string( filename, "", false) + // fixme needs html escaping...
"</a>" +
"</body></html>";
rep.get_content_type().set_parameter("charset", "utf-8");
rep.set_header("X-strip-id", file_id);
rep.set_header("X-strip-content-name", filename);
- rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" + filename);
+ rep.set_header("X-strip-path", this.created_dir + "/" + file_id + "-" + GLib.Uri.escape_string(filename,"", false));
rep.set_header("X-strip-content-type", mime_type);
var stream = new GMime.StreamMem.with_buffer(txt.data);
var con = new GMime.DataWrapper.with_stream(stream,GMime.ContentEncoding.DEFAULT);
}
public string query(string str)
{
- return this.real_query(true, str);
+ return this.real_query(1, str);
}
public string execute(string str)
{
- return this.real_query(false, str);
+ return this.real_query(0, str);
}
- public string real_query(bool need_return, string str)
+ /**
+ * need_return
+ 0 = no
+ 1 = yes
+ -1 = don't try.
+ */
+ public string real_query(int need_return, string str)
{
GLib.debug("Before Query : %u : %s\n", this.mysql.errno(), this.mysql.error());
GLib.debug("ERROR %u: Query failed: %s\n", this.mysql.errno(), this.mysql.error());
Posix.exit(1);
}
-
-
- var rs = mysql.use_result();
+ var rs = mysql.use_result();
+ if (need_return == -1) {
+ return "";
+ }
+
+
+ //GLib.debug("got %d rows", (int) rs.num_rows());
var got_row = false;
string[] row;
ret = row[0];
}
- if (!need_return) {
- GLib.debug("got %s", got_row ? "=Nothing=" : ret);
+ if (need_return == 0) {
+ if (StripApplication.opt_debug_sql) {
+ GLib.debug("got %s", got_row ? "=Nothing=" : ret);
+ }
return got_row ? "" : ret;
}
if (!got_row) {
+
GLib.debug("ERROR : no rows returned");
Posix.exit(1);
return "";
}
- GLib.debug("got %s", ret);
+ if (StripApplication.opt_debug_sql) {
+ GLib.debug("got %s", ret);
+ }
return ret;
projects / app.mailtrimmer / blobdiff