Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/kayone/NzbDrone 

Conflicts:
	NzbDrone.Web/Views/Settings/Quality.cshtml
This commit is contained in:
Mark McDowall 2011-07-04 16:33:46 -07:00
parent 6dc3a22f75 49a372eb6b
commit 14e037fc05
55 changed files with 140 additions and 800 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
IISExpress/AppServer/applicationhost.config
View File

@ -57,23 +57,17 @@
<section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" /> <section name="webLimits" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
</sectionGroup> </sectionGroup>
<sectionGroup name="system.webServer"> <sectionGroup name="system.webServer">
<section name="asp" overrideModeDefault="Deny" />
<section name="caching" overrideModeDefault="Allow" /> <section name="caching" overrideModeDefault="Allow" />
<section name="cgi" overrideModeDefault="Deny" />
<section name="defaultDocument" overrideModeDefault="Allow" /> <section name="defaultDocument" overrideModeDefault="Allow" />
<section name="directoryBrowse" overrideModeDefault="Allow" /> <section name="directoryBrowse" overrideModeDefault="Allow" />
<section name="fastCgi" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
<section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" /> <section name="globalModules" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
<section name="handlers" overrideModeDefault="Deny" /> <section name="handlers" overrideModeDefault="Deny" />
<section name="httpCompression" allowDefinition="AppHostOnly" overrideModeDefault="Deny" /> <section name="httpCompression" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
<section name="httpErrors" overrideModeDefault="Allow" /> <section name="httpErrors" overrideModeDefault="Allow" />
<section name="httpLogging" overrideModeDefault="Deny" />
<section name="httpProtocol" overrideModeDefault="Allow" /> <section name="httpProtocol" overrideModeDefault="Allow" />
<section name="httpRedirect" overrideModeDefault="Allow" /> <section name="httpRedirect" overrideModeDefault="Allow" />
<section name="httpTracing" overrideModeDefault="Deny" /> <section name="httpTracing" overrideModeDefault="Deny" />
<section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
<section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" /> <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
<section name="odbcLogging" overrideModeDefault="Deny" />
<sectionGroup name="security"> <sectionGroup name="security">
<section name="access" overrideModeDefault="Deny" /> <section name="access" overrideModeDefault="Deny" />
<section name="applicationDependencies" overrideModeDefault="Deny" /> <section name="applicationDependencies" overrideModeDefault="Deny" />
@ -87,7 +81,6 @@
</sectionGroup> </sectionGroup>
<section name="authorization" overrideModeDefault="Allow" /> <section name="authorization" overrideModeDefault="Allow" />
<section name="ipSecurity" overrideModeDefault="Deny" /> <section name="ipSecurity" overrideModeDefault="Deny" />
<section name="isapiCgiRestriction" allowDefinition="AppHostOnly" overrideModeDefault="Deny" />
<section name="requestFiltering" overrideModeDefault="Allow" /> <section name="requestFiltering" overrideModeDefault="Allow" />
</sectionGroup> </sectionGroup>
<section name="serverRuntime" overrideModeDefault="Deny" /> <section name="serverRuntime" overrideModeDefault="Deny" />
@ -99,19 +92,6 @@
</sectionGroup> </sectionGroup>
<section name="urlCompression" overrideModeDefault="Allow" /> <section name="urlCompression" overrideModeDefault="Allow" />
<section name="validation" overrideModeDefault="Allow" /> <section name="validation" overrideModeDefault="Allow" />
<sectionGroup name="webdav">
<section name="globalSettings" overrideModeDefault="Deny" />
<section name="authoring" overrideModeDefault="Deny" />
<section name="authoringRules" overrideModeDefault="Deny" />
</sectionGroup>
<sectionGroup name="rewrite">
<section name="allowedServerVariables" overrideModeDefault="Deny" />
<section name="rules" overrideModeDefault="Allow" />
<section name="outboundRules" overrideModeDefault="Allow" />
<section name="globalRules" overrideModeDefault="Deny" allowDefinition="AppHostOnly" />
<section name="providers" overrideModeDefault="Allow" />
<section name="rewriteMaps" overrideModeDefault="Allow" />
</sectionGroup>
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<configProtectedData> <configProtectedData>
@ -155,12 +135,7 @@
</system.applicationHost> </system.applicationHost>
<system.webServer> <system.webServer>
<serverRuntime /> <serverRuntime />
<asp scriptErrorSentToBrowser="true">
<cache diskTemplateCacheDirectory="%TEMP%\iisexpress\ASP Compiled Templates" />
<limits />
</asp>
<caching enabled="true" enableKernelCache="true"></caching> <caching enabled="true" enableKernelCache="true"></caching>
<cgi />
<defaultDocument enabled="true"> <defaultDocument enabled="true">
<files> <files>
<add value="Default.htm" /> <add value="Default.htm" />
@ -171,7 +146,6 @@
</files> </files>
</defaultDocument> </defaultDocument>
<directoryBrowse enabled="false" /> <directoryBrowse enabled="false" />
<fastCgi />
<!-- <!--
The <globalModules> section defines all native-code modules. The <globalModules> section defines all native-code modules.
@ -181,39 +155,19 @@
<globalModules> <globalModules>
<add name="UriCacheModule" image="%IIS_BIN%\cachuri.dll" /> <add name="UriCacheModule" image="%IIS_BIN%\cachuri.dll" />
<!-- <add name="FileCacheModule" image="%IIS_BIN%\cachfile.dll" /> --> <!-- <add name="FileCacheModule" image="%IIS_BIN%\cachfile.dll" /> -->
<add name="TokenCacheModule" image="%IIS_BIN%\cachtokn.dll" />
<!-- <add name="HttpCacheModule" image="%IIS_BIN%\cachhttp.dll" /> --> <!-- <add name="HttpCacheModule" image="%IIS_BIN%\cachhttp.dll" /> -->
<add name="DynamicCompressionModule" image="%IIS_BIN%\compdyn.dll" />
<add name="StaticCompressionModule" image="%IIS_BIN%\compstat.dll" /> <add name="StaticCompressionModule" image="%IIS_BIN%\compstat.dll" />
<add name="DefaultDocumentModule" image="%IIS_BIN%\defdoc.dll" /> <add name="DefaultDocumentModule" image="%IIS_BIN%\defdoc.dll" />
<add name="DirectoryListingModule" image="%IIS_BIN%\dirlist.dll" />
<add name="ProtocolSupportModule" image="%IIS_BIN%\protsup.dll" />
<add name="HttpRedirectionModule" image="%IIS_BIN%\redirect.dll" /> <add name="HttpRedirectionModule" image="%IIS_BIN%\redirect.dll" />
<add name="ServerSideIncludeModule" image="%IIS_BIN%\iis_ssi.dll" /> <add name="ServerSideIncludeModule" image="%IIS_BIN%\iis_ssi.dll" />
<add name="StaticFileModule" image="%IIS_BIN%\static.dll" /> <add name="StaticFileModule" image="%IIS_BIN%\static.dll" />
<add name="AnonymousAuthenticationModule" image="%IIS_BIN%\authanon.dll" /> <add name="AnonymousAuthenticationModule" image="%IIS_BIN%\authanon.dll" />
<add name="CertificateMappingAuthenticationModule" image="%IIS_BIN%\authcert.dll" />
<add name="UrlAuthorizationModule" image="%IIS_BIN%\urlauthz.dll" />
<add name="BasicAuthenticationModule" image="%IIS_BIN%\authbas.dll" /> <add name="BasicAuthenticationModule" image="%IIS_BIN%\authbas.dll" />
<add name="WindowsAuthenticationModule" image="%IIS_BIN%\authsspi.dll" />
<!-- <add name="DigestAuthenticationModule" image="%IIS_BIN%\authmd5.dll" /> --> <!-- <add name="DigestAuthenticationModule" image="%IIS_BIN%\authmd5.dll" /> -->
<add name="IISCertificateMappingAuthenticationModule" image="%IIS_BIN%\authmap.dll" />
<add name="IpRestrictionModule" image="%IIS_BIN%\iprestr.dll" />
<add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" /> <add name="RequestFilteringModule" image="%IIS_BIN%\modrqflt.dll" />
<add name="CustomLoggingModule" image="%IIS_BIN%\logcust.dll" />
<add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" /> <add name="CustomErrorModule" image="%IIS_BIN%\custerr.dll" />
<add name="HttpLoggingModule" image="%IIS_BIN%\loghttp.dll" />
<!-- <add name="TracingModule" image="%IIS_BIN%\iisetw.dll" /> --> <!-- <add name="TracingModule" image="%IIS_BIN%\iisetw.dll" /> -->
<add name="FailedRequestsTracingModule" image="%IIS_BIN%\iisfreb.dll" />
<add name="RequestMonitorModule" image="%IIS_BIN%\iisreqs.dll" />
<add name="IsapiModule" image="%IIS_BIN%\isapi.dll" />
<add name="IsapiFilterModule" image="%IIS_BIN%\filter.dll" />
<add name="CgiModule" image="%IIS_BIN%\cgi.dll" />
<add name="FastCgiModule" image="%IIS_BIN%\iisfcgi.dll" />
<!-- <add name="WebDAVModule" image="%IIS_BIN%\webdav.dll" /> -->
<add name="RewriteModule" image="%IIS_BIN%\rewrite.dll" />
<add name="ConfigurationValidationModule" image="%IIS_BIN%\validcfg.dll" /> <add name="ConfigurationValidationModule" image="%IIS_BIN%\validcfg.dll" />
<add name="WebMatrixSupportModule" image="%IIS_BIN%\webmatrixsup.dll" />
<add name="ManagedEngine" image="%windir%\Microsoft.NET\Framework\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness32" /> <add name="ManagedEngine" image="%windir%\Microsoft.NET\Framework\v2.0.50727\webengine.dll" preCondition="integratedMode,runtimeVersionv2.0,bitness32" />
<add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" /> <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
</globalModules> </globalModules>
@ -245,7 +199,6 @@
<error statusCode="501" prefixLanguageFilePath="%IIS_BIN%\custerr" path="501.htm" /> <error statusCode="501" prefixLanguageFilePath="%IIS_BIN%\custerr" path="501.htm" />
<error statusCode="502" prefixLanguageFilePath="%IIS_BIN%\custerr" path="502.htm" /> <error statusCode="502" prefixLanguageFilePath="%IIS_BIN%\custerr" path="502.htm" />
</httpErrors> </httpErrors>
<httpLogging dontLog="false" />
<httpProtocol> <httpProtocol>
<customHeaders> <customHeaders>
<clear /> <clear />
@ -257,17 +210,8 @@
</httpProtocol> </httpProtocol>
<httpRedirect enabled="false" /> <httpRedirect enabled="false" />
<httpTracing></httpTracing> <httpTracing></httpTracing>
<isapiFilters>
<filter name="ASP.Net_2.0.50727.0" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv2.0" />
<filter name="ASP.Net_2.0_for_v1.1" path="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_filter.dll" enableCache="true" preCondition="runtimeVersionv1.1" />
<filter name="ASP.Net_4.0_32bit" path="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_filter.dll" enableCache="true" preCondition="bitness32,runtimeVersionv4.0" />
</isapiFilters>
<odbcLogging />
<security> <security>
<access sslFlags="None" /> <access sslFlags="None" />
<applicationDependencies>
<application name="Active Server Pages" groupId="ASP" />
</applicationDependencies>
<authentication> <authentication>
<anonymousAuthentication enabled="true" userName="" /> <anonymousAuthentication enabled="true" userName="" />
<basicAuthentication enabled="false" /> <basicAuthentication enabled="false" />
@ -285,68 +229,6 @@
<add accessType="Allow" users="*" /> <add accessType="Allow" users="*" />
</authorization> </authorization>
<ipSecurity allowUnlisted="true" /> <ipSecurity allowUnlisted="true" />
<isapiCgiRestriction notListedIsapisAllowed="true" notListedCgisAllowed="true">
<add path="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" allowed="true" groupId="ASP.NET_v4.0" description="ASP.NET_v4.0" />
</isapiCgiRestriction>
<requestFiltering>
<fileExtensions allowUnlisted="true" applyToWebDAV="true">
<add fileExtension=".asa" allowed="false" />
<add fileExtension=".asax" allowed="false" />
<add fileExtension=".ascx" allowed="false" />
<add fileExtension=".master" allowed="false" />
<add fileExtension=".skin" allowed="false" />
<add fileExtension=".browser" allowed="false" />
<add fileExtension=".sitemap" allowed="false" />
<add fileExtension=".config" allowed="false" />
<add fileExtension=".cs" allowed="false" />
<add fileExtension=".csproj" allowed="false" />
<add fileExtension=".vb" allowed="false" />
<add fileExtension=".vbproj" allowed="false" />
<add fileExtension=".webinfo" allowed="false" />
<add fileExtension=".licx" allowed="false" />
<add fileExtension=".resx" allowed="false" />
<add fileExtension=".resources" allowed="false" />
<add fileExtension=".mdb" allowed="false" />
<add fileExtension=".vjsproj" allowed="false" />
<add fileExtension=".java" allowed="false" />
<add fileExtension=".jsl" allowed="false" />
<add fileExtension=".ldb" allowed="false" />
<add fileExtension=".dsdgm" allowed="false" />
<add fileExtension=".ssdgm" allowed="false" />
<add fileExtension=".lsad" allowed="false" />
<add fileExtension=".ssmap" allowed="false" />
<add fileExtension=".cd" allowed="false" />
<add fileExtension=".dsprototype" allowed="false" />
<add fileExtension=".lsaprototype" allowed="false" />
<add fileExtension=".sdm" allowed="false" />
<add fileExtension=".sdmDocument" allowed="false" />
<add fileExtension=".mdf" allowed="false" />
<add fileExtension=".ldf" allowed="false" />
<add fileExtension=".ad" allowed="false" />
<add fileExtension=".dd" allowed="false" />
<add fileExtension=".ldd" allowed="false" />
<add fileExtension=".sd" allowed="false" />
<add fileExtension=".adprototype" allowed="false" />
<add fileExtension=".lddprototype" allowed="false" />
<add fileExtension=".exclude" allowed="false" />
<add fileExtension=".refresh" allowed="false" />
<add fileExtension=".compiled" allowed="false" />
<add fileExtension=".msgx" allowed="false" />
<add fileExtension=".vsdisco" allowed="false" />
<add fileExtension=".rules" allowed="false" />
</fileExtensions>
<verbs allowUnlisted="true" applyToWebDAV="true" />
<hiddenSegments applyToWebDAV="true">
<add segment="web.config" />
<add segment="bin" />
<add segment="App_code" />
<add segment="App_GlobalResources" />
<add segment="App_LocalResources" />
<add segment="App_WebReferences" />
<add segment="App_Data" />
<add segment="App_Browsers" />
</hiddenSegments>
</requestFiltering>
</security> </security>
<serverSideInclude ssiExecDisable="false" /> <serverSideInclude ssiExecDisable="false" />
<staticContent lockAttributes="isDocFooterFileName"> <staticContent lockAttributes="isDocFooterFileName">
@ -706,23 +588,10 @@
<add name="Security" value="4" /> <add name="Security" value="4" />
<add name="Filter" value="8" /> <add name="Filter" value="8" />
<add name="StaticFile" value="16" /> <add name="StaticFile" value="16" />
<add name="CGI" value="32" />
<add name="Compression" value="64" /> <add name="Compression" value="64" />
<add name="Cache" value="128" /> <add name="Cache" value="128" />
<add name="RequestNotifications" value="256" /> <add name="RequestNotifications" value="256" />
<add name="Module" value="512" /> <add name="Module" value="512" />
<add name="Rewrite" value="1024" />
<add name="FastCGI" value="4096" />
</areas>
</add>
<add name="ASP" guid="{06b94d9a-b15e-456e-a4ef-37c984a2cb4b}">
<areas>
<clear />
</areas>
</add>
<add name="ISAPI Extension" guid="{a1c2040e-8840-4c31-ba11-9871031a19ea}">
<areas>
<clear />
</areas> </areas>
</add> </add>
<add name="ASPNET" guid="{AFF081FE-0247-4275-9C4E-021F3DC1DA35}"> <add name="ASPNET" guid="{AFF081FE-0247-4275-9C4E-021F3DC1DA35}">
@ -737,10 +606,7 @@
<traceFailedRequests> <traceFailedRequests>
<add path="*"> <add path="*">
<traceAreas> <traceAreas>
<add provider="ASP" verbosity="Verbose" />
<add provider="ASPNET" areas="Infrastructure,Module,Page,AppServices" verbosity="Verbose" /> <add provider="ASPNET" areas="Infrastructure,Module,Page,AppServices" verbosity="Verbose" />
<add provider="ISAPI Extension" verbosity="Verbose" />
<add provider="WWW Server" areas="Authentication,Security,Filter,StaticFile,CGI,Compression,Cache,RequestNotifications,Module,Rewrite" verbosity="Verbose" />
</traceAreas> </traceAreas>
<failureDefinitions statusCodes="200-999" /> <failureDefinitions statusCodes="200-999" />
</add> </add>
@ -748,20 +614,6 @@
</tracing> </tracing>
<urlCompression /> <urlCompression />
<validation /> <validation />
<webdav>
<globalSettings>
<propertyStores>
<add name="webdav_simple_prop" image="%IIS_BIN%\webdav_simple_prop.dll" image32="%windir%\syswow64\inetsrv\webdav_simple_prop.dll" />
</propertyStores>
<lockStores>
<add name="webdav_simple_lock" image="%IIS_BIN%\webdav_simple_lock.dll" image32="%windir%\syswow64\inetsrv\webdav_simple_lock.dll" />
</lockStores>
</globalSettings>
<authoring>
<locks enabled="true" lockStore="webdav_simple_lock" />
</authoring>
<authoringRules />
</webdav>
</system.webServer> </system.webServer>
<location path="" overrideMode="Allow"> <location path="" overrideMode="Allow">
<system.webServer> <system.webServer>
@ -769,44 +621,24 @@
<!-- <!--
<add name="HttpCacheModule" lockItem="true" /> <add name="HttpCacheModule" lockItem="true" />
--> -->
<add name="DynamicCompressionModule" lockItem="true" />
<add name="StaticCompressionModule" lockItem="true" /> <add name="StaticCompressionModule" lockItem="true" />
<add name="DefaultDocumentModule" lockItem="true" /> <add name="DefaultDocumentModule" lockItem="true" />
<add name="DirectoryListingModule" lockItem="true" />
<add name="IsapiFilterModule" lockItem="true" />
<add name="ProtocolSupportModule" lockItem="true" />
<add name="HttpRedirectionModule" lockItem="true" /> <add name="HttpRedirectionModule" lockItem="true" />
<add name="ServerSideIncludeModule" lockItem="true" /> <add name="ServerSideIncludeModule" lockItem="true" />
<add name="StaticFileModule" lockItem="true" /> <add name="StaticFileModule" lockItem="true" />
<add name="AnonymousAuthenticationModule" lockItem="true" /> <add name="AnonymousAuthenticationModule" lockItem="true" />
<add name="CertificateMappingAuthenticationModule" lockItem="true" />
<add name="UrlAuthorizationModule" lockItem="true" />
<add name="BasicAuthenticationModule" lockItem="true" /> <add name="BasicAuthenticationModule" lockItem="true" />
<add name="WindowsAuthenticationModule" lockItem="true" />
<!-- <!--
<add name="DigestAuthenticationModule" lockItem="true" /> <add name="DigestAuthenticationModule" lockItem="true" />
--> -->
<add name="IISCertificateMappingAuthenticationModule" lockItem="true" />
<add name="IpRestrictionModule" lockItem="true" />
<add name="RequestFilteringModule" lockItem="true" /> <add name="RequestFilteringModule" lockItem="true" />
<add name="CustomLoggingModule" lockItem="true" />
<add name="CustomErrorModule" lockItem="true" /> <add name="CustomErrorModule" lockItem="true" />
<add name="IsapiModule" lockItem="true" />
<add name="HttpLoggingModule" lockItem="true" />
<add name="FailedRequestsTracingModule" lockItem="true" />
<add name="CgiModule" lockItem="true" />
<add name="FastCgiModule" lockItem="true" />
<!-- <add name="WebDAVModule" /> -->
<add name="RewriteModule" />
<add name="ConfigurationValidationModule" lockItem="true" /> <add name="ConfigurationValidationModule" lockItem="true" />
<add name="WebMatrixSupportModule" lockItem="true" />
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule" preCondition="managedHandler" /> <add name="OutputCache" type="System.Web.Caching.OutputCacheModule" preCondition="managedHandler" />
<add name="Session" type="System.Web.SessionState.SessionStateModule" preCondition="managedHandler" /> <add name="Session" type="System.Web.SessionState.SessionStateModule" preCondition="managedHandler" />
<add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" preCondition="managedHandler" />
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" preCondition="managedHandler" /> <add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" preCondition="managedHandler" />
<add name="DefaultAuthentication" type="System.Web.Security.DefaultAuthenticationModule" preCondition="managedHandler" /> <add name="DefaultAuthentication" type="System.Web.Security.DefaultAuthenticationModule" preCondition="managedHandler" />
<add name="RoleManager" type="System.Web.Security.RoleManagerModule" preCondition="managedHandler" /> <add name="RoleManager" type="System.Web.Security.RoleManagerModule" preCondition="managedHandler" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" preCondition="managedHandler" />
<add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" preCondition="managedHandler" /> <add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" preCondition="managedHandler" />
<add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" preCondition="managedHandler" /> <add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" preCondition="managedHandler" />
<add name="Profile" type="System.Web.Profile.ProfileModule" preCondition="managedHandler" /> <add name="Profile" type="System.Web.Profile.ProfileModule" preCondition="managedHandler" />
@ -817,28 +649,8 @@
<add name="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="managedHandler,runtimeVersionv2.0" /> <add name="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="managedHandler,runtimeVersionv2.0" />
</modules> </modules>
<handlers accessPolicy="Read, Script"> <handlers accessPolicy="Read, Script">
<!-- <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
<add name="svc-Integrated" path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" /> <add name="svc-Integrated" path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="svc-ISAPI-2.0" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
<add name="xoml-Integrated" path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" /> <add name="xoml-Integrated" path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="xoml-ISAPI-2.0" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
<add name="rules-Integrated" path="*.rules" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="rules-ISAPI-2.0" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" />
<add name="AXD-ISAPI-4.0_32bit" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="PageHandlerFactory-ISAPI-4.0_32bit" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="SimpleHandlerFactory-ISAPI-4.0_32bit" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="WebServiceHandlerFactory-ISAPI-4.0_32bit" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="HttpRemotingHandlerFactory-rem-ISAPI-4.0_32bit" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="HttpRemotingHandlerFactory-soap-ISAPI-4.0_32bit" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="svc-ISAPI-4.0_32bit" path="*.svc" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="rules-ISAPI-4.0_32bit" path="*.rules" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="xoml-ISAPI-4.0_32bit" path="*.xoml" verb="*" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="xamlx-ISAPI-4.0_32bit" path="*.xamlx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="aspq-ISAPI-4.0_32bit" path="*.aspq" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="cshtm-ISAPI-4.0_32bit" path="*.cshtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="cshtml-ISAPI-4.0_32bit" path="*.cshtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="vbhtm-ISAPI-4.0_32bit" path="*.vbhtm" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="vbhtml-ISAPI-4.0_32bit" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="TraceHandler-Integrated-4.0" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="TraceHandler-Integrated-4.0" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="WebAdminHandler-Integrated-4.0" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="WebAdminHandler-Integrated-4.0" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="AssemblyResourceLoader-Integrated-4.0" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="AssemblyResourceLoader-Integrated-4.0" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode,runtimeVersionv4.0" />
@ -858,9 +670,6 @@
<add name="vbhtml-Integrated-4.0" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="vbhtml-Integrated-4.0" path="*.vbhtml" verb="GET,HEAD,POST,DEBUG" type="System.Web.HttpForbiddenHandler" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="ScriptHandlerFactoryAppServices-Integrated-4.0" path="*_AppService.axd" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ScriptHandlerFactoryAppServices-Integrated-4.0" path="*_AppService.axd" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="ScriptResourceIntegrated-4.0" path="ScriptResource.axd" verb="GET,HEAD" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ScriptResourceIntegrated-4.0" path="ScriptResource.axd" verb="GET,HEAD" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" preCondition="integratedMode,runtimeVersionv4.0" />
<!-- <add name="ASPClassic" path="*.asp" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />-->
<!-- <add name="SecurityCertificate" path="*.cer" verb="GET,HEAD,POST" modules="IsapiModule" scriptProcessor="%IIS_BIN%\asp.dll" resourceType="File" />-->
<add name="ISAPI-dll" path="*.dll" verb="*" modules="IsapiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
<add name="TraceHandler-Integrated" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode" /> <add name="TraceHandler-Integrated" path="trace.axd" verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TraceHandler" preCondition="integratedMode" />
<add name="WebAdminHandler-Integrated" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode" /> <add name="WebAdminHandler-Integrated" path="WebAdmin.axd" verb="GET,DEBUG" type="System.Web.Handlers.WebAdminHandler" preCondition="integratedMode" />
<add name="AssemblyResourceLoader-Integrated" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode" /> <add name="AssemblyResourceLoader-Integrated" path="WebResource.axd" verb="GET,DEBUG" type="System.Web.Handlers.AssemblyResourceLoader" preCondition="integratedMode" />
@ -869,21 +678,11 @@
<add name="WebServiceHandlerFactory-Integrated" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Services.Protocols.WebServiceHandlerFactory,System.Web.Services,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b03f5f7f11d50a3a" preCondition="integratedMode,runtimeVersionv2.0" /> <add name="WebServiceHandlerFactory-Integrated" path="*.asmx" verb="GET,HEAD,POST,DEBUG" type="System.Web.Services.Protocols.WebServiceHandlerFactory,System.Web.Services,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b03f5f7f11d50a3a" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="HttpRemotingHandlerFactory-rem-Integrated" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" /> <add name="HttpRemotingHandlerFactory-rem-Integrated" path="*.rem" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="HttpRemotingHandlerFactory-soap-Integrated" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" /> <add name="HttpRemotingHandlerFactory-soap-Integrated" path="*.soap" verb="GET,HEAD,POST,DEBUG" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory,System.Runtime.Remoting,Version=2.0.0.0,Culture=neutral,PublicKeyToken=b77a5c561934e089" preCondition="integratedMode,runtimeVersionv2.0" />
<add name="AXD-ISAPI-2.0" path="*.axd" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="PageHandlerFactory-ISAPI-2.0" path="*.aspx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="SimpleHandlerFactory-ISAPI-2.0" path="*.ashx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="WebServiceHandlerFactory-ISAPI-2.0" path="*.asmx" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="HttpRemotingHandlerFactory-rem-ISAPI-2.0" path="*.rem" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="HttpRemotingHandlerFactory-soap-ISAPI-2.0" path="*.soap" verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v2.0.50727\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv2.0,bitness32" responseBufferLimit="0" />
<add name="CGI-exe" path="*.exe" verb="*" modules="CgiModule" resourceType="File" requireAccess="Execute" allowPathInfo="true" />
<add name="SSINC-stm" path="*.stm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" /> <add name="SSINC-stm" path="*.stm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
<add name="SSINC-shtm" path="*.shtm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" /> <add name="SSINC-shtm" path="*.shtm" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
<add name="SSINC-shtml" path="*.shtml" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" /> <add name="SSINC-shtml" path="*.shtml" verb="GET,POST" modules="ServerSideIncludeModule" resourceType="File" />
<add name="TRACEVerbHandler" path="*" verb="TRACE" modules="ProtocolSupportModule" requireAccess="None" />
<add name="OPTIONSVerbHandler" path="*" verb="OPTIONS" modules="ProtocolSupportModule" requireAccess="None" />
<add name="ExtensionlessUrl-ISAPI-4.0_32bit" path="*." verb="GET,HEAD,POST,DEBUG" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness32" responseBufferLimit="0" />
<add name="ExtensionlessUrl-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" /> <add name="ExtensionlessUrl-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule,DirectoryListingModule" resourceType="Either" requireAccess="Read" /> <add name="StaticFile" path="*" verb="*" modules="StaticFileModule,DefaultDocumentModule" resourceType="Either" requireAccess="Read" />
</handlers> </handlers>
</system.webServer> </system.webServer>
</location> </location>

