Преглед изворни кода

Rename ApplicationSemanticVersion to ApplicationVersion

Andrew Rabert пре 6 година
родитељ
комит
8de4eb7d19

+ 1 - 1
Emby.Dlna/PlayTo/PlayToManager.cs

@@ -164,7 +164,7 @@ namespace Emby.Dlna.PlayTo
 
             string deviceName = null;
 
-            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationSemanticVersion, uuid, deviceName, uri.OriginalString, null);
+            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationVersion, uuid, deviceName, uri.OriginalString, null);
 
             var controller = sessionInfo.SessionControllers.OfType<PlayToController>().FirstOrDefault();
 

+ 4 - 4
Emby.Server.Implementations/ApplicationHost.cs

@@ -429,13 +429,13 @@ namespace Emby.Server.Implementations
             _validAddressResults.Clear();
         }
 
-        public string ApplicationSemanticVersion => typeof(ApplicationHost).Assembly.GetName().Version.ToString(3);
+        public string ApplicationVersion => typeof(ApplicationHost).Assembly.GetName().Version.ToString(3);
 
         /// <summary>
         /// Gets the current application server version
         /// </summary>
         /// <value>The application server version.</value>
-        public string ApplicationUserAgent => Name.Replace(' ','-') + "/" + ApplicationSemanticVersion;
+        public string ApplicationUserAgent => Name.Replace(' ','-') + "/" + ApplicationVersion;
 
         private string _productName;
         /// <summary>
@@ -1814,7 +1814,7 @@ namespace Emby.Server.Implementations
             {
                 HasPendingRestart = HasPendingRestart,
                 IsShuttingDown = IsShuttingDown,
-                Version = ApplicationSemanticVersion,
+                Version = ApplicationVersion,
                 ProductName = ApplicationProductName,
                 WebSocketPortNumber = HttpPort,
                 CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
@@ -1861,7 +1861,7 @@ namespace Emby.Server.Implementations
             var wanAddress = await GetWanApiUrl(cancellationToken).ConfigureAwait(false);
             return new PublicSystemInfo
             {
-                Version = ApplicationSemanticVersion,
+                Version = ApplicationVersion,
                 Id = SystemId,
                 OperatingSystem = EnvironmentInfo.OperatingSystem.ToString(),
                 WanAddress = wanAddress,

+ 1 - 1
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs

@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                     Url = url,
                     CancellationToken = cancellationToken,
                     // Some data providers will require a user agent
-                    UserAgent = _appHost.ApplicationSemanticVersion
+                    UserAgent = _appHost.ApplicationVersion
                 });
             }
             return Task.FromResult(_fileSystem.OpenRead(url));

+ 1 - 1
MediaBrowser.Api/Session/SessionsService.cs

@@ -309,7 +309,7 @@ namespace MediaBrowser.Api.Session
                 DateCreated = DateTime.UtcNow,
                 DeviceId = _appHost.SystemId,
                 DeviceName = _appHost.FriendlyName,
-                AppVersion = _appHost.ApplicationSemanticVersion
+                AppVersion = _appHost.ApplicationVersion
             });
         }
 

+ 3 - 3
MediaBrowser.Common/IApplicationHost.cs

@@ -66,10 +66,10 @@ namespace MediaBrowser.Common
         void Restart();
 
         /// <summary>
-        /// Gets the application semantic version.
+        /// Gets the application version.
         /// </summary>
-        /// <value>The application semantic version.</value>
-        string ApplicationSemanticVersion { get; }
+        /// <value>The application version.</value>
+        string ApplicationVersion { get; }
 
         /// <summary>
         /// Gets the application user agent.

+ 4 - 4
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -205,7 +205,7 @@ namespace MediaBrowser.WebDashboard.Api
                     return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => Task.FromResult(stream));
                 }
 
-                return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator(DashboardUIPath).ModifyHtml("dummy.html", stream, null, _appHost.ApplicationSemanticVersion, null));
+                return _resultFactory.GetStaticResult(Request, plugin.Version.ToString().GetMD5(), null, null, MimeTypes.GetMimeType("page.html"), () => GetPackageCreator(DashboardUIPath).ModifyHtml("dummy.html", stream, null, _appHost.ApplicationVersion, null));
             }
 
             throw new ResourceNotFoundException();
@@ -342,7 +342,7 @@ namespace MediaBrowser.WebDashboard.Api
                 cacheDuration = TimeSpan.FromDays(365);
             }
 
-            var cacheKey = (_appHost.ApplicationSemanticVersion + (localizationCulture ?? string.Empty) + path).GetMD5();
+            var cacheKey = (_appHost.ApplicationVersion + (localizationCulture ?? string.Empty) + path).GetMD5();
 
             // html gets modified on the fly
             if (contentType.StartsWith("text/html", StringComparison.OrdinalIgnoreCase))
@@ -364,7 +364,7 @@ namespace MediaBrowser.WebDashboard.Api
         private Task<Stream> GetResourceStream(string basePath, string virtualPath, string localizationCulture)
         {
             return GetPackageCreator(basePath)
-                .GetResource(virtualPath, null, localizationCulture, _appHost.ApplicationSemanticVersion);
+                .GetResource(virtualPath, null, localizationCulture, _appHost.ApplicationVersion);
         }
 
         private PackageCreator GetPackageCreator(string basePath)
@@ -400,7 +400,7 @@ namespace MediaBrowser.WebDashboard.Api
                 CopyDirectory(inputPath, targetPath);
             }
 
-            var appVersion = _appHost.ApplicationSemanticVersion;
+            var appVersion = _appHost.ApplicationVersion;
 
             await DumpHtml(packageCreator, inputPath, targetPath, mode, appVersion);