Adds a VirtualPath property to IFile which is the relative path of the file to the root of the website.

Shazwazza · Shazwazza · commit 1f56607044c6 · 2014-12-22T15:14:16.000+11:00
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs
@@ -55,7 +55,7 @@ public virtual string Alias
         }
 
         /// <summary>
-        /// Gets or sets the Path to the File from the root of the site
+        /// Gets or sets the Path to the File from the root of the file's associated IFileSystem
         /// </summary>
         [DataMember]
         public virtual string Path
@@ -92,6 +92,11 @@ public virtual string Content
             }
         }
 
+        /// <summary>
+        /// Gets or sets the file's virtual path (i.e. the file path relative to the root of the website)
+        /// </summary>
+        public string VirtualPath { get; set; }
+
         /// <summary>
         /// Boolean indicating whether the file could be validated
         /// </summary>
diff --git a/src/Umbraco.Core/Models/IFile.cs b/src/Umbraco.Core/Models/IFile.cs
@@ -19,7 +19,7 @@ public interface IFile : IAggregateRoot
         string Alias { get; }
 
         /// <summary>
-        /// Gets or sets the Path to the File from the root of the site
+        /// Gets or sets the Path to the File from the root of the file's associated IFileSystem
         /// </summary>
         string Path { get; set; }
 
@@ -28,6 +28,11 @@ public interface IFile : IAggregateRoot
         /// </summary>
         string Content { get; set; }
 
+        /// <summary>
+        /// Gets or sets the file's virtual path (i.e. the file path relative to the root of the website)
+        /// </summary>
+        string VirtualPath { get; set; }
+
         /// <summary>
         /// Boolean indicating whether the file could be validated
         /// </summary>
diff --git a/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs b/src/Umbraco.Core/Persistence/Repositories/FileRepository.cs
@@ -140,6 +140,7 @@ protected virtual void PersistNewItem(TEntity entity)
                 //the id can be the hash
                 entity.Id = entity.Path.GetHashCode();
                 entity.Key = entity.Path.EncodeAsGuid();
+                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
             }
         }
 
@@ -153,6 +154,7 @@ protected virtual void PersistUpdatedItem(TEntity entity)
                 //the id can be the hash
                 entity.Id = entity.Path.GetHashCode();
                 entity.Key = entity.Path.EncodeAsGuid();
+                entity.VirtualPath = FileSystem.GetUrl(entity.Path);
             }
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs b/src/Umbraco.Core/Persistence/Repositories/PartialViewRepository.cs
@@ -39,14 +39,16 @@ public override PartialView Get(string id)
             var created = FileSystem.GetCreated(path).UtcDateTime;
             var updated = FileSystem.GetLastModified(path).UtcDateTime;
 
+
             var script = new PartialView(path)
             {
                 //id can be the hash
                 Id = path.GetHashCode(),
                 Content = content,
                 Key = path.EncodeAsGuid(),
                 CreateDate = created,
-                UpdateDate = updated
+                UpdateDate = updated,
+                VirtualPath = FileSystem.GetUrl(id)
             };
 
             //on initial construction we don't want to have dirty properties tracked
diff --git a/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ScriptRepository.cs
@@ -52,7 +52,8 @@ public override Script Get(string id)
                 Content = content,
                 Key = path.EncodeAsGuid(),
                 CreateDate = created,
-                UpdateDate = updated
+                UpdateDate = updated,
+                VirtualPath = FileSystem.GetUrl(id)
             };
 
             //on initial construction we don't want to have dirty properties tracked
diff --git a/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/StylesheetRepository.cs
@@ -18,10 +18,10 @@ internal class StylesheetRepository : FileRepository<string, Stylesheet>, IStyle
         private readonly IDatabaseUnitOfWork _dbwork;
 
         internal StylesheetRepository(IUnitOfWork work, IDatabaseUnitOfWork db, IFileSystem fileSystem)
-			: base(work, fileSystem)
-	    {
+            : base(work, fileSystem)
+        {
             _dbwork = db;
-	    }
+        }
 
         public StylesheetRepository(IUnitOfWork work, IDatabaseUnitOfWork db)
             : this(work, db, new PhysicalFileSystem(SystemDirectories.Css))