BIN
IISExpress/IisExpressAdminCmd.exe
View File

Binary file not shown.

7
IISExpress/IisExpressAdminCmd.exe.config
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" />
<supportedRuntime version="v2.0.50727" />
</startup>
</configuration>

BIN
IISExpress/IisExpressadminCmd.resources.dll
View File

Binary file not shown.

BIN
IISExpress/appcmd.exe
View File

Binary file not shown.

74
IISExpress/appcmd.xml
View File

@ -1,74 +0,0 @@
<appcmd>
<object name="site" alias="sites" classId="DefaultSiteObject" >
<verb name="list" classId="DefaultSiteObject" />
<verb name="set" classId="DefaultSiteObject" />
<verb name="add" classId="DefaultSiteObject" />
<verb name="delete" classId="DefaultSiteObject" />
<!--
<verb name="start" classId="DefaultSiteObject" />
<verb name="stop" classId="DefaultSiteObject" />
-->
</object>
<object name="app" alias="apps" classId="DefaultAppObject" >
<verb name="list" description="List applications" classId="DefaultAppObject" />
<verb name="set" classId="DefaultAppObject" />
<verb name="add" classId="DefaultAppObject" />
<verb name="delete" classId="DefaultAppObject" />
</object>
<object name="vdir" alias="vdirs" classId="DefaultDirObject" >
<verb name="list" description="List virtual directories" classId="DefaultDirObject" />
<verb name="set" classId="DefaultDirObject" />
<verb name="add" classId="DefaultDirObject" />
<verb name="delete" classId="DefaultDirObject" />
</object>
<object name="apppool" alias="apppools" classId="DefaultAppPoolObject" >
<verb name="list" classId="DefaultAppPoolObject" />
<verb name="set" classId="DefaultAppPoolObject" />
<verb name="add" classId="DefaultAppPoolObject" />
<verb name="delete" classId="DefaultAppPoolObject" />
<!--
<verb name="start" classId="DefaultAppPoolObject" />
<verb name="stop" classId="DefaultAppPoolObject" />
<verb name="recycle" classId="DefaultAppPoolObject" />
-->
</object>
<object name="config" alias="configs" classId="DefaultConfigObject" >
<verb name="list" classId="DefaultConfigObject" />
<verb name="set" classId="DefaultConfigObject" />
<verb name="search" classId="DefaultConfigObject" />
<verb name="lock" classId="DefaultConfigObject" />
<verb name="unlock" classId="DefaultConfigObject" />
<verb name="clear" classId="DefaultConfigObject" />
<verb name="reset" classId="DefaultConfigObject" />
<!--
<verb name="migrate" classId="DefaultConfigObject" />
-->
</object>
<!--
<object name="wp" alias="wps" classId="DefaultWorkerProcessObject" >
<verb name="list" classId="DefaultWorkerProcessObject" />
</object>
<object name="request" alias="requests" classId="DefaultRequestObject" >
<verb name="list" classId="DefaultRequestObject" />
</object>
-->
<object name="module" alias="modules" classId="DefaultModuleObject" >
<verb name="list" classId="DefaultModuleObject" />
<verb name="set" classId="DefaultModuleObject" />
<verb name="add" classId="DefaultModuleObject" />
<verb name="delete" classId="DefaultModuleObject" />
<verb name="install" classId="DefaultModuleObject" />
<verb name="uninstall" classId="DefaultModuleObject" />
</object>
<!--object name="backup" alias="backups" classId="DefaultBackupObject" >
<verb name="list" classId="DefaultBackupObject" />
<verb name="add" classId="DefaultBackupObject" />
<verb name="delete" classId="DefaultBackupObject" />
<verb name="restore" classId="DefaultBackupObject" />
</object-->
<object name="trace" alias="traces" classId="DefaultTraceObject" >
<verb name="list" classId="DefaultTraceObject" />
<verb name="configure" classId="DefaultTraceObject" />
<verb name="inspect" classId="DefaultTraceObject" />
</object>
</appcmd>

