Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented UnurlString() and used it. Now you can fully use query: as in

Browse Source 
query://%28%28MAIL:to==%22%2ahaiku%2a%22%29%26%26%28BEOS:TYPE==%22text/x-email%22%29%29 :)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29903 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2009-04-04 16:31:33 +00:00
parent bda94e2e25
commit 8dd71c2b23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/bin/urlwrapper.cpp
View File

@ -15,14 +15,16 @@
#include <Alert.h> #include <Alert.h>
#include <Application.h> #include <Application.h>
#include <AppFileInfo.h> #include <AppFileInfo.h>
#include <Debug.h>
#include <Mime.h> #include <Mime.h>
#include <Message.h> #include <Message.h>
#include <TypeConstants.h> #include <TypeConstants.h>
#include <Roster.h> #include <Roster.h>
#include <String.h> #include <String.h>
#include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <Debug.h>
/* compile-time configuration */ /* compile-time configuration */
#include "urlwrapper.h" #include "urlwrapper.h"
@ -206,7 +208,19 @@ UrlWrapperApp::~UrlWrapperApp()
status_t UrlWrapperApp::UnurlString(BString &s) status_t UrlWrapperApp::UnurlString(BString &s)
{ {
// TODO:WRITEME // TODO: check for %00 and bail out!
int32 length = s.Length();
int i;
for (i = 0; s[i] && i < length - 2; i++) {
if (s[i] == '%' && isxdigit(s[i+1]) && isxdigit(s[i+2])) {
int c;
sscanf(s.String() + i + 1, "%02x", &c);
s.Remove(i, 3);
s.Insert((char)c, 1, i);
length -= 2;
}
}
return B_OK; return B_OK;
} }
@ -423,7 +437,7 @@ void UrlWrapperApp::ArgvReceived(int32 argc, char **argv)
if (u.proto == "file") { if (u.proto == "file") {
BMessage m(B_REFS_RECEIVED); BMessage m(B_REFS_RECEIVED);
entry_ref ref; entry_ref ref;
// UnurlString(path); UnurlString(u.path);
if (get_ref_for_path(u.path.String(), &ref) < B_OK) if (get_ref_for_path(u.path.String(), &ref) < B_OK)
return; return;
m.AddRef("refs", &ref); m.AddRef("refs", &ref);
@ -433,7 +447,7 @@ void UrlWrapperApp::ArgvReceived(int32 argc, char **argv)
#endif #endif
#ifdef HANDLE_QUERY #ifdef HANDLE_QUERY
// XXX:TODO: unencode the formula + split options // XXX:TODO: split options
if (u.proto == "query") { if (u.proto == "query") {
// mktemp ? // mktemp ?
BString qname("/tmp/query-url-temp-"); BString qname("/tmp/query-url-temp-");
@ -444,8 +458,7 @@ void UrlWrapperApp::ArgvReceived(int32 argc, char **argv)
BString s; BString s;
int32 v; int32 v;
// TODO: UnurlString(u.full);
// UnurlString(full);
// TODO: handle options (list of attrs in the column, ...) // TODO: handle options (list of attrs in the column, ...)
v = 'qybF'; // QuerY By Formula XXX: any #define for that ? v = 'qybF'; // QuerY By Formula XXX: any #define for that ?
@ -453,6 +466,7 @@ void UrlWrapperApp::ArgvReceived(int32 argc, char **argv)
s = "TextControl"; s = "TextControl";
query.WriteAttr("_trk/focusedView", B_STRING_TYPE, 0LL, s.String(), s.Length()+1); query.WriteAttr("_trk/focusedView", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
s = u.full; s = u.full;
PRINT(("QUERY='%s'\n", s.String()));
query.WriteAttr("_trk/qryinitstr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1); query.WriteAttr("_trk/qryinitstr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
query.WriteAttr("_trk/qrystr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1); query.WriteAttr("_trk/qrystr", B_STRING_TYPE, 0LL, s.String(), s.Length()+1);
s = "application/x-vnd.Be-query"; s = "application/x-vnd.Be-query";