X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=a9bc006e110570a9e3551609f619e2062b24df73;hp=727292c7001cf5b175eb8ef43b063540fc25d4d7;hb=a3edba783bb81e6032a50f059b6263caa02a2150;hpb=56d75bd90d78cf44cd3984ce2a45627ef5646d38

diff --git a/aft.c b/aft.c
index 727292c7..a9bc006e 100644
--- a/aft.c
+++ b/aft.c
@@ -72,6 +72,20 @@ enum ls_listing_mode {
 	LS_MODE_PARSER,
 };
 
+/* Data about one audio file. Needed for ls and stat output. */
+struct ls_data {
+	/* Usual audio format handler information. */
+	struct afh_info afhi;
+	/* Audio file selector information. */
+	struct afs_info afsi;
+	/* The full path of the audio file. */
+	char *path;
+	/* The score value (if -a was given). */
+	long score;
+	/* The hash value of the audio file data. */
+	unsigned char *hash;
+};
+
 /** The flags accepted by the ls command. */
 enum ls_flags {
 	/** -p */
@@ -279,60 +293,36 @@ static struct osl_table_description audio_file_table_desc = {
 	.column_descriptions = aft_cols
 };
 
-/* We don't want dot or dot-dot anywhere. */
-static int verify_dotfile(const char *rest)
-{
-	/*
-	 * The first character was '.', but that has already been discarded, we
-	 * now test the rest.
-	 */
-	switch (*rest) {
-	case '\0': case '/': /* /foo/. and /foo/./bar are not ok */
-		return -1;
-	case '.': /* path start with /foo/.. */
-		if (rest[1] == '\0' || rest[1] == '/')
-			return -1; /* /foo/.. or /foo/../bar are not ok */
-		/* /foo/..bar is ok */
-	}
-	return 1;
-}
-
 /*
- * We fundamentally don't like some paths: We don't want double slashes or
- * slashes at the end that can make pathnames ambiguous.
+ * Produce a canonicalized absolute pathname.
+ *
+ * Returns one if the resolved path a directory, zero if it is a regular file,
+ * negative on errors.
  */
 static int verify_path(const char *orig_path, char **resolved_path)
 {
-	char c;
-	size_t len;
-	char *path;
+	int ret;
+	char *path = NULL;
+	struct stat statbuf;
 
 	if (*orig_path != '/') /* we only accept absolute paths */
-		return -E_BAD_PATH;
-	len = strlen(orig_path);
-	*resolved_path = para_strdup(orig_path);
-	path = *resolved_path;
-	while (len > 1 && path[--len] == '/')
-		path[len] = '\0'; /* remove slash at the end */
-	c = *path++;
-	while (c) {
-		if (c == '/') {
-			c = *path++;
-			switch (c) {
-			case '/': /* double slash */
-				goto bad_path;
-			case '.':
-				if (verify_dotfile(path) < 0)
-					goto bad_path;
-			default:
-				continue;
-			}
-		}
-		c = *path++;
-	}
-	return 1;
-bad_path:
-	free(*resolved_path);
+		goto fail;
+	path = realpath(orig_path, NULL);
+	if (!path)
+		goto fail;
+	if (stat(path, &statbuf) < 0)
+		goto fail;
+	if (S_ISREG(statbuf.st_mode))
+		ret = 0;
+	else if (S_ISDIR(statbuf.st_mode))
+		ret = 1;
+	else
+		goto fail;
+	*resolved_path = path;
+	return ret;
+fail:
+	*resolved_path = NULL;
+	free(path);
 	return -E_BAD_PATH;
 }
 
@@ -679,16 +669,13 @@ err:
 int load_afd(int shmid, struct audio_file_data *afd)
 {
 	void *shm_afd;
-	char *buf;
 	int ret;
 
 	ret = shm_attach(shmid, ATTACH_RO, &shm_afd);
 	if (ret < 0)
 		return ret;
 	*afd = *(struct audio_file_data *)shm_afd;
-	buf = shm_afd;
-	buf += sizeof(*afd);
-	load_chunk_table(&afd->afhi, buf);
+	load_chunk_table(&afd->afhi, shm_afd + sizeof(*afd));
 	shm_detach(shm_afd);
 	return 1;
 }
@@ -1026,17 +1013,33 @@ out:
 	return ret;
 }
 
