Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Comsys moved to src/

Browse source
This commit is contained in:
Greg Taylor 2008-06-15 19:41:27 +00:00
parent 4bb00013ae
commit 811016867b
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmdhandler.py
View file

@ -11,7 +11,7 @@ import defines_global
import cmdtable import cmdtable
import functions_general import functions_general
import functions_log import functions_log
import functions_comsys from src import comsys
class UnknownCommand(Exception): class UnknownCommand(Exception):
""" """
@ -171,26 +171,26 @@ def handle(cdat):
parsed_input['splitted'][1] = parsed_input['splitted'][1][1:] parsed_input['splitted'][1] = parsed_input['splitted'][1][1:]
parsed_input['root_cmd'] = 'pose' parsed_input['root_cmd'] = 'pose'
# Channel alias match. # Channel alias match.
elif functions_comsys.plr_has_channel(session, elif comsys.plr_has_channel(session,
parsed_input['root_cmd'], parsed_input['root_cmd'],
alias_search=True, alias_search=True,
return_muted=True): return_muted=True):
calias = parsed_input['root_cmd'] calias = parsed_input['root_cmd']
cname = functions_comsys.plr_cname_from_alias(session, calias) cname = comsys.plr_cname_from_alias(session, calias)
cmessage = ' '.join(parsed_input['splitted'][1:]) cmessage = ' '.join(parsed_input['splitted'][1:])
if cmessage == "who": if cmessage == "who":
functions_comsys.msg_cwho(session, cname) comsys.msg_cwho(session, cname)
return return
elif cmessage == "on": elif cmessage == "on":
functions_comsys.plr_chan_on(session, calias) comsys.plr_chan_on(session, calias)
return return
elif cmessage == "off": elif cmessage == "off":
functions_comsys.plr_chan_off(session, calias) comsys.plr_chan_off(session, calias)
return return
elif cmessage == "last": elif cmessage == "last":
functions_comsys.msg_chan_hist(session, cname) comsys.msg_chan_hist(session, cname)
return return
second_arg = "%s=%s" % (cname, cmessage) second_arg = "%s=%s" % (cname, cmessage)

26
src/commands/comsys.py
View file

