[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r956 - Extractor Extractor/src/include Extractor/src/main E
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r956 - Extractor Extractor/src/include Extractor/src/main Extractor/src/plugins Extractor/src/plugins/ole2 Extractor/src/plugins/oo gnunet-gtk gnunet-gtk/src |
|
Date: |
Sun, 19 Jun 2005 09:14:52 -0700 (PDT) |
Author: grothoff
Date: 2005-06-19 09:14:32 -0700 (Sun, 19 Jun 2005)
New Revision: 956
Modified:
Extractor/ChangeLog
Extractor/src/include/extractor.h
Extractor/src/main/extractor.c
Extractor/src/plugins/Makefile.am
Extractor/src/plugins/debextractor.c
Extractor/src/plugins/elfextractor.c
Extractor/src/plugins/id3v23extractor.c
Extractor/src/plugins/id3v24extractor.c
Extractor/src/plugins/ole2/ole2extractor.c
Extractor/src/plugins/oo/Makefile.am
Extractor/src/plugins/oo/unzip.c
Extractor/src/plugins/pngextractor.c
Extractor/src/plugins/tarextractor.c
Extractor/src/plugins/tiffextractor.c
Extractor/src/plugins/wavextractor.c
gnunet-gtk/ChangeLog
gnunet-gtk/TODO
gnunet-gtk/src/download.c
gnunet-gtk/src/download.h
gnunet-gtk/src/fs.h
gnunet-gtk/src/search.c
gnunet-gtk/src/search.h
gnunet-gtk/src/upload.c
Log:
update
Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-06-19 10:38:10 UTC (rev 955)
+++ Extractor/ChangeLog 2005-06-19 16:14:32 UTC (rev 956)
@@ -1,3 +1,7 @@
+Sat Jun 18 14:56:38 EST 2005
+ Fixed a score of compiler warnings and some minor bugs,
+ none of which should have been observable.
+
Sat May 21 13:42:46 EST 2005
Releasing libextractor 0.5.0.
Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h 2005-06-19 10:38:10 UTC (rev 955)
+++ Extractor/src/include/extractor.h 2005-06-19 16:14:32 UTC (rev 956)
@@ -29,7 +29,7 @@
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00050001
+#define EXTRACTOR_VERSION 0x00050002
#include <stdio.h>
Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c 2005-06-19 10:38:10 UTC (rev 955)
+++ Extractor/src/main/extractor.c 2005-06-19 16:14:32 UTC (rev 956)
@@ -479,7 +479,6 @@
EXTRACTOR_loadConfigLibraries (EXTRACTOR_ExtractorList * prev,
const char *config)
{
- EXTRACTOR_ExtractorList * exlast;
char *cpy;
int pos;
int last;
Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am 2005-06-19 10:38:10 UTC (rev 955)
+++ Extractor/src/plugins/Makefile.am 2005-06-19 16:14:32 UTC (rev 956)
@@ -20,7 +20,7 @@
SUBDIRS = . oo $(printdir) hash $(oledir) rpm pdf $(thumbdir)
-PLUGINFLAGS = -export-dynamic -avoid-version -module
+PLUGINFLAGS = -export-dynamic -avoid-version -module
if HAVE_VORBISFILE
Modified: Extractor/src/plugins/debextractor.c
===================================================================
--- Extractor/src/plugins/debextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/debextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -115,9 +115,9 @@
colon++;
eol = colon;
while ( (eol < size) &&
- (data[eol] != '\n') ||
- ( (eol+1 < size) &&
- (data[eol+1] == ' ') ) )
+ ( (data[eol] != '\n') ||
+ ( (eol+1 < size) &&
+ (data[eol+1] == ' ') ) ) )
eol++;
if ( (eol == colon) || (eol > size) )
return prev;
@@ -211,7 +211,7 @@
prev);
}
if ( (fsize & 511) != 0)
- fsize = (fsize |= 511)+1; /* round up! */
+ fsize = (fsize | 511)+1; /* round up! */
if (pos + fsize < pos)
return prev;
pos += fsize;
@@ -259,8 +259,6 @@
gzFile gzf;
int fdes[2];
char * buf;
- int flags;
- size_t ret;
WTC wtc;
pthread_t pt;
void * error;
Modified: Extractor/src/plugins/elfextractor.c
===================================================================
--- Extractor/src/plugins/elfextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/elfextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -20,6 +20,7 @@
#include "platform.h"
#include "extractor.h"
+#include "pack.h"
static void addKeyword(struct EXTRACTOR_Keywords ** list,
const char * keyword,
Modified: Extractor/src/plugins/id3v23extractor.c
===================================================================
--- Extractor/src/plugins/id3v23extractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/id3v23extractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -151,7 +151,7 @@
(csize > tsize) ||
(csize == 0) )
break;
- flags = data[pos+8]<<8 + data[pos+9];
+ flags = (data[pos+8]<<8) + data[pos+9];
if ( ( (flags & 0x80) > 0) /* compressed, not yet supported */ ||
( (flags & 0x40) > 0) /* encrypted, not supported */ ) {
pos += 10 + csize;
Modified: Extractor/src/plugins/id3v24extractor.c
===================================================================
--- Extractor/src/plugins/id3v24extractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/id3v24extractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -148,7 +148,7 @@
(csize > tsize) ||
(csize == 0) )
break;
- flags = data[pos+8]<<8 + data[pos+9];
+ flags = (data[pos+8]<<8) + data[pos+9];
if ( ( (flags & 0x80) > 0) /* compressed, not yet supported */ ||
( (flags & 0x40) > 0) /* encrypted, not supported */ ) {
pos += 10 + csize;
Modified: Extractor/src/plugins/ole2/ole2extractor.c
===================================================================
--- Extractor/src/plugins/ole2/ole2extractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/ole2/ole2extractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -923,8 +923,6 @@
struct EXTRACTOR_Keywords
* prev) {
GsfInput *input;
GsfInfile *infile;
- guint8 const *data;
- size_t len;
int i;
input = gsf_input_memory_new((guint8 const *) date,
Modified: Extractor/src/plugins/oo/Makefile.am
===================================================================
--- Extractor/src/plugins/oo/Makefile.am 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/oo/Makefile.am 2005-06-19 16:14:32 UTC (rev
956)
@@ -23,4 +23,4 @@
-export-dynamic -avoid-version -module
libextractor_oo_la_LIBADD = \
- -lz
+ -lz
Modified: Extractor/src/plugins/oo/unzip.c
===================================================================
--- Extractor/src/plugins/oo/unzip.c 2005-06-19 10:38:10 UTC (rev 955)
+++ Extractor/src/plugins/oo/unzip.c 2005-06-19 16:14:32 UTC (rev 956)
@@ -592,12 +592,12 @@
/* we check the magic */
- if (err==UNZ_OK)
+ if (err==UNZ_OK) {
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
err=UNZ_ERRNO;
else if (uMagic!=0x02014b50)
err=UNZ_BADZIPFILE;
-
+ }
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) !=
UNZ_OK)
err=UNZ_ERRNO;
@@ -672,11 +672,12 @@
else
uSizeRead = extraFieldBufferSize;
- if (lSeek!=0)
+ if (lSeek!=0) {
if (ZSEEK(s->z_filefunc,
s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
lSeek=0;
else
err=UNZ_ERRNO;
+ }
if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
if (ZREAD(s->z_filefunc,
s->filestream,extraField,uSizeRead)!=uSizeRead)
err=UNZ_ERRNO;
@@ -697,11 +698,12 @@
else
uSizeRead = commentBufferSize;
- if (lSeek!=0)
+ if (lSeek!=0) {
if (ZSEEK(s->z_filefunc,
s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
lSeek=0;
else
err=UNZ_ERRNO;
+ }
if ((file_info.size_file_comment>0) && (commentBufferSize>0))
if (ZREAD(s->z_filefunc,
s->filestream,szComment,uSizeRead)!=uSizeRead)
err=UNZ_ERRNO;
@@ -960,12 +962,12 @@
return UNZ_ERRNO;
- if (err==UNZ_OK)
+ if (err==UNZ_OK) {
if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
err=UNZ_ERRNO;
else if (uMagic!=0x04034b50)
err=UNZ_BADZIPFILE;
-
+ }
if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
err=UNZ_ERRNO;
/*
@@ -1504,7 +1506,6 @@
char *szComment;
uLong uSizeBuf;
{
- int err=UNZ_OK;
unz_s* s;
uLong uReadThis ;
if (file==NULL)
Modified: Extractor/src/plugins/pngextractor.c
===================================================================
--- Extractor/src/plugins/pngextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/pngextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -32,6 +32,20 @@
return tmp;
}
+/**
+ * strnlen is GNU specific, let's redo it here to be
+ * POSIX compliant.
+ */
+static size_t stnlen(const char * str,
+ size_t maxlen) {
+ size_t ret;
+ ret = 0;
+ while ( (ret < maxlen) &&
+ (str[ret] != '\0') )
+ ret++;
+ return ret;
+}
+
static struct EXTRACTOR_Keywords * addKeyword(EXTRACTOR_KeywordType type,
char * keyword,
struct EXTRACTOR_Keywords * next)
{
@@ -80,7 +94,7 @@
int i;
data += 4;
- off = strnlen(data, length) + 1;
+ off = stnlen(data, length) + 1;
if (off >= length)
return prev; /* failed to find '\0' */
keyword = convertToUtf8(&data[off],
@@ -113,26 +127,26 @@
uLongf bufLen;
int ret;
- pos = strnlen(data, length)+1;
+ pos = stnlen(data, length)+1;
if (pos+3 >= length)
return prev;
compressed = data[pos++];
if (compressed && (data[pos++] != 0))
return prev; /* bad compression method */
language = &data[pos];
- if (strnlen(language, length-pos) > 0)
+ if (stnlen(language, length-pos) > 0)
prev = addKeyword(EXTRACTOR_LANGUAGE,
stndup(language, length-pos),
prev);
- pos += strnlen(language, length-pos)+1;
+ pos += stnlen(language, length-pos)+1;
if (pos+1 >= length)
return prev;
translated = &data[pos]; /* already in utf-8! */
- if (strnlen(translated, length-pos) > 0)
+ if (stnlen(translated, length-pos) > 0)
prev = addKeyword(EXTRACTOR_TRANSLATED,
stndup(translated, length-pos),
prev);
- pos += strnlen(translated, length-pos)+1;
+ pos += stnlen(translated, length-pos)+1;
if (pos >= length)
return prev;
@@ -213,7 +227,7 @@
int ret;
data += 4;
- off = strnlen(data, length) + 1;
+ off = stnlen(data, length) + 1;
if (off >= length)
return prev; /* failed to find '\0' */
if (data[off] != 0)
Modified: Extractor/src/plugins/tarextractor.c
===================================================================
--- Extractor/src/plugins/tarextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/tarextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -128,7 +128,7 @@
100),
prev);
if ( (fsize & 511) != 0)
- fsize = (fsize |= 511)+1; /* round up! */
+ fsize = (fsize | 511)+1; /* round up! */
if (pos + fsize < pos)
return prev;
pos += fsize;
Modified: Extractor/src/plugins/tiffextractor.c
===================================================================
--- Extractor/src/plugins/tiffextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/tiffextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -109,7 +109,6 @@
size_t size,
struct EXTRACTOR_Keywords
* prev) {
TIFF_HEADER hdr;
- struct EXTRACTOR_Keywords * pos;
int byteOrder; /* 0: do not convert;
1: do convert */
int current_ifd;
Modified: Extractor/src/plugins/wavextractor.c
===================================================================
--- Extractor/src/plugins/wavextractor.c 2005-06-19 10:38:10 UTC (rev
955)
+++ Extractor/src/plugins/wavextractor.c 2005-06-19 16:14:32 UTC (rev
956)
@@ -71,7 +71,6 @@
unsigned int sampleRate;
unsigned int dataLen;
unsigned int samples;
- int bytesProcessed;
char * scratch;
Modified: gnunet-gtk/ChangeLog
===================================================================
--- gnunet-gtk/ChangeLog 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/ChangeLog 2005-06-19 16:14:32 UTC (rev 956)
@@ -1,9 +1,3 @@
Mon May 23 11:06:02 EST 2005
Started serious coding on glade-based gnunet-gtk.
-
-2005/5/24 6:45:33 EST
- update files from .glade file
-
-2005/5/24 16:35:41 EST
- update files from .glade file
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/TODO 2005-06-19 16:14:32 UTC (rev 956)
@@ -1,5 +1,4 @@
Important (for 0.7.0):
-* cleanup-code (enum instead of 1,2,3,4; refactor search/download copied code)
[ easy, CG ]
* make use of anonymity level specification widgets [ easy, CG ]:
- search
- download
@@ -25,6 +24,7 @@
* highlight active downloads in search list [ easy ]
Later (0.7.1):
+* plugin mechanism! [ medium, CG (I have something rather specific in mind) ]
* auto-rename downloaded files to better names (user feedback!?) [ medium ]
* stats integration [ medium ]
* available apps [ medium ]
@@ -37,8 +37,6 @@
gnunet-gtk wishlist (from pre-0.7.0 days):
-- #770? (use freedback (LOG) in gnunet-gtk via show-messages)
- (is this not working nicely already?)
- add option to list all indexed files and perhaps delete from them
(ECRS now supports listing of indexed files!)
- for potentially long clists, add option to specify a string
Modified: gnunet-gtk/src/download.c
===================================================================
--- gnunet-gtk/src/download.c 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/download.c 2005-06-19 16:14:32 UTC (rev 956)
@@ -63,14 +63,6 @@
GtkTreeIter iter;
GtkTreeIter child;
int i;
- unsigned long long size;
- char * name;
- char * mime;
- char * desc;
- unsigned char * thumb;
- size_t ts;
- GdkPixbuf * pixbuf;
- GdkPixbufLoader * loader;
GtkTreePath * path;
if (! gtk_tree_row_reference_valid(pos->rr))
@@ -89,7 +81,7 @@
uri = NULL;
gtk_tree_model_get(pos->model,
&iter,
- 5, &uri,
+ SEARCH_URI, &uri,
-1);
if ( (uri != NULL) &&
(ECRS_equalsUri(uri,
@@ -100,69 +92,10 @@
gtk_tree_store_append(GTK_TREE_STORE(pos->model),
&child,
&iter);
-
- /* FIXME: this code is identical to some
- code in search.c -- refactor into one
- function (on model, iter and fi) */
- mime = ECRS_getFromMetaData(fi->meta,
- EXTRACTOR_MIMETYPE);
- if (mime == NULL)
- mime = STRDUP(_("unknown"));
- desc = ECRS_getFirstFromMetaData(fi->meta,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_GENRE,
- EXTRACTOR_ALBUM,
- EXTRACTOR_COMMENT,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_FORMAT,
- EXTRACTOR_SIZE,
- EXTRACTOR_KEYWORDS,
- -1);
- if (desc == NULL)
- desc = STRDUP(_(""));
- name = ECRS_getFirstFromMetaData(fi->meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_UNKNOWN,
- -1);
- if (name == NULL)
- name = STRDUP(_("no name given"));
- size = ECRS_fileSize(fi->uri);
- thumb = NULL;
- ts = ECRS_getThumbnailFromMetaData(fi->meta,
- &thumb);
- if (ts != 0) {
- loader = gdk_pixbuf_loader_new();
- gdk_pixbuf_loader_write(loader,
- (const guchar*) thumb,
- ts,
- NULL);
- pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
- gdk_pixbuf_loader_close(loader,
- NULL);
- } else {
- pixbuf = NULL;
- }
- gtk_tree_store_set(GTK_TREE_STORE(pos->model),
- &child,
- 0, name,
- 1, size,
- 2, mime,
- 3, desc,
- 4, pixbuf,
- 5, ECRS_dupUri(fi->uri),
- 6, ECRS_dupMetaData(fi->meta),
- 7, NULL, /* internal */
- -1);
- FREE(mime);
- FREE(desc);
- FREE(name);
- FREENONNULL(thumb);
+ addEntryToSearchTree(GTK_TREE_STORE(pos->model),
+ &child,
+ fi->uri,
+ fi->meta);
}
return OK;
}
@@ -186,9 +119,9 @@
name = NULL;
gtk_tree_model_get(model,
iter,
- 0, &name,
- 5, &uri,
- 6, &meta,
+ SEARCH_NAME, &name,
+ SEARCH_URI, &uri,
+ SEARCH_META, &meta,
-1);
if (uri == NULL) {
BREAK();
@@ -258,12 +191,12 @@
0);
gtk_tree_store_set(summary,
&iiter,
- 0, name,
- 1, ECRS_fileSize(uri),
- 2, 0, /* progress */
- 3, filename,
- 4, ECRS_dupUri(uri),
- 5, list->rr, /* internal: row reference! */
+ DOWNLOAD_FILENAME, name,
+ DOWNLOAD_SIZE, ECRS_fileSize(uri),
+ DOWNLOAD_PROGRESS, 0, /* progress */
+ DOWNLOAD_URISTRING, filename,
+ DOWNLOAD_URI, ECRS_dupUri(uri),
+ DOWNLOAD_TREEPATH, list->rr, /* internal: row reference! */
-1);
FREE(filename);
FREE(name);
@@ -303,8 +236,8 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 1, &total,
- 4, &u,
+ DOWNLOAD_SIZE, &total,
+ DOWNLOAD_URI, &u,
-1);
if (ECRS_equalsUri(u, uri)) {
if (total != 0)
@@ -313,7 +246,7 @@
val = 100;
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 2, val,
+ DOWNLOAD_PROGRESS, val,
-1);
break;
}
@@ -409,12 +342,12 @@
0);
gtk_tree_store_set(summary,
&iiter,
- 0, filename,
- 1, filesize,
- 2, progress,
- 3, uriname,
- 4, ECRS_dupUri(uri),
- 5, NULL,
+ DOWNLOAD_FILENAME, filename,
+ DOWNLOAD_SIZE, filesize,
+ DOWNLOAD_PROGRESS, progress,
+ DOWNLOAD_URISTRING, uriname,
+ DOWNLOAD_URI, ECRS_dupUri(uri),
+ DOWNLOAD_TREEPATH, NULL,
-1);
FREE(uriname);
return OK;
@@ -430,7 +363,7 @@
downloadList = glade_xml_get_widget(mainXML,
"activeDownloadsList");
summary =
- gtk_tree_store_new(6,
+ gtk_tree_store_new(DOWNLOAD_NUM,
G_TYPE_STRING, /* name */
G_TYPE_UINT64, /* size */
G_TYPE_INT, /* progress */
@@ -444,22 +377,22 @@
-1,
_("Name"),
renderer,
- "value", 2,
- "text", 0,
+ "value", DOWNLOAD_PROGRESS,
+ "text", DOWNLOAD_FILENAME,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
-1,
_("Size"),
renderer,
- "text", 1,
+ "text", DOWNLOAD_SIZE,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
-1,
_("URI"),
renderer,
- "text", 3,
+ "text", DOWNLOAD_URISTRING,
NULL);
FSUI_listDownloads(ctx,
NULL,
@@ -480,13 +413,15 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 4, &u,
+ DOWNLOAD_URI, &u,
-1);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 4, NULL,
+ DOWNLOAD_URI, NULL,
-1);
ECRS_freeUri(u);
+ /* FIXME:
+ also free DOWNLOAD_TREEPATH! */
} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
&iter));
}
Modified: gnunet-gtk/src/download.h
===================================================================
--- gnunet-gtk/src/download.h 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/download.h 2005-06-19 16:14:32 UTC (rev 956)
@@ -30,6 +30,7 @@
#include "main.h"
#include "fs.h"
+
/**
*/
void displayDownloadUpdate(const struct ECRS_URI * uri,
@@ -46,4 +47,5 @@
void fs_download_stop(void);
+
#endif
Modified: gnunet-gtk/src/fs.h
===================================================================
--- gnunet-gtk/src/fs.h 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/fs.h 2005-06-19 16:14:32 UTC (rev 956)
@@ -31,6 +31,56 @@
#include <GNUnet/gnunet_ecrs_lib.h>
#include <GNUnet/gnunet_fsui_lib.h>
+enum {
+ SEARCH_NAME = 0,
+ SEARCH_SIZE,
+ SEARCH_MIME,
+ SEARCH_DESC,
+ SEARCH_PIXBUF,
+ SEARCH_URI,
+ SEARCH_META,
+ SEARCH_INTERNAL,
+ SEARCH_NUM,
+};
+
+enum {
+ SER_SUM_NAME = 0,
+ SER_SUM_COUNT,
+ SER_SUM_URI,
+ SER_SUM_NUM
+};
+
+enum {
+ DOWNLOAD_FILENAME = 0,
+ DOWNLOAD_SIZE,
+ DOWNLOAD_PROGRESS,
+ DOWNLOAD_URISTRING,
+ DOWNLOAD_URI,
+ DOWNLOAD_TREEPATH,
+ DOWNLOAD_NUM
+};
+
+enum {
+ UPLOAD_FILENAME = 0,
+ UPLOAD_PROGRESS,
+ UPLOAD_URISTRING,
+ UPLOAD_NUM
+};
+
+enum {
+ META_TYPE = 0,
+ META_STYPE,
+ META_VALUE,
+ META_NUM,
+};
+
+enum {
+ KTYPE_STRING = 0,
+ KTYPE_TYPE,
+ KTYPE_NUM,
+};
+
+
extern struct FSUI_Context * ctx;
void gtk_fs_init(void);
Modified: gnunet-gtk/src/search.c
===================================================================
--- gnunet-gtk/src/search.c 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/search.c 2005-06-19 16:14:32 UTC (rev 956)
@@ -31,6 +31,90 @@
#include <extractor.h>
/**
+ * Add an entry to the search tree.
+ *
+ * @param model the search model
+ * @param pos the position to add the entry
+ * @param uri the URI to add
+ * @param meta metadata describing the URI
+ */
+void addEntryToSearchTree(GtkTreeStore * model,
+ GtkTreeIter * pos,
+ const struct ECRS_URI * uri,
+ const struct ECRS_MetaData * meta) {
+ char * name;
+ char * mime;
+ char * desc;
+ unsigned char * thumb;
+ size_t ts;
+ GdkPixbuf * pixbuf;
+ GdkPixbufLoader * loader;
+ unsigned long long size;
+
+ mime = ECRS_getFromMetaData(meta,
+ EXTRACTOR_MIMETYPE);
+ if (mime == NULL)
+ mime = STRDUP(_("unknown"));
+ desc = ECRS_getFirstFromMetaData(meta,
+ EXTRACTOR_DESCRIPTION,
+ EXTRACTOR_GENRE,
+ EXTRACTOR_ALBUM,
+ EXTRACTOR_COMMENT,
+ EXTRACTOR_SUBJECT,
+ EXTRACTOR_FORMAT,
+ EXTRACTOR_SIZE,
+ EXTRACTOR_KEYWORDS,
+ -1);
+ if (desc == NULL)
+ desc = STRDUP(_(""));
+ name = ECRS_getFirstFromMetaData(meta,
+ EXTRACTOR_FILENAME,
+ EXTRACTOR_TITLE,
+ EXTRACTOR_ARTIST,
+ EXTRACTOR_AUTHOR,
+ EXTRACTOR_PUBLISHER,
+ EXTRACTOR_CREATOR,
+ EXTRACTOR_PRODUCER,
+ EXTRACTOR_UNKNOWN,
+ -1);
+ if (name == NULL)
+ name = STRDUP(_("no name given"));
+ size = ECRS_fileSize(uri);
+ thumb = NULL;
+ ts = ECRS_getThumbnailFromMetaData(meta,
+ &thumb);
+ if (ts != 0) {
+ loader = gdk_pixbuf_loader_new();
+ gdk_pixbuf_loader_write(loader,
+ (const guchar*) thumb,
+ ts,
+ NULL);
+ pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+ gdk_pixbuf_loader_close(loader,
+ NULL);
+ } else {
+ pixbuf = NULL;
+ }
+ gtk_tree_store_set(model,
+ pos,
+ SEARCH_NAME, name,
+ SEARCH_SIZE, size,
+ SEARCH_MIME, mime,
+ SEARCH_DESC, desc,
+ SEARCH_PIXBUF, pixbuf,
+ SEARCH_URI, ECRS_dupUri(uri),
+ SEARCH_META, ECRS_dupMetaData(meta),
+ SEARCH_INTERNAL, NULL, /* internal */
+ -1);
+ FREE(mime);
+ FREE(desc);
+ FREE(name);
+ FREENONNULL(thumb);
+}
+
+
+
+/**
* @brief linked list of pages in the search notebook
*/
typedef struct SL {
@@ -59,8 +143,8 @@
meta = NULL;
gtk_tree_model_get(tree,
iter,
- 5, &uri,
- 6, &meta,
+ SEARCH_URI, &uri,
+ SEARCH_META, &meta,
-1);
if (uri != NULL)
ECRS_freeUri(uri);
@@ -68,8 +152,8 @@
ECRS_freeMetaData(meta);
gtk_tree_store_set(GTK_TREE_STORE(tree),
iter,
- 5, NULL,
- 6, NULL,
+ SEARCH_URI, NULL,
+ SEARCH_META, NULL,
-1);
if (gtk_tree_model_iter_children(tree,
&child,
@@ -110,14 +194,6 @@
GtkTreeIter parent;
GtkTreeIter * pparent;
GtkTreePath * path;
- unsigned long long size;
- char * name;
- char * mime;
- char * desc;
- unsigned char * thumb;
- size_t ts;
- GdkPixbuf * pixbuf;
- GdkPixbufLoader * loader;
if (! gtk_tree_row_reference_valid(row))
path = NULL;
@@ -135,65 +211,10 @@
&iter,
pparent,
0);
- mime = ECRS_getFromMetaData(info->meta,
- EXTRACTOR_MIMETYPE);
- if (mime == NULL)
- mime = STRDUP(_("unknown"));
- desc = ECRS_getFirstFromMetaData(info->meta,
- EXTRACTOR_DESCRIPTION,
- EXTRACTOR_GENRE,
- EXTRACTOR_ALBUM,
- EXTRACTOR_COMMENT,
- EXTRACTOR_SUBJECT,
- EXTRACTOR_FORMAT,
- EXTRACTOR_SIZE,
- EXTRACTOR_KEYWORDS,
- -1);
- if (desc == NULL)
- desc = STRDUP(_(""));
- name = ECRS_getFirstFromMetaData(info->meta,
- EXTRACTOR_FILENAME,
- EXTRACTOR_TITLE,
- EXTRACTOR_ARTIST,
- EXTRACTOR_AUTHOR,
- EXTRACTOR_PUBLISHER,
- EXTRACTOR_CREATOR,
- EXTRACTOR_PRODUCER,
- EXTRACTOR_UNKNOWN,
- -1);
- if (name == NULL)
- name = STRDUP(_("no name given"));
- size = ECRS_fileSize(info->uri);
- thumb = NULL;
- ts = ECRS_getThumbnailFromMetaData(info->meta,
- &thumb);
- if (ts != 0) {
- loader = gdk_pixbuf_loader_new();
- gdk_pixbuf_loader_write(loader,
- (const guchar*) thumb,
- ts,
- NULL);
- pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
- gdk_pixbuf_loader_close(loader,
- NULL);
- } else {
- pixbuf = NULL;
- }
- gtk_tree_store_set(model,
- &iter,
- 0, name,
- 1, size,
- 2, mime,
- 3, desc,
- 4, pixbuf,
- 5, ECRS_dupUri(info->uri),
- 6, ECRS_dupMetaData(info->meta),
- 7, NULL, /* internal */
- -1);
- FREE(mime);
- FREE(desc);
- FREE(name);
- FREENONNULL(thumb);
+ addEntryToSearchTree(model,
+ &iter,
+ info->uri,
+ info->meta);
}
/**
@@ -236,15 +257,15 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 1, &count,
- 2, &euri,
+ SER_SUM_COUNT, &count,
+ SER_SUM_URI, &euri,
-1);
if (ECRS_equalsUri(euri,
uri)) {
count++;
gtk_list_store_set(GTK_LIST_STORE(summary),
&iter,
- 1, count,
+ SER_SUM_COUNT, count,
-1);
return;
}
@@ -308,7 +329,7 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 2, &euri,
+ SER_SUM_URI, &euri,
-1);
if (ECRS_equalsUri(euri,
uri)) {
@@ -344,7 +365,7 @@
if (treeview != NULL)
(*treeview) = GTK_WIDGET(GTK_TREE_VIEW(resultList));
tree =
- gtk_tree_store_new(8,
+ gtk_tree_store_new(SEARCH_NUM,
G_TYPE_STRING, /* name */
G_TYPE_UINT64, /* size */
G_TYPE_STRING, /* mime-type */
@@ -360,35 +381,35 @@
-1,
_("Name"),
renderer,
- "text", 0,
+ "text", SEARCH_NAME,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-1,
_("Size"),
renderer,
- "text", 1,
+ "text", SEARCH_SIZE,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-1,
_("Mime-type"),
renderer,
- "text", 2,
+ "text", SEARCH_MIME,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-1,
_("Meta-data"),
renderer,
- "text", 3,
+ "text", SEARCH_DESC,
NULL);
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-1,
_("Preview"),
renderer,
- "pixbuf", 4,
+ "pixbuf", SEARCH_PIXBUF,
NULL);
child = gtk_bin_get_child(GTK_BIN(window));
gtk_widget_ref(GTK_WIDGET(child));
@@ -435,8 +456,7 @@
&iter);
gtk_list_store_set(model,
&iter,
- 0,
- ss,
+ 0, ss,
-1);
}
@@ -504,9 +524,9 @@
&iter);
gtk_list_store_set(summary,
&iter,
- 0, tabtxt,
- 1, 0,
- 2, ECRS_dupUri(uri),
+ SER_SUM_NAME, tabtxt,
+ SER_SUM_COUNT, 0,
+ SER_SUM_URI, ECRS_dupUri(uri),
-1);
label = gtk_label_new(tabtxt);
@@ -631,9 +651,9 @@
&iter);
gtk_list_store_set(summary,
&iter,
- 0, dhead,
- 1, resultCount,
- 2, ECRS_dupUri(uri),
+ SER_SUM_NAME, dhead,
+ SER_SUM_COUNT, resultCount,
+ SER_SUM_URI, ECRS_dupUri(uri),
-1);
FREE(description);
@@ -683,7 +703,7 @@
searchList = glade_xml_get_widget(mainXML,
"activeSearchesSummary");
summary =
- gtk_list_store_new(3,
+ gtk_list_store_new(SER_SUM_NUM,
G_TYPE_STRING, /* name */
G_TYPE_INT, /* # results */
G_TYPE_POINTER); /* internal: uri */
@@ -694,14 +714,14 @@
-1,
_("Query"),
renderer,
- "text", 0,
+ "text", SER_SUM_NAME,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(searchList),
-1,
_("Results"),
renderer,
- "text", 1,
+ "text", SER_SUM_COUNT,
NULL);
FSUI_listSearches(ctx,
Modified: gnunet-gtk/src/search.h
===================================================================
--- gnunet-gtk/src/search.h 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/search.h 2005-06-19 16:14:32 UTC (rev 956)
@@ -31,6 +31,19 @@
#include "fs.h"
/**
+ * Add an entry to the search tree.
+ *
+ * @param model the search model
+ * @param pos the position to add the entry
+ * @param uri the URI to add
+ * @param meta metadata describing the URI
+ */
+void addEntryToSearchTree(GtkTreeStore * model,
+ GtkTreeIter * pos,
+ const struct ECRS_URI * uri,
+ const struct ECRS_MetaData * meta);
+
+/**
* Add the given result to the model (search result
* list).
* @param info the information to add to the model
Modified: gnunet-gtk/src/upload.c
===================================================================
--- gnunet-gtk/src/upload.c 2005-06-19 10:38:10 UTC (rev 955)
+++ gnunet-gtk/src/upload.c 2005-06-19 16:14:32 UTC (rev 956)
@@ -61,12 +61,12 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 0, &name,
+ UPLOAD_FILENAME, &name,
-1);
if (0 == strcmp(name, filename)) {
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 1, progress,
+ UPLOAD_PROGRESS, progress,
-1);
return;
}
@@ -77,12 +77,12 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&child,
- 0, &name,
+ UPLOAD_FILENAME, &name,
-1);
if (0 == strcmp(name, filename)) {
gtk_tree_store_set(GTK_TREE_STORE(summary),
&child,
- 1, progress,
+ UPLOAD_PROGRESS, progress,
-1);
return;
}
@@ -94,9 +94,9 @@
&iter);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&child,
- 0, filename,
- 1, progress,
- 2, NULL,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, progress,
+ UPLOAD_URISTRING, NULL,
-1);
return;
}
@@ -110,18 +110,18 @@
NULL);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 0, mainName,
- 1, 0,
- 2, NULL,
+ UPLOAD_FILENAME, mainName,
+ UPLOAD_PROGRESS, 0,
+ UPLOAD_URISTRING, NULL,
-1);
gtk_tree_store_append(GTK_TREE_STORE(summary),
&child,
&iter);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&child,
- 0, filename,
- 1, progress,
- 2, NULL,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, progress,
+ UPLOAD_URISTRING, NULL,
-1);
} else {
gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -129,9 +129,9 @@
NULL);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 0, filename,
- 1, progress,
- 2, NULL,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, progress,
+ UPLOAD_URISTRING, NULL,
-1);
}
}
@@ -153,13 +153,13 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&iter,
- 0, &name,
+ UPLOAD_FILENAME, &name,
-1);
if (0 == strcmp(name, filename)) {
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 1, 100,
- 2, us,
+ UPLOAD_PROGRESS, 100,
+ UPLOAD_URISTRING, us,
-1);
FREE(us);
return;
@@ -171,13 +171,13 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
&child,
- 0, &name,
+ UPLOAD_FILENAME, &name,
-1);
if (0 == strcmp(name, filename)) {
gtk_tree_store_set(GTK_TREE_STORE(summary),
&child,
- 1, 100,
- 2, us,
+ UPLOAD_PROGRESS, 100,
+ UPLOAD_URISTRING, us,
-1);
FREE(us);
return;
@@ -190,9 +190,9 @@
&iter);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&child,
- 0, filename,
- 1, 100,
- 2, us,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, 100,
+ UPLOAD_URISTRING, us,
-1);
FREE(us);
return;
@@ -207,18 +207,18 @@
NULL);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 0, mainName,
- 1, 0,
- 2, NULL,
+ UPLOAD_FILENAME, mainName,
+ UPLOAD_PROGRESS, 0,
+ UPLOAD_URISTRING, NULL,
-1);
gtk_tree_store_append(GTK_TREE_STORE(summary),
&child,
&iter);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 0, filename,
- 1, 100,
- 2, NULL,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, 100,
+ UPLOAD_URISTRING, NULL,
-1);
} else {
gtk_tree_store_append(GTK_TREE_STORE(summary),
@@ -226,9 +226,9 @@
NULL);
gtk_tree_store_set(GTK_TREE_STORE(summary),
&iter,
- 0, filename,
- 1, 100,
- 2, us,
+ UPLOAD_FILENAME, filename,
+ UPLOAD_PROGRESS, 100,
+ UPLOAD_URISTRING, us,
-1);
}
FREE(us);
@@ -246,9 +246,9 @@
&iter);
gtk_list_store_set(store,
&iter,
- 0, type,
- 1, stype,
- 2, data,
+ META_TYPE, type,
+ META_STYPE, stype,
+ META_VALUE, data,
-1);
return OK;
}
@@ -340,16 +340,16 @@
return; /* oops */
gtk_tree_model_get(GTK_TREE_MODEL(typemodel),
&iter,
- 0, &stype,
- 1, &type,
+ META_STYPE, &stype,
+ META_TYPE, &type,
-1);
gtk_list_store_append(metamodel,
&iter);
gtk_list_store_set(metamodel,
&iter,
- 0, type,
- 1, stype,
- 2, value,
+ META_TYPE, type,
+ META_STYPE, stype,
+ META_VALUE, value,
-1);
gtk_entry_set_text(GTK_ENTRY(entryLine), "");
}
@@ -410,7 +410,7 @@
dialog = glade_xml_get_widget(metaXML,
"metaDataDialog");
metamodel
- = gtk_list_store_new(3,
+ = gtk_list_store_new(META_NUM,
G_TYPE_INT,
G_TYPE_STRING,
G_TYPE_STRING);
@@ -421,14 +421,14 @@
-1,
_("Category"),
renderer,
- "text", 1,
+ "text", META_STYPE,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
-1,
_("Value"),
renderer,
- "text", 2,
+ "text", META_VALUE,
NULL);
gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
GTK_TREE_MODEL(metamodel));
@@ -467,7 +467,7 @@
(ECRS_KeywordIterator) &publishKeyword,
keymodel);
keywordTypeModel
- = gtk_list_store_new(2,
+ = gtk_list_store_new(KTYPE_NUM,
G_TYPE_STRING,
G_TYPE_INT);
metaType = glade_xml_get_widget(metaXML,
@@ -480,8 +480,8 @@
&iter);
gtk_list_store_set(keywordTypeModel,
&iter,
- 0, stype,
- 1, type,
+ KTYPE_STRING, stype,
+ KTYPE_TYPE, type,
-1);
}
renderer = gtk_cell_renderer_text_new();
@@ -490,7 +490,7 @@
FALSE);
gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),
renderer,
- "text", 0);
+ "text", KTYPE_STRING);
gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),
0);
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -538,8 +538,8 @@
do {
gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
&iter,
- 0, &type,
- 2, &mvalue,
+ META_TYPE, &type,
+ META_VALUE, &mvalue,
-1);
ECRS_addToMetaData(meta,
type,
@@ -722,7 +722,7 @@
uploadList = glade_xml_get_widget(mainXML,
"activeUploadsList");
summary =
- gtk_tree_store_new(3,
+ gtk_tree_store_new(UPLOAD_NUM,
G_TYPE_STRING, /* filename */
G_TYPE_INT, /* progress */
G_TYPE_STRING); /* URI (as string) - after completion */
@@ -733,15 +733,15 @@
-1,
_("Filename"),
renderer,
- "text", 0,
- "value", 1,
+ "text", UPLOAD_FILENAME,
+ "value", UPLOAD_PROGRESS,
NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
-1,
_("URI"),
renderer,
- "text", 2,
+ "text", UPLOAD_URISTRING,
NULL);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r956 - Extractor Extractor/src/include Extractor/src/main Extractor/src/plugins Extractor/src/plugins/ole2 Extractor/src/plugins/oo gnunet-gtk gnunet-gtk/src,
grothoff <=