heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possibly_localize_file->localized_file... a bit less terribly long.

Browse Source
This commit is contained in:
Christopher Allan Webber 2011-06-11 21:23:32 -05:00
parent ca030ab6cd
commit 68ffb13690
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/process_media/__init__.py
View File

@ -32,7 +32,7 @@ def process_media_initial(media_id):
{'_id': ObjectId(media_id)}) {'_id': ObjectId(media_id)})
queued_filepath = entry['queued_media_file'] queued_filepath = entry['queued_media_file']
queued_filename = mg_globals.workbench_manager.possibly_localize_file( queued_filename = mg_globals.workbench_manager.localized_file(
workbench, mg_globals.queue_store, queued_filepath, workbench, mg_globals.queue_store, queued_filepath,
'source') 'source')

10
mediagoblin/tests/test_workbench.py
View File

@ -54,7 +54,7 @@ class TestWorkbench(object):
self.workbench_manager.destroy_workbench, self.workbench_manager.destroy_workbench,
dont_kill_this) dont_kill_this)
def test_possibly_localize_file(self): def test_localized_file(self):
tmpdir, this_storage = get_tmp_filestorage() tmpdir, this_storage = get_tmp_filestorage()
this_workbench = self.workbench_manager.create_workbench() this_workbench = self.workbench_manager.create_workbench()
@ -65,7 +65,7 @@ class TestWorkbench(object):
our_file.write('Our file') our_file.write('Our file')
# with a local file storage # with a local file storage
filename = self.workbench_manager.possibly_localize_file( filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath) this_workbench, this_storage, filepath)
assert filename == os.path.join( assert filename == os.path.join(
tmpdir, 'dir1/dir2/ourfile.txt') tmpdir, 'dir1/dir2/ourfile.txt')
@ -77,20 +77,20 @@ class TestWorkbench(object):
with this_storage.get_file(filepath, 'w') as our_file: with this_storage.get_file(filepath, 'w') as our_file:
our_file.write('Our file') our_file.write('Our file')
filename = self.workbench_manager.possibly_localize_file( filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath) this_workbench, this_storage, filepath)
assert filename == os.path.join( assert filename == os.path.join(
this_workbench, 'ourfile.txt') this_workbench, 'ourfile.txt')
# fake remote file storage, filename_if_copying set # fake remote file storage, filename_if_copying set
filename = self.workbench_manager.possibly_localize_file( filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath, 'thisfile') this_workbench, this_storage, filepath, 'thisfile')
assert filename == os.path.join( assert filename == os.path.join(
this_workbench, 'thisfile.txt') this_workbench, 'thisfile.txt')
# fake remote file storage, filename_if_copying set, # fake remote file storage, filename_if_copying set,
# keep_extension_if_copying set to false # keep_extension_if_copying set to false
filename = self.workbench_manager.possibly_localize_file( filename = self.workbench_manager.localized_file(
this_workbench, this_storage, filepath, 'thisfile.text', False) this_workbench, this_storage, filepath, 'thisfile.text', False)
assert filename == os.path.join( assert filename == os.path.join(
this_workbench, 'thisfile.text') this_workbench, 'thisfile.text')

14
mediagoblin/workbench.py
View File

@ -70,9 +70,9 @@ class WorkbenchManager(object):
shutil.rmtree(workbench) shutil.rmtree(workbench)
def possibly_localize_file(self, workbench, storage, filepath, def localized_file(self, workbench, storage, filepath,
filename_if_copying=None, filename_if_copying=None,
keep_extension_if_copying=True): keep_extension_if_copying=True):
""" """
Possibly localize the file from this storage system (for read-only Possibly localize the file from this storage system (for read-only
purposes, modifications should be written to a new file.). purposes, modifications should be written to a new file.).
@ -93,22 +93,22 @@ class WorkbenchManager(object):
localized_filename localized_filename
Examples: Examples:
>>> wb_manager.possibly_localize_file( >>> wb_manager.localized_file(
... '/our/workbench/subdir', local_storage, ... '/our/workbench/subdir', local_storage,
... ['path', 'to', 'foobar.jpg']) ... ['path', 'to', 'foobar.jpg'])
u'/local/storage/path/to/foobar.jpg' u'/local/storage/path/to/foobar.jpg'
>>> wb_manager.possibly_localize_file( >>> wb_manager.localized_file(
... '/our/workbench/subdir', remote_storage, ... '/our/workbench/subdir', remote_storage,
... ['path', 'to', 'foobar.jpg']) ... ['path', 'to', 'foobar.jpg'])
'/our/workbench/subdir/foobar.jpg' '/our/workbench/subdir/foobar.jpg'
>>> wb_manager.possibly_localize_file( >>> wb_manager.localized_file(
... '/our/workbench/subdir', remote_storage, ... '/our/workbench/subdir', remote_storage,
... ['path', 'to', 'foobar.jpg'], 'source.jpeg', False) ... ['path', 'to', 'foobar.jpg'], 'source.jpeg', False)
'/our/workbench/subdir/foobar.jpeg' '/our/workbench/subdir/foobar.jpeg'
>>> wb_manager.possibly_localize_file( >>> wb_manager.localized_file(
... '/our/workbench/subdir', remote_storage, ... '/our/workbench/subdir', remote_storage,
... ['path', 'to', 'foobar.jpg'], 'source', True) ... ['path', 'to', 'foobar.jpg'], 'source', True)
'/our/workbench/subdir/foobar.jpg' '/our/workbench/subdir/foobar.jpg'