BIN
IISExpress/authcert.dll
View File

Binary file not shown.

BIN
IISExpress/authmap.dll
View File

Binary file not shown.

BIN
IISExpress/authsspi.dll
View File

Binary file not shown.

BIN
IISExpress/cachtokn.dll
View File

Binary file not shown.

BIN
IISExpress/cgi.dll
View File

Binary file not shown.

BIN
IISExpress/compdyn.dll
View File

Binary file not shown.

124
IISExpress/config/schema/WebDAV_schema.xml
View File

@ -1,124 +0,0 @@
<!--
WebDAV configuration schema.
Please do not edit this file. To add configuration sections to the schema,
put them in .xml files similar to this one, in this directory. They will
be picked up automatically at application pool startup.
-->
<configSchema>
<!--
These settings are always access from the top-level
<system.webServer/webdav> section.
-->
<sectionSchema name="system.webServer/webdav/globalSettings">
<element name="propertyStores">
<collection addElement="add" allowUnrecognizedAttributes="true">
<attribute name="name" type="string" required="true" isUniqueKey="true" />
<attribute name="image" type="string" required="true" expanded="true" />
<attribute name="image32" type="string" expanded="true" />
</collection>
</element>
<element name="lockStores">
<collection addElement="add" allowUnrecognizedAttributes="true">
<attribute name="name" type="string" required="true" isUniqueKey="true" />
<attribute name="image" type="string" required="true" expanded="true" />
<attribute name="image32" type="string" expanded="true" />
</collection>
</element>
</sectionSchema>
<!--
These settings are always accessed using a query path similar
to "MACHINE/WEBROOT/APPHOST/{sitename}". Thus, there is no
inheritance from lower levels in the URI hierarchy.
-->
<sectionSchema name="system.webServer/webdav/authoring">
<attribute name="enabled" type="bool" defaultValue="false" />
<attribute name="requireSsl" type="bool" defaultValue="false" />
<attribute name="compatFlags" type="flags" defaultValue="MsAuthorVia, MultiProp, CompactXml, IsHidden, IsCollection">
<flag name="None" value="0" />
<flag name="MsAuthorVia" value="1" />
<flag name="MultiProp" value="2" />
<flag name="CompactXml" value="4" />
<flag name="IsHidden" value="8" />
<flag name="IsCollection" value="16" />
</attribute>
<attribute name="maxAllowedXmlRequestLength" type="uint" defaultValue="1000000" />
<element name="fileSystem">
<attribute name="allowHiddenFiles" type="bool" defaultValue="false" />
<attribute name="useTransactionalIo" type="bool" defaultValue="false" />
<attribute name="hideChildVirtualDirectories" type="bool" defaultValue="false" />
</element>
<element name="properties">
<attribute name="allowAnonymousPropfind" type="bool" defaultValue="false" />
<attribute name="allowInfinitePropfindDepth" type="bool" defaultValue="false" />
<attribute name="allowCustomProperties" type="bool" defaultValue="true" />
<collection addElement="add" removeElement="remove" clearElement="clear" allowUnrecognizedAttributes="true">
<attribute name="xmlNamespace" type="string" isUniqueKey="true" required="true" validationType="nonEmptyString" />
<attribute name="propertyStore" type="string" required="true" validationType="nonEmptyString" />
</collection>
</element>
<element name="locks" allowUnrecognizedAttributes="true">
<attribute name="enabled" type="bool" defaultValue="false" />
<attribute name="lockStore" type="string" />
<attribute name="requireLockForWriting" type="bool" defaultValue="false" />
</element>
</sectionSchema>
<!--
These settings are always accessed using a URI-based query
path similar to "MACHINE/WEBROOT/APPHOST/{sitename}/{uri}".
Settings are inherited from lower levels in the URI hierarchy.
-->
<sectionSchema name="system.webServer/webdav/authoringRules">
<attribute name="defaultAccess" type="flags" defaultValue="None">
<flag name="None" value="0" />
<flag name="Read" value="1" />
<flag name="Write" value="2" />
<flag name="Source" value="16" />
</attribute>
<attribute name="allowNonMimeMapFiles" type="bool" defaultValue="true" />
<attribute name="defaultMimeType" type="string" defaultValue="application/octet-stream" />
<collection addElement="add" clearElement="clear" removeElement="remove">
<attribute name="users" type="string" isCombinedKey="true" />
<attribute name="roles" type="string" isCombinedKey="true" />
<attribute name="path" type="string" isCombinedKey="true" validationType="nonEmptyString" />
<attribute name="access" type="flags" defaultValue="Read">
<flag name="None" value="0" />
<flag name="Read" value="1" />
<flag name="Write" value="2" />
<flag name="Source" value="16" />
</attribute>
</collection>
</sectionSchema>
</configSchema>

