From a2350fd53908d8a0719ef2b8045efa1ed46886d1 Mon Sep 17 00:00:00 2001
From: Zestyr <zestyr@protonmail.com>
Date: Mon, 3 Jul 2017 20:29:58 +0200
Subject: [PATCH] Clean up legacy code

---
 lbrynet/daemon/Downloader.py                 |  2 --
 lbrynet/daemon/FileStreamer.py               | 14 +-------------
 lbrynet/daemon/Resources.py                  | 11 -----------
 lbrynet/daemon/daemon_scripts/Autofetcher.py | 13 +++----------
 4 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/lbrynet/daemon/Downloader.py b/lbrynet/daemon/Downloader.py
index 14f570ffc..488f02886 100644
--- a/lbrynet/daemon/Downloader.py
+++ b/lbrynet/daemon/Downloader.py
@@ -56,7 +56,6 @@ class GetStream(object):
         # fired after the metadata and the first data blob have been downloaded
         self.data_downloading_deferred = defer.Deferred(None)
 
-
     @property
     def download_path(self):
         return os.path.join(self.download_directory, self.downloader.file_name)
@@ -211,4 +210,3 @@ class GetStream(object):
             raise
 
         defer.returnValue((self.downloader, self.finished_deferred))
-
diff --git a/lbrynet/daemon/FileStreamer.py b/lbrynet/daemon/FileStreamer.py
index 4f8c4db94..bff4926ad 100644
--- a/lbrynet/daemon/FileStreamer.py
+++ b/lbrynet/daemon/FileStreamer.py
@@ -1,24 +1,14 @@
 import logging
-import os
-import sys
 import mimetypes
 
-from appdirs import user_data_dir
 from zope.interface import implements
 from twisted.internet import defer, error, interfaces, abstract, task, reactor
 
 
-# TODO: omg, this code is essentially duplicated in Daemon
-if sys.platform != "darwin":
-    data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
-else:
-    data_dir = user_data_dir("LBRY")
-if not os.path.isdir(data_dir):
-    os.mkdir(data_dir)
-
 log = logging.getLogger(__name__)
 STATUS_FINISHED = 'finished'
 
+
 class EncryptedFileStreamer(object):
     """
     Writes LBRY stream to request; will pause to wait for new data if the file
@@ -31,7 +21,6 @@ class EncryptedFileStreamer(object):
 
     bufferSize = abstract.FileDescriptor.bufferSize
 
-
     # How long to wait between sending blocks (needed because some
     # video players freeze up if you try to send data too fast)
     stream_interval = 0.005
@@ -39,7 +28,6 @@ class EncryptedFileStreamer(object):
     # How long to wait before checking if new data has been appended to the file
     new_data_check_interval = 0.25
 
-
     def __init__(self, request, path, stream, file_manager):
         def _set_content_length_header(length):
             self._request.setHeader('content-length', length)
diff --git a/lbrynet/daemon/Resources.py b/lbrynet/daemon/Resources.py
index 9abe612b5..c6918b057 100644
--- a/lbrynet/daemon/Resources.py
+++ b/lbrynet/daemon/Resources.py
@@ -2,26 +2,15 @@ import logging
 import os
 import shutil
 import json
-import sys
 import tempfile
 
 
-from appdirs import user_data_dir
 from twisted.web import server, static, resource
 from twisted.internet import defer, error
 
 from lbrynet import conf
 from lbrynet.daemon.FileStreamer import EncryptedFileStreamer
 
-# TODO: omg, this code is essentially duplicated in Daemon
-
-if sys.platform != "darwin":
-    data_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
-else:
-    data_dir = user_data_dir("LBRY")
-if not os.path.isdir(data_dir):
-    os.mkdir(data_dir)
-
 log = logging.getLogger(__name__)
 
 
diff --git a/lbrynet/daemon/daemon_scripts/Autofetcher.py b/lbrynet/daemon/daemon_scripts/Autofetcher.py
index fc73373f2..1cba26d3c 100644
--- a/lbrynet/daemon/daemon_scripts/Autofetcher.py
+++ b/lbrynet/daemon/daemon_scripts/Autofetcher.py
@@ -1,21 +1,14 @@
 import json
 import logging.handlers
-import sys
 import os
 
-from appdirs import user_data_dir
 from twisted.internet.task import LoopingCall
 from twisted.internet import reactor
+from lbrynet import conf
 
 
-if sys.platform != "darwin":
-    log_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
-else:
-    log_dir = user_data_dir("LBRY")
-
-if not os.path.isdir(log_dir):
-    os.mkdir(log_dir)
-
+conf.initialize_settings()
+log_dir = conf.settings['data_dir']
 LOG_FILENAME = os.path.join(log_dir, 'lbrynet-daemon.log')
 
 if os.path.isfile(LOG_FILENAME):