sdether
diff --git a/‎MongoDB.Driver.GridFS/GridFile.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFile.cs
+1-4Lines changed: 1 addition & 4 deletions b/‎MongoDB.Driver.GridFS/GridFile.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFile.cs
+1-4Lines changed: 1 addition & 4 deletions
diff --git a/‎MongoDB.Driver.GridFS/GridFileInfo.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFileInfo.cs
+24-4Lines changed: 24 additions & 4 deletions b/‎MongoDB.Driver.GridFS/GridFileInfo.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFileInfo.cs
+24-4Lines changed: 24 additions & 4 deletions
diff --git a/‎MongoDB.Driver.GridFS/GridFileStream.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFileStream.cs
+2-4Lines changed: 2 additions & 4 deletions b/‎MongoDB.Driver.GridFS/GridFileStream.cs
Copy file name to clipboardExpand all lines: MongoDB.Driver.GridFS/GridFileStream.cs
+2-4Lines changed: 2 additions & 4 deletions
@@ -6,10 +6,7 @@
 namespace MongoDB.Driver.GridFS
 {
     public class GridFile{
-        
-        private const int DEFAULT_CHUNKSIZE = 256 * 1024;
-        private const string DEFAULT_CONTENT_TYPE = "text/plain";
-        
+
         private Database db;
 
         private string name;
 
@@ -9,12 +9,14 @@ namespace MongoDB.Driver.GridFS
     /// Provides instance methods for the creation, copying, deletion, moving, and opening of files, 
     /// and aids in the creation of GridFileStream objects.  It also contains 
     /// </summary>
-    public sealed class GridFileInfo
+    public class GridFileInfo
     {
         private const int DEFAULT_CHUNKSIZE = 256 * 1024;
         private const string DEFAULT_CONTENT_TYPE = "text/plain";
 
         private GridFile gridFile;
+        private Database db;
+        private string bucket;
 
 
         #region "filedata properties"
@@ -67,13 +69,17 @@ public string Md5{
         #endregion
 
         public GridFileInfo(Database db, string bucket, string filename){
+            this.db = db;
+            this.bucket = bucket;
             this.gridFile = new GridFile(db,bucket);
             SetFileDataDefaults(filename);
             this.ContentType = DEFAULT_CONTENT_TYPE;
             if(gridFile.Exists(filename)) this.LoadFileData();
         }
 
         public GridFileInfo(Database db, string filename){
+            this.db = db;
+            this.bucket = "fs";
             this.gridFile = new GridFile(db);
             SetFileDataDefaults(filename);
             if(gridFile.Exists(filename)) this.LoadFileData();
@@ -139,12 +145,21 @@ public GridFileStream Open(FileMode mode, FileAccess access){
                 case FileMode.Create:
                 case FileMode.CreateNew:
                     return this.Create(mode, access);
+                case FileMode.Open:
+                    LoadFileData();
+                    return new GridFileStream(this,this.gridFile.Files, this.gridFile.Chunks, access);
+                case FileMode.OpenOrCreate:
+                    if(gridFile.Exists(this.FileName) == false) return this.Create(mode, access);
+                    LoadFileData();
+                    return new GridFileStream(this, this.gridFile.Files, this.gridFile.Chunks, access);
                 case FileMode.Truncate:
                     this.Truncate();
                     return new GridFileStream(this,this.gridFile.Files, this.gridFile.Chunks, access);
-                case FileMode.Open:
+                case FileMode.Append:
                     LoadFileData();
-                    return new GridFileStream(this,this.gridFile.Files, this.gridFile.Chunks, access);
+                    GridFileStream gfs = new GridFileStream(this,this.gridFile.Files, this.gridFile.Chunks, access);
+                    gfs.Seek(0,SeekOrigin.End);
+                    return gfs;
             }
             throw new NotImplementedException("Not all modes are implemented yet.");
         }
@@ -167,7 +182,12 @@ public void Truncate(){
             this.Length = 0;
             this.gridFile.Files.Update(filedata);
         }
-        
+
+        public string CalcMD5(){
+            Document doc = this.db.SendCommand(new Document().Append("filemd5", this.Id).Append("root",this.bucket));
+            return (String)doc["md5"];
+        }
+
         private void LoadFileData(){
             Document doc = this.gridFile.Files.FindOne(new Document().Append("filename",this.FileName));
             if(doc != null){
 
@@ -12,10 +12,6 @@ namespace MongoDB.Driver.GridFS
     /// </summary>
     public class GridFileStream : Stream
     {
-//        public static String CHUNKID = "_id";
-//        public static String CHUNKFILESID = "files_id";
-//        public static String CHUNKN = "n";
-//        public static String CHUNKDATA = "data";
 
         private IMongoCollection files;
         private IMongoCollection chunks;
@@ -279,6 +275,8 @@ public override void Close(){
             this.Flush();
             //Should update more gridFileInfo statistics.
             gridFileInfo.Length = highestPosWritten;
+            string md5 = gridFileInfo.CalcMD5();
+            gridFileInfo.Md5 = md5;
             this.files.Update(gridFileInfo.ToDocument());
             base.Close();
         }