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 2022-01-03 17:06:41 +00:00
parent f5bafebcdd
commit fdf8e24a6f
2 changed files with 88 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
siteactive.py
View File

@ -119,5 +119,4 @@ def site_is_active(url: str, timeout: int) -> bool:
except BaseException: except BaseException:
print('EX: site_is_active ' + str(loc)) print('EX: site_is_active ' + str(loc))
pass
return False return False

176
skills.py
View File

@ -24,46 +24,46 @@ from utils import local_actor_url
from utils import has_actor from utils import has_actor
def set_skills_from_dict(actor_json: {}, skillsDict: {}) -> []: def set_skills_from_dict(actor_json: {}, skills_dict: {}) -> []:
"""Converts a dict containing skills to a list """Converts a dict containing skills to a list
Returns the string version of the dictionary Returns the string version of the dictionary
""" """
skillsList = [] skills_list = []
for name, value in skillsDict.items(): for name, value in skills_dict.items():
skillsList.append(name + ':' + str(value)) skills_list.append(name + ':' + str(value))
set_occupation_skills_list(actor_json, skillsList) set_occupation_skills_list(actor_json, skills_list)
return skillsList return skills_list
def get_skills_from_list(skillsList: []) -> {}: def get_skills_from_list(skills_list: []) -> {}:
"""Returns a dict of skills from a list """Returns a dict of skills from a list
""" """
if isinstance(skillsList, list): if isinstance(skills_list, list):
skillsList2 = skillsList skills_list2 = skills_list
else: else:
skillsList2 = skillsList.split(',') skills_list2 = skills_list.split(',')
skillsDict = {} skills_dict = {}
for skill in skillsList2: for skill in skills_list2:
if ':' not in skill: if ':' not in skill:
continue continue
name = skill.split(':')[0].strip().lower() name = skill.split(':')[0].strip().lower()
valueStr = skill.split(':')[1] value_str = skill.split(':')[1]
if not valueStr.isdigit(): if not value_str.isdigit():
continue continue
skillsDict[name] = int(valueStr) skills_dict[name] = int(value_str)
return skillsDict return skills_dict
def actor_skill_value(actor_json: {}, skillName: str) -> int: def actor_skill_value(actor_json: {}, skill_name: str) -> int:
"""Returns The skill level from an actor """Returns The skill level from an actor
""" """
ocSkillsList = get_occupation_skills(actor_json) oc_skills_list = get_occupation_skills(actor_json)
skillsDict = get_skills_from_list(ocSkillsList) skills_dict = get_skills_from_list(oc_skills_list)
if not skillsDict: if not skills_dict:
return 0 return 0
skillName = skillName.lower() skill_name = skill_name.lower()
if skillsDict.get(skillName): if skills_dict.get(skill_name):
return skillsDict[skillName] return skills_dict[skill_name]
return 0 return 0
@ -71,17 +71,17 @@ def no_of_actor_skills(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 = get_occupation_skills(actor_json) skills_list = get_occupation_skills(actor_json)
return len(skillsList) return len(skills_list)
return 0 return 0
def set_actor_skill_level(actor_json: {}, def set_actor_skill_level(actor_json: {},
skill: str, skillLevelPercent: int) -> bool: skill: str, skill_level_percent: int) -> bool:
"""Set a skill level for a person """Set a skill level for a person
Setting skill level to zero removes it Setting skill level to zero removes it
""" """
if skillLevelPercent < 0 or skillLevelPercent > 100: if skill_level_percent < 0 or skill_level_percent > 100:
return False return False
if not actor_json: if not actor_json:
@ -96,51 +96,51 @@ def set_actor_skill_level(actor_json: {},
}, },
'skills': [] 'skills': []
}] }]
ocSkillsList = get_occupation_skills(actor_json) oc_skills_list = get_occupation_skills(actor_json)
skillsDict = get_skills_from_list(ocSkillsList) skills_dict = get_skills_from_list(oc_skills_list)
if not skillsDict.get(skill): if not skills_dict.get(skill):
if len(skillsDict.items()) >= 32: if len(skills_dict.items()) >= 32:
print('WARN: Maximum number of skills reached for ' + print('WARN: Maximum number of skills reached for ' +
actor_json['id']) actor_json['id'])
return False return False
if skillLevelPercent > 0: if skill_level_percent > 0:
skillsDict[skill] = skillLevelPercent skills_dict[skill] = skill_level_percent
else: else:
if skillsDict.get(skill): if skills_dict.get(skill):
del skillsDict[skill] del skills_dict[skill]
set_skills_from_dict(actor_json, skillsDict) set_skills_from_dict(actor_json, skills_dict)
return True return True
def set_skill_level(base_dir: str, nickname: str, domain: str, def set_skill_level(base_dir: str, nickname: str, domain: str,
skill: str, skillLevelPercent: int) -> bool: skill: str, skill_level_percent: int) -> bool:
"""Set a skill level for a person """Set a skill level for a person
Setting skill level to zero removes it Setting skill level to zero removes it
""" """
if skillLevelPercent < 0 or skillLevelPercent > 100: if skill_level_percent < 0 or skill_level_percent > 100:
return False return False
actorFilename = acct_dir(base_dir, nickname, domain) + '.json' actor_filename = acct_dir(base_dir, nickname, domain) + '.json'
if not os.path.isfile(actorFilename): if not os.path.isfile(actor_filename):
return False return False
actor_json = load_json(actorFilename) actor_json = load_json(actor_filename)
return set_actor_skill_level(actor_json, return set_actor_skill_level(actor_json,
skill, skillLevelPercent) skill, skill_level_percent)
def get_skills(base_dir: str, nickname: str, domain: str) -> []: def get_skills(base_dir: str, nickname: str, domain: str) -> []:
"""Returns the skills for a given person """Returns the skills for a given person
""" """
actorFilename = acct_dir(base_dir, nickname, domain) + '.json' actor_filename = acct_dir(base_dir, nickname, domain) + '.json'
if not os.path.isfile(actorFilename): if not os.path.isfile(actor_filename):
return False return False
actor_json = load_json(actorFilename) actor_json = load_json(actor_filename)
if actor_json: if actor_json:
if not actor_json.get('hasOccupation'): if not actor_json.get('hasOccupation'):
return None return None
ocSkillsList = get_occupation_skills(actor_json) oc_skills_list = get_occupation_skills(actor_json)
return get_skills_from_list(ocSkillsList) return get_skills_from_list(oc_skills_list)
return None return None
@ -157,25 +157,25 @@ def outbox_skills(base_dir: str, nickname: str, message_json: {},
if not has_object_string(message_json, debug): if not has_object_string(message_json, debug):
return False return False
actorNickname = get_nickname_from_actor(message_json['actor']) actor_nickname = get_nickname_from_actor(message_json['actor'])
if actorNickname != nickname: if actor_nickname != nickname:
return False return False
domain, port = get_domain_from_actor(message_json['actor']) domain, _ = get_domain_from_actor(message_json['actor'])
skill = message_json['object'].replace('"', '').split(';')[0].strip() skill = message_json['object'].replace('"', '').split(';')[0].strip()
skillLevelPercentStr = \ skill_level_percent_str = \
message_json['object'].replace('"', '').split(';')[1].strip() message_json['object'].replace('"', '').split(';')[1].strip()
skillLevelPercent = 50 skill_level_percent = 50
if skillLevelPercentStr.isdigit(): if skill_level_percent_str.isdigit():
skillLevelPercent = int(skillLevelPercentStr) skill_level_percent = int(skill_level_percent_str)
return set_skill_level(base_dir, nickname, domain, return set_skill_level(base_dir, nickname, domain,
skill, skillLevelPercent) skill, skill_level_percent)
def send_skill_via_server(base_dir: str, session, nickname: str, password: str, def send_skill_via_server(base_dir: str, session, nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, http_prefix: str,
skill: str, skillLevelPercent: int, skill: str, skill_level_percent: int,
cached_webfingers: {}, person_cache: {}, cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
@ -188,20 +188,20 @@ def send_skill_via_server(base_dir: str, session, nickname: str, password: str,
domain_full = get_full_domain(domain, port) domain_full = get_full_domain(domain, port)
actor = local_actor_url(http_prefix, nickname, domain_full) actor = local_actor_url(http_prefix, nickname, domain_full)
toUrl = actor to_url = actor
ccUrl = actor + '/followers' cc_url = actor + '/followers'
if skillLevelPercent: if skill_level_percent:
skillStr = skill + ';' + str(skillLevelPercent) skill_str = skill + ';' + str(skill_level_percent)
else: else:
skillStr = skill + ';0' skill_str = skill + ';0'
newSkillJson = { new_skill_json = {
'type': 'Skill', 'type': 'Skill',
'actor': actor, 'actor': actor,
'object': '"' + skillStr + '"', 'object': '"' + skill_str + '"',
'to': [toUrl], 'to': [to_url],
'cc': [ccUrl] 'cc': [cc_url]
} }
handle = http_prefix + '://' + domain_full + '/@' + nickname handle = http_prefix + '://' + domain_full + '/@' + nickname
@ -221,55 +221,55 @@ def send_skill_via_server(base_dir: str, session, nickname: str, password: str,
' did not return a dict. ' + str(wf_request)) ' did not return a dict. ' + str(wf_request))
return 1 return 1
postToBox = 'outbox' post_to_box = 'outbox'
# get the actor inbox for the To handle # get the actor inbox for the To handle
originDomain = domain origin_domain = domain
(inboxUrl, pubKeyId, pubKey, fromPersonId, sharedInbox, avatarUrl, (inbox_url, _, _, from_person_id, _, _,
displayName, _) = get_person_box(signing_priv_key_pem, _, _) = get_person_box(signing_priv_key_pem,
originDomain, origin_domain,
base_dir, session, wf_request, base_dir, session, wf_request,
person_cache, project_version, person_cache, project_version,
http_prefix, nickname, domain, http_prefix, nickname, domain,
postToBox, 76121) post_to_box, 76121)
if not inboxUrl: if not inbox_url:
if debug: if debug:
print('DEBUG: skill no ' + postToBox + print('DEBUG: skill no ' + post_to_box +
' was found for ' + handle) ' was found for ' + handle)
return 3 return 3
if not fromPersonId: if not from_person_id:
if debug: if debug:
print('DEBUG: skill no actor was found for ' + handle) print('DEBUG: skill no actor was found for ' + handle)
return 4 return 4
authHeader = create_basic_auth_header(nickname, password) auth_header = create_basic_auth_header(nickname, password)
headers = { headers = {
'host': domain, 'host': domain,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': auth_header
} }
postResult = \ post_result = \
post_json(http_prefix, domain_full, post_json(http_prefix, domain_full,
session, newSkillJson, [], inboxUrl, session, new_skill_json, [], inbox_url,
headers, 30, True) headers, 30, True)
if not postResult: if not post_result:
if debug: if debug:
print('DEBUG: POST skill failed for c2s to ' + inboxUrl) print('DEBUG: POST skill failed for c2s to ' + inbox_url)
# return 5 # return 5
if debug: if debug:
print('DEBUG: c2s POST skill success') print('DEBUG: c2s POST skill success')
return newSkillJson return new_skill_json
def actor_has_skill(actor_json: {}, skillName: str) -> bool: def actor_has_skill(actor_json: {}, skill_name: str) -> bool:
"""Returns true if the given actor has the given skill """Returns true if the given actor has the given skill
""" """
ocSkillsList = get_occupation_skills(actor_json) oc_skills_list = get_occupation_skills(actor_json)
for skillStr in ocSkillsList: for skill_str in oc_skills_list:
if skillName + ':' in skillStr: if skill_name + ':' in skill_str:
return True return True
return False return False