264
IISExpress/config/schema/rewrite_schema.xml
View File

@ -1,264 +0,0 @@
<!--
IIS URL Rewrite configuration schema.
** Please DO NOT edit this file yourself. **
If you want to add configuration sections to the schema, you may place
them in .xml files similar to this one, in this directory. They will be
picked up automatically on startup.
-->
<configSchema>
<sectionSchema name="system.webServer/rewrite/globalRules">
<collection addElement="rule" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
<attribute name="enabled" type="bool" defaultValue="true"/>
<attribute name="patternSyntax" type="enum" defaultValue="ECMAScript">
<enum name="ECMAScript" value="0"/>
<enum name="Wildcard" value="1"/>
<enum name="ExactMatch" value="2"/>
</attribute>
<attribute name="stopProcessing" type="bool" defaultValue="false"/>
<element name="match">
<attribute name="url" type="string" validationType="nonEmptyString"/>
<attribute name="ignoreCase" type="bool" defaultValue="true"/>
<attribute name="negate" type="bool" defaultValue="false"/>
</element>
<element name="conditions">
<attribute name="logicalGrouping" type="enum" defaultValue="MatchAll">
<enum name="MatchAll" value="0"/>
<enum name="MatchAny" value="1"/>
</attribute>
<attribute name="trackAllCaptures" type="bool" defaultValue="false" />
<collection addElement="add">
<attribute name="input" type="string" isCombinedKey="true"/>
<attribute name="matchType" type="enum" defaultValue="Pattern" isCombinedKey="true">
<enum name="Pattern" value="0"/>
</attribute>
<attribute name="pattern" type="string" isCombinedKey="true"/>
<attribute name="ignoreCase" type="bool" defaultValue="true" isCombinedKey="true"/>
<attribute name="negate" type="bool" defaultValue="false" isCombinedKey="true"/>
</collection>
</element>
<element name="serverVariables">
<collection addElement="set">
<attribute name="name" type="string" required="true" isUniqueKey="true" validationType="requireTrimmedString"/>
<attribute name="value" type="string" />
<attribute name="replace" type="bool" defaultValue="true" />
</collection>
</element>
<element name="action">
<attribute name="type" type="enum" defaultValue="None">
<enum name="None" value="0"/>
<enum name="Rewrite" value="1"/>
<enum name="Redirect" value="2"/>
<enum name="CustomResponse" value="3"/>
<enum name="AbortRequest" value="4"/>
</attribute>
<attribute name="url" type="string" validationType="requireTrimmedString"/>
<attribute name="appendQueryString" type="bool" defaultValue="true"/>
<attribute name="redirectType" type="enum" defaultValue="Permanent">
<enum name="Permanent" value="301"/>
<enum name="Found" value="302"/>
<enum name="SeeOther" value="303"/>
<enum name="Temporary" value="307"/>
</attribute>
<attribute name="statusCode" type="uint" validationType="integerRange" validationParameter="300,307,exclude" defaultValue="0"/>
<attribute name="subStatusCode" type="uint" validationType="integerRange" validationParameter="0,999" defaultValue="0"/>
<attribute name="statusReason" type="string"/>
<attribute name="statusDescription" type="string"/>
</element>
</collection>
</sectionSchema>
<sectionSchema name="system.webServer/rewrite/allowedServerVariables">
<collection addElement="add" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
</collection>
</sectionSchema>
<sectionSchema name="system.webServer/rewrite/rules">
<collection addElement="rule" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
<attribute name="enabled" type="bool" defaultValue="true"/>
<attribute name="patternSyntax" type="enum" defaultValue="ECMAScript">
<enum name="ECMAScript" value="0"/>
<enum name="Wildcard" value="1"/>
<enum name="ExactMatch" value="2"/>
</attribute>
<attribute name="stopProcessing" type="bool" defaultValue="false"/>
<element name="match">
<attribute name="url" type="string" validationType="nonEmptyString"/>
<attribute name="ignoreCase" type="bool" defaultValue="true"/>
<attribute name="negate" type="bool" defaultValue="false"/>
</element>
<element name="conditions">
<attribute name="logicalGrouping" type="enum" defaultValue="MatchAll">
<enum name="MatchAll" value="0"/>
<enum name="MatchAny" value="1"/>
</attribute>
<attribute name="trackAllCaptures" type="bool" defaultValue="false" />
<collection addElement="add">
<attribute name="input" type="string"/>
<attribute name="matchType" type="enum" defaultValue="Pattern">
<enum name="Pattern" value="0"/>
<enum name="IsFile" value="1"/>
<enum name="IsDirectory" value="2"/>
</attribute>
<attribute name="pattern" type="string"/>
<attribute name="ignoreCase" type="bool" defaultValue="true"/>
<attribute name="negate" type="bool" defaultValue="false"/>
</collection>
</element>
<element name="serverVariables">
<collection addElement="set">
<attribute name="name" type="string" required="true" isUniqueKey="true" validationType="requireTrimmedString"/>
<attribute name="value" type="string" />
<attribute name="replace" type="bool" defaultValue="true" />
</collection>
</element>
<element name="action">
<attribute name="type" type="enum" defaultValue="None">
<enum name="None" value="0"/>
<enum name="Rewrite" value="1"/>
<enum name="Redirect" value="2"/>
<enum name="CustomResponse" value="3"/>
<enum name="AbortRequest" value="4"/>
</attribute>
<attribute name="url" type="string" validationType="requireTrimmedString"/>
<attribute name="appendQueryString" type="bool" defaultValue="true"/>
<attribute name="logRewrittenUrl" type="bool" defaultValue="false"/>
<attribute name="redirectType" type="enum" defaultValue="Permanent">
<enum name="Permanent" value="301"/>
<enum name="Found" value="302"/>
<enum name="SeeOther" value="303"/>
<enum name="Temporary" value="307"/>
</attribute>
<attribute name="statusCode" type="uint" validationType="integerRange" validationParameter="300,307,exclude"/>
<attribute name="subStatusCode" type="uint" validationType="integerRange" validationParameter="0,999" defaultValue="0"/>
<attribute name="statusReason" type="string"/>
<attribute name="statusDescription" type="string"/>
</element>
</collection>
</sectionSchema>
<sectionSchema name="system.webServer/rewrite/outboundRules">
<attribute name="rewriteBeforeCache" type="bool" defaultValue="false" />
<element name="customTags">
<collection addElement="tags" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
<collection addElement="tag" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isCombinedKey="true" validationType="nonEmptyString" />
<attribute name="attribute" type="string" required="true" isCombinedKey="true" validationType="nonEmptyString"/>
</collection>
</collection>
</element>
<element name="preConditions">
<collection addElement="preCondition" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
<attribute name="logicalGrouping" type="enum" defaultValue="MatchAll">
<enum name="MatchAll" value="0"/>
<enum name="MatchAny" value="1"/>
</attribute>
<attribute name="patternSyntax" type="enum" defaultValue="ECMAScript">
<enum name="ECMAScript" value="0"/>
<enum name="Wildcard" value="1"/>
<enum name="ExactMatch" value="2"/>
</attribute>
<collection addElement="add">
<attribute name="input" type="string" isCombinedKey="true"/>
<attribute name="matchType" type="enum" defaultValue="Pattern" isCombinedKey="true">
<enum name="Pattern" value="0" isCombinedKey="true"/>
</attribute>
<attribute name="pattern" type="string" isCombinedKey="true"/>
<attribute name="ignoreCase" type="bool" defaultValue="true" isCombinedKey="true"/>
<attribute name="negate" type="bool" defaultValue="false" isCombinedKey="true"/>
</collection>
</collection>
</element>
<collection addElement="rule" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true"/>
<attribute name="preCondition" type="string"/>
<attribute name="enabled" type="bool" defaultValue="true"/>
<attribute name="patternSyntax" type="enum" defaultValue="ECMAScript">
<enum name="ECMAScript" value="0"/>
<enum name="Wildcard" value="1"/>
<enum name="ExactMatch" value="2"/>
</attribute>
<attribute name="stopProcessing" type="bool" defaultValue="false"/>
<element name="match">
<attribute name="filterByTags" type="flags" default="None">
<flag name="None" value="0"/>
<flag name="A" value="1"/> <!--href-->
<flag name="Area" value="2"/> <!--href-->
<flag name="Base" value="4"/> <!--href-->
<flag name="Form" value="8"/> <!--action-->
<flag name="Frame" value="16"/> <!--src,longdesc-->
<flag name="Head" value="32"/> <!--profile-->
<flag name="IFrame" value="64"/> <!--src,longdesc-->
<flag name="Img" value="128"/> <!--src,longdesc,usemap-->
<flag name="Input" value="256"/> <!--src,usemap-->
<flag name="Link" value="512"/> <!--href-->
<flag name="Script" value="1024"/> <!--src-->
<flag name="CustomTags" value="32768"/> <!--Use filter attribute-->
</attribute>
<attribute name="customTags" type="string"/>
<attribute name="serverVariable" type="string" />
<attribute name="pattern" type="string"/>
<attribute name="occurrences" type="int64" defaultValue="0"/>
<attribute name="ignoreCase" type="bool" defaultValue="true"/>
<attribute name="negate" type="bool" defaultValue="false"/>
</element>
<element name="conditions">
<attribute name="logicalGrouping" type="enum" defaultValue="MatchAll">
<enum name="MatchAll" value="0"/>
<enum name="MatchAny" value="1"/>
</attribute>
<attribute name="trackAllCaptures" type="bool" defaultValue="true" />
<collection addElement="add">
<attribute name="input" type="string" isCombinedKey="true"/>
<attribute name="matchType" type="enum" defaultValue="Pattern" isCombinedKey="true">
<enum name="Pattern" value="0"/>
</attribute>
<attribute name="pattern" type="string" isCombinedKey="true"/>
<attribute name="ignoreCase" type="bool" defaultValue="true" isCombinedKey="true"/>
<attribute name="negate" type="bool" defaultValue="false" isCombinedKey="true"/>
</collection>
</element>
<element name="action">
<attribute name="type" type="enum" defaultValue="None">
<enum name="None" value="0"/>
<enum name="Rewrite" value="1"/>
</attribute>
<attribute name="value" type="string" />
<attribute name="replace" type="bool" defaultValue="true"/>
</element>
</collection>
</sectionSchema>
<sectionSchema name="system.webServer/rewrite/providers">
<collection addElement="provider" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true" validationType="requireTrimmedString"/>
<attribute name="type" type="string" required="true" validationType="requireTrimmedString" />
<element name="settings">
<collection addElement="add" clearElement="clear" removeElement="remove">
<attribute name="key" type="string" required="true" isUniqueKey="true" validationType="nonEmptyString" />
<attribute name="value" type="string" />
<attribute name="encryptedValue" type="string" encrypted="true" defaultValue="[enc:AesProvider::enc]" />
</collection>
</element>
</collection>
</sectionSchema>
<sectionSchema name="system.webServer/rewrite/rewriteMaps">
<collection addElement="rewriteMap" clearElement="clear" removeElement="remove">
<attribute name="name" type="string" required="true" isUniqueKey="true" validationType="requireTrimmedString"/>
<attribute name="defaultValue" type="string"/>
<attribute name="ignoreCase" type="bool" defaultValue="true"/>
<collection addElement="add" clearElement="clear" removeElement="remove">
<attribute name="key" type="string" required="true" caseSensitive="true" isUniqueKey="true"/>
<attribute name="value" type="string"/>
</collection>
</collection>
</sectionSchema>
</configSchema>

BIN
IISExpress/dirlist.dll
View File

Binary file not shown.

BIN
IISExpress/filter.dll
View File

Binary file not shown.

30
IISExpress/iisexpress.exe.manifest
View File

@ -1,30 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='nativrd2' version='1.0.0.0' />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='browscap' version='1.0.0.0' />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='rsca2' version='1.0.0.0' />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' />
</dependentAssembly>
</dependency>
</assembly>

20
IISExpress/iisexpresstray.exe.manifest
View File

@ -1,20 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='nativrd2' version='1.0.0.0' />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity type='win32' name='rsca2' version='1.0.0.0' />
</dependentAssembly>
</dependency>
</assembly>

BIN
IISExpress/iisfcgi.dll
View File

Binary file not shown.

BIN
IISExpress/iisfreb.dll
View File

Binary file not shown.

BIN
IISExpress/iisreqs.dll
View File

Binary file not shown.

BIN
IISExpress/iprestr.dll
View File

Binary file not shown.

BIN
IISExpress/isapi.dll
View File

Binary file not shown.

BIN
IISExpress/logcust.dll
View File

Binary file not shown.

BIN
IISExpress/loghttp.dll
View File

Binary file not shown.

BIN
IISExpress/protsup.dll
View File

Binary file not shown.

BIN
IISExpress/rewrite.dll
View File

