andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utils: Add mkdir and content options to get_or_create_file

Browse Source 
This lets callers control is parent directories are created, and set the
default content of the file.
This commit is contained in:
Thomas Adamcik 2013-11-22 07:13:36 +01:00
parent 17a1336e5c
commit b22d7bee0b
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/utils/path.py
View File

@ -37,14 +37,17 @@ def get_or_create_dir(dir_path):
return dir_path return dir_path
def get_or_create_file(file_path): def get_or_create_file(file_path, mkdir=True, content=None):
if not isinstance(file_path, bytes): if not isinstance(file_path, bytes):
raise ValueError('Path is not a bytestring.') raise ValueError('Path is not a bytestring.')
file_path = expand_path(file_path) file_path = expand_path(file_path)
get_or_create_dir(os.path.dirname(file_path)) if mkdir:
get_or_create_dir(os.path.dirname(file_path))
if not os.path.isfile(file_path): if not os.path.isfile(file_path):
logger.info('Creating file %s', file_path) logger.info('Creating file %s', file_path)
open(file_path, 'w').close() with open(file_path, 'w') as fh:
if content:
fh.write(content)
return file_path return file_path

16
tests/utils/path_test.py
View File

@ -102,17 +102,29 @@ class GetOrCreateFileTest(unittest.TestCase):
def test_create_file_with_name_of_existing_dir_throws_ioerror(self): def test_create_file_with_name_of_existing_dir_throws_ioerror(self):
conflicting_dir = os.path.join(self.parent) conflicting_dir = os.path.join(self.parent)
self.assertRaises(IOError, path.get_or_create_file, conflicting_dir) with self.assertRaises(IOError):
path.get_or_create_file(conflicting_dir)
def test_create_dir_with_unicode(self): def test_create_dir_with_unicode(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
file_path = unicode(os.path.join(self.parent, b'test')) file_path = unicode(os.path.join(self.parent, b'test'))
path.get_or_create_file(file_path) path.get_or_create_file(file_path)
def test_create_dir_with_none(self): def test_create_file_with_none(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
path.get_or_create_file(None) path.get_or_create_file(None)
def test_create_dir_without_mkdir(self):
file_path = os.path.join(self.parent, b'foo', b'bar')
with self.assertRaises(IOError):
path.get_or_create_file(file_path, mkdir=False)
def test_create_dir_with_defualt_content(self):
file_path = os.path.join(self.parent, b'test')
created = path.get_or_create_file(file_path, content=b'foobar')
with open(created) as fh:
self.assertEqual(fh.read(), b'foobar')
class PathToFileURITest(unittest.TestCase): class PathToFileURITest(unittest.TestCase):
def test_simple_path(self): def test_simple_path(self):