X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=1234ee5a35aa8fdbe93ba225ef511e88205336d4;hp=68e89dbb8ecd639a91f0c8330c0fb20a2c886a79;hb=a35c113e0bb9fa9ac02b77eb01dd32f49cd5c8d0;hpb=13ba5f96e64bd0f3157a6fe73ed7b950ec9c5ea7

diff --git a/aft.c b/aft.c
index 68e89dbb..1234ee5a 100644
--- a/aft.c
+++ b/aft.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file aft.c Audio file table functions. */
 
@@ -138,7 +134,7 @@ struct ls_options {
 /**
  * Describes the layout of the mmapped-afs info struct.
  *
- * \sa struct afs_info.
+ * \sa struct \ref afs_info.
  */
 enum afsi_offsets {
 	/** Where .last_played is stored. */
@@ -167,7 +163,7 @@ enum afsi_offsets {
  * \param afsi Pointer to the audio file info to be converted.
  * \param obj Result pointer.
  *
- * \sa load_afsi().
+ * \sa \ref load_afsi().
  */
 static void save_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
@@ -192,7 +188,7 @@ static void save_afsi(struct afs_info *afsi, struct osl_object *obj)
  *
  * \return Standard.
  *
- * \sa save_afsi().
+ * \sa \ref save_afsi().
  */
 static int load_afsi(struct afs_info *afsi, struct osl_object *obj)
 {
@@ -365,7 +361,10 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
 	write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
 	p = buf + AFHI_INFO_STRING_OFFSET;
-	/* The sprintf's below are OK as our caller made sure that buf is large enough */
+	/*
+	 * The below sprintf(3) calls are OK because our caller already made
+	 * sure that buf is large enough.
+	 */
 	p += sprintf(p, "%s", afhi->techinfo) + 1;
 	p += sprintf(p, "%s", afhi->tags.artist) + 1;
 	p += sprintf(p, "%s", afhi->tags.title) + 1;
@@ -529,7 +528,7 @@ static int get_afsi_of_path(const char *path, struct afs_info *afsi)
  * \param row Pointer to a row in the audio file table.
  * \param path Result pointer.
  *
- * The result is a pointer to mmapped data. The caller must not attempt
+ * The result is a pointer to memory-mapped data. The caller must not attempt
  * to free it.
  *
  * \return Standard.
@@ -539,10 +538,12 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
 	struct osl_object path_obj;
 	int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_PATH,
 		&path_obj));
+
 	if (ret < 0)
-		return ret;
-	*path = path_obj.data;
-	return 1;
+		*path = NULL;
+	else
+		*path = path_obj.data;
+	return ret;
 }
 
 /**
@@ -553,7 +554,7 @@ int get_audio_file_path_of_row(const struct osl_row *row, char **path)
  *
  * \return The return value of the underlying call to osl_get_object().
  *
- * \sa get_hash_of_row().
+ * \sa \ref get_hash_of_row().
  */
 static int get_hash_object_of_aft_row(const struct osl_row *row,
 		struct osl_object *obj)
@@ -594,8 +595,6 @@ static int get_hash_of_row(const struct osl_row *row, unsigned char **hash)
  * After the call the members of the afhi structure point to mapped memory
  * which is owned by the osl table, Hence the caller must not attempt to free
  * this memory by calling \ref clear_afhi().
- *
- * \sa get_chunk_table_of_row().
  */
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
@@ -988,6 +987,8 @@ static int make_status_items(void)
 	time_t current_time;
 	int ret;
 
+	if (!status_item_ls_data.path) /* no audio file open */
+		return 0;
 	ret = lls_parse(ARRAY_SIZE(argv), argv, cmd, &opts.lpr, NULL);
 	assert(ret >= 0);
 	time(&current_time);
@@ -1109,6 +1110,12 @@ out:
 	return ret;
 }
 
+static int ls_hash_compare(const void *a, const void *b)
+{
+	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
+	return memcmp(d1->hash, d2->hash, HASH_SIZE);
+}
+
 static int ls_audio_format_compare(const void *a, const void *b)
 {
 	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
@@ -1226,6 +1233,8 @@ static int sort_matching_paths(struct ls_options *options)
 		compar = ls_duration_compare; break;
 	case LS_SORT_BY_AUDIO_FORMAT:
 		compar = ls_audio_format_compare; break;
+	case LS_SORT_BY_HASH:
+		compar = ls_hash_compare; break;
 	default:
 		return -E_BAD_SORT;
 	}
@@ -1374,7 +1383,6 @@ out:
 	return ret;
 }
 
-/* TODO: flags -h (sort by hash) */
 static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(LS);
@@ -1440,6 +1448,8 @@ static int com_ls(struct command_context *cc, struct lls_parse_result *lpr)
 			opts->sorting = LS_SORT_BY_DURATION;
 		else if (!strcmp(val, "a") || !strcmp(val, "audio-format"))
 			opts->sorting = LS_SORT_BY_AUDIO_FORMAT;
+		else if (!strcmp(val, "h") || !strcmp(val, "hash"))
+			opts->sorting = LS_SORT_BY_HASH;
 		else {
 			ret = -E_AFT_SYNTAX;
 			goto out;
@@ -1912,11 +1922,7 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(add);
 
-/**
- * Flags used by the touch command.
- *
- * \sa com_touch().
- */
+/** Flags used by the touch command. */
 enum touch_flags {
 	/** Whether the \p FNM_PATHNAME flag should be passed to fnmatch(). */
 	TOUCH_FLAG_FNM_PATHNAME = 1,
@@ -2402,8 +2408,6 @@ static int check_audio_file(struct osl_row *row, void *data)
  * \param aca Only ->pbout is used for diagnostics.
  *
  * \return Standard. Inconsistencies are reported but not regarded as an error.
- *
- * \sa com_check().
  */
 int aft_check_callback(struct afs_callback_arg *aca)
 {
@@ -2472,7 +2476,7 @@ int aft_check_attributes(uint64_t att_mask, struct para_buffer *pb)
  *
  * \param flags Usual flags that are passed to osl_close_table().
  *
- * \sa osl_close_table().
+ * \sa \ref osl_close_table().
  */
 static void aft_close(void)
 {
@@ -2487,7 +2491,7 @@ static void aft_close(void)
  *
  * \return Standard.
  *
- * \sa osl_open_table().
+ * \sa \ref osl_open_table().
  */
 static int aft_open(const char *dir)
 {
@@ -2563,6 +2567,17 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 			return ret;
 		make_status_items();
 		return 1;
+	}
+	case BLOB_RENAME:
+	case BLOB_REMOVE:
+	case BLOB_ADD: {
+		/*
+		 * These events are rare. We don't bother to check whether the
+		 * current status items are affected and simply recreate them
+		 * every time.
+		 */
+		make_status_items();
+		return 0;
 	} default:
 		return 0;
 	}