X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=423731f6b70e770f4b84924bbf9e3640b8e8ba51;hp=d88be97e4c175cfb588291ae2a34f2f7571275bf;hb=a8509af9116e9a045ace70ff312e40569c5ace16;hpb=a7feb744f32ed508b05ce7a0c14265a24705a4a7

diff --git a/aft.c b/aft.c
index d88be97e..423731f6 100644
--- a/aft.c
+++ b/aft.c
@@ -69,7 +69,7 @@ int load_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
 	char *buf = obj->data;
 	if (obj->size < AFSI_SIZE)
-		return -E_BAD_AFS;
+		return -E_BAD_AFSI;
 	afsi->last_played = read_u64(buf + AFSI_LAST_PLAYED_OFFSET);
 	afsi->attributes = read_u64(buf + AFSI_ATTRIBUTES_OFFSET);
 	afsi->num_played = read_u32(buf + AFSI_NUM_PLAYED_OFFSET);
@@ -376,7 +376,7 @@ int aft_get_row_of_hash(HASH_TYPE *hash, struct osl_row **row)
  *
  * \return The return value of the underlying call to osl_get_object().
  */
-int get_afsi_object_of_row(const void *row, struct osl_object *obj)
+int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
 {
 	return osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj);
 }
@@ -445,7 +445,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \sa get_hash_of_row().
  */
-int get_hash_object_of_aft_row(const void *row, struct osl_object *obj)
+static int get_hash_object_of_aft_row(const struct osl_row *row, struct osl_object *obj)
 {
 	return osl_get_object(audio_file_table, row, AFTCOL_HASH, obj);
 }
@@ -461,7 +461,7 @@ int get_hash_object_of_aft_row(const void *row, struct osl_object *obj)
  * \return The return value of the underlying call to
  * get_hash_object_of_aft_row().
  */
-static int get_hash_of_row(const void *row, HASH_TYPE **hash)
+static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
 {
 	struct osl_object obj;
 	int ret = get_hash_object_of_aft_row(row, &obj);
@@ -482,7 +482,7 @@ static int get_hash_of_row(const void *row, HASH_TYPE **hash)
  *
  * \sa get_chunk_table_of_row().
  */
-int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
+static int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 {
 	struct osl_object obj;
 	int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
@@ -503,7 +503,7 @@ int get_afhi_of_row(const void *row, struct audio_format_info *afhi)
  *
  * \sa get_afhi_of_row().
  */
-int get_chunk_table_of_row(const void *row, struct audio_format_info *afhi)
+static int get_chunk_table_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 {
 	struct osl_object obj;
 	int ret = osl_open_disk_object(audio_file_table, row, AFTCOL_CHUNKS,
@@ -572,15 +572,14 @@ err:
 	return ret;
 }
 
-time_t now;
-
-static int get_local_time(uint64_t *seconds, char *buf, size_t size)
+static int get_local_time(uint64_t *seconds, char *buf, size_t size,
+	time_t current_time)
 {
 	struct tm t;
 
 	if (!localtime_r((time_t *)seconds, &t))
 		return -E_LOCALTIME;
-	if (*seconds + 6 * 30 * 24 * 3600 > now) {
+	if (*seconds + 6 * 30 * 24 * 3600 > current_time) {
 		if (!strftime(buf, size, "%b %e %k:%M", &t))
 			return -E_STRFTIME;
 		return 1;
@@ -654,7 +653,7 @@ static char *make_image_line(struct afs_info *afsi)
 }
 
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
-	struct para_buffer *b)
+	struct para_buffer *b, time_t current_time)
 {
 	int ret;
 	char att_buf[65];
@@ -672,7 +671,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	}
 	get_attribute_bitmap(&afsi->attributes, att_buf);
 	ret = get_local_time(&afsi->last_played, last_played_time,
-		sizeof(last_played_time));
+		sizeof(last_played_time), current_time);
 	if (ret < 0)
 		return ret;
 	get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width);
@@ -683,6 +682,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			sprintf(score_buf, "%li ", d->score);
 	}
 
