matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update api and filesystem modules to new os_specifics

Browse Source 
renames
This commit is contained in:
Roberto Rosario
2011-11-30 09:33:32 -04:00
parent a646997ab8
commit 1e22d1099e
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/document_indexing/filesystem.py
View File

@@ -3,7 +3,8 @@ import os
from django.utils.translation import ugettext_lazy as _
from document_indexing.os_agnostic import assemble_document_filename
from document_indexing.os_specifics import (assemble_suffixed_filename,
assemble_path_from_list)
from document_indexing.conf.settings import FILESERVING_ENABLE
from document_indexing.conf.settings import FILESERVING_PATH
@@ -19,12 +20,12 @@ def get_instance_path(index_instance):
names.append(index_instance.value)
return os.sep.join(names)
return assemble_path_from_list(names)
def fs_create_index_directory(index_instance):
if FILESERVING_ENABLE:
target_directory = os.path.join(FILESERVING_PATH, get_instance_path(index_instance))
target_directory = assemble_path_from_list([FILESERVING_PATH, get_instance_path(index_instance)])
try:
os.mkdir(target_directory)
except OSError, exc:
@@ -36,8 +37,9 @@ def fs_create_index_directory(index_instance):
def fs_create_document_link(index_instance, document, suffix=0):
if FILESERVING_ENABLE:
filename = assemble_document_filename(document.file_filename, suffix)
filepath = os.path.join(FILESERVING_PATH, get_instance_path(index_instance), filename)
filename = assemble_suffixed_filename(document.file.name, suffix)
filepath = assemble_path_from_list([FILESERVING_PATH, get_instance_path(index_instance), filename])
try:
os.symlink(document.file.path, filepath)
except OSError, exc:
@@ -55,8 +57,8 @@ def fs_create_document_link(index_instance, document, suffix=0):
def fs_delete_document_link(index_instance, document, suffix=0):
if FILESERVING_ENABLE:
filename = assemble_document_filename(document.file_filename, suffix)
filepath = os.path.join(FILESERVING_PATH, get_instance_path(index_instance), filename)
filename = assemble_suffixed_filename(document.file.name, suffix)
filepath = assemble_path_from_list([FILESERVING_PATH, get_instance_path(index_instance), filename])
try:
os.unlink(filepath)
@@ -68,7 +70,7 @@ def fs_delete_document_link(index_instance, document, suffix=0):
def fs_delete_index_directory(index_instance):
if FILESERVING_ENABLE:
target_directory = os.path.join(FILESERVING_PATH, get_instance_path(index_instance))
target_directory = assemble_path_from_list([FILESERVING_PATH, get_instance_path(index_instance)])
try:
os.removedirs(target_directory)
except OSError, exc: