only save the summary, don't update from server, thats what refresh info

2004-06-03  Not Zed  <NotZed@Ximian.com>

	* providers/nntp/camel-nntp-folder.c (nntp_folder_sync_online):
	only save the summary, don't update from server, thats what
	refresh info does.
	(nntp_folder_download_message): fix exception handling.
	(nntp_folder_cache_message): same.
	(nntp_folder_get_message): ditto, plus major cleanup.
	(nntp_folder_download_message): take combined uid so it can cache
	and lookup properly.  duh.

	* providers/nntp/camel-nntp-store.c
	(nntp_store_get_subscribed_folder_info): if not fast, then open
	the folder, and update it.  Yeah i've given up trying to worry
	about performance vs usability.

	* providers/nntp/camel-nntp-summary.c (camel_nntp_summary_check):
	update the storesummary if we update the folder summary.  Hmm,
	isn't duplicated data meant to be a bad thing? :P

	* providers/nntp/camel-nntp-store.c (camel_nntp_store_set_folder):
	removed, now handled by nntp_command.
	(nntp_connected): removed, now handled by nntp_command.

	* camel-string-utils.c (camel_tolower): added ascii to-lower
	function.
	(camel_toupper): and upper, for completeness.

	* camel-store-summary.c (CAMEL_STORE_SUMMARY_VERSION): bumped file
	version by 1.  This is a mess, version 1 files treated the
	bitfield 'flags' with bit number values not bits.  Messy.

	* providers/nntp/camel-nntp-store-summary.c (store_info_save):
	write last/first count.
	(CAMEL_NNTP_STORE_SUMMARY_VERSION): bump version to 1.
	(store_info_load): if we're loading >= version 1, then load
	last/first counts.

	* providers/nntp/camel-nntp-store.c
	(nntp_store_get_folder_info_all): pass the whole line to
	store_info_from_line, dont strip last/first info.
	(nntp_store_info_update): renamed from info_new_from_line.  only
	add if not present.  handle updates, try and handle unread counts
	and readonly status.

2004-06-02  Not Zed  <NotZed@Ximian.com>

	* providers/nntp/camel-nntp-store.c: setup xover once we've
	started.

	* providers/nntp/camel-nntp-summary.c: (xover_setup): moved to
	nntp store.

	* providers/nntp/camel-nntp-folder.c (folder_check)
	(folder_check_free, camel_nntp_folder_new): remove async summary
	stuff.

	* providers/nntp/camel-nntp-store.c (camel_nntp_command): take
	exception argument again, and folder argument.  do retry logic and
	auth logic differently.
	(camel_nntp_raw_command): raw command interface, dont try
	reconnect or anything fancy.  pass i/o errors straight out, etc.
	(camel_nntp_try_authenticate): change to return return codes &
	take exception.

	* providers/nntp/camel-nntp-summary.c (camel_nntp_summary_new):
	just take path argument.
	(camel_nntp_summary_check): take a store, and a folder name.
	(add_range_head, add_range_xover): remove the time based update
	events, they never had any effect anyway.  Take store argument.
	(xover_setup): take store argument.

	* camel-folder-search.c (search_match_threads): remove debug.

svn path=/trunk/; revision=26164

1 files changed, 75 insertions, 187 deletions

diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 411cc346b5..04855a2a78 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -65,21 +65,29 @@ static CamelDiscoFolderClass *parent_class = NULL;
 #define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 #define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
 