+	PARA_NOTICE_LOG("id: %s, %d\n", d->path, afsi->audio_format_id);
 	if (opts->mode == LS_MODE_LONG) {
 		para_printf(b,
 			"%s"    /* score */
@@ -827,7 +827,7 @@ static int ls_path_compare(const void *a, const void *b)
 static int sort_matching_paths(struct ls_options *options)
 {
 	size_t nmemb = options->num_matching_paths;
-	size_t size = sizeof(uint32_t);
+	size_t size = sizeof(*options->data_ptr);
 	int (*compar)(const void *, const void *);
 	int i;
 
@@ -962,6 +962,8 @@ static int com_ls_callback(const struct osl_object *query,
 	char *p, *pattern_start = (char *)query->data + sizeof(*opts);
 	struct para_buffer b = {.buf = NULL, .size = 0};
 	int i = 0, ret;
+	time_t current_time;
+
 
 	PARA_NOTICE_LOG("%d patterns\n", opts->num_patterns);
 	if (opts->num_patterns) {
@@ -988,15 +990,16 @@ static int com_ls_callback(const struct osl_object *query,
 	ret = sort_matching_paths(opts);
 	if (ret < 0)
 		goto out;
+	time(&current_time);
 	if (opts->flags & LS_FLAG_REVERSE)
 		for (i = opts->num_matching_paths - 1; i >= 0; i--) {
-			ret = print_list_item(opts->data_ptr[i], opts, &b);
+			ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
 			if (ret < 0)
 				break;
 		}
 	else
 		for (i = 0; i < opts->num_matching_paths; i++) {
-			ret = print_list_item(opts->data_ptr[i], opts, &b);
+			ret = print_list_item(opts->data_ptr[i], opts, &b, current_time);
 			if (ret < 0)
 				break;
 		}
@@ -1012,7 +1015,7 @@ out:
 }
 
 /*
- * TODO: flags -h (sort by hash)
+ * TODO: flags -h (sort by hash) -lm (list in mbox format)
  *
  * long list: list hash, attributes as (xx--x-x-), file size, lastplayed
  * full list: list everything, including afsi, afhi, atts as clear text
@@ -1116,7 +1119,6 @@ int com_afs_ls(int fd, int argc, char * const * const argv)
 		}
 		return -E_AFT_SYNTAX;
 	}
-	time(&now);
 	opts.flags = flags;
 	opts.sorting = sort;
 	opts.mode = mode;
@@ -1268,7 +1270,7 @@ static int com_add_callback(const struct osl_object *query,
 	objs[AFTCOL_PATH].data = path;
 	objs[AFTCOL_PATH].size = strlen(path) + 1;
 
-	PARA_DEBUG_LOG("request to add %s with hash %s\n", path, asc);
+	PARA_INFO_LOG("request to add %s\n", path);
 	hs = find_hash_sister(hash);
 	ret = aft_get_row_of_path(path, &pb);
 	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
@@ -1325,24 +1327,22 @@ static int com_add_callback(const struct osl_object *query,
 			return ret;
 	}
 	if (hs || pb) { /* (hs != NULL and pb != NULL) implies hs == pb */
-		const void *row = pb? pb : hs;
+		const struct osl_row *row = pb? pb : hs;
 		/* update afhi and chunk_table */
 		if (flags & ADD_FLAG_VERBOSE)
-			PARA_NOTICE_LOG("updating audio format handler info (%zd bytes)\n",
+			PARA_DEBUG_LOG("updating audio format handler info (%zd bytes)\n",
 				objs[AFTCOL_AFHI].size);
 		ret = osl_update_object(audio_file_table, row, AFTCOL_AFHI,
 			&objs[AFTCOL_AFHI]);
 		if (ret < 0)
 			return ret;
 		if (flags & ADD_FLAG_VERBOSE)
-			PARA_NOTICE_LOG("updating chunk table\n");
+			PARA_DEBUG_LOG("updating chunk table\n");
 		ret = osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
 			&objs[AFTCOL_CHUNKS]);
 		if (ret < 0)
 			return ret;
-		ret = mood_update_audio_file(row, NULL);
-		if (ret < 0)
-			return ret;
+		return mood_update_audio_file(row, NULL);
 	}
 	/* new entry, use default afsi */
 	default_afsi.last_played = time(NULL) - 365 * 24 * 60 * 60;
@@ -1705,6 +1705,7 @@ err:
 void aft_shutdown(enum osl_close_flags flags)
 {
 	osl_close_table(audio_file_table, flags);
+	audio_file_table = NULL;
 }
 
 /**