Commit 52318cbd by rfkelly0

remove debugging prints

parent 6ea42bbc
...@@ -168,7 +168,7 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS): ...@@ -168,7 +168,7 @@ class OSFS(OSFSXAttrMixin, OSFSWatchMixin, FS):
prefix += os.path.sep prefix += os.path.sep
if not os.path.normcase(path).startswith(prefix): if not os.path.normcase(path).startswith(prefix):
raise ValueError("path not within this FS: %s (%s)" % (os.path.normcase(path),prefix)) raise ValueError("path not within this FS: %s (%s)" % (os.path.normcase(path),prefix))
return path[len(self.root_path):] return normpath(path[len(self.root_path):])
def getmeta(self, meta_name, default=NoDefaultMeta): def getmeta(self, meta_name, default=NoDefaultMeta):
......
...@@ -70,7 +70,6 @@ class LimitSizeFS(WrapFS): ...@@ -70,7 +70,6 @@ class LimitSizeFS(WrapFS):
self._set_file_size(path,None,1) self._set_file_size(path,None,1)
else: else:
self.cur_size -= size self.cur_size -= size
print "OPEN, SIZE NOW", self.cur_size
size = 0 size = 0
self._set_file_size(path,0,1) self._set_file_size(path,0,1)
return LimitSizeFile(f,mode,size,self,path) return LimitSizeFile(f,mode,size,self,path)
...@@ -115,27 +114,21 @@ class LimitSizeFS(WrapFS): ...@@ -115,27 +114,21 @@ class LimitSizeFS(WrapFS):
with self._size_lock: with self._size_lock:
try: try:
(cur_size,_) = self._file_sizes[path] (cur_size,_) = self._file_sizes[path]
print "...LOADED", cur_size
except KeyError: except KeyError:
print "...NOT LOADED"
try: try:
cur_size = self.getsize(path) cur_size = self.getsize(path)
except ResourceNotFoundError: except ResourceNotFoundError:
cur_size = 0 cur_size = 0
self._set_file_size(path,cur_size,1) self._set_file_size(path,cur_size,1)
print "WRITING", path, size, cur_size
diff = size - cur_size diff = size - cur_size
if diff > 0: if diff > 0:
if self.cur_size + diff > self.max_size: if self.cur_size + diff > self.max_size:
raise StorageSpaceError("write") raise StorageSpaceError("write")
self.cur_size += diff self.cur_size += diff
print "WRITE, CUR SIZE NOW", self.cur_size
self._set_file_size(path,size) self._set_file_size(path,size)
print self._file_sizes[path]
return size return size
elif diff < 0 and shrink: elif diff < 0 and shrink:
self.cur_size += diff self.cur_size += diff
print "WRITE, CUR SIZE NOW", self.cur_size
self._set_file_size(path,size) self._set_file_size(path,size)
return size return size
else: else:
...@@ -164,7 +157,6 @@ class LimitSizeFS(WrapFS): ...@@ -164,7 +157,6 @@ class LimitSizeFS(WrapFS):
size = self.getsize(path) size = self.getsize(path)
super(LimitSizeFS,self).remove(path) super(LimitSizeFS,self).remove(path)
self.cur_size -= size self.cur_size -= size
print "REMOVE, SIZE NOW", self.cur_size
self._file_sizes.pop(path,None) self._file_sizes.pop(path,None)
def removedir(self, path, recursive=False, force=False): def removedir(self, path, recursive=False, force=False):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment