From eba74b97bd640b2cb707ef356fef4e5d818af827 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Sun, 25 Jun 2017 21:04:04 -0400 Subject: [PATCH] rename lbrynet.lbryfilemanager to lbrynet.file_manager --- .../{lbryfilemanager => file_manager}/EncryptedFileCreator.py | 0 .../EncryptedFileDownloader.py | 2 +- .../{lbryfilemanager => file_manager}/EncryptedFileManager.py | 4 ++-- .../EncryptedFileStatusReport.py | 0 lbrynet/{lbryfilemanager => file_manager}/__init__.py | 0 lbrynet/lbrynet_daemon/Daemon.py | 2 +- lbrynet/lbrynet_daemon/Downloader.py | 4 ++-- lbrynet/lbrynet_daemon/Publisher.py | 2 +- tests/functional/test_misc.py | 4 ++-- tests/functional/test_reflector.py | 4 ++-- tests/functional/test_streamify.py | 4 ++-- tests/unit/lbryfilemanager/test_EncryptedFileCreator.py | 4 ++-- tests/unit/lbryfilemanager/test_EncryptedFileManager.py | 4 ++-- tests/unit/lbrynet_daemon/test_Downloader.py | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileCreator.py (100%) rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileDownloader.py (98%) rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileManager.py (98%) rename lbrynet/{lbryfilemanager => file_manager}/EncryptedFileStatusReport.py (100%) rename lbrynet/{lbryfilemanager => file_manager}/__init__.py (100%) diff --git a/lbrynet/lbryfilemanager/EncryptedFileCreator.py b/lbrynet/file_manager/EncryptedFileCreator.py similarity index 100% rename from lbrynet/lbryfilemanager/EncryptedFileCreator.py rename to lbrynet/file_manager/EncryptedFileCreator.py diff --git a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py b/lbrynet/file_manager/EncryptedFileDownloader.py similarity index 98% rename from lbrynet/lbryfilemanager/EncryptedFileDownloader.py rename to lbrynet/file_manager/EncryptedFileDownloader.py index 754f700fd..0850086e8 100644 --- a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py +++ b/lbrynet/file_manager/EncryptedFileDownloader.py @@ -12,7 +12,7 @@ from lbrynet.core.utils import short_hash from lbrynet.core.StreamDescriptor import StreamMetadata from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileSaver from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileDownloader -from lbrynet.lbryfilemanager.EncryptedFileStatusReport import EncryptedFileStatusReport +from lbrynet.file_manager.EncryptedFileStatusReport import EncryptedFileStatusReport from lbrynet.interfaces import IStreamDownloaderFactory from lbrynet.lbry_file.StreamDescriptor import save_sd_info from lbrynet.core.Wallet import ClaimOutpoint diff --git a/lbrynet/lbryfilemanager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py similarity index 98% rename from lbrynet/lbryfilemanager/EncryptedFileManager.py rename to lbrynet/file_manager/EncryptedFileManager.py index ca5b5e350..914cfd242 100644 --- a/lbrynet/lbryfilemanager/EncryptedFileManager.py +++ b/lbrynet/file_manager/EncryptedFileManager.py @@ -11,8 +11,8 @@ from twisted.python.failure import Failure from lbrynet.reflector.reupload import reflect_stream from lbrynet.core.PaymentRateManager import NegotiatedPaymentRateManager -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType from lbrynet.cryptstream.client.CryptStreamDownloader import AlreadyStoppedError from lbrynet.cryptstream.client.CryptStreamDownloader import CurrentlyStoppingError diff --git a/lbrynet/lbryfilemanager/EncryptedFileStatusReport.py b/lbrynet/file_manager/EncryptedFileStatusReport.py similarity index 100% rename from lbrynet/lbryfilemanager/EncryptedFileStatusReport.py rename to lbrynet/file_manager/EncryptedFileStatusReport.py diff --git a/lbrynet/lbryfilemanager/__init__.py b/lbrynet/file_manager/__init__.py similarity index 100% rename from lbrynet/lbryfilemanager/__init__.py rename to lbrynet/file_manager/__init__.py diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 2f4421c0b..9e6538c98 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -30,7 +30,7 @@ from lbrynet.lbry_file.client.EncryptedFileDownloader import EncryptedFileOpener from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager from lbrynet.lbry_file.StreamDescriptor import EncryptedFileStreamType -from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager +from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from lbrynet.lbrynet_daemon.Downloader import GetStream from lbrynet.lbrynet_daemon.Publisher import Publisher from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager diff --git a/lbrynet/lbrynet_daemon/Downloader.py b/lbrynet/lbrynet_daemon/Downloader.py index bec8a2667..a72f01423 100644 --- a/lbrynet/lbrynet_daemon/Downloader.py +++ b/lbrynet/lbrynet_daemon/Downloader.py @@ -7,8 +7,8 @@ from lbryschema.fee import Fee from lbrynet.core.Error import InsufficientFundsError, KeyFeeAboveMaxAllowed from lbrynet.core.StreamDescriptor import download_sd_blob -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader from lbrynet import conf INITIALIZING_CODE = 'initializing' diff --git a/lbrynet/lbrynet_daemon/Publisher.py b/lbrynet/lbrynet_daemon/Publisher.py index 24fa85f27..2d9d2eeb6 100644 --- a/lbrynet/lbrynet_daemon/Publisher.py +++ b/lbrynet/lbrynet_daemon/Publisher.py @@ -5,7 +5,7 @@ import os from twisted.internet import defer from lbrynet.core import file_utils -from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file +from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file from lbrynet.lbry_file.StreamDescriptor import publish_sd_blob diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py index 43b78bd70..77d912442 100644 --- a/tests/functional/test_misc.py +++ b/tests/functional/test_misc.py @@ -12,14 +12,14 @@ from Crypto.Hash import MD5 from lbrynet import conf from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager -from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager +from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from lbrynet.core.Session import Session from lbrynet.core.server.BlobAvailabilityHandler import BlobAvailabilityHandlerFactory from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader from lbrynet.core.StreamDescriptor import BlobStreamDescriptorWriter from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier from lbrynet.core.StreamDescriptor import download_sd_blob -from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file +from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier from lbrynet.lbry_file.StreamDescriptor import get_sd_info from twisted.internet import defer, threads, task diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py index c15e17c13..dc6b5d30f 100644 --- a/tests/functional/test_reflector.py +++ b/tests/functional/test_reflector.py @@ -15,8 +15,8 @@ from lbrynet.core import StreamDescriptor from lbrynet.dht.node import Node from lbrynet.lbry_file import EncryptedFileMetadataManager from lbrynet.lbry_file.client import EncryptedFileOptions -from lbrynet.lbryfilemanager import EncryptedFileCreator -from lbrynet.lbryfilemanager import EncryptedFileManager +from lbrynet.file_manager import EncryptedFileCreator +from lbrynet.file_manager import EncryptedFileManager from tests import mocks diff --git a/tests/functional/test_streamify.py b/tests/functional/test_streamify.py index 2dfadebff..289dbbf90 100644 --- a/tests/functional/test_streamify.py +++ b/tests/functional/test_streamify.py @@ -9,11 +9,11 @@ from twisted.internet import defer, threads from lbrynet import conf from lbrynet.lbry_file.EncryptedFileMetadataManager import TempEncryptedFileMetadataManager from lbrynet.lbry_file.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager -from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager +from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from lbrynet.core.Session import Session from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier from lbrynet.lbry_file import publish_sd_blob -from lbrynet.lbryfilemanager.EncryptedFileCreator import create_lbry_file +from lbrynet.file_manager.EncryptedFileCreator import create_lbry_file from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier from lbrynet.lbry_file.StreamDescriptor import get_sd_info from lbrynet.core.PeerManager import PeerManager diff --git a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py index 704274444..cb8f520af 100644 --- a/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py +++ b/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py @@ -9,8 +9,8 @@ from twisted.trial import unittest from lbrynet.core import BlobManager from lbrynet.core import Session from lbrynet.core.server import DHTHashAnnouncer -from lbrynet.lbryfilemanager import EncryptedFileCreator -from lbrynet.lbryfilemanager import EncryptedFileManager +from lbrynet.file_manager import EncryptedFileCreator +from lbrynet.file_manager import EncryptedFileManager from tests import mocks diff --git a/tests/unit/lbryfilemanager/test_EncryptedFileManager.py b/tests/unit/lbryfilemanager/test_EncryptedFileManager.py index babf9596b..18a4d696d 100644 --- a/tests/unit/lbryfilemanager/test_EncryptedFileManager.py +++ b/tests/unit/lbryfilemanager/test_EncryptedFileManager.py @@ -1,7 +1,7 @@ from twisted.internet import defer from twisted.trial import unittest -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloader -from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader +from lbrynet.file_manager.EncryptedFileManager import EncryptedFileManager from tests.util import random_lbry_hash class TestEncryptedFileManager(unittest.TestCase): diff --git a/tests/unit/lbrynet_daemon/test_Downloader.py b/tests/unit/lbrynet_daemon/test_Downloader.py index 7ead14280..836b363a0 100644 --- a/tests/unit/lbrynet_daemon/test_Downloader.py +++ b/tests/unit/lbrynet_daemon/test_Downloader.py @@ -12,7 +12,7 @@ from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier,StreamMetad from lbrynet.lbry_file.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier from lbrynet.core.HashBlob import TempBlob from lbrynet.core.BlobManager import TempBlobManager -from lbrynet.lbryfilemanager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory +from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet.lbrynet_daemon.ExchangeRateManager import ExchangeRateManager from tests.mocks import BlobAvailabilityTracker as DummyBlobAvailabilityTracker