Binary file not shown.

BIN
IISExpress/urlauthz.dll
View File

Binary file not shown.

BIN
IISExpress/webdav.dll
View File

Binary file not shown.

BIN
IISExpress/webdav_simple_lock.dll
View File

Binary file not shown.

BIN
IISExpress/webdav_simple_prop.dll
View File

Binary file not shown.

BIN
IISExpress/webmatrixsup.dll
View File

Binary file not shown.

9
NzbDrone.Core.Test/DownloadProviderTest.cs
View File

@ -17,7 +17,7 @@ namespace NzbDrone.Core.Test
public class DownloadProviderTest : TestBase public class DownloadProviderTest : TestBase
{ {
[Test] [Test]
public void Download_report_should_send_to_sab_and_add_to_history() public void Download_report_should_send_to_sab_add_to_history_mark_as_grabbed()
{ {
var mocker = new AutoMoqer(MockBehavior.Strict); var mocker = new AutoMoqer(MockBehavior.Strict);
var parseResult = Builder<EpisodeParseResult>.CreateNew() var parseResult = Builder<EpisodeParseResult>.CreateNew()
@ -52,6 +52,13 @@ namespace NzbDrone.Core.Test
mocker.GetMock<EpisodeProvider>() mocker.GetMock<EpisodeProvider>()
.Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>(), false)).Returns(episodes); .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>(), false)).Returns(episodes);
mocker.GetMock<EpisodeProvider>()
.Setup(c => c.MarkEpisodeAsFetched(12));
mocker.GetMock<EpisodeProvider>()
.Setup(c => c.MarkEpisodeAsFetched(99));
mocker.Resolve<DownloadProvider>().DownloadReport(parseResult); mocker.Resolve<DownloadProvider>().DownloadReport(parseResult);
mocker.VerifyAllMocks(); mocker.VerifyAllMocks();

25
NzbDrone.Core.Test/EpisodeProviderTest.cs
View File

@ -757,6 +757,31 @@ namespace NzbDrone.Core.Test
episode.EpisodeFile.Should().BeNull(); episode.EpisodeFile.Should().BeNull();
} }
[Test]
public void MarkEpisodeAsFetched()
{
var mocker = new AutoMoqer();
var db = MockLib.GetEmptyDatabase();
mocker.SetConstant(db);
var fakeEpisodes = Builder<Episode>.CreateListOfSize(5)
.WhereAll().Have(e => e.GrabDate = null)
.Build();
db.InsertMany(fakeEpisodes);
//Act
mocker.Resolve<EpisodeProvider>().MarkEpisodeAsFetched(2);
var episodes = db.Fetch<Episode>();
//Assert
episodes.Where(e => e.EpisodeId == 2).Single().GrabDate.Should().BeWithin(TimeSpan.FromSeconds(5)).Before(
DateTime.Now);
episodes.Where(e => e.GrabDate == null).Should().HaveCount(4);
}
} }

31
NzbDrone.Core.Test/IndexerTests.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
@ -159,8 +160,9 @@ namespace NzbDrone.Core.Test
ExceptionVerification.IgnoreWarns(); ExceptionVerification.IgnoreWarns();
} }
[Test] [TestCase("simpsons", 21, 23)]
public void nzbsorg_search_returns_valid_results() [TestCase("Hawaii Five-0 (2010)", 1, 5)]
public void nzbsorg_search_returns_valid_results(string title, int season, int episode)
{ {
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
@ -174,16 +176,16 @@ namespace NzbDrone.Core.Test
mocker.Resolve<HttpProvider>(); mocker.Resolve<HttpProvider>();
var result = mocker.Resolve<NzbsOrg>().FetchEpisode("Simpsons", 21, 23); var result = mocker.Resolve<NzbsOrg>().FetchEpisode(title, season, episode);
result.Should().NotBeEmpty(); result.Should().NotBeEmpty();
result.Should().OnlyContain(r => r.CleanTitle == "simpsons"); result.Should().OnlyContain(r => r.CleanTitle == Parser.NormalizeTitle(title));
result.Should().OnlyContain(r => r.SeasonNumber == 21); result.Should().OnlyContain(r => r.SeasonNumber == season);
result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(23)); result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(episode));
} }
[TestCase("simpsons", 21, 23)] [TestCase("simpsons", 21, 23)]
[TestCase("Hawaii Five-0 2010", 1, 5)] [TestCase("Hawaii Five-0 (2010)", 1, 1)]
public void newzbin_search_returns_valid_results(string title, int season, int episode) public void newzbin_search_returns_valid_results(string title, int season, int episode)
{ {
var mocker = new AutoMoqer(); var mocker = new AutoMoqer();
@ -275,5 +277,20 @@ namespace NzbDrone.Core.Test
result.Should().OnlyContain(r => r.SeasonNumber == 1); result.Should().OnlyContain(r => r.SeasonNumber == 1);
result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(19)); result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(19));
} }
[TestCase("hawaii five-0 (2010)", "hawaii+five+0+2010")]
[TestCase("this& that", "this+that")]
[TestCase("this& that", "this+that")]
public void get_query_title(string raw, string clean)
{
var result = IndexerBase.GetQueryTitle(raw);
result.Should().Be(clean);
}
} }
} }

9
NzbDrone.Core.Test/LogProviderTest.cs
View File

