partial cleanup of UserManager.py
This commit is contained in:
parent
701b5e2449
commit
39acf04b4b
1 changed files with 70 additions and 66 deletions
|
@ -1,4 +1,9 @@
|
|||
import json, logging, os
|
||||
# Included modules
|
||||
import os
|
||||
import json
|
||||
import logging
|
||||
|
||||
# ZeroNet Modules
|
||||
from User import User
|
||||
from Plugin import PluginManager
|
||||
from Config import config
|
||||
|
@ -9,10 +14,10 @@ class UserManager(object):
|
|||
def __init__(self):
|
||||
self.users = {}
|
||||
|
||||
|
||||
# Load all user from data/users.json
|
||||
def load(self):
|
||||
if not self.users: self.users = {}
|
||||
if not self.users:
|
||||
self.users = {}
|
||||
|
||||
user_found = []
|
||||
added = 0
|
||||
|
@ -30,8 +35,8 @@ class UserManager(object):
|
|||
del(self.users[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
|
||||
# Return: User
|
||||
|
@ -43,7 +48,6 @@ class UserManager(object):
|
|||
user.save()
|
||||
return user
|
||||
|
||||
|
||||
# List all users from data/users.json
|
||||
# Return: {"usermasteraddr": User}
|
||||
def list(self):
|
||||
|
@ -51,7 +55,6 @@ class UserManager(object):
|
|||
self.load()
|
||||
return self.users
|
||||
|
||||
|
||||
# Get user based on master_address
|
||||
# Return: User or None
|
||||
def get(self, master_address=None):
|
||||
|
@ -62,7 +65,8 @@ class UserManager(object):
|
|||
return None
|
||||
|
||||
|
||||
user_manager = UserManager() # Singletone
|
||||
user_manager = UserManager() # Singleton
|
||||
|
||||
|
||||
# Debug: Reload User.py
|
||||
def reloadModule():
|
||||
|
|
Loading…
Reference in a new issue