2002-05-12 Robert Collins <rbtcollins@hotmail.com>

        * geturl.h: Declare getUrlToStream.
        * geturl.cc (getUrlToStream):  New function.
        (get_url_to_membuf): Refactor to use getUrlToStream.

diff --git a/ChangeLog b/ChangeLog
index 0d06cb4fd1a22f455a2a1bf4c7cebffa8ecfc3d6..6bf25116c16f3d258cd43a145f6309b97180b64c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-12  Robert Collins  <rbtcollins@hotmail.com>
+
+       * geturl.h: Declare getUrlToStream.
+       * geturl.cc (getUrlToStream):  New function.
+       (get_url_to_membuf): Refactor to use getUrlToStream.
+
 2002-05-11  Robert Collins  <rbtcollins@hotmail.com>
 
        * Makefile.am: Add a release target to automate some of the routine

diff --git a/geturl.cc b/geturl.cc
index 06474a49a96e989dbcd81593f1daa38073619be6..1564e6d833559baa17aedb2e35a48b94d97c41fc 100644 (file)
--- a/geturl.cc
+++ b/geturl.cc
@@ -47,6 +47,8 @@ static const char *cvsid =
 
 #include "String++.h"  
 
+#include "Exception.h"
+
 extern ThreeBarProgressPage Progress;
 
 static int max_bytes = 0;
@@ -102,9 +104,8 @@ progress (int bytes)
       sprintf (buf, "%d %%  (%dk/%dk)  %03.1f kb/s\n",
               perc, bytes / 1000, max_bytes / 1000, kbps);
       if (total_download_bytes > 0)
-       {
-      Progress.SetBar2(total_download_bytes_sofar + bytes, total_download_bytes);
-       }
+         Progress.SetBar2(total_download_bytes_sofar + bytes,
+                          total_download_bytes);
     }
   else
     sprintf (buf, "%d  %2.1f kb/s\n", bytes, kbps);
@@ -112,25 +113,23 @@ progress (int bytes)
   Progress.SetText3(buf);
 }
 
-io_stream *
-get_url_to_membuf (String const &_url, HWND owner)
+void
+getUrlToStream (String const &_url, HWND owner, io_stream *output)
 {
-  log (LOG_BABBLE, String ("get_url_to_membuf ") + _url);
+  log (LOG_BABBLE, String ("getUrlToStream ") + _url);
   is_local_install = (source == IDC_SOURCE_CWD);
   init_dialog (_url, 0, owner);
   NetIO *n = NetIO::open (_url.cstr_oneuse());
   if (!n || !n->ok ())
     {
       delete n;
-      log (LOG_BABBLE, "get_url_to_membuf failed!");
-      return 0;
+      log (LOG_BABBLE, "getUrlToStream failed!");
+      throw new Exception ("__LINE__ __FILE__", "Error opening url",  APPERR_IO_ERROR);
     }
 
   if (n->file_size)
     max_bytes = n->file_size;
 
-  io_stream_memory *membuf = new io_stream_memory ();
-
   int total_bytes = 0;
   progress (0);
   while (1)
@@ -140,7 +139,7 @@ get_url_to_membuf (String const &_url, HWND owner)
       rlen = n->read (buf, 2048);
       if (rlen > 0)
        {
-         wlen = membuf->write (buf, rlen);
+         wlen = output->write (buf, rlen);
          if (wlen != rlen)
            /* FIXME: Show an error message */
            break;
@@ -150,20 +149,37 @@ get_url_to_membuf (String const &_url, HWND owner)
       else
        break;
     }
+  if (n)
+    delete (n);
+  /* reseeking is up to the recipient if desired */
+}
 
-  if (membuf->seek (0, IO_SEEK_SET))
+io_stream *
+get_url_to_membuf (String const &_url, HWND owner)
+{
+  io_stream_memory *membuf = new io_stream_memory ();
+  try 
     {
-      if (n)
-       delete n;
-      if (membuf)
-       delete membuf;
-      log (LOG_BABBLE, "get_url_to_membuf(): seek (0) failed for membuf!");
+      log (LOG_BABBLE, String ("get_url_to_membuf ") + _url);
+      getUrlToStream (_url, owner, membuf);
+      
+      if (membuf->seek (0, IO_SEEK_SET))
+       {
+         if (membuf)
+             delete membuf;
+         log (LOG_BABBLE, "get_url_to_membuf(): seek (0) failed for membuf!");
+         return 0;
+       }
+      return membuf;
+    }
+  catch (Exception *e)
+    {
+      if (e->errNo() != APPERR_IO_ERROR)
+       throw e;
+      log (LOG_BABBLE, "get_url_to_membuf failed!");
+      delete membuf;
       return 0;
     }
-
-  if (n)
-    delete n;
-  return membuf;
 }
 
 // predicate: url has no '\0''s in it.

diff --git a/geturl.h b/geturl.h
index 6f805c2405834294fd55fb57cb617bd831ea2144..c4f9e1af862b7b7d7646877abe71c5e54377aad4 100644 (file)
--- a/geturl.h
+++ b/geturl.h
@@ -23,6 +23,7 @@ class io_stream;
 class String;
 
 io_stream *get_url_to_membuf (String const &, HWND owner);
+void getUrlToStream (String const &, HWND owner, io_stream *);
 String get_url_to_string (String const&, HWND owner);
 int get_url_to_file (String const &_url, String const &_filename, int expected_size,
                     HWND owner, BOOL allow_ftp_auth = FALSE);