[Sync] refactoring, removed old code, cleanup

utils/Sync/sync/data/__init__.py

@@ -1,10 +1,7 @@
 import os
 from io import BytesIO
 
-import requests
-
-import settings
-from utils.fn import combine, lmap
+from utils.fn import combine
 
 
 class Provider:
@@ -61,16 +58,11 @@ def scan_subdirs(provider, ext, path='.'):
     :return: list of files relative to provider.root
     """
     items = provider.scan(path)
-    items = list(filter(
+    items = filter(
         lambda i: provider.is_dir(i),
         items
-    ))
-
-    items = lmap(
-        lambda folder: provider.type_filter(folder, ext),
-        items
     )
-
+    items = [provider.type_filter(folder, ext) for folder in items]
     items = combine(items)
     return items
 
@@ -82,7 +74,5 @@ def get_data(provider, path, transform):
 
 def list_images(provider, path):
     image_types = ['.jpg', '.JPG', '.png', '.PNG']
-    return combine(lmap(
-        lambda ext: provider.type_filter(path, ext),
-        image_types
-    ))
+    images = [provider.type_filter(path, ext) for ext in image_types]
+    return combine(images)

utils/Sync/sync/data/fs.py

@@ -4,7 +4,6 @@ from glob import glob
 from shutil import copyfile
 
 from sync.data import Provider
-from utils.fn import lmap
 from utils.hash import hash_file
 
 
@@ -18,7 +17,8 @@ class FSProvider(Provider):
         return [self.get_rel(path) for path in paths]
 
     def glob(self, pattr):
-        return lmap(self.get_rel, glob(self.get_abs(pattr)))
+        items = glob(self.get_abs(pattr))
+        return [self.get_rel(i) for i in items]
 
     def type_filter(self, path, ext):
         return list(filter(

utils/Sync/sync/data/yandexdisk.py

@@ -8,7 +8,6 @@ from tempfile import mkstemp
 import requests
 
 from sync.data import Provider
-from utils.fn import lmap
 from yandexdisk import YDClient
 
 
@@ -34,7 +33,7 @@ class YDProvider(Provider):
             lambda fp: re.sub('disk:', '', fp),
             files
         )
-        return lmap(self.get_rel, files)
+        return [self.get_rel(i) for i in files]
 
     def glob(self, pattr):
         return []