~vomun-developers/anonplus/vomun-trunk

Committer: AJ00200
Date: 2011-11-26 00:03:57 UTC
Revision ID: git-v1:f4f4352eb338a5f57a5a92e4bf23bec36d298d13

Blocks we receive are now stored in ~/.vomun/blocks.json. libs.globals and libs.config are now used directly after importing libs; they are set in libs/__init__.py now.

files removed:
src/libs/config.py

src/libs/globals.py

files modified:
src/libs/__init__.py

src/libs/encryption/rsa.py

src/libs/events.py

src/libs/friends.py

src/libs/logs.py

src/libs/morado/functions.py

src/libs/morado/morado.py

src/libs/storage/manager.py

src/setup.py

src/uis/web/handler.py

src/uis/web/manager.py

src/vomun.py

Show diffs side-by-side

added added

removed removed

src/libs/config.py

'''Load the config from ~/.vomun/config.json'''

import os

import json

import libs.globals

from libs.morado.functions import register_with_api

CONFIG_PATH = os.path.expanduser("~/.vomun/config.json")

def open_config():

'''Open the configuration file from ~/.vomun/config.json'''

try:

configfile = open(CONFIG_PATH,"r+")

except IOError:

default_config = {

'vomundir': os.getenv('HOME') + '/.vomun/',

'nodekey': ''

}

configfile = open(CONFIG_PATH, 'a')

configfile.write(json.dumps(default_config, indent = 4))

configfile.flush()

configfile.close()

configfile = open(CONFIG_PATH, 'r+')

return configfile

config_file = open_config()

@register_with_api

def load_config():

'''Load the configuration file'''

libs.globals.global_vars['config'] = json.loads(config_file.read())

config_file.seek(0) # return read/write position to beginning of the file

@register_with_api

def get_config():

'''Return the contents of the configuration file'''

return libs.globals.global_vars["config"]

@register_with_api

def save_config():

'''Write the configuration file to the hard disk'''

config_file.write(json.dumps(libs.globals.global_vars['config'],

indent = 4))

load_config()

Older »