Merge pull request #35 from kasperhhk/master

courier updates

Author: rasmusjp

.gitignore

@@ -1,3 +1,6 @@
+#VS2015
+/.vs/
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

RJP.MultiUrlPicker.sln

@@ -1,12 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite", "src\TestSite\TestSite.csproj", "{435CB5B1-AA14-4EE9-996F-A8A6C79CF8F5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJP.MultiUrlPicker", "src\RJP.MultiUrlPicker\RJP.MultiUrlPicker.csproj", "{2553C499-3593-43ED-95D6-39B03CC61ED1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{65D120C1-CF73-4EBF-963B-E63FAF8FB373}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -21,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{F960CEAB
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite", "src\TestSite\TestSite.csproj", "{435CB5B1-AA14-4EE9-996F-A8A6C79CF8F5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJP.MultiUrlPicker", "src\RJP.MultiUrlPicker\RJP.MultiUrlPicker.csproj", "{2553C499-3593-43ED-95D6-39B03CC61ED1}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJP.MultiUrlPicker.Courier", "src\RJP.MultiUrlPicker.Courier\RJP.MultiUrlPicker.Courier.csproj", "{7893EFE1-6D7B-4978-A859-F9F955FFB141}"
 EndProject
 Global

lib/Umbraco.Courier.Core.dll

@@ -6,6 +6,7 @@
     using Newtonsoft.Json.Linq;
 
     using Umbraco.Courier.Core;
+    using Umbraco.Courier.Core.Logging;
     using Umbraco.Courier.DataResolvers;
     using Umbraco.Courier.ItemProviders;
 
@@ -30,9 +31,27 @@ public override void PackagingProperty(Item item, ContentProperty propertyData)
                     {
                         if (link.id != null)
                         {
-                            link.id = ExecutionContext.DatabasePersistence.GetUniqueId(
-                                (int)link.id,
-                                link.isMedia != null ? NodeObjectTypes.Media : NodeObjectTypes.Document);
+                            var objectTypeId = link.isMedia != null
+                                ? UmbracoNodeObjectTypeIds.Media
+                                : UmbracoNodeObjectTypeIds.Document;
+                            var itemProviderId = link.isMedia != null
+                                ? ItemProviderIds.mediaItemProviderGuid
+                                : ItemProviderIds.documentItemProviderGuid;
+
+                            link.id = ExecutionContext.DatabasePersistence.GetUniqueId((int)link.id, objectTypeId);
+                            item.Dependencies.Add(link.id.ToString(), itemProviderId);
+                        }
+                        else if (link.isMedia != null)
+                        {
+                            try
+                            {
+                                var mediaId = ExecutionContext.DatabasePersistence.GetUniqueIdFromMediaFile(link.url);
+                                item.Dependencies.Add(mediaId.ToString(), ItemProviderIds.mediaItemProviderGuid);
+                            }
+                            catch (Exception e)
+                            {
+                                CourierLogHelper.Error<MultiUrlPickerDataResolverProvider>(string.Format("Error setting media-item dependency, name={0}, url={1}", link.name, link.url), e);
+                            }
                         }
                     }
                     propertyData.Value = links.ToString();
@@ -53,10 +72,10 @@ public override void ExtractingProperty(Item item, ContentProperty propertyData)
                         {
                             link.id = ExecutionContext.DatabasePersistence.GetNodeId(
                                 (Guid)link.id,
-                                link.isMedia != null ? NodeObjectTypes.Media : NodeObjectTypes.Document);
+                                link.isMedia != null ? UmbracoNodeObjectTypeIds.Media : UmbracoNodeObjectTypeIds.Document);
                         }
                     }
-                    propertyData.Value = links.ToString();
+                    propertyData.Value = links;
                 }
             }
         }

lib/Umbraco.Courier.DataResolvers.dll

@@ -25,6 +25,12 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>a927a8cd</NuGetPackageImportStamp>
+    <MvcProjectUpgradeChecked>true</MvcProjectUpgradeChecked>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>12.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>