+void
+camel_nntp_folder_selected(CamelNNTPFolder *folder, char *line, CamelException *ex)
+{
+	camel_nntp_summary_check((CamelNNTPSummary *)((CamelFolder *)folder)->summary,
+				 (CamelNNTPStore *)((CamelFolder *)folder)->parent_store,
+				 line, folder->changes, ex);
+}
+
 static void
 nntp_folder_refresh_info_online (CamelFolder *folder, CamelException *ex)
 {
 	CamelNNTPStore *nntp_store;
 	CamelFolderChangeInfo *changes = NULL;
 	CamelNNTPFolder *nntp_folder;
-	
+	char *line;
+
 	nntp_store = (CamelNNTPStore *) folder->parent_store;
 	nntp_folder = (CamelNNTPFolder *) folder;
 	
 	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
-	
-	if (camel_nntp_summary_check ((CamelNNTPSummary *) folder->summary, nntp_folder->changes, ex) != -1)
-		camel_folder_summary_save (folder->summary);
-	
+
+	camel_nntp_command(nntp_store, ex, nntp_folder, &line, NULL);
+
 	if (camel_folder_change_info_changed(nntp_folder->changes)) {
 		changes = nntp_folder->changes;
 		nntp_folder->changes = camel_folder_change_info_new();
@@ -96,35 +104,17 @@ nntp_folder_refresh_info_online (CamelFolder *folder, CamelException *ex)
 static void
 nntp_folder_sync_online (CamelFolder *folder, CamelException *ex)
 {
-	CamelNNTPStore *nntp_store;
-	CamelFolderChangeInfo *changes = NULL;
-	CamelNNTPFolder *nntp_folder;
-	
-	nntp_store = (CamelNNTPStore *) folder->parent_store;
-	nntp_folder = (CamelNNTPFolder *) folder;
-	
-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
-	
-	if (camel_nntp_summary_check ((CamelNNTPSummary *) folder->summary, nntp_folder->changes, ex) != -1)
-		camel_folder_summary_save (folder->summary);
-	
-	if (camel_folder_change_info_changed(nntp_folder->changes)) {
-		changes = nntp_folder->changes;
-		nntp_folder->changes = camel_folder_change_info_new();
-	}
-	
-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-	
-	if (changes) {
-		camel_object_trigger_event ((CamelObject *) folder, "folder_changed", changes);
-		camel_folder_change_info_free (changes);
-	}
+	CAMEL_NNTP_STORE_LOCK(folder->parent_store, command_lock);
+	camel_folder_summary_save (folder->summary);
+	CAMEL_NNTP_STORE_UNLOCK(folder->parent_store, command_lock);
 }
 
 static void
 nntp_folder_sync_offline (CamelFolder *folder, CamelException *ex)
 {
+	CAMEL_NNTP_STORE_LOCK(folder->parent_store, command_lock);
 	camel_folder_summary_save (folder->summary);
+	CAMEL_NNTP_STORE_UNLOCK(folder->parent_store, command_lock);
 }
 
 static gboolean
@@ -134,20 +124,14 @@ nntp_folder_set_message_flags (CamelFolder *folder, const char *uid, guint32 fla
 }
 
 static CamelStream *
-nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const char *msgid, CamelException *ex)
+nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const char *id, const char *msgid, CamelException *ex)
 {
 	CamelNNTPStore *nntp_store = (CamelNNTPStore *) ((CamelFolder *) nntp_folder)->parent_store;
 	CamelStream *stream = NULL;
 	int ret;
 	char *line;
-	
-	if (camel_nntp_store_set_folder (nntp_store, (CamelFolder *) nntp_folder, nntp_folder->changes, ex) == -1)
-		return NULL;
-	
-	ret = camel_nntp_command (nntp_store, &line, "article %s", msgid);
-	if (ret == -1)
-		goto fail;
-	
+
+	ret = camel_nntp_command (nntp_store, ex, nntp_folder, &line, "article %s", id);
 	if (ret == 220) {
 		stream = camel_data_cache_add (nntp_store->cache, "cache", msgid, NULL);
 		if (stream) {
@@ -159,6 +143,10 @@ nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const char *msgid, C
 			stream = (CamelStream *) nntp_store->stream;
 			camel_object_ref (stream);
 		}
+	} else if (ret == 423 || ret == 430) {
+		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message %s: %s"), msgid, line);
+	} else if (ret != -1) {
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), msgid, line);
 	}
 	
 	return stream;
@@ -192,15 +180,10 @@ nntp_folder_cache_message (CamelDiscoFolder *disco_folder, const char *uid, Came
 	
 	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
 	
-	stream = nntp_folder_download_message ((CamelNNTPFolder *) disco_folder, article, ex);
-	if (stream) {
+	stream = nntp_folder_download_message ((CamelNNTPFolder *) disco_folder, article, msgid, ex);
+	if (stream)
 		camel_object_unref (stream);
-	} else {
-		/* failed to download message! */
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not get article %s from NNTP server"), uid);
-	}
-	
+
 	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
 }
 
@@ -212,23 +195,22 @@ nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *e
 	CamelFolderChangeInfo *changes;
 	CamelNNTPFolder *nntp_folder;
 	CamelStream *stream = NULL;
