encdetect in synchro, imports cleanup

sc0ty · Jul 10, 2019 · 7ebe137 · 7ebe137
1 parent d467867
commit 7ebe137
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/subsync/cmdargs.py b/subsync/cmdargs.py
@@ -1,5 +1,4 @@
 import argparse
-from subsync.synchro import SyncTask, SyncTaskList, SubFile, RefFile, OutputFile, ChannelsMap
 import re
 
 
@@ -21,6 +20,8 @@ def parseSettingsArgs(args):
 
 
 def parseSyncArgs(args):
+    from subsync.synchro import SyncTask, SubFile, RefFile, OutputFile, ChannelsMap
+
     sub = SubFile(path=args.sub)
     if args.sub_stream is not None:
         sub.select(args.sub_stream - 1)
@@ -39,6 +40,7 @@ def parseSyncArgs(args):
 
 
 def parseBatchArgs(args):
+    from subsync.synchro import SyncTaskList
     return SyncTaskList.load(args.batch)
 
 

diff --git a/subsync/synchro/__init__.py b/subsync/synchro/__init__.py
@@ -4,11 +4,8 @@
 from subsync.synchro.output import OutputFile
 from subsync.synchro.channels import ChannelsMap
 
-Synchronizer = Synchronizer
-SyncTask = SyncTask
-SyncTaskList = SyncTaskList
-InputFile = InputFile
-SubFile = SubFile
-RefFile = RefFile
-OutputFile = OutputFile
-ChannelsMap = ChannelsMap
+__all__ = [
+        'Synchronizer',
+        'SyncTask', 'SyncTaskList',
+        'InputFile', 'SubFile', 'RefFile', 'OutputFile',
+        'ChannelsMap' ]
diff --git a/subsync/encdetect.py → subsync/synchro/encdetect.py b/subsync/encdetect.py → subsync/synchro/encdetect.py
diff --git a/subsync/synchro/synchronizer.py b/subsync/synchro/synchronizer.py
@@ -3,7 +3,7 @@
 from subsync import subtitle
 from subsync.settings import settings
 from subsync.synchro import dictionary
-from subsync import encdetect
+from subsync.synchro import encdetect
 import threading
 import multiprocessing
 from collections import namedtuple