** check left to do:
- range scans on maildir
- see how replacing the links works in the resulting email via thunderbird etc..
-
+ - some checksum issues (see dupelicates?? suspect 0byte issues?) -- seems ok now?
// initialize it with known data..
// that should wipe out dupes.
- var filesize = this.query("SELECT filesize FROM Attachment WHERE id = %d".printf(
- int.parse(sid)));
+ var matches = this.execute("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;
+ }
+
+
+ // initialize it with known data..
+ // that should wipe out dupes.
+ var filesize = this.execute("SELECT filesize FROM Attachment WHERE id = %d".printf(
+ int.parse(sid)));
+
+ if (filesize=="") {
+ GLib.debug("Ignoring record id (missing in database) :%s", sid);
+ return;
+ }
if (int.parse(filesize) < 1) {
GLib.debug("Could not get filesize from id :%s = %s", sid,filesize);
Posix.exit(0);
}
GLib.debug("Creating file %s", target_fn);
if (!FileUtils.test (target_fn, FileTest.EXISTS)) {
- Posix.link(fn, target_fn);
+ var from = File.new_for_path (fn);
+ var to = File.new_for_path (target_fn);
+ from.copy(to, 0, null);
+
}
} else {
GLib.debug("Skipping extraction %s", target_fn);
- var rc= this.mysql.query(str);
+ var rc= this.mysql.query(str);
if ( rc != 0 ) {
GLib.debug("ERROR %u: Query failed: %s\n", this.mysql.errno(), this.mysql.error());
}
if (!need_return) {
- return "";
+ GLib.debug("got %s", got_row ? "=Nothing=" : ret);
+ return got_row ? "" : ret;
}
if (!got_row) {
GLib.debug("ERROR : no rows returned");
GLib.debug("finished writing output %d", file_size);
//
+ outstream = null;
this.used_space_after += file_size;
if (StripApplication.opt_is_replacing) {
Posix.unlink(path +"/" + name);
GLib.debug("copy tmp file %s to %s" , tmpfile, path +"/" + name);
- Posix.link(tmpfile, path +"/" + name);
- Posix.unlink(tmpfile);
- var nf = File.new_for_path(path +"/" + name);
+
+ // link will not work, as we are doing it accross file systems
+ var from = File.new_for_path (tmpfile);
+ var nf = File.new_for_path (path +"/" + name);
+ from.copy(nf, 0, null);
+
+
var newfileinfo = nf.query_info(GLib.FileAttribute.TIME_MODIFIED,GLib.FileQueryInfoFlags.NONE,null);
newfileinfo.set_modification_time(mod_time);
nf.set_attributes_from_info(newfileinfo,FileQueryInfoFlags.NONE);
+ Posix.unlink(tmpfile);
}
this.processed++;
continue;
}
-
+ var ds = next_file.get_display_name();
if (next_file.get_file_type() != FileType.DIRECTORY) {
- if (next_file.get_display_name()[0] == ',') {
+
+
+ if (ds[0] == ',') {
continue;
}
// other files to ignore?
-
- this.scan_file(basepath + subpath , next_file.get_display_name());
+ if (Regex.match_simple (".tgz$", ds)) {
+ continue;
+ }
+ this.scan_file(basepath + subpath , ds);
if(this.has_replaced) {
- this.report_state("After scanning %s/%s".printf(basepath + subpath , next_file.get_display_name()));
+ this.report_state("After scanning %s/%s".printf(basepath + subpath , ds));
}
continue;
}
- var ds = next_file.get_display_name();
+
// not really needed?? - we are storing attachments in a seperate location now...
if (ds[0] == '.') {
next_file = null;