oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

partial cleanup of UserManager.py

Browse source
This commit is contained in:
Matthew Bell 2015-06-17 22:37:53 +01:00
parent 701b5e2449
commit 39acf04b4b
1 changed files with 70 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/User/UserManager.py
View file

@ -1,4 +1,9 @@
import json, logging, os # Included modules
import os
import json
import logging
# ZeroNet Modules
from User import User from User import User
from Plugin import PluginManager from Plugin import PluginManager
from Config import config from Config import config
@ -9,10 +14,10 @@ class UserManager(object):
def __init__(self): def __init__(self):
self.users = {} self.users = {}
# Load all user from data/users.json # Load all user from data/users.json
def load(self): def load(self):
if not self.users: self.users = {} if not self.users:
self.users = {}
user_found = [] user_found = []
added = 0 added = 0
@ -30,8 +35,8 @@ class UserManager(object):
del(self.users[master_address]) del(self.users[master_address])
logging.debug("Removed user: %s" % master_address) logging.debug("Removed user: %s" % master_address)
if added: logging.debug("UserManager added %s users" % added) if added:
logging.debug("UserManager added %s users" % added)
# Create new user # Create new user
# Return: User # Return: User
@ -43,7 +48,6 @@ class UserManager(object):
user.save() user.save()
return user return user
# List all users from data/users.json # List all users from data/users.json
# Return: {"usermasteraddr": User} # Return: {"usermasteraddr": User}
def list(self): def list(self):
@ -51,7 +55,6 @@ class UserManager(object):
self.load() self.load()
return self.users return self.users
# Get user based on master_address # Get user based on master_address
# Return: User or None # Return: User or None
def get(self, master_address=None): def get(self, master_address=None):
@ -62,7 +65,8 @@ class UserManager(object):
return None return None
user_manager = UserManager() # Singletone user_manager = UserManager() # Singleton
# Debug: Reload User.py # Debug: Reload User.py
def reloadModule(): def reloadModule():