From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 21 Oct 2023 16:56:48 +0000 (+0200)
Subject: Merge topic branch t/afs-select into master
X-Git-Tag: v0.7.3~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=101dcb49997b393280c10ba5a1cfc11e8fe0a091

Merge topic branch t/afs-select into master

A single patch which silences the select command. The merge conflicted
in afs.c, but that was trivial to resolve.

* refs/heads/t/afs-select:
  server: Implement select -verbose.
---

101dcb49997b393280c10ba5a1cfc11e8fe0a091
diff --cc NEWS.md
index 22816b19,598db71f..aa515e5a
--- a/NEWS.md
+++ b/NEWS.md
@@@ -1,24 -1,6 +1,27 @@@
  NEWS
  ====
  
 +----------------------------------------------
 +0.7.3 (to be announced) "weighted correctness"
 +----------------------------------------------
 +
 +- Old style PEM keys are now deprecated. They still work but their
 +  use results in a run-time warning. The removal of PEM key support is
 +  scheduled for paraslash-0.8.0.
 +- Version 1.0 of the openssl library has been deprecated. A warning
 +  is printed at compile-time on systems which have this outdated version
 +  because it will no longer be supported once paraslash-0.8.0 comes out.
 +- A spring cleanup for the senescent code in fd.c.
 +- The --admissible option of the ls command now takes an optional
 +  argument. When invoked like --admissible=m/foo, only files which are
 +  admissible with respect to mood foo are listed.
++- The select server command is now quiet by default, The new --verbose
++  option can be used to show information about the newly loaded mood
++  or playlist.
 +
 +Downloads:
 +[tarball](./releases/paraslash-git.tar.xz)
 +
  -------------------------------------
  0.7.2 (2023-03-08) "optical friction"
  -------------------------------------
diff --cc afs.c
index 3083084c,cb3ead27..445d5871
--- a/afs.c
+++ b/afs.c
@@@ -974,12 -985,14 +975,14 @@@ static int com_select_callback(struct a
  	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
  	assert(ret >= 0);
  	arg = lls_input(0, aca->lpr);
+ 	pbout = SERVER_CMD_OPT_GIVEN(SELECT, VERBOSE, aca->lpr)?
+ 		&aca->pbout : NULL;
  	score_clear();
  	if (current_play_mode == PLAY_MODE_MOOD)
 -		mood_unload();
 +		mood_unload(NULL);
  	else
 -		playlist_unload();
 +		playlist_unload(NULL);
- 	ret = activate_mood_or_playlist(arg, &aca->pbout);
+ 	ret = activate_mood_or_playlist(arg, pbout);
  	if (ret >= 0)
  		goto free_lpr;
  	/* ignore subsequent errors (but log them) */