Merge pull request #136 from developmentseed/update_join

better handle url joins to a fix error on Windows

.travis.yml

@@ -20,6 +20,9 @@ after_success:
 - docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
 - docker push developmentseed/landsat-util:travis
 
+before_deploy:
+  - pip install twine
+
 deploy:
   provider: pypi
   user: devseed

landsat/__init__.py

@@ -1 +1 @@
-__version__ = '0.10b2'
+__version__ = '0.10b3'

landsat/downloader.py

@@ -5,7 +5,7 @@
 from homura import download as fetch
 import requests
 
-from utils import check_create_folder
+from utils import check_create_folder, url_builder
 from mixins import VerbosityMixin
 import settings
 
@@ -192,7 +192,7 @@ def google_storage_url(self, sat):
             (String) The URL to a google storage file
         """
         filename = sat['scene'] + '.tar.bz'
-        return join(self.google, sat['sat'], sat['path'], sat['row'], filename)
+        return url_builder([self.google, sat['sat'], sat['path'], sat['row'], filename])
 
     def amazon_s3_url(self, sat, filename):
         """
@@ -210,7 +210,7 @@ def amazon_s3_url(self, sat, filename):
         :returns:
             (String) The URL to a S3 file
         """
-        return join(self.s3, sat['sat'], sat['path'], sat['row'], sat['scene'], filename)
+        return url_builder([self.s3, sat['sat'], sat['path'], sat['row'], sat['scene'], filename])
 
     def remote_file_exists(self, url):
         """ Checks whether the remote file exists.
@@ -284,4 +284,4 @@ def scene_interpreter(self, scene):
 
     d = Downloader()
 
-    # d.download(['LC81990242015046LGN00', 'LC80030172015001LGN00'])
+    # d.download(['LC81990242015046LGN00', 'LC80030172015001LGN00'])

landsat/utils.py

@@ -391,3 +391,17 @@ def adjust_bounding_box(bounds1, bounds2):
         new_bounds[3] = bounds1[3]
 
     return tuple(new_bounds)
+
+
+def remove_slash(value):
+
+    assert(isinstance(value, str))
+    return re.sub('(^\/|\/$)', '', value)
+
+
+def url_builder(segments):
+
+    # Only accept list or tuple
+    assert((isinstance(segments, list) or isinstance(segments, tuple)))
+    return "/".join([remove_slash(s) for s in segments])
+

tests/test_utils.py

@@ -175,6 +175,16 @@ def test_adjust_bounding_box(self):
 
         self.assertEqual(utils.adjust_bounding_box(origin, target), origin)
 
+    def test_url_builder(self):
+
+        self.assertEqual('http://example.com/segment1/segment2',
+                         utils.url_builder(['/http://example.com', 'segment1/', '/segment2']))
+
+        self.assertEqual('http://example.com/segment1/segment2',
+                         utils.url_builder(('/http://example.com', 'segment1/', '/segment2',)))
+
+        with self.assertRaises(AssertionError):
+            utils.url_builder('example.com')
 
 if __name__ == '__main__':
     unittest.main()