From 49ffec5320e97d2a9fb87383bd14e2b4c7b59497 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 1 Jun 2021 03:11:02 +0200 Subject: [PATCH] v0.11.3 --- copyparty/__version__.py | 2 +- copyparty/u2idx.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/copyparty/__version__.py b/copyparty/__version__.py index f677a5c7..603aca25 100644 --- a/copyparty/__version__.py +++ b/copyparty/__version__.py @@ -1,6 +1,6 @@ # coding: utf-8 -VERSION = (0, 11, 2) +VERSION = (0, 11, 3) CODENAME = "the grid" BUILD_DT = (2021, 6, 1) diff --git a/copyparty/u2idx.py b/copyparty/u2idx.py index 8404ae5a..cad90c1a 100644 --- a/copyparty/u2idx.py +++ b/copyparty/u2idx.py @@ -120,16 +120,16 @@ class U2idx(object): elif v == "name": v = "up.fn" - elif v == "tags": - v = "mt.v" - - elif ptn_mt.match(v): + elif v == "tags" or ptn_mt.match(v): mt_ctr += 1 mt_keycmp2 = "mt{}.w".format(mt_ctr) joins += "inner join mt mt{} on {} = {} ".format( mt_ctr, mt_keycmp, mt_keycmp2 ) - v = "mt{0}.k = '{1}' and mt{0}.v".format(mt_ctr, v) + if v == "tags": + v = "mt{0}.v".format(mt_ctr) + else: + v = "mt{0}.k = '{1}' and mt{0}.v".format(mt_ctr, v) else: raise Pebkac(400, "invalid key [" + v + "]")