[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1872 - gnunet-gtk/src/plugins/fs
|
From: |
durner |
|
Subject: |
[GNUnet-SVN] r1872 - gnunet-gtk/src/plugins/fs |
|
Date: |
Tue, 23 Aug 2005 15:03:34 -0700 (PDT) |
Author: durner
Date: 2005-08-23 15:03:27 -0700 (Tue, 23 Aug 2005)
New Revision: 1872
Modified:
gnunet-gtk/src/plugins/fs/download.c
Log:
tab2space
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2005-08-23 19:29:55 UTC (rev
1871)
+++ gnunet-gtk/src/plugins/fs/download.c 2005-08-23 22:03:27 UTC (rev
1872)
@@ -54,7 +54,7 @@
pos = head;
while (pos != NULL) {
if (ECRS_equalsUri(uri,
- pos->uri))
+ pos->uri))
break;
pos = pos->next;
}
@@ -70,42 +70,42 @@
return SYSERR;
path = gtk_tree_row_reference_get_path(pos->rr);
gtk_tree_model_get_iter(GTK_TREE_MODEL(pos->model),
- &iter,
- path);
+ &iter,
+ path);
gtk_tree_path_free(path);
for (i=gtk_tree_model_iter_n_children(pos->model,
- &iter)-1;i>=0;i--) {
+ &iter)-1;i>=0;i--) {
if (TRUE == gtk_tree_model_iter_nth_child(pos->model,
- &child,
- &iter,
- i)) {
- struct ECRS_URI * uri;
- uri = NULL;
- gtk_tree_model_get(pos->model,
- &child,
- SEARCH_URI, &uri,
- -1);
- if ( (uri != NULL) &&
- (ECRS_equalsUri(uri,
- fi->uri)) )
- return OK;
+ &child,
+ &iter,
+ i)) {
+ struct ECRS_URI * uri;
+ uri = NULL;
+ gtk_tree_model_get(pos->model,
+ &child,
+ SEARCH_URI, &uri,
+ -1);
+ if ( (uri != NULL) &&
+ (ECRS_equalsUri(uri,
+ fi->uri)) )
+ return OK;
}
}
gtk_tree_store_append(GTK_TREE_STORE(pos->model),
- &child,
- &iter);
+ &child,
+ &iter);
addEntryToSearchTree(GTK_TREE_STORE(pos->model),
- &child,
- fi->uri,
- fi->meta);
+ &child,
+ fi->uri,
+ fi->meta);
}
return OK;
}
static void initiateDownload(GtkTreeModel * model,
- GtkTreePath * path,
- GtkTreeIter * iter,
- gpointer unused) {
+ GtkTreePath * path,
+ GtkTreeIter * iter,
+ gpointer unused) {
struct ECRS_URI * uri;
struct ECRS_MetaData * meta;
char * filename;
@@ -123,11 +123,11 @@
meta = NULL;
name = NULL;
gtk_tree_model_get(model,
- iter,
- SEARCH_NAME, &name,
- SEARCH_URI, &uri,
- SEARCH_META, &meta,
- -1);
+ iter,
+ SEARCH_NAME, &name,
+ SEARCH_URI, &uri,
+ SEARCH_META, &meta,
+ -1);
if (uri == NULL) {
BREAK();
return;
@@ -135,8 +135,8 @@
filename = ECRS_uriToString(uri);
if ( (filename == NULL) ||
(strlen(filename) <
- strlen(ECRS_URI_PREFIX) +
- strlen(ECRS_FILE_INFIX)) ) {
+ strlen(ECRS_URI_PREFIX) +
+ strlen(ECRS_FILE_INFIX)) ) {
BREAK();
FREENONNULL(filename);
return;
@@ -153,30 +153,30 @@
}
list->uri = ECRS_dupUri(uri);
fn = getFileName("FS",
- "DOWNLOADDIR",
- _("You must specify a directory in the configuration"
- " in section `%s' under `%s'."));
+ "DOWNLOADDIR",
+ _("You must specify a directory in the configuration"
+ " in section `%s' under `%s'."));
mkdirp(fn);
pfx = MALLOC(strlen(fn) + 2 +
- strlen(name));
+ strlen(name));
lnk = MALLOC(strlen(fn) + 2 +
- strlen(filename));
+ strlen(filename));
strcpy(pfx, fn);
if (pfx[strlen(pfx)-1] != DIR_SEPARATOR)
strcat(pfx,
- DIR_SEPARATOR_STR);
+ DIR_SEPARATOR_STR);
strcpy(lnk, fn);
FREE(fn);
if (lnk[strlen(lnk)-1] != DIR_SEPARATOR)
strcat(lnk,
- DIR_SEPARATOR_STR);
+ DIR_SEPARATOR_STR);
strcat(pfx,
- name);
+ name);
strcat(lnk,
- &filename[strlen(ECRS_URI_PREFIX) +
- strlen(ECRS_FILE_INFIX)]);
+ &filename[strlen(ECRS_URI_PREFIX) +
+ strlen(ECRS_FILE_INFIX)]);
if (0 != STAT(pfx,
- &sbuf)) {
+ &sbuf)) {
if (0 != SYMLINK(lnk, pfx))
LOG_FILE_STRERROR(LOG_ERROR, "symlink", pfx);
} else {
@@ -186,20 +186,20 @@
list->filename = pfx;
head = list;
gtk_tree_store_insert(summary,
- &iiter,
- NULL,
- 0);
+ &iiter,
+ NULL,
+ 0);
gtk_tree_store_set(summary,
- &iiter,
- DOWNLOAD_FILENAME, lnk,
- DOWNLOAD_LINKNAME, pfx,
- 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);
+ &iiter,
+ DOWNLOAD_FILENAME, lnk,
+ DOWNLOAD_LINKNAME, pfx,
+ 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);
spin = getAnonymityButtonFromTM(model);
if (spin == NULL) {
@@ -210,14 +210,14 @@
(GTK_SPIN_BUTTON(spin));
}
FSUI_startDownload(ctx,
- anon,
- uri,
- lnk);
+ anon,
+ uri,
+ lnk);
FREE(lnk);
}
void on_downloadButton_clicked(GtkWidget * treeview,
- GtkWidget * downloadButton) {
+ GtkWidget * downloadButton) {
GtkTreeSelection * selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
@@ -231,9 +231,9 @@
/**
*/
void displayDownloadUpdate(const struct ECRS_URI * uri,
- unsigned long long completed,
- const char * data,
- unsigned int size) {
+ unsigned long long completed,
+ const char * data,
+ unsigned int size) {
GtkTreeIter iter;
unsigned int val;
unsigned long long total;
@@ -242,35 +242,35 @@
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
- &iter)) {
+ &iter)) {
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
- &iter,
- DOWNLOAD_SIZE, &total,
- DOWNLOAD_URI, &u,
- -1);
+ &iter,
+ DOWNLOAD_SIZE, &total,
+ DOWNLOAD_URI, &u,
+ -1);
if (u == NULL)
- return;
+ return;
if (ECRS_equalsUri(u, uri)) {
- if (total != 0)
- val = completed * 100 / total;
- else
- val = 100;
- gtk_tree_store_set(summary,
- &iter,
- DOWNLOAD_PROGRESS, val,
- -1);
- break;
+ if (total != 0)
+ val = completed * 100 / total;
+ else
+ val = 100;
+ gtk_tree_store_set(summary,
+ &iter,
+ DOWNLOAD_PROGRESS, val,
+ -1);
+ break;
}
} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
- &iter));
+ &iter));
}
meta = NULL;
ECRS_listDirectory(data,
- size,
- &meta,
- &addFilesToDirectory,
- (void*)uri);
+ size,
+ &meta,
+ &addFilesToDirectory,
+ (void*)uri);
if (meta != NULL)
ECRS_freeMetaData(meta);
}
@@ -278,7 +278,7 @@
/**
*/
void displayDownloadComplete(const struct ECRS_URI * uri,
- const char * filename) {
+ const char * filename) {
char * ren;
const char * fn;
const char * ln;
@@ -294,7 +294,7 @@
pos = head;
while (pos != NULL) {
if (ECRS_equalsUri(uri,
- pos->uri))
+ pos->uri))
break;
pos = pos->next;
}
@@ -307,23 +307,23 @@
if (OK == getFileSize(filename, &size)) {
fd = fileopen(filename, O_RDONLY);
data = MMAP(NULL,
- size,
- PROT_READ,
- MAP_SHARED,
- fd,
- 0);
+ size,
+ PROT_READ,
+ MAP_SHARED,
+ fd,
+ 0);
meta = NULL;
if (data != NULL) {
- ECRS_listDirectory(data,
- size,
- &meta,
- &addFilesToDirectory,
- (void*)uri);
- MUNMAP(data, size);
+ ECRS_listDirectory(data,
+ size,
+ &meta,
+ &addFilesToDirectory,
+ (void*)uri);
+ MUNMAP(data, size);
}
CLOSE(fd);
if (meta != NULL)
- ECRS_freeMetaData(meta);
+ ECRS_freeMetaData(meta);
}
path = gtk_tree_row_reference_get_path(pos->rr);
@@ -336,83 +336,83 @@
/* only rename top-level files, not files inside of directories! */
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
- &iter)) {
+ &iter)) {
do {
ln = NULL;
fn = NULL;
gtk_tree_model_get(GTK_TREE_MODEL(summary),
- &iter,
- DOWNLOAD_URI, &u,
- DOWNLOAD_FILENAME, &fn,
- DOWNLOAD_LINKNAME, &ln,
- -1);
+ &iter,
+ DOWNLOAD_URI, &u,
+ DOWNLOAD_FILENAME, &fn,
+ DOWNLOAD_LINKNAME, &ln,
+ -1);
if (ECRS_equalsUri(u, uri)) {
- ren = ECRS_suggestFilename(ln);
- if (ren != NULL) {
- gtk_tree_store_set(summary,
- &iter,
- DOWNLOAD_LINKNAME, ren,
- -1);
- if (0 == strcmp(fn, ln)) {
- /* keep the actual data under the URI name
- and create a symlink */
- if (0 != RENAME(ren, fn))
- LOG(LOG_ERROR,
- _("Renaming of file `%s' to `%s' failed: %s\n"),
- ren,
- fn,
- STRERROR(errno));
- else
- if (0 != SYMLINK(fn, ren))
- LOG_FILE_STRERROR(LOG_ERROR, "symlink", ren);
- }
- FREE(ren);
- }
- break;
+ ren = ECRS_suggestFilename(ln);
+ if (ren != NULL) {
+ gtk_tree_store_set(summary,
+ &iter,
+ DOWNLOAD_LINKNAME, ren,
+ -1);
+ if (0 == strcmp(fn, ln)) {
+ /* keep the actual data under the URI name
+ and create a symlink */
+ if (0 != RENAME(ren, fn))
+ LOG(LOG_ERROR,
+ _("Renaming of file `%s' to `%s' failed: %s\n"),
+ ren,
+ fn,
+ STRERROR(errno));
+ else
+ if (0 != SYMLINK(fn, ren))
+ LOG_FILE_STRERROR(LOG_ERROR, "symlink", ren);
+ }
+ FREE(ren);
+ }
+ break;
}
} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
- &iter));
+ &iter));
}
}
static int delDownloadView(void * cls,
- const struct FSUI_DownloadList * pos,
- const char * filename,
- const struct ECRS_URI * uri,
- unsigned long long filesize,
- unsigned long long bytesCompleted,
- int isRecursive,
- unsigned int anonymityLevel) {
+ const struct FSUI_DownloadList * pos,
+ const char * filename,
+ const struct ECRS_URI * uri,
+ unsigned long long filesize,
+ unsigned long long bytesCompleted,
+ int isRecursive,
+ unsigned int anonymityLevel) {
GtkTreeIter iter;
char * f;
struct ECRS_URI * u;
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
- &iter)) {
+ &iter)) {
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
- &iter,
- DOWNLOAD_FILENAME, &f,
- DOWNLOAD_URI, &u,
- -1);
+ &iter,
+ DOWNLOAD_FILENAME, &f,
+ DOWNLOAD_URI, &u,
+ -1);
if ( (ECRS_equalsUri(u, uri)) &&
- (0 == strcmp(f, filename)) ) {
- gtk_tree_store_remove(summary,
- &iter);
- break;
+ (0 == strcmp(f, filename)) ) {
+ gtk_tree_store_remove(summary,
+ &iter);
+ break;
}
} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
- &iter));
+ &iter));
}
return OK;
}
void on_clearCompletedDownloadsButton_clicked(void * unused,
- GtkWidget * clearButton) {
+ GtkWidget * clearButton) {
FSUI_clearCompletedDownloads(ctx,
- &delDownloadView,
- NULL);
+ &delDownloadView,
+ NULL);
}
struct aDC_closure {
@@ -423,38 +423,38 @@
static void * shutdownCode(void * c) {
struct aDC_closure * cls = c;
FSUI_stopDownload(ctx,
- cls->u,
- cls->fn);
+ cls->u,
+ cls->fn);
return NULL;
}
static void abortDownloadCallback(GtkTreeModel * model,
- GtkTreePath * path,
- GtkTreeIter * iter,
- GtkTreeStore * tree) {
+ GtkTreePath * path,
+ GtkTreeIter * iter,
+ GtkTreeStore * tree) {
struct aDC_closure cls;
GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
gtk_tree_model_get(model,
- iter,
- DOWNLOAD_URI, &cls.u,
- DOWNLOAD_FILENAME, &cls.fn,
- -1);
+ iter,
+ DOWNLOAD_URI, &cls.u,
+ DOWNLOAD_FILENAME, &cls.fn,
+ -1);
run_with_save_calls(&shutdownCode,
- &cls);
+ &cls);
gtk_tree_store_remove(summary,
- iter);
+ iter);
if (cls.u != NULL)
ECRS_freeUri(cls.u);
}
void on_abortDownloadButton_clicked(void * unused,
- GtkWidget * clearButton) {
+ GtkWidget * clearButton) {
GtkTreeSelection * selection;
GtkWidget * downloadList;
downloadList = glade_xml_get_widget(getMainXML(),
- "activeDownloadsList");
+ "activeDownloadsList");
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
gtk_tree_selection_selected_foreach
(selection,
@@ -463,13 +463,13 @@
}
static int addDownloadView(void * cls,
- const struct FSUI_DownloadList * pos,
- const char * filename,
- const struct ECRS_URI * uri,
- unsigned long long filesize,
- unsigned long long bytesCompleted,
- int isRecursive,
- unsigned int anonymityLevel) {
+ const struct FSUI_DownloadList * pos,
+ const char * filename,
+ const struct ECRS_URI * uri,
+ unsigned long long filesize,
+ unsigned long long bytesCompleted,
+ int isRecursive,
+ unsigned int anonymityLevel) {
GtkTreeIter iiter;
int progress;
char * uriname;
@@ -480,19 +480,19 @@
progress = 100;
uriname = ECRS_uriToString(uri);
gtk_tree_store_insert(summary,
- &iiter,
- NULL,
- 0);
+ &iiter,
+ NULL,
+ 0);
gtk_tree_store_set(summary,
- &iiter,
- DOWNLOAD_FILENAME, filename,
- DOWNLOAD_LINKNAME, filename,
- DOWNLOAD_SIZE, filesize,
- DOWNLOAD_PROGRESS, progress,
- DOWNLOAD_URISTRING, uriname,
- DOWNLOAD_URI, ECRS_dupUri(uri),
- DOWNLOAD_TREEPATH, NULL,
- -1);
+ &iiter,
+ DOWNLOAD_FILENAME, filename,
+ DOWNLOAD_LINKNAME, filename,
+ DOWNLOAD_SIZE, filesize,
+ DOWNLOAD_PROGRESS, progress,
+ DOWNLOAD_URISTRING, uriname,
+ DOWNLOAD_URI, ECRS_dupUri(uri),
+ DOWNLOAD_TREEPATH, NULL,
+ -1);
FREE(uriname);
return OK;
}
@@ -504,44 +504,44 @@
downloadList = glade_xml_get_widget(getMainXML(),
- "activeDownloadsList");
+ "activeDownloadsList");
summary =
gtk_tree_store_new(DOWNLOAD_NUM,
- G_TYPE_STRING, /* name (URI as string) */
- G_TYPE_STRING, /* name (user-friendly name) */
- G_TYPE_UINT64, /* size */
- G_TYPE_INT, /* progress */
- G_TYPE_STRING, /* uri */
- G_TYPE_POINTER, /* url */
- G_TYPE_POINTER); /* internal: gtk tree path / NULL */
+ G_TYPE_STRING, /* name (URI as string) */
+ G_TYPE_STRING, /* name (user-friendly name) */
+ G_TYPE_UINT64, /* size */
+ G_TYPE_INT, /* progress */
+ G_TYPE_STRING, /* uri */
+ G_TYPE_POINTER, /* url */
+ G_TYPE_POINTER); /* internal: gtk tree path / NULL */
gtk_tree_view_set_model(GTK_TREE_VIEW(downloadList),
- GTK_TREE_MODEL(summary));
+ GTK_TREE_MODEL(summary));
renderer = gtk_cell_renderer_progress_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
- -1,
- _("Name"),
- renderer,
- "value", DOWNLOAD_PROGRESS,
- "text", DOWNLOAD_LINKNAME,
- NULL);
+ -1,
+ _("Name"),
+ renderer,
+ "value", DOWNLOAD_PROGRESS,
+ "text", DOWNLOAD_LINKNAME,
+ NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
- -1,
- _("Size"),
- renderer,
- "text", DOWNLOAD_SIZE,
- NULL);
+ -1,
+ _("Size"),
+ renderer,
+ "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", DOWNLOAD_URISTRING,
- NULL);
+ -1,
+ _("URI"),
+ renderer,
+ "text", DOWNLOAD_URISTRING,
+ NULL);
FSUI_listDownloads(ctx,
- NULL,
- &addDownloadView,
- NULL);
+ NULL,
+ &addDownloadView,
+ NULL);
}
@@ -552,21 +552,21 @@
/* free URIs in summary model */
if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
- &iter))
+ &iter))
return;
do {
gtk_tree_model_get(GTK_TREE_MODEL(summary),
- &iter,
- DOWNLOAD_URI, &u,
- -1);
+ &iter,
+ DOWNLOAD_URI, &u,
+ -1);
gtk_tree_store_set(summary,
- &iter,
- DOWNLOAD_URI, NULL,
- -1);
+ &iter,
+ DOWNLOAD_URI, NULL,
+ -1);
if (u != NULL)
ECRS_freeUri(u);
} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
- &iter));
+ &iter));
while (head != NULL) {
pos = head->next;
ECRS_freeUri(head->uri);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1872 - gnunet-gtk/src/plugins/fs,
durner <=