@ -42,7 +42,10 @@ namespace NzbDrone.Core.Test
var logItem = db.Fetch<Log>().First(); var logItem = db.Fetch<Log>().First();
Assert.AreNotEqual(new DateTime(), logItem.Time); Assert.AreNotEqual(new DateTime(), logItem.Time);
Assert.AreEqual(message, logItem.Message); Assert.AreEqual(message, logItem.Message);
Assert.AreEqual(Logger.Name, logItem.Logger); Assert.AreEqual("Core.Test.LogProviderTest", logItem.Logger);
Logger.Name.Should().EndWith(logItem.Logger);
Assert.AreEqual(LogLevel.Info.Name, logItem.Level); Assert.AreEqual(LogLevel.Info.Name, logItem.Level);
Assert.AreEqual("write_log", logItem.Method); Assert.AreEqual("write_log", logItem.Method);
} }
@ -106,7 +109,7 @@ namespace NzbDrone.Core.Test
var logItem = db.Fetch<Log>().First(); var logItem = db.Fetch<Log>().First();
Assert.AreNotEqual(new DateTime(), logItem.Time); Assert.AreNotEqual(new DateTime(), logItem.Time);
Assert.AreEqual(message + ": " + ex.Message, logItem.Message); Assert.AreEqual(message + ": " + ex.Message, logItem.Message);
Assert.AreEqual(Logger.Name, logItem.Logger); Assert.AreEqual("Core.Test.LogProviderTest", logItem.Logger);
Assert.AreEqual(LogLevel.Error.Name, logItem.Level); Assert.AreEqual(LogLevel.Error.Name, logItem.Level);
Assert.AreEqual(ex.GetType().ToString(), logItem.ExceptionType); Assert.AreEqual(ex.GetType().ToString(), logItem.ExceptionType);
Assert.AreEqual(ex.ToString(), logItem.Exception); Assert.AreEqual(ex.ToString(), logItem.Exception);
@ -140,7 +143,7 @@ namespace NzbDrone.Core.Test
var logItem = db.Fetch<Log>().First(); var logItem = db.Fetch<Log>().First();
Assert.AreNotEqual(new DateTime(), logItem.Time); Assert.AreNotEqual(new DateTime(), logItem.Time);
Assert.AreEqual(ex.Message, logItem.Message); Assert.AreEqual(ex.Message, logItem.Message);
Assert.AreEqual(Logger.Name, logItem.Logger); Assert.AreEqual("Core.Test.LogProviderTest", logItem.Logger);
Assert.AreEqual(LogLevel.Error.Name, logItem.Level); Assert.AreEqual(LogLevel.Error.Name, logItem.Level);
Assert.AreEqual(ex.GetType().ToString(), logItem.ExceptionType); Assert.AreEqual(ex.GetType().ToString(), logItem.ExceptionType);
Assert.AreEqual(ex.ToString(), logItem.Exception); Assert.AreEqual(ex.ToString(), logItem.Exception);

2
NzbDrone.Core.Test/TvDbProviderTest.cs
View File

@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test
} }
//assert //assert
seasonsNumbers.Should().HaveCount(7); seasonsNumbers.Should().HaveCount(8);
seasons[1].Should().HaveCount(23); seasons[1].Should().HaveCount(23);
seasons[2].Should().HaveCount(19); seasons[2].Should().HaveCount(19);
seasons[3].Should().HaveCount(16); seasons[3].Should().HaveCount(16);

5
NzbDrone.Core/Instrumentation/DatabaseTarget.cs
View File

@ -33,6 +33,11 @@ namespace NzbDrone.Core.Instrumentation
log.Logger = logEvent.LoggerName; log.Logger = logEvent.LoggerName;
if (log.Logger.StartsWith("NzbDrone."))
{
log.Logger = log.Logger.Remove(0, 9);
}
if (logEvent.Exception != null) if (logEvent.Exception != null)
{ {
if (String.IsNullOrWhiteSpace(log.Message)) if (String.IsNullOrWhiteSpace(log.Message))

9
NzbDrone.Core/Instrumentation/ExceptioneerTarget.cs
View File

@ -8,15 +8,14 @@ namespace NzbDrone.Core.Instrumentation
{ {
public class ExceptioneerTarget : Target public class ExceptioneerTarget : Target
{ {
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
protected override void Write(LogEventInfo logEvent) protected override void Write(LogEventInfo logEvent)
{ {
if (logEvent.Exception == null)
throw new InvalidOperationException(
@"Missing Exception Object.. Please Use Logger.FatalException() or Logger.ErrorException() rather
than Logger.Fatal() and Logger.Error()");
if (!Debugger.IsAttached) if (!Debugger.IsAttached)
{ {
Logger.Trace("Sending Exception to Exceptioneer");
new Client new Client
{ {
ApiKey = "43BBF60A-EB2A-4C1C-B09E-422ADF637265", ApiKey = "43BBF60A-EB2A-4C1C-B09E-422ADF637265",

2
NzbDrone.Core/Instrumentation/LogConfiguration.cs
View File

@ -24,7 +24,7 @@ namespace NzbDrone.Core.Instrumentation
public static void StartDbLogging() public static void StartDbLogging()
{ {
#if Release #if RELEASE
var exTarget = new ExceptioneerTarget(); var exTarget = new ExceptioneerTarget();
LogManager.Configuration.AddTarget("Exceptioneer", exTarget); LogManager.Configuration.AddTarget("Exceptioneer", exTarget);
LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Error, exTarget)); LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Error, exTarget));

1
NzbDrone.Core/Parser.cs
View File

@ -300,7 +300,6 @@ namespace NzbDrone.Core
return result; return result;
} }
Logger.Trace("Quality Parsed:{0} Title:", result, name);
return result; return result;
} }

2
NzbDrone.Core/Providers/DiskScanProvider.cs
View File

@ -156,7 +156,7 @@ namespace NzbDrone.Core.Providers
_diskProvider.CreateDirectory(newFile.DirectoryName); _diskProvider.CreateDirectory(newFile.DirectoryName);
//Do the rename //Do the rename
Logger.Debug("Moving file [{0}] > [1]", episodeFile.Path, newFile.FullName); Logger.Debug("Moving file [{0}] > [{1}]", episodeFile.Path, newFile.FullName);
_diskProvider.MoveFile(episodeFile.Path, newFile.FullName); _diskProvider.MoveFile(episodeFile.Path, newFile.FullName);
//Update the filename in the DB //Update the filename in the DB

1
NzbDrone.Core/Providers/DownloadProvider.cs
View File

@ -51,6 +51,7 @@ namespace NzbDrone.Core.Providers
history.SeriesId = episode.SeriesId; history.SeriesId = episode.SeriesId;
_historyProvider.Add(history); _historyProvider.Add(history);
_episodeProvider.MarkEpisodeAsFetched(episode.EpisodeId);
} }
} }

7
NzbDrone.Core/Providers/EpisodeProvider.cs
View File

@ -106,6 +106,13 @@ namespace NzbDrone.Core.Providers
} }
public virtual void MarkEpisodeAsFetched(int episodeId)
{
Logger.Trace("Marking episode {0} as fetched.", episodeId);
_database.Execute("UPDATE Episodes SET GrabDate=@0 WHERE EpisodeId=@1", DateTime.Now, episodeId);
}
public virtual IList<Episode> GetEpisodesByParseResult(EpisodeParseResult parseResult, Boolean autoAddNew = false) public virtual IList<Episode> GetEpisodesByParseResult(EpisodeParseResult parseResult, Boolean autoAddNew = false)
{ {
var result = new List<Episode>(); var result = new List<Episode>();

16
NzbDrone.Core/Providers/Fakes/FakeNotificationProvider.cs
View File

@ -31,7 +31,7 @@ namespace NzbDrone.Core.Providers.Fakes
fakeNotification.Status = ProgressNotificationStatus.InProgress; fakeNotification.Status = ProgressNotificationStatus.InProgress;
fakeNotification2.CurrentMessage = DateTime.UtcNow.ToString(); fakeNotification2.CurrentMessage = DateTime.UtcNow.ToString();
fakeNotification.CurrentMessage = DateTime.Now.ToString(); fakeNotification.CurrentMessage = DateTime.Now.ToString();
return new List<ProgressNotification> {fakeNotification}; return new List<ProgressNotification> { fakeNotification };
} }
} }
@ -45,19 +45,5 @@ namespace NzbDrone.Core.Providers.Fakes
_basicNotifications.Add(notification.Id, notification); _basicNotifications.Add(notification.Id, notification);
} }
public void Dismiss(Guid notificationId)
{
lock (_lock)
{
if (_basicNotifications.ContainsKey(notificationId))
{
_basicNotifications.Remove(notificationId);
}
else if (_progressNotification.ContainsKey(notificationId))
{
_progressNotification.Remove(notificationId);
}
}
}
} }
} }

13
NzbDrone.Core/Providers/Indexer/IndexerBase.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.ServiceModel.Syndication; using System.ServiceModel.Syndication;
using System.Text.RegularExpressions;
using System.Web; using System.Web;
using Ninject; using Ninject;
using NLog; using NLog;
@ -16,6 +17,8 @@ namespace NzbDrone.Core.Providers.Indexer
private readonly HttpProvider _httpProvider; private readonly HttpProvider _httpProvider;
protected readonly ConfigProvider _configProvider; protected readonly ConfigProvider _configProvider;
private static readonly Regex TitleSearchRegex = new Regex(@"[\W]", RegexOptions.IgnoreCase | RegexOptions.Compiled);
[Inject] [Inject]
protected IndexerBase(HttpProvider httpProvider, ConfigProvider configProvider) protected IndexerBase(HttpProvider httpProvider, ConfigProvider configProvider)
{ {
@ -102,7 +105,7 @@ namespace NzbDrone.Core.Providers.Indexer
var result = new List<EpisodeParseResult>(); var result = new List<EpisodeParseResult>();
var searchUrls = GetSearchUrls(HttpUtility.UrlDecode(seriesTitle), seasonNumber, episodeNumber); var searchUrls = GetSearchUrls(GetQueryTitle(seriesTitle), seasonNumber, episodeNumber);
foreach (var url in searchUrls) foreach (var url in searchUrls)
{ {
@ -165,9 +168,13 @@ namespace NzbDrone.Core.Providers.Indexer
return CustomParser(item, episodeParseResult); return CustomParser(item, episodeParseResult);
} }
protected static string GetQueryTitle(string title) public static string GetQueryTitle(string title)
{ {
return title.Trim().Replace(' ', '+'); var cleanTitle = TitleSearchRegex.Replace(title, "+").Trim('+', ' ');
//remove any repeating +s
cleanTitle = Regex.Replace(cleanTitle, @"\+{1,100}", "+");
return cleanTitle;
} }
} }
} }