@@ -43,7 +43,7 @@ public override Stylesheet Get(string id)
             {
                 byte[] bytes = new byte[stream.Length];
                 stream.Position = 0;
-                stream.Read(bytes, 0, (int) stream.Length);
+                stream.Read(bytes, 0, (int)stream.Length);
                 content = Encoding.UTF8.GetString(bytes);
             }
 
@@ -52,20 +52,21 @@ public override Stylesheet Get(string id)
             var updated = FileSystem.GetLastModified(path).UtcDateTime;
 
             var stylesheet = new Stylesheet(path)
-                                 {
-                                     Content = content,
-                                     Key = path.EncodeAsGuid(),
-                                     CreateDate = created,
-                                     UpdateDate = updated,
-                                     Id = GetStylesheetId(path)
-                                 };
+            {
+                Content = content,
+                Key = path.EncodeAsGuid(),
+                CreateDate = created,
+                UpdateDate = updated,
+                Id = GetStylesheetId(path),
+                VirtualPath = FileSystem.GetUrl(id)
+            };
 
             //on initial construction we don't want to have dirty properties tracked
             // http://issues.umbraco.org/issue/U4-1946
             stylesheet.ResetDirtyProperties(false);
 
             return stylesheet;
-            
+
         }
 
         // Fix for missing Id's on FileService.GetStylesheets() call.  This is needed as sytlesheets can only bo loaded in the editor via 
@@ -77,8 +78,11 @@ private int GetStylesheetId(string path)
                 .Select("*")
                 .From<NodeDto>()
                 .Where("nodeObjectType = @NodeObjectType AND umbracoNode.text = @Alias",
-                    new { NodeObjectType = UmbracoObjectTypes.Stylesheet.GetGuid(), 
-                        Alias = path.TrimEnd(".css").Replace("\\", "/") });
+                    new
+                    {
+                        NodeObjectType = UmbracoObjectTypes.Stylesheet.GetGuid(),
+                        Alias = path.TrimEnd(".css").Replace("\\", "/")
+                    });
             var nodeDto = _dbwork.Database.FirstOrDefault<NodeDto>(sql);
             return nodeDto == null ? 0 : nodeDto.NodeId;
         }
@@ -90,7 +94,7 @@ private IEnumerable<Tuple<int, string>> GetStylesheetIds(string[] paths)
                 .Select("*")
                 .From<NodeDto>()
                 .Where("nodeObjectType = @NodeObjectType AND umbracoNode.text in (@aliases)",
-                    new 
+                    new
                     {
                         NodeObjectType = UmbracoObjectTypes.Stylesheet.GetGuid(),
                         aliases = paths.Select(x => x.TrimEnd(".css").Replace("\\", "/")).ToArray()

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public virtual string Alias`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// <summary>`
`58`		`- /// Gets or sets the Path to the File from the root of the site`
	`58`	`+ /// Gets or sets the Path to the File from the root of the file's associated IFileSystem`
`59`	`59`	`/// </summary>`
`60`	`60`	`[DataMember]`
`61`	`61`	`public virtual string Path`
`@@ -92,6 +92,11 @@ public virtual string Content`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ /// <summary>`
	`96`	`+ /// Gets or sets the file's virtual path (i.e. the file path relative to the root of the website)`
	`97`	`+ /// </summary>`
	`98`	`+ public string VirtualPath { get; set; }`
	`99`	`+`
`95`	`100`	`/// <summary>`
`96`	`101`	`/// Boolean indicating whether the file could be validated`
`97`	`102`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ protected virtual void PersistNewItem(TEntity entity)`
`140`	`140`	`//the id can be the hash`
`141`	`141`	`entity.Id = entity.Path.GetHashCode();`
`142`	`142`	`entity.Key = entity.Path.EncodeAsGuid();`
	`143`	`+ entity.VirtualPath = FileSystem.GetUrl(entity.Path);`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`
`@@ -153,6 +154,7 @@ protected virtual void PersistUpdatedItem(TEntity entity)`
`153`	`154`	`//the id can be the hash`
`154`	`155`	`entity.Id = entity.Path.GetHashCode();`
`155`	`156`	`entity.Key = entity.Path.EncodeAsGuid();`
	`157`	`+ entity.VirtualPath = FileSystem.GetUrl(entity.Path);`
`156`	`158`	`}`
`157`	`159`	`}`
`158`	`160`