static int c_get(struct conn *c,
char **vec,
int attribute((unused)) nvec) {
- const char *v;
+ const char *v, *track;
- if(vec[1][0] != '_' && (v = trackdb_get(vec[0], vec[1])))
+ if(!(track = trackdb_resolve(vec[0]))) {
+ sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n");
+ return 1;
+ }
+ if(vec[1][0] != '_' && (v = trackdb_get(track, vec[1])))
sink_printf(ev_writer_sink(c->w), "252 %s\n", quoteutf8(v));
else
sink_writes(ev_writer_sink(c->w), "555 not found\n");
static int c_set(struct conn *c,
char **vec,
int attribute((unused)) nvec) {
- if(vec[1][0] != '_' && !trackdb_set(vec[0], vec[1], vec[2]))
+ const char *track;
+
+ if(!(track = trackdb_resolve(vec[0]))) {
+ sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n");
+ return 1;
+ }
+ if(vec[1][0] != '_' && !trackdb_set(track, vec[1], vec[2]))
sink_writes(ev_writer_sink(c->w), "250 OK\n");
else
sink_writes(ev_writer_sink(c->w), "550 not found\n");
char **vec,
int attribute((unused)) nvec) {
struct kvp *k;
+ const char *track;
- k = trackdb_get_all(vec[0]);
+ if(!(track = trackdb_resolve(vec[0]))) {
+ sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n");
+ return 1;
+ }
+ k = trackdb_get_all(track);
sink_writes(ev_writer_sink(c->w), "253 prefs follow\n");
for(; k; k = k->next)
if(k->name[0] != '_') /* omit internal values */
static int c_exists(struct conn *c,
char **vec,
int attribute((unused)) nvec) {
+ /* trackdb_exists() does its own alias checking */
sink_printf(ev_writer_sink(c->w), "252 %s\n", noyes[trackdb_exists(vec[0])]);
return 1;
}
static int c_part(struct conn *c,
char **vec,
int attribute((unused)) nvec) {
+ const char *track;
+
+ if(!(track = trackdb_resolve(vec[0]))) {
+ sink_writes(ev_writer_sink(c->w), "550 cannot resolve track\n");
+ return 1;
+ }
sink_printf(ev_writer_sink(c->w), "252 %s\n",
- quoteutf8(trackdb_getpart(vec[0], vec[1], vec[2])));
+ quoteutf8(trackdb_getpart(track, vec[1], vec[2])));
return 1;
}
--- /dev/null
+#! /usr/bin/env python -u
+#
+# This file is part of DisOrder.
+# Copyright (C) 2008 Richard Kettlewell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+import dtest,disorder
+
+def test():
+ """Exercise alias logic"""
+ dtest.start_daemon()
+ dtest.create_user()
+ dtest.rescan()
+ c = disorder.client()
+
+ print " creating an alias in new directory"
+ track = "%s/misc/blahblahblah.ogg" % dtest.tracks
+ c.set(track,
+ "trackname_display_artist",
+ "Fred Smith")
+ c.set(track,
+ "trackname_display_album",
+ "wibble")
+
+ print " checking it shows up in the right place"
+ alias = "%s/Fred Smith/wibble/blahblahblah.ogg" % dtest.tracks
+ files = c.files("%s/Fred Smith/wibble" % dtest.tracks)
+ assert files == [alias]
+
+ print " checking part calculation"
+ artist = c.part(track, "display", "artist")
+ assert artist == "Fred Smith", "checking artist part"
+ album = c.part(track, "display", "album")
+ assert album == "wibble", "checking album part"
+ title = c.part(track, "display", "title")
+ assert title == "blahblahblah", "checking title part"
+
+ print " checking part calculation on alias"
+ artist = c.part(alias, "display", "artist")
+ assert artist == "Fred Smith", "checking artist part"
+ album = c.part(alias, "display", "album")
+ assert album == "wibble", "checking album part"
+ title = c.part(alias, "display", "title")
+ assert title == "blahblahblah", "checking title part"
+
+ # See defect #20
+ print " checking that prefs always belong to the canonical name"
+ c.set(alias, "wibble", "spong")
+ value = c.get(track, "wibble")
+ assert value == "spong", "checking pref ended up on resolved track"
+ c.set(track, "foo", "bar")
+ value = c.get(alias, "foo")
+ assert value == "bar", "checking pref visible via alias"
+
+if __name__ == '__main__':
+ dtest.run()