i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gopher: Handle info resources and add proper title

Browse Source 
We now create a proper title from the error message, or
the TITLE resource if present.
This commit is contained in:
François Revol
2014-07-26 01:43:22 +02:00
parent 2e8b8fd046
commit f74e08fca8
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetapi/GopherRequest.cpp
+19 -3
View File
@@ -405,6 +405,7 @@ BGopherRequest::_ParseInput(bool last)
fprintf(stderr, "type: '%c' name: '%s'\n", type, fields.StringAt(FIELD_NAME).String()); fprintf(stderr, "type: '%c' name: '%s'\n", type, fields.StringAt(FIELD_NAME).String());
//fields.PrintToStream(); //fields.PrintToStream();
BString pageTitle;
BString item; BString item;
BString title = fields.StringAt(FIELD_NAME); BString title = fields.StringAt(FIELD_NAME);
BString link("gopher://"); BString link("gopher://");
@@ -449,6 +450,19 @@ BGopherRequest::_ParseInput(bool last)
case GOPHER_TYPE_ERROR: case GOPHER_TYPE_ERROR:
item << "<span class=\"error\">" << title << "</span>" item << "<span class=\"error\">" << title << "</span>"
"<br/>\n"; "<br/>\n";
if (fPosition == 0 && pageTitle.Length() == 0)
pageTitle << "Error: " << title;
break;
case GOPHER_TYPE_INFO:
// TITLE resource, cf.
// gopher://gophernicus.org/0/doc/gopher/gopher-title-resource.txt
if (fPosition == 0 && pageTitle.Length() == 0
&& fields.StringAt(FIELD_SELECTOR) == "TITLE") {
pageTitle = title;
break;
}
item << "<span class=\"info\">" << title << "</span>"
"<br/>\n";
break; break;
default: default:
item << "<div>" << fields.StringAt(FIELD_NAME) << "</div>"; item << "<div>" << fields.StringAt(FIELD_NAME) << "</div>";
@@ -456,7 +470,9 @@ BGopherRequest::_ParseInput(bool last)
} }
if (fPosition == 0) { if (fPosition == 0) {
BString title = "TITLE"; if (pageTitle.Length() == 0)
pageTitle << "Index of " << Url();
const char *uplink = "."; const char *uplink = ".";
if (fPath.EndsWith("/")) if (fPath.EndsWith("/"))
uplink = ".."; uplink = "..";
@@ -473,14 +489,14 @@ BGopherRequest::_ParseInput(bool last)
"type=\"text/css\" href=\"resource:internal.css\">\n" "type=\"text/css\" href=\"resource:internal.css\">\n"
"<link rel=\"icon\" type=\"image/png\"" "<link rel=\"icon\" type=\"image/png\""
" href=\"resource:icons/directory.png\">\n" " href=\"resource:icons/directory.png\">\n"
"<title>" << title << "</title>\n" "<title>" << pageTitle << "</title>\n"
"</head>\n" "</head>\n"
"<body id=\"gopher\">\n" "<body id=\"gopher\">\n"
"<div class=\"uplink dontprint\">\n" "<div class=\"uplink dontprint\">\n"
"<a href=" << uplink << ">[up]</a>\n" "<a href=" << uplink << ">[up]</a>\n"
"<a href=\"/\">[top]</a>\n" "<a href=\"/\">[top]</a>\n"
"</div>\n" "</div>\n"
"<h1>" << title << "</h1>\n"; "<h1>" << pageTitle << "</h1>\n";
fListener->DataReceived(this, header.String(), fPosition, fListener->DataReceived(this, header.String(), fPosition,
header.Length()); header.Length());