Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

Fix missing conf imports

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-10-27 19:20:28 -05:00
parent 80f548fdfd
commit 779ba8e214
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -28,6 +28,7 @@ from lbryum.version import LBRYUM_VERSION as lbryum_version
from lbrynet import __version__ as lbrynet_version from lbrynet import __version__ as lbrynet_version
from lbrynet.conf import settings as lbrynet_settings from lbrynet.conf import settings as lbrynet_settings
from lbrynet import analytics from lbrynet import analytics
from lbrynet import conf
from lbrynet import reflector from lbrynet import reflector
from lbrynet.metadata.Metadata import Metadata, verify_name_characters from lbrynet.metadata.Metadata import Metadata, verify_name_characters
from lbrynet.metadata.Fee import FeeValidator from lbrynet.metadata.Fee import FeeValidator

3
lbrynet/lbrynet_daemon/DaemonServer.py
View file

@ -3,6 +3,7 @@ import os
from twisted.internet import defer from twisted.internet import defer
from lbrynet import conf
from lbrynet.lbrynet_daemon.Daemon import Daemon from lbrynet.lbrynet_daemon.Daemon import Daemon
from lbrynet.lbrynet_daemon.Resources import LBRYindex, HostedEncryptedFile, EncryptedFileUpload from lbrynet.lbrynet_daemon.Resources import LBRYindex, HostedEncryptedFile, EncryptedFileUpload
from lbrynet.conf import settings from lbrynet.conf import settings
@ -13,7 +14,7 @@ log = logging.getLogger(__name__)
class DaemonServer(object): class DaemonServer(object):
def _setup_server(self): def _setup_server(self):
ui_path = os.path.join(get_data_dir(), "lbry-ui", "active") ui_path = os.path.join(conf.get_data_dir(), "lbry-ui", "active")
self.root = LBRYindex(ui_path) self.root = LBRYindex(ui_path)
self._api = Daemon(self.root) self._api = Daemon(self.root)
self.root.putChild("view", HostedEncryptedFile(self._api)) self.root.putChild("view", HostedEncryptedFile(self._api))