From 17ffcea10fc12e7e92b8a21db2ce5634e729e93f Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@nevesomo.com>
Date: Mon, 19 Jun 2017 18:13:55 -0700
Subject: [PATCH] Error when syncing data subfolders. Close #94

---
 dvc/data_cloud.py | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/dvc/data_cloud.py b/dvc/data_cloud.py
index f0752574c..a14221bf6 100644
--- a/dvc/data_cloud.py
+++ b/dvc/data_cloud.py
@@ -1,20 +1,19 @@
 import base64
 import hashlib
 import os
+import threading
 import configparser
 import shutil
 
 from boto.s3.connection import S3Connection
 from google.cloud import storage as gc
 
-from dvc.command.base import CmdBase, DvcLock
 from dvc.logger import Logger
 from dvc.exceptions import DvcException
-from dvc.runtime import Runtime
-from dvc.system import System
 from dvc.config import ConfigError
 from dvc.settings import Settings
 
+
 class DataCloudError(DvcException):
     def __init__(self, msg):
         super(DataCloudError, self).__init__('Data sync error: {}'.format(msg))
@@ -47,6 +46,7 @@ class DataCloudBase(object):
         self._settings = settings
         self._config = config
         self._cloud_config = cloud_config
+        self._lock = threading.Lock()
 
     @property
     def storage_path(self):
@@ -97,8 +97,25 @@ class DataCloudBase(object):
         if os.path.isfile(item.resolved_cache.dvc):
             self.sync_to_cloud(item)
         else:
+            self.create_directory(fname, item)
             self.sync_from_cloud(item)
 
+    def create_directory(self, fname, item):
+        self._lock.acquire()
+        try:
+            dir = os.path.dirname(item.cache.relative)
+            if not os.path.exists(dir):
+                Logger.debug(u'Creating directory {}'.format(dir))
+                try:
+                    os.makedirs(dir)
+                except OSError as ex:
+                    raise DataCloudError(u'Cannot create directory {}: {}'.format(dir, ex))
+            elif not os.path.isdir(dir):
+                msg = u'File {} cannot be synced because {} is not a directory'
+                raise DataCloudError(msg.format(fname, dir))
+        finally:
+            self._lock.release()
+
     def remove_from_cloud(self, item):
         pass
 
@@ -116,6 +133,7 @@ class DataCloudLOCAL(DataCloudBase):
         Logger.debug('rm from cloud ' + item.resolved_cache.dvc)
         os.remove(item.resolved_cache.dvc)
 
+
 class DataCloudAWS(DataCloudBase):
     """ DataCloud class for Amazon Web Services """
     @property