AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-08-06 13:23:03 +02:00
commit 37e3eb93bd
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/li/cil/oc/server/fs/Capacity.scala
View File

@ -26,7 +26,7 @@ trait Capacity extends OutputStreamFileSystem {
override def delete(path: String) = {
val freed = Settings.get.fileCost + size(path)
if (super.delete(path)) {
used -= freed
used = math.max(0, used - freed)
true
}
else false
@ -45,6 +45,13 @@ trait Capacity extends OutputStreamFileSystem {
// ----------------------------------------------------------------------- //
override def close() {
super.close()
used = computeSize("/")
}
// ----------------------------------------------------------------------- //
override def load(nbt: NBTTagCompound) {
try {
ignoreCapacity = true
@ -52,6 +59,8 @@ trait Capacity extends OutputStreamFileSystem {
} finally {
ignoreCapacity = false
}
used = computeSize("/")
}
override def save(nbt: NBTTagCompound) {
@ -78,7 +87,7 @@ trait Capacity extends OutputStreamFileSystem {
super.openOutputHandle(id, path, mode) match {
case None => None
case Some(stream) =>
used += delta
used = math.max(0, used + delta)
if (mode == Mode.Append) {
stream.seek(stream.length())
}

2
src/main/scala/li/cil/oc/server/fs/FileSystem.scala
View File

@ -143,8 +143,8 @@ object FileSystem extends api.detail.FileSystemAPI {
private class RamFileSystem(protected val capacity: Long)
extends VirtualFileSystem
with Capacity
with Volatile
with Capacity
private class BufferedFileSystem(protected val fileRoot: io.File, protected val capacity: Long)
extends VirtualFileSystem