-static int make_status_items(struct audio_file_data *afd,
-		struct afs_info *afsi, char *path, long score,
-		unsigned char *hash)
+static struct ls_data status_item_ls_data;
+static struct osl_row *current_aft_row;
+
+static void make_inode_status_items(struct para_buffer *pb)
+{
+	struct stat statbuf = {.st_size = 0};
+	char *path, mtime_str[30] = "\0";
+	struct tm mtime_tm;
+	int ret;
+
+	ret = get_audio_file_path_of_row(current_aft_row, &path);
+	if (ret < 0)
+		goto out;
+	ret = stat(path, &statbuf);
+	if (ret < 0)
+		goto out;
+	localtime_r(&statbuf.st_mtime, &mtime_tm);
+	ret = strftime(mtime_str, 29, "%b %d %Y", &mtime_tm);
+	assert(ret > 0); /* number of bytes placed in mtime_str */
+out:
+	/* We don't care too much about errors here */
+	(void)WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str);
+	(void)WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024);
+}
+
+static int make_status_items(void)
 {
-	struct ls_data d = {
-		.afhi = afd->afhi,
-		.afsi = *afsi,
-		.path = path,
-		.score = score,
-		.hash = hash
-	};
 	struct ls_options opts = {
 		.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
 		.mode = LS_MODE_VERBOSE,
@@ -1046,30 +1049,30 @@ static int make_status_items(struct audio_file_data *afd,
 	int ret;
 
 	time(&current_time);
-	ret = print_list_item(&d, &opts, &pb, current_time);
+	ret = print_list_item(&status_item_ls_data, &opts, &pb, current_time);
 	if (ret < 0)
 		return ret;
+	make_inode_status_items(&pb);
 	free(status_items);
 	status_items = pb.buf;
 	memset(&pb, 0, sizeof(pb));
 	pb.max_size = shm_get_shmmax() - 1;
 	pb.flags = PBF_SIZE_PREFIX;
-	ret = print_list_item(&d, &opts, &pb, current_time);
+	ret = print_list_item(&status_item_ls_data, &opts, &pb, current_time);
 	if (ret < 0) {
 		free(status_items);
 		status_items = NULL;
 		return ret;
 	}
+	make_inode_status_items(&pb);
 	free(parser_friendly_status_items);
 	parser_friendly_status_items = pb.buf;
 	return 1;
 }
 
 /**
- * Mmap the given audio file and update statistics.
+ * Open the audio file with highest score and set up an afd structure.
  *
- * \param aft_row Determines the audio file to be opened and updated.
- * \param score The score of the audio file.
  * \param afd Result pointer.
  *
  * On success, the numplayed field of the audio file selector info is increased
@@ -1078,66 +1081,75 @@ static int make_status_items(struct audio_file_data *afd,
  *
  * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct osl_row *aft_row, long score,
-	struct audio_file_data *afd)
+int open_and_update_audio_file(struct audio_file_data *afd)
 {
-	unsigned char *aft_hash, file_hash[HASH_SIZE];
+	unsigned char file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
-	struct afs_info old_afsi, new_afsi;
-	int ret = get_hash_of_row(aft_row, &aft_hash);
+	struct afs_info new_afsi;
+	int ret;
 	struct afsi_change_event_data aced;
 	struct osl_object map, chunk_table_obj;
-	char *path;
-
+	struct ls_data *d = &status_item_ls_data;
+again:
+	ret = score_get_best(&current_aft_row, &d->score);
 	if (ret < 0)
 		return ret;
-	ret = get_audio_file_path_of_row(aft_row, &path);
+	ret = get_hash_of_row(current_aft_row, &d->hash);
 	if (ret < 0)
 		return ret;
-	PARA_NOTICE_LOG("%s\n", path);
-	ret = get_afsi_object_of_row(aft_row, &afsi_obj);
+	ret = get_audio_file_path_of_row(current_aft_row, &d->path);
 	if (ret < 0)
 		return ret;
-	ret = load_afsi(&old_afsi, &afsi_obj);
+	PARA_NOTICE_LOG("%s\n", d->path);
+	ret = get_afsi_object_of_row(current_aft_row, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	ret = get_afhi_of_row(aft_row, &afd->afhi);
+	ret = load_afsi(&d->afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
-	afd->afhi.chunk_table = NULL;
-	ret = osl(osl_open_disk_object(audio_file_table, aft_row,
+	ret = get_afhi_of_row(current_aft_row, &afd->afhi);
+	if (ret < 0)
+		return ret;
+	d->afhi = afd->afhi;
+	d->afhi.chunk_table = afd->afhi.chunk_table = NULL;
+	ret = osl(osl_open_disk_object(audio_file_table, current_aft_row,
 		AFTCOL_CHUNKS, &chunk_table_obj));
 	if (ret < 0)
 		return ret;
-	ret = mmap_full_file(path, O_RDONLY, &map.data, &map.size, &afd->fd);
+	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
 	if (ret < 0)
-		goto err;
+		goto out;
 	hash_function(map.data, map.size, file_hash);
-	ret = hash_compare(file_hash, aft_hash);
+	ret = hash_compare(file_hash, d->hash);
 	para_munmap(map.data, map.size);
 	if (ret) {
 		ret = -E_HASH_MISMATCH;
-		goto err;
+		goto out;
 	}
-	new_afsi = old_afsi;
+	new_afsi = d->afsi;
 	new_afsi.num_played++;
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
-	afd->audio_format_id = old_afsi.audio_format_id;
+	afd->audio_format_id = d->afsi.audio_format_id;
 	load_chunk_table(&afd->afhi, chunk_table_obj.data);
-	ret = make_status_items(afd, &old_afsi, path, score, file_hash);
-	if (ret < 0)
-		goto err;
-	aced.aft_row = aft_row;
-	aced.old_afsi = &old_afsi;
+	aced.aft_row = current_aft_row;
+	aced.old_afsi = &d->afsi;
+	/*
+	 * No need to update the status items as the AFSI_CHANGE event will
+	 * recreate them.
+	 */
 	afs_event(AFSI_CHANGE, NULL, &aced);
 	ret = save_afd(afd);
-err:
+out:
 	free(afd->afhi.chunk_table);
 	osl_close_disk_object(&chunk_table_obj);
-	if (ret < 0)
-		PARA_ERROR_LOG("%s: %s\n", path, para_strerror(-ret));
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s: %s\n", d->path, para_strerror(-ret));
+		ret = score_delete(current_aft_row);
+		if (ret >= 0)
+			goto again;
+	}
 	return ret;
 }
 
@@ -1864,8 +1876,10 @@ static int add_one_audio_file(const char *path, void *private_data)
 	unsigned char hash[HASH_SIZE];
 
 	ret = guess_audio_format(path);
-	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL))
+	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL)) {
+		ret = 0;
 		goto out_free;
+	}
 	query.data = (char *)path;
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query,
@@ -1942,7 +1956,6 @@ int com_add(struct command_context *cc)
 {
 	int i, ret;
 	struct private_add_data pad = {.cc = cc, .flags = 0};
-	struct stat statbuf;
 
 	for (i = 1; i < cc->argc; i++) {
 		const char *arg = cc->argv[i];
@@ -1981,20 +1994,10 @@ int com_add(struct command_context *cc)
 				return ret;
 			continue;
 		}
-		ret = stat(path, &statbuf);
-		if (ret < 0) {
-			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
-				"failed to stat %s (%s)\n", path,
-				strerror(errno));
-			free(path);
-			if (ret < 0)
-				return ret;
-			continue;
-		}
-		if (S_ISDIR(statbuf.st_mode))
+		if (ret == 1) /* directory */
 			ret = for_each_file_in_dir(path, add_one_audio_file,
 				&pad);
-		else
+		else /* regular file */
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
 			send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
@@ -2099,7 +2102,10 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	struct touch_action_data tad = {.cto = query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2240,7 +2246,10 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 	struct com_rm_action_data crd = {.flags = *(uint32_t *)query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2382,7 +2391,10 @@ static void com_cpsi_callback(int fd, const struct osl_object *query)
 		.flags = *(unsigned *)query->data,
 		.pb = {
 			.max_size = shm_get_shmmax(),
-			.private_data = &fd,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			},
 			.max_size_handler = afs_max_size_handler
 		}
 	};
@@ -2708,9 +2720,9 @@ static int aft_open(const char *dir)
 		PARA_INFO_LOG("audio file table contains %d files\n", num);
 		return ret;
 	}
-	PARA_INFO_LOG("failed to open audio file table\n");
+	PARA_NOTICE_LOG("failed to open audio file table\n");
 	audio_file_table = NULL;
-	if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
+	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
 		return 1;
 	return ret;
 }
@@ -2753,9 +2765,27 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		if (ret < 0)
 			return ret;
 		return audio_file_loop(data, clear_attribute);
-		}
-	default:
+	} case AFSI_CHANGE: {
+		struct afsi_change_event_data *aced = data;
+		uint64_t old_last_played = status_item_ls_data.afsi.last_played;
+		if (aced->aft_row != current_aft_row)
+			return 0;
+		ret = get_afsi_of_row(aced->aft_row, &status_item_ls_data.afsi);
+		if (ret < 0)
+			return ret;
+		status_item_ls_data.afsi.last_played = old_last_played;
+		make_status_items();
 		return 1;
+	} case AFHI_CHANGE: {
+		if (data != current_aft_row)
+			return 0;
+		ret = get_afhi_of_row(data, &status_item_ls_data.afhi);
+		if (ret < 0)
+			return ret;
+		make_status_items();
+		return 1;
+	} default:
+		return 0;
 	}
 }