@ -7,7 +7,7 @@ import time
from django.conf import settings from django.conf import settings
import functions_general import functions_general
import functions_comsys import src.comsys
import defines_global import defines_global
from src import ansi from src import ansi
@ -44,18 +44,18 @@ def cmd_addcom(cdat):
session.msg("You are already on that channel.") session.msg("You are already on that channel.")
return return
name_matches = functions_comsys.cname_search(chan_name, exact=True) name_matches = src.comsys.cname_search(chan_name, exact=True)
if name_matches: if name_matches:
chan_name_parsed = name_matches[0].get_name() chan_name_parsed = name_matches[0].get_name()
session.msg("You join %s, with an alias of %s." % \ session.msg("You join %s, with an alias of %s." % \
(chan_name_parsed, chan_alias)) (chan_name_parsed, chan_alias))
functions_comsys.plr_set_channel(session, chan_alias, chan_name_parsed, True) src.comsys.plr_set_channel(session, chan_alias, chan_name_parsed, True)
# Announce the user's joining. # Announce the user's joining.
join_msg = "[%s] %s has joined the channel." % \ join_msg = "[%s] %s has joined the channel." % \
(chan_name_parsed, pobject.get_name(show_dbref=False)) (chan_name_parsed, pobject.get_name(show_dbref=False))
functions_comsys.send_cmessage(chan_name_parsed, join_msg) src.comsys.send_cmessage(chan_name_parsed, join_msg)
else: else:
session.msg("Could not find channel %s." % (chan_name,)) session.msg("Could not find channel %s." % (chan_name,))
@ -81,12 +81,12 @@ def cmd_delcom(cdat):
chan_name = session.channels_subscribed[chan_alias][0] chan_name = session.channels_subscribed[chan_alias][0]
session.msg("You have left %s." % (chan_name,)) session.msg("You have left %s." % (chan_name,))
functions_comsys.plr_del_channel(session, chan_alias) src.comsys.plr_del_channel(session, chan_alias)
# Announce the user's leaving. # Announce the user's leaving.
leave_msg = "[%s] %s has left the channel." % \ leave_msg = "[%s] %s has left the channel." % \
(chan_name, pobject.get_name(show_dbref=False)) (chan_name, pobject.get_name(show_dbref=False))
functions_comsys.send_cmessage(chan_name, leave_msg) src.comsys.send_cmessage(chan_name, leave_msg)
def cmd_comlist(cdat): def cmd_comlist(cdat):
""" """
@ -131,7 +131,7 @@ def cmd_clist(cdat):
""" """
session = cdat['session'] session = cdat['session']
session.msg("** Channel Owner Description") session.msg("** Channel Owner Description")
for chan in functions_comsys.get_all_channels(): for chan in src.comsys.get_all_channels():
session.msg("%s%s %-13.13s %-15.15s %-45.45s" % session.msg("%s%s %-13.13s %-15.15s %-45.45s" %
('-', '-', chan.get_name(), chan.get_owner().get_name(), 'No Description')) ('-', '-', chan.get_name(), chan.get_owner().get_name(), 'No Description'))
session.msg("-- End of Channel List --") session.msg("-- End of Channel List --")
@ -150,7 +150,7 @@ def cmd_cdestroy(cdat):
session.msg("You must supply a name!") session.msg("You must supply a name!")
return return
name_matches = functions_comsys.cname_search(cname, exact=True) name_matches = src.comsys.cname_search(cname, exact=True)
if not name_matches: if not name_matches:
session.msg("Could not find channel %s." % (cname,)) session.msg("Could not find channel %s." % (cname,))
@ -218,7 +218,7 @@ def cmd_cemit(cdat):
session.msg("You must provide a message to emit.") session.msg("You must provide a message to emit.")
return return
name_matches = functions_comsys.cname_search(cname, exact=True) name_matches = src.comsys.cname_search(cname, exact=True)
try: try:
# Safety first, kids! # Safety first, kids!
@ -234,7 +234,7 @@ def cmd_cemit(cdat):
final_cmessage = cmessage final_cmessage = cmessage
else: else:
if "sendername" in switches: if "sendername" in switches:
if not functions_comsys.plr_has_channel(session, cname_parsed, return_muted=False): if not src.comsys.plr_has_channel(session, cname_parsed, return_muted=False):
session.msg("You must be on %s to do that." % (cname_parsed,)) session.msg("You must be on %s to do that." % (cname_parsed,))
return return
final_cmessage = "[%s] %s: %s" % (cname_parsed, pobject.get_name(show_dbref=False), cmessage) final_cmessage = "[%s] %s: %s" % (cname_parsed, pobject.get_name(show_dbref=False), cmessage)
@ -246,7 +246,7 @@ def cmd_cemit(cdat):
if not "quiet" in switches: if not "quiet" in switches:
session.msg("Sent - %s" % (name_matches[0],)) session.msg("Sent - %s" % (name_matches[0],))
functions_comsys.send_cmessage(cname_parsed, final_cmessage) src.comsys.send_cmessage(cname_parsed, final_cmessage)
def cmd_cwho(cdat): def cmd_cwho(cdat):
""" """
@ -273,14 +273,14 @@ def cmd_ccreate(cdat):
session.msg("You must supply a name!") session.msg("You must supply a name!")
return return
name_matches = functions_comsys.cname_search(cname, exact=True) name_matches = src.comsys.cname_search(cname, exact=True)
if name_matches: if name_matches:
session.msg("A channel with that name already exists.") session.msg("A channel with that name already exists.")
else: else:
# Create and set the object up. # Create and set the object up.
cdat = {"name": cname, "owner": pobject} cdat = {"name": cname, "owner": pobject}
new_chan = functions_comsys.create_channel(cdat) new_chan = src.comsys.create_channel(cdat)
session.msg("Channel %s created." % (new_chan.get_name(),)) session.msg("Channel %s created." % (new_chan.get_name(),))
def cmd_cchown(cdat): def cmd_cchown(cdat):

0
functions_comsys.py → src/comsys.py
View file