From 723e6e7a5ec836a8b1787ce9f30c76b5b4c4c7d1 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 24 Jul 2021 16:05:21 +0100 Subject: [PATCH] Check for food category before assigning dfc id --- daemon.py | 3 ++- epicyon.py | 4 ++-- outbox.py | 3 ++- shares.py | 15 ++++++++++----- translations/ar.json | 3 ++- translations/ca.json | 3 ++- translations/cy.json | 3 ++- translations/de.json | 3 ++- translations/en.json | 3 ++- translations/es.json | 3 ++- translations/fr.json | 3 ++- translations/ga.json | 3 ++- translations/hi.json | 3 ++- translations/it.json | 3 ++- translations/ja.json | 3 ++- translations/ku.json | 3 ++- translations/oc.json | 3 ++- translations/pt.json | 3 ++- translations/ru.json | 3 ++- translations/sw.json | 3 ++- translations/zh.json | 3 ++- 21 files changed, 50 insertions(+), 26 deletions(-) diff --git a/daemon.py b/daemon.py index fa9e798d1..265d5d5b0 100644 --- a/daemon.py +++ b/daemon.py @@ -13665,7 +13665,8 @@ class PubServer(BaseHTTPRequestHandler): durationStr, self.server.debug, city, - self.server.systemLanguage) + self.server.systemLanguage, + self.server.translate) if filename: if os.path.isfile(filename): os.remove(filename) diff --git a/epicyon.py b/epicyon.py index fc32df676..2bc7987d4 100644 --- a/epicyon.py +++ b/epicyon.py @@ -2332,7 +2332,7 @@ if args.testdata: "mechanical", "City", "2 months", - debug, city, args.language) + debug, city, args.language, {}) addShare(baseDir, httpPrefix, nickname, domain, port, "witch hat", @@ -2342,7 +2342,7 @@ if args.testdata: "clothing", "City", "3 months", - debug, city, args.language) + debug, city, args.language, {}) deleteAllPosts(baseDir, nickname, domain, 'inbox') deleteAllPosts(baseDir, nickname, domain, 'outbox') diff --git a/outbox.py b/outbox.py index bfff4f7a3..0d12c8212 100644 --- a/outbox.py +++ b/outbox.py @@ -549,7 +549,8 @@ def postMessageToOutbox(session, translate: {}, if debug: print('DEBUG: handle share uploads') outboxShareUpload(baseDir, httpPrefix, postToNickname, domain, - port, messageJson, debug, city, systemLanguage) + port, messageJson, debug, city, + systemLanguage, translate) if debug: print('DEBUG: handle undo share uploads') diff --git a/shares.py b/shares.py index 826936b1f..348246502 100644 --- a/shares.py +++ b/shares.py @@ -139,11 +139,15 @@ def _addShareDurationSec(duration: str, published: str) -> int: return 0 -def _getshareDfcId(baseDir: str, systemLanguage: str, itemType: str) -> str: +def _getshareDfcId(baseDir: str, systemLanguage: str, + itemType: str, itemCategory: str, + translate: {}) -> str: """Attempts to obtain a DFC Id for the shared item, based upon productTypes ontology. See https://github.com/datafoodconsortium/ontology """ + if translate['food'] not in itemCategory.lower(): + return '' dfcIds = _loadDfcIds(baseDir, systemLanguage) if not dfcIds: return '' @@ -176,7 +180,7 @@ def addShare(baseDir: str, displayName: str, summary: str, imageFilename: str, itemQty: int, itemType: str, itemCategory: str, location: str, duration: str, debug: bool, city: str, - systemLanguage: str) -> None: + systemLanguage: str, translate: {}) -> None: """Adds a new share """ sharesFilename = acctDir(baseDir, nickname, domain) + '/shares.json' @@ -189,7 +193,8 @@ def addShare(baseDir: str, durationSec = _addShareDurationSec(duration, published) itemID = getValidSharedItemID(displayName) - dfcId = _getshareDfcId(baseDir, systemLanguage, itemType) + dfcId = _getshareDfcId(baseDir, systemLanguage, + itemType, itemCategory, translate) # has an image for this share been uploaded? imageUrl = None @@ -603,7 +608,7 @@ def sendUndoShareViaServer(baseDir: str, session, def outboxShareUpload(baseDir: str, httpPrefix: str, nickname: str, domain: str, port: int, messageJson: {}, debug: bool, city: str, - systemLanguage: str) -> None: + systemLanguage: str, translate: {}) -> None: """ When a shared item is received by the outbox from c2s """ if not messageJson.get('type'): @@ -658,7 +663,7 @@ def outboxShareUpload(baseDir: str, httpPrefix: str, messageJson['object']['itemCategory'], messageJson['object']['location'], messageJson['object']['duration'], - debug, city, systemLanguage) + debug, city, systemLanguage, translate) if debug: print('DEBUG: shared item received via c2s') diff --git a/translations/ar.json b/translations/ar.json index f6e54fb4a..5106215ba 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "أعلمني عندما ينشر الحساب هذا", "Languages": "اللغات", "Translated": "تترجم", - "Quantity": "كمية" + "Quantity": "كمية", + "food": "غذاء" } diff --git a/translations/ca.json b/translations/ca.json index 0c4e49f54..e238d3270 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Aviseu-me quan publiqui aquest compte", "Languages": "Idiomes", "Translated": "Traduït", - "Quantity": "Quantitat" + "Quantity": "Quantitat", + "food": "menjar" } diff --git a/translations/cy.json b/translations/cy.json index 8eb9088d3..093334c80 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Rhoi gwybod i mi pan fydd y cyfrifon cyfrif hwn", "Languages": "Ieithoedd", "Translated": "Chyfieithwyd", - "Quantity": "Symiau" + "Quantity": "Symiau", + "food": "bwyd" } diff --git a/translations/de.json b/translations/de.json index f6b501be1..52eaaaa29 100644 --- a/translations/de.json +++ b/translations/de.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Benachrichtigen Sie mich, wenn dieses Konto postet", "Languages": "Sprachen", "Translated": "Übersetzt", - "Quantity": "Menge" + "Quantity": "Menge", + "food": "lebensmittel" } diff --git a/translations/en.json b/translations/en.json index e358967ba..bfbb2ec5e 100644 --- a/translations/en.json +++ b/translations/en.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Notify me when this account posts", "Languages": "Languages", "Translated": "Translated", - "Quantity": "Quantity" + "Quantity": "Quantity", + "food": "food" } diff --git a/translations/es.json b/translations/es.json index 0627c523c..7af7d0862 100644 --- a/translations/es.json +++ b/translations/es.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Notifíqueme cuando se publique esta cuenta", "Languages": "Idiomas", "Translated": "Traducida", - "Quantity": "Cantidad" + "Quantity": "Cantidad", + "food": "comida" } diff --git a/translations/fr.json b/translations/fr.json index 0e73dcd27..e1f026a73 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Avertissez-moi quand ce compte publie", "Languages": "Langues", "Translated": "Traduite", - "Quantity": "Quantité" + "Quantity": "Quantité", + "food": "aliments" } diff --git a/translations/ga.json b/translations/ga.json index 6841a30d8..0d039b369 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Cuir in iúl dom nuair a phostófar an cuntas seo", "Languages": "Teangacha", "Translated": "Aistrithe", - "Quantity": "Cainníocht" + "Quantity": "Cainníocht", + "food": "bia" } diff --git a/translations/hi.json b/translations/hi.json index fd07f2407..cade54185 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "यह खाता पोस्ट होने पर मुझे सूचित करें", "Languages": "बोली", "Translated": "अनुवाद", - "Quantity": "मात्रा" + "Quantity": "मात्रा", + "food": "खाना" } diff --git a/translations/it.json b/translations/it.json index 98fc2abb4..74a7399ee 100644 --- a/translations/it.json +++ b/translations/it.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Avvisami quando questo account messaggi", "Languages": "Le lingue", "Translated": "Tradotto", - "Quantity": "Quantità" + "Quantity": "Quantità", + "food": "cibo" } diff --git a/translations/ja.json b/translations/ja.json index 237c40538..10f678667 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "この口座投稿を通知する", "Languages": "言語", "Translated": "翻訳", - "Quantity": "量" + "Quantity": "量", + "food": "食物" } diff --git a/translations/ku.json b/translations/ku.json index ddd15e33e..22c792d13 100644 --- a/translations/ku.json +++ b/translations/ku.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Dema ku ev postên hesabê min agahdar bikin", "Languages": "Ziman", "Translated": "Wergerandin", - "Quantity": "Jimarî" + "Quantity": "Jimarî", + "food": "xûrek" } diff --git a/translations/oc.json b/translations/oc.json index 53843d5aa..f6e1a2673 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -449,5 +449,6 @@ "Notify me when this account posts": "Notify me when this account posts", "Languages": "Languages", "Translated": "Translated", - "Quantity": "Quantity" + "Quantity": "Quantity", + "food": "food" } diff --git a/translations/pt.json b/translations/pt.json index b2bfcbf1a..cbf9f0975 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Notifique-me quando esta conta posts", "Languages": "Línguas", "Translated": "Traduzida", - "Quantity": "Quantidade" + "Quantity": "Quantidade", + "food": "comida" } diff --git a/translations/ru.json b/translations/ru.json index 2284d4d13..f64dce626 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Сообщите мне, когда эта учетная запись", "Languages": "Языки", "Translated": "Перевод", - "Quantity": "Количество" + "Quantity": "Количество", + "food": "еда" } diff --git a/translations/sw.json b/translations/sw.json index 2b010a9a2..1d83ff995 100644 --- a/translations/sw.json +++ b/translations/sw.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "Nijulishe wakati akaunti hii ya akaunti.", "Languages": "Lugha", "Translated": "Ilitafsiriwa", - "Quantity": "Wingi" + "Quantity": "Wingi", + "food": "chakula" } diff --git a/translations/zh.json b/translations/zh.json index 828b32382..ec5d25507 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -453,5 +453,6 @@ "Notify me when this account posts": "此帐户帖子时通知我", "Languages": "语言", "Translated": "翻译", - "Quantity": "数量" + "Quantity": "数量", + "food": "食物" }