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 19:01:36 +00:00
parent 467c5831a4
commit d32d6eb86d
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon.py
View File

@ -263,7 +263,7 @@ from utils import user_agent_domain
from utils import isLocalNetworkAddress from utils import isLocalNetworkAddress
from utils import permitted_dir from utils import permitted_dir
from utils import is_account_dir from utils import is_account_dir
from utils import getOccupationSkills from utils import get_occupation_skills
from utils import get_occupation_name from utils import get_occupation_name
from utils import set_occupation_name from utils import set_occupation_name
from utils import loadTranslationsFromFile from utils import loadTranslationsFromFile
@ -9803,7 +9803,7 @@ class PubServer(BaseHTTPRequestHandler):
accessKeys = \ accessKeys = \
self.server.keyShortcuts[nickname] self.server.keyShortcuts[nickname]
actorSkillsList = \ actorSkillsList = \
getOccupationSkills(actor_json) get_occupation_skills(actor_json)
skills = getSkillsFromList(actorSkillsList) skills = getSkillsFromList(actorSkillsList)
city = getSpoofedCity(self.server.city, city = getSpoofedCity(self.server.city,
base_dir, base_dir,
@ -9861,7 +9861,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
if self._secure_mode(): if self._secure_mode():
actorSkillsList = \ actorSkillsList = \
getOccupationSkills(actor_json) get_occupation_skills(actor_json)
skills = getSkillsFromList(actorSkillsList) skills = getSkillsFromList(actorSkillsList)
msg = json.dumps(skills, msg = json.dumps(skills,
ensure_ascii=False) ensure_ascii=False)

12
skills.py
View File

@ -17,7 +17,7 @@ from utils import get_full_domain
from utils import getNicknameFromActor from utils import getNicknameFromActor
from utils import getDomainFromActor from utils import getDomainFromActor
from utils import load_json from utils import load_json
from utils import getOccupationSkills from utils import get_occupation_skills
from utils import set_occupation_skills_list from utils import set_occupation_skills_list
from utils import acct_dir from utils import acct_dir
from utils import local_actor_url from utils import local_actor_url
@ -57,7 +57,7 @@ def getSkillsFromList(skillsList: []) -> {}:
def actorSkillValue(actor_json: {}, skillName: str) -> int: def actorSkillValue(actor_json: {}, skillName: str) -> int:
"""Returns The skill level from an actor """Returns The skill level from an actor
""" """
ocSkillsList = getOccupationSkills(actor_json) ocSkillsList = get_occupation_skills(actor_json)
skillsDict = getSkillsFromList(ocSkillsList) skillsDict = getSkillsFromList(ocSkillsList)
if not skillsDict: if not skillsDict:
return 0 return 0
@ -71,7 +71,7 @@ def noOfActorSkills(actor_json: {}) -> int:
"""Returns the number of skills that an actor has """Returns the number of skills that an actor has
""" """
if actor_json.get('hasOccupation'): if actor_json.get('hasOccupation'):
skillsList = getOccupationSkills(actor_json) skillsList = get_occupation_skills(actor_json)
return len(skillsList) return len(skillsList)
return 0 return 0
@ -96,7 +96,7 @@ def setActorSkillLevel(actor_json: {},
}, },
'skills': [] 'skills': []
}] }]
ocSkillsList = getOccupationSkills(actor_json) ocSkillsList = get_occupation_skills(actor_json)
skillsDict = getSkillsFromList(ocSkillsList) skillsDict = getSkillsFromList(ocSkillsList)
if not skillsDict.get(skill): if not skillsDict.get(skill):
if len(skillsDict.items()) >= 32: if len(skillsDict.items()) >= 32:
@ -139,7 +139,7 @@ def getSkills(base_dir: str, nickname: str, domain: str) -> []:
if actor_json: if actor_json:
if not actor_json.get('hasOccupation'): if not actor_json.get('hasOccupation'):
return None return None
ocSkillsList = getOccupationSkills(actor_json) ocSkillsList = get_occupation_skills(actor_json)
return getSkillsFromList(ocSkillsList) return getSkillsFromList(ocSkillsList)
return None return None
@ -268,7 +268,7 @@ def sendSkillViaServer(base_dir: str, session, nickname: str, password: str,
def actorHasSkill(actor_json: {}, skillName: str) -> bool: def actorHasSkill(actor_json: {}, skillName: str) -> bool:
"""Returns true if the given actor has the given skill """Returns true if the given actor has the given skill
""" """
ocSkillsList = getOccupationSkills(actor_json) ocSkillsList = get_occupation_skills(actor_json)
for skillStr in ocSkillsList: for skillStr in ocSkillsList:
if skillName + ':' in skillStr: if skillName + ':' in skillStr:
return True return True

20
utils.py
View File

@ -2719,26 +2719,26 @@ def dmAllowedFromDomain(base_dir: str,
return False return False
def getOccupationSkills(actor_json: {}) -> []: def get_occupation_skills(actor_json: {}) -> []:
"""Returns the list of skills for an actor """Returns the list of skills for an actor
""" """
if 'hasOccupation' not in actor_json: if 'hasOccupation' not in actor_json:
return [] return []
if not isinstance(actor_json['hasOccupation'], list): if not isinstance(actor_json['hasOccupation'], list):
return [] return []
for occupationItem in actor_json['hasOccupation']: for occupation_item in actor_json['hasOccupation']:
if not isinstance(occupationItem, dict): if not isinstance(occupation_item, dict):
continue continue
if not occupationItem.get('@type'): if not occupation_item.get('@type'):
continue continue
if not occupationItem['@type'] == 'Occupation': if not occupation_item['@type'] == 'Occupation':
continue continue
if not occupationItem.get('skills'): if not occupation_item.get('skills'):
continue continue
if isinstance(occupationItem['skills'], list): if isinstance(occupation_item['skills'], list):
return occupationItem['skills'] return occupation_item['skills']
elif isinstance(occupationItem['skills'], str): elif isinstance(occupation_item['skills'], str):
return [occupationItem['skills']] return [occupation_item['skills']]
break break
return [] return []