Mercurial > hg > xemacs-beta
view netinstall/geturl.cc @ 1365:02909207294a
[xemacs-hg @ 2003-03-20 13:19:56 by youngs]
2003-03-20 Steve Youngs <youngs@xemacs.org>
* menubar-items.el (default-menubar): Add a "Pre-Release Download
Sites" submenu to "Tools -> Packages" menu.
Filter the package download sites menus through
`menu-split-long-menu'.
* obsolete.el (pui-add-install-directory): New.
(package-get-download-menu): New.
* package-admin.el: (package-admin-add-single-file-package):
Removed.
(package-admin-get-install-dir): Don't rely on an installed
xemacs-base package to guess where a package needs to be installed
to.
(package-admin-get-manifest-file): Whitespace clean up.
(package-admin-check-manifest): Use `directory-sep-char' to
compute regexp.
Only search 'lisp' and 'man' directories to determine package
name.
Don't error is xemacs-base package isn't installed, just don't
sort the MANIFEST file and issue a warning.
(package-admin-add-binary-package): Whitespace clean up.
(package-admin-get-lispdir): Ditto.
(package-admin-delete-binary-package): Use `with-temp-buffer'
instead of creating a temporary buffer manually.
* package-get.el: (package-get-remote): Change custom type so that
only either a single directory or remote host:directory can be
selected.
(package-get-download-sites): Put the sites into alphabetical
order of country.
Make the description element be "Country (site)" instead of the
other way around.
(package-get-pre-release-download-sites): New.
(package-get-require-signed-base-updates): Default to t.
(package-get-download-menu): Removed.
(package-get-locate-file): Change to reflect new format of
'package-get-remote'.
(package-get-update-base-from-buffer): Whitespace clean up and
remove an unneccessary 'when'.
(package-get-interactive-package-query): Whitespace clean up.
(package-get-update-all): Ditto.
(package-get-all): Ditto.
(package-get-init-package): Ditto.
(package-get-info): New.
(package-get): Bring into line with new format of
'package-get-remote'.
Error if non-Mule XEmacsen try to install Mule packages.
Don't rely on a Mule package having 'mule-base' in its
"REQUIRES" to determine if it is a Mule package or not,
instead we test "CATEGORY".
Better handling of the situation where a partial package tarball
exists on the local hard drive from a previous interupted
download.
Clean up after a failed package install.
(package-get-set-version-prop): Removed.
(package-get-installedp): Whitespace clean up.
* package-ui.el: Whitespace clean up.
(pui-info-buffer): Make it a defcustom.
(pui-directory-exists): Removed.
(pui-package-dir-list): Removed.
(pui-add-install-directory): Removed.
(package-ui-download-menu): New.
(package-ui-pre-release-download-menu): New.
(pui-set-local-package-get-directory): New.
(pui-package-symbol-char): Whitespace clean up.
(pui-update-package-display): Ditto.
(pui-toggle-package): Ditto.
(pui-toggle-package-key): Ditto.
(pui-toggle-package-delete): Ditto.
(pui-toggle-package-delete-key): Ditto.
(pui-toggle-package-event): Ditto.
(pui-toggle-verbosity-redisplay): Ditto.
(pui-install-selected-packages): Ditto.
(pui-help-echo): Ditto.
(pui-display-info): Ditto.
(pui-list-packages): Ditto.
* packages.el: Whitespace clean up.
author | youngs |
---|---|
date | Thu, 20 Mar 2003 13:19:59 +0000 |
parents | 42a8626b741e |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to act as a pretty interface to netio.cc. We add a progress dialog and some convenience functions (like collect to string or file */ #include "win32.h" #include "commctrl.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> #include "dialog.h" #include "geturl.h" #include "resource.h" #include "netio.h" #include "msg.h" #include "log.h" static int is_showing = 0; static HWND gw_dialog = 0; static HWND gw_url = 0; static HWND gw_rate = 0; static HWND gw_progress = 0; static HANDLE init_event; static int max_bytes = 0; static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDCANCEL: exit_setup (0); } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: gw_dialog = h; gw_url = GetDlgItem (h, IDC_DLS_URL); gw_rate = GetDlgItem (h, IDC_DLS_RATE); gw_progress = GetDlgItem (h, IDC_DLS_PROGRESS); SetEvent (init_event); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return FALSE; } static DWORD WINAPI dialog (void *) { MSG m; HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), 0, dialog_proc); ShowWindow (lgw_dialog, SW_SHOWNORMAL); UpdateWindow (lgw_dialog); while (GetMessage (&m, 0, 0, 0) > 0) { TranslateMessage (&m); DispatchMessage (&m); } return FALSE; } static DWORD start_tics; static void init_dialog (char *url, int length) { if (gw_dialog == 0) { DWORD tid; HANDLE thread; init_event = CreateEvent (0, 0, 0, 0); thread = CreateThread (0, 0, dialog, 0, 0, &tid); WaitForSingleObject (init_event, 1000); CloseHandle (init_event); SendMessage (gw_progress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); is_showing = 0; } char *sl=url, *cp; for (cp=url; *cp; cp++) if (*cp == '/' || *cp == '\\' || *cp == ':') sl = cp+1; max_bytes = length; SetWindowText (gw_url, sl); SetWindowText (gw_rate, "Connecting..."); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) 0, 0); ShowWindow (gw_progress, (length > 0) ? SW_SHOW : SW_HIDE); ShowWindow (gw_dialog, SW_SHOWNORMAL); if (!is_showing) { SetForegroundWindow (gw_dialog); is_showing = 1; } start_tics = GetTickCount (); } static void progress (int bytes) { static char buf[100]; int kbps; static DWORD last_tics = 0; DWORD tics = GetTickCount (); if (tics == start_tics) // to prevent division by zero return; if (tics < last_tics + 200) // to prevent flickering updates return; last_tics = tics; kbps = bytes / (tics - start_tics); ShowWindow (gw_progress, (max_bytes > 0) ? SW_SHOW : SW_HIDE); if (max_bytes > 100) { int perc = bytes / (max_bytes / 100); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) perc, 0); sprintf (buf, "%3d %% (%dk/%dk) %d kb/s\n", perc, bytes/1000, max_bytes/1000, kbps); } else sprintf (buf, "%d %d kb/s\n", bytes, kbps); SetWindowText (gw_rate, buf); } struct GUBuf { GUBuf *next; int count; char buf[2000]; }; char * get_url_to_string (char *_url) { log (LOG_BABBLE, "get_url_to_string %s", _url); init_dialog (_url, 0); NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_string failed!"); return 0; } if (n->file_size) max_bytes = n->file_size; GUBuf *bufs = 0; GUBuf **nextp = &bufs; int total_bytes = 1; /* for the NUL */ progress (0); while (1) { GUBuf *b = new GUBuf; *nextp = b; b->next = 0; nextp = &(b->next); b->count = n->read (b->buf, sizeof (b->buf)); if (b->count <= 0) break; total_bytes += b->count; progress (total_bytes); } char *rv = (char *) malloc (total_bytes); char *rvp = rv; while (bufs && bufs->count > 0) { GUBuf *tmp = bufs->next; memcpy (rvp, bufs->buf, bufs->count); rvp += bufs->count; delete bufs; bufs = tmp; } *rvp = 0; if (n) delete n; return rv; } int get_url_to_file (char *_url, char *_filename, int expected_length) { log (LOG_BABBLE, "get_url_to_file %s %s", _url, _filename); init_dialog (_url, expected_length); remove (_filename); /* but ignore errors */ NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_file failed!"); return 1; } FILE *f = fopen (_filename, "wb"); if (!f) { char *err = strerror (errno); if (!err) err = "(unknown error)"; fatal (IDS_ERR_OPEN_WRITE, _filename, err); } if (n->file_size) max_bytes = n->file_size; int total_bytes = 0; progress (0); while (1) { char buf[8192]; int count; count = n->read (buf, sizeof (buf)); if (count <= 0) break; fwrite (buf, 1, count, f); total_bytes += count; progress (total_bytes); } fclose (f); if (n) delete n; return 0; } void dismiss_url_status_dialog () { ShowWindow (gw_dialog, SW_HIDE); is_showing = 0; }