mirror of
https://github.com/skoelle/icloud-contacts-sync.git
synced 2026-09-17 23:40:24 +00:00
web dashboard special links fix
This commit is contained in:
@@ -156,15 +156,16 @@ def get_contact_count(conn, account: str | None) -> int:
|
|||||||
|
|
||||||
def search_contacts_without_photo(conn, account: str | None) -> list[dict]:
|
def search_contacts_without_photo(conn, account: str | None) -> list[dict]:
|
||||||
where_clause, params = _account_filter_clause(account)
|
where_clause, params = _account_filter_clause(account)
|
||||||
name_cond = "AND given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
op = "AND" if where_clause else "WHERE"
|
||||||
|
name_cond = f"{op} given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
||||||
city_cond = "AND (JSON_SEARCH(addresses, 'one', '%', NULL, '$[*].city') IS NOT NULL)"
|
city_cond = "AND (JSON_SEARCH(addresses, 'one', '%', NULL, '$[*].city') IS NOT NULL)"
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute(
|
cur.execute(
|
||||||
f"""SELECT id, full_name, given_name, middle_name, family_name,
|
f"""SELECT id, full_name, given_name, middle_name, family_name,
|
||||||
prefix, suffix, organization, birthday, account, photo_url
|
prefix, suffix, organization, birthday, account, photo_url
|
||||||
FROM contacts {where_clause}
|
FROM contacts {where_clause}
|
||||||
AND photo_base64 IS NULL AND photo_url IS NULL
|
{name_cond} AND photo_base64 IS NULL AND photo_url IS NULL
|
||||||
{name_cond} {city_cond}
|
{city_cond}
|
||||||
AND family_name != 'X'
|
AND family_name != 'X'
|
||||||
ORDER BY full_name""",
|
ORDER BY full_name""",
|
||||||
params,
|
params,
|
||||||
@@ -174,7 +175,8 @@ def search_contacts_without_photo(conn, account: str | None) -> list[dict]:
|
|||||||
|
|
||||||
def search_contacts_without_city(conn, account: str | None) -> list[dict]:
|
def search_contacts_without_city(conn, account: str | None) -> list[dict]:
|
||||||
where_clause, params = _account_filter_clause(account)
|
where_clause, params = _account_filter_clause(account)
|
||||||
name_cond = "AND given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
op = "AND" if where_clause else "WHERE"
|
||||||
|
name_cond = f"{op} given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
||||||
contact_cond = "AND (JSON_LENGTH(phones) > 0 OR JSON_LENGTH(emails) > 0)"
|
contact_cond = "AND (JSON_LENGTH(phones) > 0 OR JSON_LENGTH(emails) > 0)"
|
||||||
city_cond = "AND (JSON_LENGTH(addresses) = 0 OR JSON_SEARCH(addresses, 'one', '%', NULL, '$[*].city') IS NULL)"
|
city_cond = "AND (JSON_LENGTH(addresses) = 0 OR JSON_SEARCH(addresses, 'one', '%', NULL, '$[*].city') IS NULL)"
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
@@ -192,7 +194,8 @@ def search_contacts_without_city(conn, account: str | None) -> list[dict]:
|
|||||||
|
|
||||||
def search_contacts_without_social(conn, account: str | None) -> list[dict]:
|
def search_contacts_without_social(conn, account: str | None) -> list[dict]:
|
||||||
where_clause, params = _account_filter_clause(account)
|
where_clause, params = _account_filter_clause(account)
|
||||||
name_cond = "AND given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
op = "AND" if where_clause else "WHERE"
|
||||||
|
name_cond = f"{op} given_name IS NOT NULL AND given_name != '' AND family_name IS NOT NULL AND family_name != ''"
|
||||||
contact_cond = "AND (JSON_LENGTH(phones) > 0 OR JSON_LENGTH(emails) > 0)"
|
contact_cond = "AND (JSON_LENGTH(phones) > 0 OR JSON_LENGTH(emails) > 0)"
|
||||||
social_cond = "AND (social_profiles IS NULL OR JSON_LENGTH(social_profiles) = 0)"
|
social_cond = "AND (social_profiles IS NULL OR JSON_LENGTH(social_profiles) = 0)"
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
|
|||||||
Reference in New Issue
Block a user