From a328048251b410cd5f881a6dd71e575c7b94e197 Mon Sep 17 00:00:00 2001
From: Yorhel
Date: Fri, 14 Oct 2011 18:23:54 +0200
Subject: [PATCH] ncdc 1.3 released + misc. fixes
---
dat/ncdc-changelog | 16 ++++++++++++++++
dat/ncdc-man | 30 ++++++++++++++++++++++++++++--
index.cgi | 20 +++++++++++++-------
3 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/dat/ncdc-changelog b/dat/ncdc-changelog
index ad4a336..fd2c6bb 100644
--- a/dat/ncdc-changelog
+++ b/dat/ncdc-changelog
@@ -1,3 +1,19 @@
+1.3 - 2011-10-14
+ - Added multi-source downloading
+ - Added user information view and management keys to download queue tab
+ - Added "search for alternative" key to queue, file browser and search tabs
+ - Added "match queue" key to file browser and search tabs
+ - Added ui_time_format setting
+ - Added chat_only setting
+ - Changed default value of color_log_time to dark grey
+ - Improved tracking of a parent for each tab
+ - Improved portability for Solaris
+ - Fixed crash when closing a hub tab while it is connecting
+ - Fixed crash when auto-completing settings without auto-completion
+ - Fixed bug with file name display if download_dir ends with a slash
+ - Fixed bug with uploading chunks larger than 2GiB
+ - Fixed handling of directory search results on ADC
+
1.2 - 2011-09-25
- Fixed incorrect handling of outgoing NMDC connections
diff --git a/dat/ncdc-man b/dat/ncdc-man
index 239a269..ca143ae 100644
--- a/dat/ncdc-man
+++ b/dat/ncdc-man
@@ -227,7 +227,7 @@ INTERACTIVE COMMANDS
Available options:
-hub Search the current hub only. (default)
- -all Search all connected hubs.
+ -all Search all connected hubs, except those with `chat_only' set.
-le Size of the file must be less than .
-ge Size of the file must be larger than .
-t File must be of type . (see below)
@@ -343,6 +343,11 @@ SETTINGS
that, while this setting can be set on a per-hub basis, PM windows will
use the global value (global.backlog).
+ chat_only
+ Set to true to indicate that this hub is only used for chatting. That is,
+ you won't or can't download from it. This setting affects the /search
+ command when it is given the -all option.
+
color_*
The settings starting with the `color_' prefix allow you to change the
interface colors. The following is a list of available color settings:
@@ -498,6 +503,15 @@ SETTINGS
note that, even if you set this to `prefer', TLS will only be used if the
connecting party also supports it.
+ ui_time_format
+ The format of the time displayed in the lower-left of the screen. Set `-'
+ to not display a time at all. The string is passed to the Glib
+ g_date_time_format() function, which accepts roughly the same formats as
+ strftime(). Check out the strftime(3) man page or the Glib documentation
+ for more information. Note that this setting does not influence the
+ date/time format used in other places, such as the chat window or log
+ files.
+
KEY BINDINGS
@@ -545,6 +559,9 @@ KEY BINDINGS
Right/l Open selected directory.
Left/h Open parent directory.
d Add selected file/directory to the download queue.
+ m Match selected item with the download queue.
+ M Match entire file list with the download queue.
+ a Search for alternative download sources.
Connection list
Up/Down Select one item up/down.
@@ -561,10 +578,16 @@ KEY BINDINGS
k/j Select one item up/down.
PgUp/PgDown Select one page of items up/down.
End/Home Select last/first item in the list.
+ K/J Select one user up/down.
f Find user in user list.
c Find connection in the connection list.
+ a Search for alternative download sources.
d Remove selected file from the queue.
+/- Increase/decrease priority.
+ i/Return Toggle user list.
+ r Remove selected user for this file.
+ R Remove selected user from all files in the download queue.
+ x Clear error state for the selected user.
Note: when an item in the queue has `ERR' indicated in the priority col‐
umn, you have two choices: You can remove the item from the queue using
@@ -583,6 +606,9 @@ KEY BINDINGS
s Order by file size.
l Order by free slots.
n Order by file name.
+ m Match selected item with the download queue.
+ M Match all search results with the download queue.
+ a Search for alternative download sources.
User list tab
Up/Down Select one item up/down.
@@ -688,4 +714,4 @@ SEE ALSO
-ncdc-1.2 September 2011 ncdc(1)
+ncdc-1.3 October 2011 ncdc(1)
diff --git a/index.cgi b/index.cgi
index d561797..ae554f0 100755
--- a/index.cgi
+++ b/index.cgi
@@ -53,6 +53,7 @@ sub home {
E;
end;
h2 'Updates';
+ b '2011-10-14'; txt ' ncdc 1.3 released!'; br;
b '2011-09-25'; txt ' ncdc 1.1 released - follwed by a 1.2 quickfix.'; br;
b '2011-09-16'; txt ' ncdc 1.0 released!'; br;
b '2011-09-15'; txt ' Added some screenshots for ncdu.'; br;
@@ -122,6 +123,7 @@ sub ncdu {
a href => 'http://packages.debian.org/ncdu', 'Debian'; txt ' - ';
a href => 'https://admin.fedoraproject.org/pkgdb/acls/name/ncdu', 'Fedora'; txt ' - ';
a href => 'http://www.freshports.org/sysutils/ncdu/', 'FreeBSD'; txt ' - ';
+ a href => 'http://frugalware.org/packages/?op=pkg&srch=ncdu&arch=all&ver=all', 'Frugalware'; txt ' - ';
a href => 'http://packages.gentoo.org/package/sys-fs/ncdu', 'Gentoo'; txt ' - ';
a href => 'http://www.ipcopaddons.org/addondb.php?action=detail&addonid=67', 'IPCop'; txt ' - ';
a href => 'http://www.openbsd.org/cgi-bin/cvsweb/ports/sysutils/ncdu/', 'OpenBSD'; txt ' - ';
@@ -174,7 +176,7 @@ sub ncduchangelog {
sub ncdumanual {
my $s = shift;
$s->htmlHeader(title => 'Manual page', page => 'ncdu', tab => 'man');
- open my $F, '<', "$ROOT/dat/ncdu-man" or die $!;
+ open my $F, '<:utf8', "$ROOT/dat/ncdu-man" or die $!;
pre;
txt $_ while(<$F>);
end;
@@ -227,8 +229,8 @@ sub ncdc {
h2 'Get ncdc!';
p;
- b 'Latest version:'; txt ' 1.2 (';
- a href => '/download/ncdc-1.2.tar.gz', 'download';
+ b 'Latest version:'; txt ' 1.3 (';
+ a href => '/download/ncdc-1.3.tar.gz', 'download';
txt ' - '; a href => '/ncdc/changes', 'changes';
txt ' - '; a href => '/download/ncdc.md5', 'md5';
txt ' - '; a href => '/download/ncdc.sha1', 'sha1';
@@ -237,6 +239,11 @@ sub ncdc {
a href => 'http://g.blicky.net/ncdc.git/', 'this git repository';
txt '. The README includes instructions to build ncdc. Check out the ';
a href => '/ncdc/man', 'manual'; txt ' to get started.';
+ br;br;
+ txt 'Packages/ports are available for the following systems: ';
+ a href => 'http://aur.archlinux.org/packages.php?ID=50949', 'Arch Linux'; txt ' - ';
+ a href => 'http://packages.gentoo.org/package/net-p2p/ncdc', 'Gentoo'; txt ' - ';
+ a href => 'http://packman.links2linux.org/package/ncdc', 'OpenSUSE'; txt '.';
end;
h2 'Features';
@@ -249,7 +256,7 @@ sub ncdc {
li 'Share management and file uploading,';
li 'Connections and download queue management,';
li 'File list browsing,';
- li 'Single-source and TTH-checked file downloading,';
+ li 'Multi-source and TTH-checked file downloading,';
li 'Searching for files,';
li 'Secure hub (adcs:// and nmdcs://) and client connections on both protocols.';
end;
@@ -269,7 +276,6 @@ sub ncdc {
more interesting to list a few features that are (relatively) common in other
DC clients, but which ncdc doesn\'t do. Yet.";
ul;
- li 'Multi-source downloading,';
li 'Segmented downloading,';
li 'Bandwidth throttling,';
li 'OP features (e.g. client detection, file list scanning and other useful stuff for OPs),';
@@ -357,7 +363,7 @@ sub ncdcfaq {
connections, so your file transfers will remain unencrypted.
The following example stunnel configuration is what I used to connect to
the DC Development hub before ncdc had native TLS support:
- [dcdev]
client = yes
accept = 127.0.0.1:16591
connect = devpublic.adcportal.com:16591
+ [dcdev]
client = yes
accept = 127.0.0.1:16591
connect = hub.dcbase.org:16591
The URL `adc://127.0.0.1:16591/' can then be used to connect to the hub
from within ncdc.
E;
@@ -412,7 +418,7 @@ sub ncdcfaq {
sub ncdcmanual {
my $s = shift;
$s->htmlHeader(title => 'Manual page', page => 'ncdc', tab => 'man');
- open my $F, '<', "$ROOT/dat/ncdc-man" or die $!;
+ open my $F, '<:utf8', "$ROOT/dat/ncdc-man" or die $!;
pre;
txt $_ while(<$F>);
end;