2
NzbDrone.Core/Providers/InventoryProvider.cs
View File

@ -110,7 +110,7 @@ namespace NzbDrone.Core.Providers
{ {
if (currentQuality.QualityType >= cutOff) if (currentQuality.QualityType >= cutOff)
{ {
Logger.Trace("Existing file meets cut-off. skipping."); Logger.Trace("Existing item meets cut-off. skipping.");
return false; return false;
} }

6
NzbDrone.Web/Global.asax.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Data.Common; using System.Data.Common;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
@ -41,6 +42,11 @@ namespace NzbDrone.Web
RegisterRoutes(RouteTable.Routes); RegisterRoutes(RouteTable.Routes);
//base.OnApplicationStarted(); //base.OnApplicationStarted();
AreaRegistration.RegisterAllAreas(); AreaRegistration.RegisterAllAreas();
var razor =ViewEngines.Engines.Where(e => e.GetType() == typeof (RazorViewEngine)).Single();
ViewEngines.Engines.Clear();
ViewEngines.Engines.Add(razor);
RegisterGlobalFilters(GlobalFilters.Filters); RegisterGlobalFilters(GlobalFilters.Filters);
Logger.Debug("Fully initialized and ready."); Logger.Debug("Fully initialized and ready.");

5
NzbDrone.Web/Views/Log/Index.cshtml
View File

@ -31,12 +31,13 @@ Logs
.TableHtmlAttributes(new { @class = "Grid" }) .TableHtmlAttributes(new { @class = "Grid" })
.Columns(columns => .Columns(columns =>
{ {
columns.Bound(c => c.Time).Title("Time").Width(190); columns.Bound(c => c.Time).Title("Time").Width(0);
columns.Bound(c => c.Level).Title("Level").Width(0); columns.Bound(c => c.Level).Title("Level").Width(0);
columns.Bound(c => c.Logger).Title("Source").Width(0);
columns.Bound(c => c.Message); columns.Bound(c => c.Message);
}) })
.DetailView(detailView => detailView.ClientTemplate( .DetailView(detailView => detailView.ClientTemplate(
"<div>Logger: <#= Logger #></div>" + "<div>Method: <#= Method #></div>" +
"<div><#= ExceptionType #></div>" + "<div><#= ExceptionType #></div>" +
"<div class='stackframe'><#= Exception #></div>" "<div class='stackframe'><#= Exception #></div>"
)).DataBinding(data => data.Ajax().Select("_AjaxBinding", "Log")) )).DataBinding(data => data.Ajax().Select("_AjaxBinding", "Log"))

45
NzbDrone.Web/Views/Settings/Quality.cshtml
View File

@ -1,28 +1,26 @@
@using NzbDrone.Web.Helpers; @using NzbDrone.Web.Helpers;
@model NzbDrone.Web.Models.QualityModel @model NzbDrone.Web.Models.QualityModel
@section HeaderContent{ @section HeaderContent{
<link rel="stylesheet" type="text/css" href="../../Content/Settings.css" /> <link rel="stylesheet" type="text/css" href="/Content/Settings.css" />
<link href="../../Content/QualitySettings.css" rel="stylesheet" type="text/css" /> <link href="/Content/QualitySettings.css" rel="stylesheet" type="text/css" />
} }
@section TitleContent{ @section TitleContent{
Settings Settings
} }
@section ActionMenu{ @section ActionMenu{
@{Html.RenderPartial("SubMenu");} @{Html.RenderPartial("SubMenu");}
} }
@section MainContent{ @section MainContent{
<div id="stylized"> <div id="stylized">
@using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" })) @using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
{ {
<div id="top" class="settingsForm clearfix"> <div id="top" class="settingsForm clearfix">
<h1>Quality</h1> <h1>
<p></p> Quality</h1>
<p>
</p>
<label class="labelClass">@Html.LabelFor(m => m.DefaultQualityProfileId) <label class="labelClass">@Html.LabelFor(m => m.DefaultQualityProfileId)
<span class="small">@Html.DescriptionFor(m => m.DefaultQualityProfileId)</span> <span class="small">@Html.DescriptionFor(m => m.DefaultQualityProfileId)</span>
</label> </label>
@Html.DropDownListFor(m => m.DefaultQualityProfileId, Model.QualityProfileSelectList, new { @class = "inputClass" }) @Html.DropDownListFor(m => m.DefaultQualityProfileId, Model.QualityProfileSelectList, new { @class = "inputClass" })
</div> </div>
@ -31,9 +29,9 @@
<div id="profileContainer"> <div id="profileContainer">
<div id="profileHeader"> <div id="profileHeader">
<a id="addItem" href="@Url.Action("AddProfile", "Settings")"> <a id="addItem" href="@Url.Action("AddProfile", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" /> Add New Profile</a> <img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" />
Add New Profile</a>
</div> </div>
<div id="profiles" class="clearfix"> <div id="profiles" class="clearfix">
@foreach (var item in Model.Profiles) @foreach (var item in Model.Profiles)
{ {
@ -42,20 +40,19 @@
</div> </div>
</div> </div>
<br /> <br />
<button type="submit" id="save_button" >Save</button><img src="../../Content/Images/ajax-loader.gif" alt="Loader" id="saveAjax"/> Save</button><img src="../../Content/Images/ajax-loader.gif" alt="Loader" id="saveAjax" />
</div> </div>
} }
</div> </div>
<div id="result" class="hiddenResult">
<div id="result" class="hiddenResult"></div> </div>
} }
@section Scripts{ @section Scripts{
<script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script> <script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
<script src="http://ajax.aspnetcdn.com/ajax/mvc/3.0/jquery.validate.unobtrusive.min.js" type="text/javascript"></script> <script src="http://ajax.aspnetcdn.com/ajax/mvc/3.0/jquery.validate.unobtrusive.min.js"
type="text/javascript"></script>
<script src="../../Scripts/settingsForm.js" type="text/javascript"></script> <script src="../../Scripts/settingsForm.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
$("#addItem").live('click', function () { $("#addItem").live('click', function () {
$.ajax({ $.ajax({
@ -112,7 +109,7 @@
} }
}); });
} }
function getProfileId(obj) { function getProfileId(obj) {
var parentProfileSection = $(obj).parents('.profileSection'); var parentProfileSection = $(obj).parents('.profileSection');
return parentProfileSection.children('.qualityProfileId').val(); return parentProfileSection.children('.qualityProfileId').val();

4
NzbDrone.Web/Views/Settings/Sabnzbd.cshtml
View File

@ -74,9 +74,7 @@
} }
@section Scripts{ @section Scripts{
<script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script> <script src="/Scripts/settingsForm.js" type="text/javascript"></script>
<script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
<script src="../../Scripts/settingsForm.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")'; var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';

2
NzbDrone.Web/Views/Shared/_Layout.cshtml
View File

@ -61,7 +61,7 @@
<span id="msgText">background notification</span> <span id="msgText">background notification</span>
</div> </div>
@(Html.Telerik().ScriptRegistrar().jQuery(false)) @(Html.Telerik().ScriptRegistrar().jQuery(false))
<script type="text/javascript" src="/Scripts/Notification.js"></script> <script type="text/javascript" src="/Scripts/Notification.js" async="async"></script>
@RenderSection("Scripts", required: false) @RenderSection("Scripts", required: false)
</body> </body>
</html> </html>

BIN
NzbDrone/Microsoft.Web.Administration.dll
View File

Binary file not shown.

2
NzbDrone/NzbDrone.csproj
View File

@ -74,7 +74,6 @@
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -91,7 +90,6 @@
<None Include="app.config" /> <None Include="app.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Microsoft.Web.Administration.dll" />
<Content Include="NzbDrone.ico" /> <Content Include="NzbDrone.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

20
NzbDrone/Program.cs
View File

@ -12,21 +12,25 @@ namespace NzbDrone
private static void Main() private static void Main()
{ {
Logger.Info(Process.GetCurrentProcess().Id);
try try
{ {
Config.ConfigureNlog();
Logger.Info("Starting NZBDrone. Start-up Path:'{0}'", Config.ProjectRoot);
Thread.CurrentThread.Name = "Host"; Thread.CurrentThread.Name = "Host";
Process currentProcess = Process.GetCurrentProcess();
if (currentProcess.PriorityClass < ProcessPriorityClass.Normal)
{
Logger.Info("Promoting process priority from {0} to {1}", currentProcess.PriorityClass, ProcessPriorityClass.Normal);
currentProcess.PriorityClass = ProcessPriorityClass.Normal;
}
currentProcess.EnableRaisingEvents = true;
currentProcess.Exited += ProgramExited;
AppDomain.CurrentDomain.UnhandledException += ((s, e) => AppDomainException(e)); AppDomain.CurrentDomain.UnhandledException += ((s, e) => AppDomainException(e));
AppDomain.CurrentDomain.ProcessExit += ProgramExited; AppDomain.CurrentDomain.ProcessExit += ProgramExited;
AppDomain.CurrentDomain.DomainUnload += ProgramExited; AppDomain.CurrentDomain.DomainUnload += ProgramExited;
Process.GetCurrentProcess().EnableRaisingEvents = true;
Process.GetCurrentProcess().Exited += ProgramExited;
Config.ConfigureNlog();
Logger.Info("Starting NZBDrone. Start-up Path:'{0}'", Config.ProjectRoot);
IISController.StopServer(); IISController.StopServer();
IISController.StartServer(); IISController.StartServer();