-	char *line = NULL;
 	char *article, *msgid;
 
 	nntp_store = (CamelNNTPStore *) folder->parent_store;
 	nntp_folder = (CamelNNTPFolder *) folder;
 	
-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
-
 	article = alloca(strlen(uid)+1);
 	strcpy(article, uid);
 	msgid = strchr (article, ',');
 	if (msgid == NULL) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Internal error: uid in invalid format: %s"), uid);
-		goto fail;
+		return NULL;
 	}
 	*msgid++ = 0;
+
+	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
 	
 	/* Lookup in cache, NEWS is global messageid's so use a global cache path */
 	stream = camel_data_cache_get (nntp_store->cache, "cache", msgid, NULL);
@@ -239,38 +221,23 @@ nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *e
 			goto fail;
 		}
 
-		stream = nntp_folder_download_message (nntp_folder, article, ex);
+		stream = nntp_folder_download_message (nntp_folder, article, msgid, ex);
 		if (stream == NULL)
 			goto fail;
 	}
 	
-	if (stream) {
-		message = camel_mime_message_new ();
-		if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1)
-			goto error;
-		
-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-		
-		camel_object_unref (stream);
-		
-		return message;
+	message = camel_mime_message_new ();
+	if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
+		if (errno == EINTR)
+			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
+		else
+			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, g_strerror (errno));
+		camel_object_unref(message);
+		message = NULL;
 	}
-	
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, line);
-	
- error:
-	if (errno == EINTR)
-		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
-	else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, g_strerror (errno));
-	
- fail:
-	if (message)
-		camel_object_unref (message);
-	
-	if (stream)
-		camel_object_unref (stream);
-	
+
+	camel_object_unref (stream);
+fail:
 	if (camel_folder_change_info_changed (nntp_folder->changes)) {
 		changes = nntp_folder->changes;
 		nntp_folder->changes = camel_folder_change_info_new ();
@@ -284,8 +251,8 @@ nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *e
 		camel_object_trigger_event ((CamelObject *) folder, "folder_changed", changes);
 		camel_folder_change_info_free (changes);
 	}
-	
-	return NULL;
+		
+	return message;
 }
 
 static GPtrArray*
@@ -349,33 +316,25 @@ nntp_folder_append_message_online (CamelFolder *folder, CamelMimeMessage *mime_m
 	int ret;
 	unsigned int u;
 	struct _camel_header_raw *header, *savedhdrs, *n, *tail;
-	unsigned char *line;
-	char *cmdbuf = NULL, *respbuf = NULL;
+	char *group, *line;
 	
 	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
 	
 	/* send 'POST' command */
-	ret = camel_nntp_command (nntp_store, (char **) &line, "post");
-	
+	ret = camel_nntp_command (nntp_store, ex, NULL, &line, "post");
 	if (ret != 340) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
-		                      _("Posting not allowed by news server"));
+		if (ret == 440)
+			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
+					      _("Posting failed: %s"), line);
+		else if (ret != -1)
+			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+					      _("Posting failed: %s"), line);
 		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
 		return;
 	}
 	
-	/* send the 'Newsgroups: ' header */
-	cmdbuf = g_strdup_printf ("Newsgroups: %s\r\n", folder->full_name);
-	
-	if (camel_stream_write (stream, cmdbuf, strlen (cmdbuf)) == -1) {
-		g_free (cmdbuf);
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Failed to send newsgroups header: %s: message not posted"),
-				      g_strerror (errno));
-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-		return;
-	}
-	g_free (cmdbuf);
+	/* the 'Newsgroups: ' header */
+	group = g_strdup_printf ("Newsgroups: %s\r\n", folder->full_name);
 	
 	/* setup stream filtering */
 	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);
@@ -403,46 +362,23 @@ nntp_folder_append_message_online (CamelFolder *folder, CamelMimeMessage *mime_m
 	}
 	
 	/* write the message */
