indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Snake case

merge-requests/30/head
Bob Mottram 2021-12-26 17:18:34 +00:00
parent 73bd65b8a9
commit 2b90a745b6
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shares.py
View File

@ -35,7 +35,7 @@ from utils import removeDomainPort
from utils import isAccountDir from utils import isAccountDir
from utils import acct_dir from utils import acct_dir
from utils import isfloat from utils import isfloat
from utils import getCategoryTypes from utils import get_category_types
from utils import getSharesFilesList from utils import getSharesFilesList
from utils import local_actor_url from utils import local_actor_url
from media import processMetaData from media import processMetaData
@ -187,7 +187,7 @@ def _dfcProductTypeFromCategory(base_dir: str,
This will be used to select an appropriate ontology file This will be used to select an appropriate ontology file
such as ontology/foodTypes.json such as ontology/foodTypes.json
""" """
productTypesList = getCategoryTypes(base_dir) productTypesList = get_category_types(base_dir)
categoryLower = itemCategory.lower() categoryLower = itemCategory.lower()
for productType in productTypesList: for productType in productTypesList:
if translate.get(productType): if translate.get(productType):
@ -1762,7 +1762,7 @@ def _dfcToSharesFormat(catalogJson: {},
sharesJson = {} sharesJson = {}
dfcIds = {} dfcIds = {}
productTypesList = getCategoryTypes(base_dir) productTypesList = get_category_types(base_dir)
for productType in productTypesList: for productType in productTypesList:
dfcIds[productType] = \ dfcIds[productType] = \
_loadDfcIds(base_dir, system_language, productType, _loadDfcIds(base_dir, system_language, productType,

4
tests.py
View File

@ -59,7 +59,7 @@ from utils import dangerousSVG
from utils import canReplyTo from utils import canReplyTo
from utils import isGroupAccount from utils import isGroupAccount
from utils import get_actor_languages_list from utils import get_actor_languages_list
from utils import getCategoryTypes from utils import get_category_types
from utils import getSupportedLanguages from utils import getSupportedLanguages
from utils import setConfigParam from utils import setConfigParam
from utils import isGroupActor from utils import isGroupActor
@ -5703,7 +5703,7 @@ def _testGetPriceFromString() -> None:
def _translateOntology(base_dir: str) -> None: def _translateOntology(base_dir: str) -> None:
return return
ontologyTypes = getCategoryTypes(base_dir) ontologyTypes = get_category_types(base_dir)
url = 'https://translate.astian.org' url = 'https://translate.astian.org'
apiKey = None apiKey = None
ltLangList = libretranslateLanguages(url, apiKey) ltLangList = libretranslateLanguages(url, apiKey)

12
utils.py
View File

@ -3122,12 +3122,12 @@ def getSupportedLanguages(base_dir: str) -> []:
return languagesStr return languagesStr
def getCategoryTypes(base_dir: str) -> []: def get_category_types(base_dir: str) -> []:
"""Returns the list of ontologies """Returns the list of ontologies
""" """
ontologyDir = base_dir + '/ontology' ontology_dir = base_dir + '/ontology'
categories = [] categories = []
for _, _, files in os.walk(ontologyDir): for _, _, files in os.walk(ontology_dir):
for f in files: for f in files:
if not f.endswith('.json'): if not f.endswith('.json'):
continue continue
@ -3135,9 +3135,9 @@ def getCategoryTypes(base_dir: str) -> []:
continue continue
if f.startswith('custom'): if f.startswith('custom'):
continue continue
ontologyFilename = f.split('.')[0] ontology_filename = f.split('.')[0]
if 'Types' in ontologyFilename: if 'Types' in ontology_filename:
categories.append(ontologyFilename.replace('Types', '')) categories.append(ontology_filename.replace('Types', ''))
break break
return categories return categories

6
webapp_create_post.py
View File

@ -16,7 +16,7 @@ from utils import getMediaFormats
from utils import get_config_param from utils import get_config_param
from utils import acct_dir from utils import acct_dir
from utils import getCurrencies from utils import getCurrencies
from utils import getCategoryTypes from utils import get_category_types
from webapp_utils import getBannerFile from webapp_utils import getBannerFile
from webapp_utils import htmlHeaderWithExternalStyle from webapp_utils import htmlHeaderWithExternalStyle
from webapp_utils import htmlFooter from webapp_utils import htmlFooter
@ -452,7 +452,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
extraFields += '<br>' + \ extraFields += '<br>' + \
editTextField(translate['Type of shared item. eg. hat'] + ':', editTextField(translate['Type of shared item. eg. hat'] + ':',
'itemType', '', '', True) 'itemType', '', '', True)
categoryTypes = getCategoryTypes(base_dir) categoryTypes = get_category_types(base_dir)
catStr = translate['Category of shared item. eg. clothing'] catStr = translate['Category of shared item. eg. clothing']
extraFields += '<label class="labels">' + catStr + '</label><br>\n' extraFields += '<label class="labels">' + catStr + '</label><br>\n'
@ -517,7 +517,7 @@ def htmlNewPost(cssCache: {}, media_instance: bool, translate: {},
extraFields += '<br>' + \ extraFields += '<br>' + \
editTextField(translate['Type of wanted item. eg. hat'] + ':', editTextField(translate['Type of wanted item. eg. hat'] + ':',
'itemType', '', '', True) 'itemType', '', '', True)
categoryTypes = getCategoryTypes(base_dir) categoryTypes = get_category_types(base_dir)
catStr = translate['Category of wanted item. eg. clothes'] catStr = translate['Category of wanted item. eg. clothes']
extraFields += '<label class="labels">' + catStr + '</label><br>\n' extraFields += '<label class="labels">' + catStr + '</label><br>\n'