-	ret = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_message), CAMEL_STREAM (filtered_stream));
-	
-	/* restore the mail headers */
-	header->next = savedhdrs;
-	
-	if (ret == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Error posting to newsgroup: %s: message not posted"),
-				      g_strerror (errno));
-		camel_object_unref (filtered_stream);
-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-		return;
-	}
-	
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (filtered_stream);
-	
-	/* terminate the message body */
-	if (camel_stream_write (stream, "\r\n.\r\n", 5) == -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Error posting to newsgroup: %s: message not posted"),
-				      g_strerror (errno));
-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-		return;
-	}
-	
-	if (camel_nntp_stream_line (nntp_store->stream, (unsigned char **) &respbuf, &u) == -1)
-		respbuf = NULL;
-	
-	if (!respbuf || strncmp (respbuf, "240", 3)) {
-		if (!respbuf)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error reading response to posted message: message not posted"));
+	if (camel_stream_write(stream, group, strlen(group)) == -1
+	    || camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_message), CAMEL_STREAM (filtered_stream)) == -1
+	    || camel_stream_flush (CAMEL_STREAM (filtered_stream)) == -1
+	    || camel_stream_write (stream, "\r\n.\r\n", 5) == -1
+	    || (ret = camel_nntp_stream_line (nntp_store->stream, (unsigned char **)&line, &u)) == -1) {
+		if (errno == EINTR)
+			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
 		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Error posting message: %s: message not posted"), respbuf);
-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-		return;
+			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Posting failed: %s"), g_strerror (errno));
+	} else if (atoi(line) != 240) {
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Posting failed: %s"), line);
 	}
-	
+
+	camel_object_unref (filtered_stream);
+	g_free(group);
+	header->next = savedhdrs;
+
 	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
 	
 	return;
@@ -541,47 +477,6 @@ camel_nntp_folder_get_type (void)
 	return camel_nntp_folder_type;
 }
 
-
-/* not yet */
-/* Idea is we update in stages, but this requires a different xover command, etc */
-#ifdef ASYNC_SUMMARY
-struct _folder_check_msg {
-	CamelSessionThreadMsg msg;
-	CamelNNTPFolder *folder;
-};
-
-static void
-folder_check(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	struct _folder_check_msg *m = (struct _folder_check_msg *)msg;
-	CamelException *ex;
-	CamelNNTPStore *nntp_store;
-	
-	nntp_store = (CamelNNTPStore *) m->folder->parent.parent_store;
-	
-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);
-	
-	ex = camel_exception_new ();
-	camel_nntp_summary_check ((CamelNNTPSummary *) m->folder->parent.summary, m->folder->changes, ex);
-	camel_exception_free (ex);
-	
-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);
-}
-
-static void
-folder_check_free(CamelSession *session, CamelSessionThreadMsg *msg)
-{
-	struct _folder_check_msg *m = (struct _folder_check_msg *)msg;
-	
-	camel_object_unref (m->folder);
-}
-
-static CamelSessionThreadOps folder_check_ops = {
-	folder_check,
-	folder_check_free,
-};
-#endif
-
 CamelFolder *
 camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
 {
@@ -589,9 +484,6 @@ camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelExcepti
 	CamelNNTPFolder *nntp_folder;
 	char *root;
 	CamelService *service;
-#ifdef ASYNC_SUMMARY
-	struct _folder_check_msg *m;
-#endif
 	CamelStoreInfo *si;
 	gboolean subscribed = TRUE;
 	
@@ -617,7 +509,9 @@ camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelExcepti
 	camel_object_state_read(nntp_folder);
 	g_free(root);
 
-	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (nntp_folder);
+	root = g_strdup_printf("%s.ev-summary", nntp_folder->storage_path);
+	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (root);
+	g_free(root);
 	camel_folder_summary_load (folder->summary);
 	
 	si = camel_store_summary_path ((CamelStoreSummary *) ((CamelNNTPStore*) parent)->summary, folder_name);
@@ -627,17 +521,11 @@ camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelExcepti
 	}
 	
 	if (subscribed) {
-#ifdef ASYNC_SUMMARY
-		m = camel_session_thread_msg_new (service->session, &folder_check_ops, sizeof(*m));
-		m->folder = nntp_folder;
-		camel_object_ref (folder);
-		camel_session_thread_queue (service->session, &m->msg, 0);
-#else
-		if (camel_nntp_summary_check ((CamelNNTPSummary *) folder->summary, nntp_folder->changes, ex) == -1) {
+		camel_folder_refresh_info(folder, ex);
+		if (camel_exception_is_set(ex)) {
 			camel_object_unref (folder);
 			folder = NULL;
 		}
-#endif
         }
 	
 	return folder;