conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
using System.Linq;
=======
using Microsoft.Extensions.Hosting;
>>>>>>>
using System.Linq;
using Microsoft.Extensions.Hosting;
<<<<<<<
// If cultures are specified in the configuration, use them (making sure they are among the available cultures),
// otherwise use all the available cultures
var supportedCultureCodes = (cultureConfiguration?.Cultures?.Count > 0 ?
cultureConfiguration.Cultures.Intersect(CultureConfiguration.AvailableCultures) :
CultureConfiguration.AvailableCultures);
if (supportedCultureCodes.Count() == 0)
supportedCultureCodes = CultureConfiguration.AvailableCultures;
var supportedCultures = supportedCultureCodes
.Select(c => new CultureInfo(c)).ToList();
// If the default culture is specified use it, otherwise use CultureConfiguration.DefaultRequestCulture ("en")
string defaultCultureCode = string.IsNullOrEmpty(cultureConfiguration?.DefaultCulture) ?
CultureConfiguration.DefaultRequestCulture : cultureConfiguration?.DefaultCulture;
// If the default culture is not among the supported cultures, use the first supported culture as default
if (!supportedCultureCodes.Contains(defaultCultureCode))
defaultCultureCode = supportedCultureCodes.FirstOrDefault();
opts.DefaultRequestCulture = new RequestCulture(defaultCultureCode);
=======
var supportedCultures = new[]
{
new CultureInfo("en"),
new CultureInfo("da"),
new CultureInfo("fa"),
new CultureInfo("fr"),
new CultureInfo("ru"),
new CultureInfo("sv"),
new CultureInfo("zh"),
new CultureInfo("es")
};
opts.DefaultRequestCulture = new RequestCulture("en");
>>>>>>>
// If cultures are specified in the configuration, use them (making sure they are among the available cultures),
// otherwise use all the available cultures
var supportedCultureCodes = (cultureConfiguration?.Cultures?.Count > 0 ?
cultureConfiguration.Cultures.Intersect(CultureConfiguration.AvailableCultures) :
CultureConfiguration.AvailableCultures);
if (supportedCultureCodes.Count() == 0)
supportedCultureCodes = CultureConfiguration.AvailableCultures;
var supportedCultures = supportedCultureCodes
.Select(c => new CultureInfo(c)).ToList();
// If the default culture is specified use it, otherwise use CultureConfiguration.DefaultRequestCulture ("en")
string defaultCultureCode = string.IsNullOrEmpty(cultureConfiguration?.DefaultCulture) ?
CultureConfiguration.DefaultRequestCulture : cultureConfiguration?.DefaultCulture;
// If the default culture is not among the supported cultures, use the first supported culture as default
if (!supportedCultureCodes.Contains(defaultCultureCode))
defaultCultureCode = supportedCultureCodes.FirstOrDefault();
opts.DefaultRequestCulture = new RequestCulture(defaultCultureCode); |
<<<<<<<
public static readonly string TestAuthorizationHeader = "FakeAuthorization";
=======
public const string TestUserPrefixHeader = "TestUser";
public const string TestUserId = "UserId";
public const string TestUserName = "UserName";
public const string TestUserRoles = "UserRoles";
public const string TestAdministrationRole = "SkorubaIdentityAdminAdministrator";
>>>>>>>
public static readonly string TestAuthorizationHeader = "FakeAuthorization";
public const string TestAdministrationRole = "SkorubaIdentityAdminAdministrator"; |
<<<<<<<
_textView.Closed += TextView_Closed;
_isRepl = _textView.Properties.ContainsProperty(BufferProperties.FromRepl);
=======
>>>>>>>
_textView.Closed += TextView_Closed; |
<<<<<<<
/// Looks up a localized string similar to This value is not one of the allowed values for parameter '{0}'..
/// </summary>
public static string Error_DisallowedValue_1arg {
get {
return ResourceManager.GetString("Error_DisallowedValue_1arg", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Parameter '{0}' must be of type '{1}'..
/// </summary>
public static string Error_TypeMismatch_2args {
get {
return ResourceManager.GetString("Error_TypeMismatch_2args", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to (script).
/// </summary>
public static string DropDownScriptName {
get {
return ResourceManager.GetString("DropDownScriptName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Use the dropdown to view and navigate to other items in this file..
/// </summary>
public static string DropDownToolTip {
get {
return ResourceManager.GetString("DropDownToolTip", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to This value is not one of the allowed values for parameter '{0}'..
/// </summary>
public static string Error_DisallowedValue_1arg {
get {
return ResourceManager.GetString("Error_DisallowedValue_1arg", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Parameter '{0}' must be of type '{1}'..
/// </summary>
public static string Error_TypeMismatch_2args {
get {
return ResourceManager.GetString("Error_TypeMismatch_2args", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to (script).
/// </summary>
public static string DropDownScriptName {
get {
return ResourceManager.GetString("DropDownScriptName", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Use the dropdown to view and navigate to other items in this file..
/// </summary>
public static string DropDownToolTip {
get {
return ResourceManager.GetString("DropDownToolTip", resourceCulture);
}
}
/// <summary> |
<<<<<<<
using System.Runtime.InteropServices;
=======
using System.ComponentModel.Composition;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.ComponentModelHost;
>>>>>>>
using System.ComponentModel.Composition;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.ComponentModelHost;
<<<<<<<
[ProvideEditorExtension(typeof(PowerShellEditorFactory), PowerShellConstants.PS1File, 1000)]
[ProvideEditorExtension(typeof(PowerShellEditorFactory), PowerShellConstants.PSM1File, 1000)]
[ProvideEditorLogicalView(typeof(PowerShellEditorFactory), "{7651a702-06e5-11d1-8ebd-00a0c90f26ea}")] //LOGVIEWID_Designer
[ProvideEditorLogicalView(typeof(PowerShellEditorFactory), "{7651a701-06e5-11d1-8ebd-00a0c90f26ea}")] //LOGVIEWID_Code
=======
[ProvideEditorExtension(typeof(PowerShellEditorFactory), PowerShellConstants.PS1File, 50, ProjectGuid = VSConstants.CLSID.MiscellaneousFilesProject_string, NameResourceID = 3004, DefaultName = "module", TemplateDir = "NewItemTemplates")]
[Export]
>>>>>>>
[ProvideEditorExtension(typeof(PowerShellEditorFactory), PowerShellConstants.PS1File, 1000)]
[ProvideEditorExtension(typeof(PowerShellEditorFactory), PowerShellConstants.PSM1File, 1000)]
[ProvideEditorLogicalView(typeof(PowerShellEditorFactory), "{7651a702-06e5-11d1-8ebd-00a0c90f26ea}")] //LOGVIEWID_Designer
[ProvideEditorLogicalView(typeof(PowerShellEditorFactory), "{7651a701-06e5-11d1-8ebd-00a0c90f26ea}")] //LOGVIEWID_Code
[Export] |
<<<<<<<
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
=======
>>>>>>>
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
<<<<<<<
=======
EstablishServiceConnection();
>>>>>>>
<<<<<<<
var connectionManager = new ConnectionManager();
IntelliSenseService = connectionManager.PowershellIntelliSenseServiceChannel;
DebuggingService = connectionManager.PowershellDebuggingServiceChannel;
=======
// This is for triggering the initialization so that first IntelliSense trigger won't take too long.
var firstTrigger = ConnectionManager.PowershellIntelliSenseSerivce;
>>>>>>>
// This is for triggering the initialization so that first IntelliSense trigger won't take too long.
var firstTrigger = ConnectionManager.PowershellIntelliSenseSerivce; |
<<<<<<<
=======
using Microsoft.VisualStudio.Shell.Interop;
using Microsoft.VisualStudio.Shell;
using Microsoft.Win32;
>>>>>>>
<<<<<<<
using System.IO;
using PowerShellTools.Common.ServiceManagement.DebuggingContract;
=======
using MessageBox = System.Windows.MessageBox;
using MessageBoxOptions = System.Windows.MessageBoxOptions;
>>>>>>>
using MessageBox = System.Windows.MessageBox;
<<<<<<<
internal static IPowershellIntelliSenseService IntelliSenseService
{
get
{
return ConnectionManager.Instance.PowershellIntelliSenseSerivce;
}
}
public static IPowershellDebuggingService DebuggingService
{
get
{
return ConnectionManager.Instance.PowershellDebuggingService;
}
}
=======
[Export]
internal DependencyValidator DependencyValidator { get; set; }
>>>>>>>
internal static IPowershellIntelliSenseService IntelliSenseService
{
get
{
return ConnectionManager.Instance.PowershellIntelliSenseSerivce;
}
}
public static IPowershellDebuggingService DebuggingService
{
get
{
return ConnectionManager.Instance.PowershellDebuggingService;
}
}
[Export]
internal DependencyValidator DependencyValidator { get; set; } |
<<<<<<<
private readonly Runspace _runspace = PowershellDebuggingService.Runspace;
private long _requestTrigger;
private string _script = string.Empty;
private int _caretPosition;
private IIntelliSenseServiceCallback _callback;
/// <summary>
/// Request trigger property
/// Once it was set, initellisense service starts processing the existing request in background thread
/// </summary>
public long RequestTrigger
{
get
{
return _requestTrigger;
}
set
{
_requestTrigger = value;
if (_callback == null)
{
_callback = OperationContext.Current.GetCallbackChannel<IIntelliSenseServiceCallback>();
}
// Start process the existing waiting request, should only be one
Task.Run(() =>
{
try
{
var commandCompletion = CommandCompletionHelper.GetCommandCompletionList(_script, _caretPosition, _runspace);
ServiceCommon.Log("Getting completion list at position {0}", _caretPosition);
if (commandCompletion != null && commandCompletion.CompletionMatches.Count() > 0)
{
ServiceCommon.LogCallbackEvent("Callback intellisense at position {0}", _caretPosition);
_callback.PushCompletionResult(CompletionResultList.FromCommandCompletion(commandCompletion));
}
// Reset trigger
_requestTrigger = 0;
}
catch (Exception ex)
{
ServiceCommon.Log("Failed to retrieve the completion list per request due to exception: {0}", ex.Message);
}
});
}
}
/// <summary>
/// Default ctor
/// </summary>
public PowerShellIntelliSenseService() { }
/// <summary>
/// Ctor (unit test hook)
/// </summary>
/// <param name="callback">Callback context object (unit test hook)</param>
public PowerShellIntelliSenseService(IIntelliSenseServiceCallback callback)
:this()
{
_callback = callback;
_runspace = RunspaceFactory.CreateRunspace();
_runspace.Open();
}
=======
private readonly Runspace _runspace = PowerShellDebuggingService.Runspace;
>>>>>>>
private readonly Runspace _runspace = PowerShellDebuggingService.Runspace;
private long _requestTrigger;
private string _script = string.Empty;
private int _caretPosition;
private IIntelliSenseServiceCallback _callback;
/// <summary>
/// Request trigger property
/// Once it was set, initellisense service starts processing the existing request in background thread
/// </summary>
public long RequestTrigger
{
get
{
return _requestTrigger;
}
set
{
_requestTrigger = value;
if (_callback == null)
{
_callback = OperationContext.Current.GetCallbackChannel<IIntelliSenseServiceCallback>();
}
// Start process the existing waiting request, should only be one
Task.Run(() =>
{
try
{
var commandCompletion = CommandCompletionHelper.GetCommandCompletionList(_script, _caretPosition, _runspace);
ServiceCommon.Log("Getting completion list at position {0}", _caretPosition);
if (commandCompletion != null && commandCompletion.CompletionMatches.Count() > 0)
{
ServiceCommon.LogCallbackEvent("Callback intellisense at position {0}", _caretPosition);
_callback.PushCompletionResult(CompletionResultList.FromCommandCompletion(commandCompletion));
}
// Reset trigger
_requestTrigger = 0;
}
catch (Exception ex)
{
ServiceCommon.Log("Failed to retrieve the completion list per request due to exception: {0}", ex.Message);
}
});
}
}
/// <summary>
/// Default ctor
/// </summary>
public PowerShellIntelliSenseService() { }
/// <summary>
/// Ctor (unit test hook)
/// </summary>
/// <param name="callback">Callback context object (unit test hook)</param>
public PowerShellIntelliSenseService(IIntelliSenseServiceCallback callback)
:this()
{
_callback = callback;
_runspace = RunspaceFactory.CreateRunspace();
_runspace.Open();
} |
<<<<<<<
IFactory<Category> factory) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService,pictureService)
=======
IFactory<Category> factory,
IDTOHelper dtoHelper) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService)
>>>>>>>
IFactory<Category> factory,
IDTOHelper dtoHelper) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService,pictureService)
<<<<<<<
private void PrepareDtoAditionalProperties(Category category, CategoryDto categoryDto)
{
Picture picture = _pictureService.GetPictureById(category.PictureId);
ImageDto imageDto = PrepareImageDto(picture);
if (imageDto != null)
{
categoryDto.Image = imageDto;
}
categoryDto.SeName = category.GetSeName();
categoryDto.DiscountIds = category.AppliedDiscounts.Select(discount => discount.Id).ToList();
categoryDto.RoleIds = _aclService.GetAclRecords(category).Select(acl => acl.CustomerRoleId).ToList();
categoryDto.StoreIds = _storeMappingService.GetStoreMappings(category).Select(mapping => mapping.StoreId).ToList();
}
=======
>>>>>>> |
<<<<<<<
private readonly IProductAttributeService _productAttributeService;
=======
private readonly IDTOHelper _dtoHelper;
>>>>>>>
private readonly IProductAttributeService _productAttributeService;
private readonly IDTOHelper _dtoHelper;
<<<<<<<
IProductTagService productTagService,
IProductAttributeService productAttributeService) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService, pictureService)
=======
IProductTagService productTagService,
IDTOHelper dtoHelper) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService)
>>>>>>>
IProductTagService productTagService,
IProductAttributeService productAttributeService,
IDTOHelper dtoHelper) : base(jsonFieldsSerializer, aclService, customerService, storeMappingService, storeService, discountService, customerActivityService, localizationService, pictureService)
<<<<<<<
_productAttributeService = productAttributeService;
=======
_dtoHelper = dtoHelper;
>>>>>>>
_productAttributeService = productAttributeService;
_dtoHelper = dtoHelper;
<<<<<<<
private void MapAdditionalPropertiesToDTO(Product product, ProductDto productDto)
{
PrepareProductImages(product.ProductPictures, productDto);
PrepareProductAttributes(product.ProductAttributeMappings, productDto);
productDto.SeName = product.GetSeName();
productDto.DiscountIds = product.AppliedDiscounts.Select(discount => discount.Id).ToList();
productDto.ManufacturerIds = product.ProductManufacturers.Select(pm => pm.ManufacturerId).ToList();
productDto.RoleIds = _aclService.GetAclRecords(product).Select(acl => acl.CustomerRoleId).ToList();
productDto.StoreIds = _storeMappingService.GetStoreMappings(product).Select(mapping => mapping.StoreId).ToList();
productDto.Tags = product.ProductTags.Select(tag => tag.Name).ToList();
productDto.AssociatedProductIds =
_productService.GetAssociatedProducts(product.Id, showHidden: true)
.Select(associatedProduct => associatedProduct.Id)
.ToList();
}
private void UpdateProductPictures(Product entityToUpdate, List<ImageMappingDto> setPictures)
=======
private void UpdateProductPictures(Product entityToUpdate, List<ImageDto> setPictures)
>>>>>>>
private void UpdateProductPictures(Product entityToUpdate, List<ImageMappingDto> setPictures) |
<<<<<<<
=======
private void RegisterControllers(ContainerBuilder builder)
{
builder.RegisterType<CustomersController>().InstancePerLifetimeScope();
builder.RegisterType<CategoriesController>().InstancePerLifetimeScope();
builder.RegisterType<ProductsController>().InstancePerLifetimeScope();
builder.RegisterType<ProductAttributesController>().InstancePerLifetimeScope();
builder.RegisterType<ProductCategoryMappingsController>().InstancePerLifetimeScope();
builder.RegisterType<OrdersController>().InstancePerLifetimeScope();
builder.RegisterType<ShoppingCartItemsController>().InstancePerLifetimeScope();
builder.RegisterType<OrderItemsController>().InstancePerLifetimeScope();
builder.RegisterType<StoreController>().InstancePerLifetimeScope();
builder.RegisterType<LanguagesController>().InstancePerLifetimeScope();
builder.RegisterType<CustomerRolesController>().InstancePerLifetimeScope();
builder.RegisterType<WebHookRegistrationsController>().InstancePerLifetimeScope();
builder.RegisterType<WebHookFiltersController>().InstancePerLifetimeScope();
}
>>>>>>> |
<<<<<<<
using fNbt;
using Maploader.Core;
using Maploader.Extensions;
=======
>>>>>>>
using fNbt;
using Maploader.Core;
using Maploader.Extensions;
<<<<<<<
if (args.Length == 0 || !(new string[]{"map", "test","find"}.Contains(args[0])))
=======
if (args.Length == 0 || !(new string[] { "map", "test" }.Contains(args[0])))
>>>>>>>
if (args.Length == 0 || !(new string[]{"map", "test","find"}.Contains(args[0])))
<<<<<<<
private static void TestDbRead(TestOptions opts)
{
var world = new World();
try
{
Console.WriteLine("Testing DB READ. Opening world...");
world.Open(opts.MinecraftWorld);
}
catch (Exception ex)
{
Console.WriteLine($"Could not open world at '{opts.MinecraftWorld}'!. Did you specify the .../db folder?");
Console.WriteLine("The reason was:");
Console.WriteLine(ex.Message);
{
return;
}
}
int i = 0;
int nextout = 2000;
var keys = world.OverworldKeys.Select(x => new LevelDbWorldKey2(x)).Where(x => x.SubChunkId == 0).ToList();
Console.WriteLine(keys.Count());
_time = Stopwatch.StartNew();
Parallel.ForEach(keys, new ParallelOptions() {MaxDegreeOfParallelism = opts.Threads}, key =>
{
Interlocked.Increment(ref i);
//var value = world.GetChunk(key.GetIntLe(0), key.GetIntLe(4));
var k = key.Key;
for (int y = 0; y < 16; y++)
{
k[9] = (byte) y;
world.GetData(k);
}
if (i > nextout)
{
Interlocked.Add(ref nextout, 2000);
Console.WriteLine($"Reading key {i} {_time.Elapsed} {i / (_time.ElapsedMilliseconds / 1000.0)}");
}
});
Console.WriteLine($"Reading key {i}");
Console.WriteLine(_time.Elapsed);
}
private static void TestDecode(TestOptions opts)
{
var world = new World();
world.ChunkPool = new ChunkPool();
try
{
Console.WriteLine("Testing Decode. Opening world...");
world.Open(opts.MinecraftWorld);
}
catch (Exception ex)
{
Console.WriteLine($"Could not open world at '{opts.MinecraftWorld}'!. Did you specify the .../db folder?");
Console.WriteLine("The reason was:");
Console.WriteLine(ex.Message);
{
return;
}
}
int i = 0;
int nextout = 2000;
var keys = world.OverworldKeys.Select(x => new LevelDbWorldKey2(x)).GroupBy(x => x.XZ).Select(x=>x.Key).ToList();
Console.WriteLine(keys.Count());
_time = Stopwatch.StartNew();
Parallel.ForEach(keys, new ParallelOptions() { MaxDegreeOfParallelism = opts.Threads }, key =>
{
Interlocked.Increment(ref i);
//var value = world.GetChunk(key.GetIntLe(0), key.GetIntLe(4));
var k = key;
//var gcsk = new GroupedChunkSubKeys(key);
//var cd = world.GetChunkData(gcsk);
//var chunk = world.GetChunk(key.X, key.Z);
//var chunk = world.GetChunk(gcsk.Subchunks.First().Value.X, gcsk.Subchunks.First().Value.Z);
//var chunk = world.GetChunk(key.First().X, key.First().Z);
#if true
var X = (int)((ulong)key >> 32);
var Z = (int)((ulong)key & 0xffffffff);
var cd = world.GetChunkData(X, Z);
var c = world.GetChunk(cd.X, cd.Z, cd);
var bells = c.Blocks.Where(x => x.Value.Block.Id == "minecraft:bell");
foreach (var b in bells)
{
Console.WriteLine($"Chunk {X} {Z} {c.X} {c.Z} -- Block {b.Value.X+c.X*16} {b.Value.Z+c.Z*16} {b.Value.Y} {b.Value.Block.Id}");
}
#else
var X = (int) ((ulong) key >> 32);
var Z = (int) ((ulong) key & 0xffffffff);
var c = world.GetChunk(X,Z);
#endif
if (i > nextout)
{
Interlocked.Add(ref nextout, 2000);
Console.WriteLine($"Reading key {i} {_time.Elapsed} {i / (_time.ElapsedMilliseconds / 1000.0)}");
}
});
Console.WriteLine($"Reading key {i}");
Console.WriteLine(_time.Elapsed);
}
private static void TestSmallFlow(TestOptions opts)
{
var world = new World();
world.ChunkPool = new ChunkPool();
try
{
Console.WriteLine("Testing SmallFlow. Opening world...");
world.Open(opts.MinecraftWorld);
}
catch (Exception ex)
{
Console.WriteLine($"Could not open world at '{opts.MinecraftWorld}'!. Did you specify the .../db folder?");
Console.WriteLine("The reason was:");
Console.WriteLine(ex.Message);
{
return;
}
}
int i = 0;
int nextout = 2000;
var keys = new HashSet<ulong>();
foreach (var x in world.OverworldKeys)
{
var key = new LevelDbWorldKey2(x);
if (!keys.Contains(key.XZ))
keys.Add(key.XZ);
}
//var keys = world.OverworldKeys.Select(x => new LevelDbWorldKey2(x)).GroupBy(x => x.XZ).Select(x => x.Key).ToList();
Console.WriteLine(keys.Count());
_time = Stopwatch.StartNew();
//ObjectPool<ChunkData> op = new DefaultObjectPool<ChunkData>(new DefaultPooledObjectPolicy<ChunkData>());
var tb = new TransformBlock<IEnumerable<ulong>, IReadOnlyCollection<ChunkData>>(key2 =>
{
var ret = new List<ChunkData>();
foreach (var u in key2)
{
var X = (int)((ulong)u >> 32);
var Z = (int)((ulong)u & 0xffffffff);
var cd = world.GetChunkData(X, Z);
ret.Add(cd);
}
return ret;
}, new ExecutionDataflowBlockOptions() { MaxDegreeOfParallelism = 1, BoundedCapacity = 16});
var chunkCreator = new ActionBlock<IReadOnlyCollection<ChunkData>>(data =>
{
var sp = Stopwatch.StartNew();
Chunk ck = null;
foreach (var d in data)
{
ck = world.GetChunk(d.X, d.Z, d);
world.ChunkPool.Return(ck);
}
Interlocked.Add(ref i, data.Count);
if (i > nextout)
{
Interlocked.Add(ref nextout, 2000);
Console.WriteLine($"Reading key {i} {_time.Elapsed} {i / (_time.ElapsedMilliseconds / 1000.0)}");
if (ck != null)
{
Console.WriteLine(ck.Blocks.Count());
}
}
Console.WriteLine(sp.Elapsed);
}, new ExecutionDataflowBlockOptions() { MaxDegreeOfParallelism = 4, BoundedCapacity = 16});
tb.LinkTo(chunkCreator, new DataflowLinkOptions() {PropagateCompletion = true});
int i2 = 0;
foreach (var k in keys.Batch(256))
{
i2 += 256;
if (!tb.Post(k))
{
tb.SendAsync(k).Wait();
}
if (i2 > 500 * 100)
{
break;
}
}
tb.Complete();
chunkCreator.Completion.Wait();
Console.WriteLine($"Reading key {i}");
Console.WriteLine(_time.Elapsed);
}
private static void TestSmallFlow2(TestOptions opts)
{
var world = new World();
try
{
Console.WriteLine("Testing SmallFlow2. Opening world...");
world.Open(opts.MinecraftWorld);
}
catch (Exception ex)
{
Console.WriteLine($"Could not open world at '{opts.MinecraftWorld}'!. Did you specify the .../db folder?");
Console.WriteLine("The reason was:");
Console.WriteLine(ex.Message);
{
return;
}
}
int i = 0;
int nextout = 2000;
var keys = new HashSet<ulong>();
foreach (var x in world.OverworldKeys)
{
var key = new LevelDbWorldKey2(x);
if (!keys.Contains(key.XZ))
keys.Add(key.XZ);
}
Console.WriteLine(keys.Count());
_time = Stopwatch.StartNew();
var chunkdatalist = new List<ChunkData>();
var tb = new TransformBlock<IEnumerable<ulong>, IReadOnlyCollection<ChunkData>>(key2 =>
{
var ret = new List<ChunkData>();
foreach (var u in key2)
{
var X = (int)((ulong)u >> 32);
var Z = (int)((ulong)u & 0xffffffff);
var cd = world.GetChunkData(X, Z);
ret.Add(cd);
}
return ret;
}, new ExecutionDataflowBlockOptions() { MaxDegreeOfParallelism = 1, BoundedCapacity = 16 });
var justStore = new ActionBlock<IReadOnlyCollection<ChunkData>>(datas => chunkdatalist.AddRange(datas), new ExecutionDataflowBlockOptions() {MaxDegreeOfParallelism = 1});
var chunkCreator = new ActionBlock<IReadOnlyCollection<ChunkData>>(data =>
{
var sp = Stopwatch.StartNew();
Chunk ck = null;
foreach (var d in data)
{
ck = world.GetChunk(d.X, d.Z, d);
}
Interlocked.Add(ref i, data.Count);
if (i > nextout)
{
Interlocked.Add(ref nextout, 2000);
Console.WriteLine($"Reading key {i} {_time.Elapsed} {i / (_time.ElapsedMilliseconds / 1000.0)}");
if (ck != null)
{
Console.WriteLine(ck.Blocks.Count());
}
}
Console.WriteLine(sp.Elapsed);
}, new ExecutionDataflowBlockOptions() { MaxDegreeOfParallelism = 4, BoundedCapacity = 16 });
//tb.LinkTo(chunkCreator, new DataflowLinkOptions() { PropagateCompletion = true });
tb.LinkTo(justStore, new DataflowLinkOptions() { PropagateCompletion = true });
int i2 = 0;
foreach (var k in keys.Batch(256))
{
i2 += 256;
if (!tb.Post(k))
{
tb.SendAsync(k).Wait();
}
if (i2 > 25 * 1000)
{
//break;
}
}
tb.Complete();
justStore.Completion.Wait();
Console.WriteLine(chunkdatalist.Count);
_time = Stopwatch.StartNew();
NotParallel.ForEach(chunkdatalist, d =>
{
Chunk ck = null;
ck = world.GetChunk(d.X, d.Z, d);
Interlocked.Add(ref i, 1);
if (i > nextout)
{
Interlocked.Add(ref nextout, 2000);
Console.WriteLine($"Reading key {i} {_time.Elapsed} {i / (_time.ElapsedMilliseconds / 1000.0)}");
if (ck != null)
{
Console.WriteLine(ck.Blocks.Count());
}
}
});
Console.WriteLine($"Reading key {i}");
Console.WriteLine(_time.Elapsed);
}
=======
>>>>>>>
<<<<<<<
int chunksPerDimension = 4;
=======
int chunksPerDimension = options.ChunksPerDimension;
>>>>>>>
int chunksPerDimension = options.ChunksPerDimension; |
<<<<<<<
=======
//added by rubsy92
if (isoLocation[2] < 0 || isoLocation[2] > 1.0)
{
throw new Exception("z must be between 0 and 1. 0 is the centre of the plate and 1 is on the plate surface. Use the section points to get the top/bottom.") { };
}
>>>>>>>
//added by rubsy92
if (isoLocation[2] < 0 || isoLocation[2] > 1.0)
{
throw new Exception("z must be between 0 and 1. 0 is the centre of the plate and 1 is on the plate surface. Use the section points to get the top/bottom.") { };
} |
<<<<<<<
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
=======
using Microsoft.Extensions.DependencyInjection;
>>>>>>>
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
<<<<<<<
=======
using System;
using System.Linq;
using System.Threading.Tasks;
>>>>>>>
<<<<<<<
public virtual string ReturnGrainName(string grainType, GrainReference grainReference)
{
return grainType.Split('.', '+').Last();
}
private void EnsureInitialized()
{
if (DataManager == null)
{
throw new ArgumentException("DataManager property not initialized");
}
}
=======
>>>>>>>
public virtual string ReturnGrainName(string grainType, GrainReference grainReference)
{
return grainType.Split('.', '+').Last();
}
private void EnsureInitialized()
{
if (DataManager == null)
{
throw new ArgumentException("DataManager property not initialized");
}
} |
<<<<<<<
GUILayout.BeginHorizontal ();
if (GUILayout.Button ("Toggle stock ocean"))
{
stockOcean=!stockOcean;
}
=======
GUILayout.BeginHorizontal ();
// if (GUILayout.Button ("Toggle depth buffer")) {
// if (!depthbufferEnabled) {
//// cams[2].gameObject.AddComponent(typeof(ViewDepthBuffer));
// depthbufferEnabled = true;
// } else {
//// Component.Destroy(cams[2].gameObject.GetComponent < ViewDepthBuffer > ());
// depthbufferEnabled = false;
// }
// }
if (GUILayout.Button ("Toggle PostProcessing")) {
if (!scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.postprocessingEnabled) {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.enablePostprocess ();
} else {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.disablePostprocess ();
}
}
GUILayout.EndHorizontal ();
GUILayout.BeginHorizontal ();
GUILayout.Label ("New point altitude:");
newCfgPtAlt = (float)(Convert.ToDouble (GUILayout.TextField (newCfgPtAlt.ToString ())));
if (GUILayout.Button ("Add")) {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.configPoints.Insert (selectedConfigPoint + 1, new configPoint (newCfgPtAlt, alphaGlobal / 100, exposure / 100, postProcessingalpha / 100, postProcessDepth / 10000, postProcessExposure / 100, extinctionMultiplier / 100, extinctionTint / 100, openglThreshold, edgeThreshold / 100));
selectedConfigPoint += 1;
configPointsCnt = scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.configPoints.Count;
loadConfigPoint (selectedConfigPoint);
}
GUILayout.EndHorizontal ();
>>>>>>>
GUILayout.BeginHorizontal ();
if (GUILayout.Button ("Toggle stock ocean"))
{
stockOcean=!stockOcean;
}
GUILayout.EndHorizontal ();
GUILayout.BeginHorizontal ();
// if (GUILayout.Button ("Toggle depth buffer")) {
// if (!depthbufferEnabled) {
//// cams[2].gameObject.AddComponent(typeof(ViewDepthBuffer));
// depthbufferEnabled = true;
// } else {
//// Component.Destroy(cams[2].gameObject.GetComponent < ViewDepthBuffer > ());
// depthbufferEnabled = false;
// }
// }
if (GUILayout.Button ("Toggle PostProcessing")) {
if (!scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.postprocessingEnabled) {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.enablePostprocess ();
} else {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.disablePostprocess ();
}
}
GUILayout.EndHorizontal ();
GUILayout.BeginHorizontal ();
GUILayout.Label ("New point altitude:");
newCfgPtAlt = (float)(Convert.ToDouble (GUILayout.TextField (newCfgPtAlt.ToString ())));
if (GUILayout.Button ("Add")) {
scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.configPoints.Insert (selectedConfigPoint + 1, new configPoint (newCfgPtAlt, alphaGlobal / 100, exposure / 100, postProcessingalpha / 100, postProcessDepth / 10000, postProcessExposure / 100, extinctionMultiplier / 100, extinctionTint / 100, openglThreshold, edgeThreshold / 100));
selectedConfigPoint += 1;
configPointsCnt = scattererCelestialBodies [selectedPlanet].m_manager.m_skyNode.configPoints.Count;
loadConfigPoint (selectedConfigPoint);
}
GUILayout.EndHorizontal (); |
<<<<<<<
}
return (File.ReadAllText(importPath), importPath);
});
=======
}
return File.ReadAllText(importPath);
});
this.AddText(File.ReadAllText(filePath), filePath, importResolver);
>>>>>>>
}
return (File.ReadAllText(importPath), importPath);
});
this.AddText(File.ReadAllText(filePath), filePath, importResolver);
<<<<<<<
/// <param name="ambigiousPath">authoredPath.</param>
/// <returns>path expressed as OS path.</returns>
private static string GetOsPath(string ambigiousPath)
=======
/// <param name="ambigiousPath">authoredPath.</param>
/// <returns>path expressed as OS path.</returns>
private string GetOsPath(string ambigiousPath)
>>>>>>>
/// <param name="ambigiousPath">authoredPath.</param>
/// <returns>path expressed as OS path.</returns>
private string GetOsPath(string ambigiousPath) |
<<<<<<<
readonly EventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
=======
readonly IEventStoreConnection _connection;
readonly SnapshotStoreReadConfiguration _configuration;
>>>>>>>
readonly IEventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
<<<<<<<
public AsyncSnapshotReader(EventStoreConnection connection, SnapshotReaderConfiguration configuration) {
=======
public AsyncSnapshotReader(IEventStoreConnection connection, SnapshotStoreReadConfiguration configuration) {
>>>>>>>
public AsyncSnapshotReader(IEventStoreConnection connection, SnapshotReaderConfiguration configuration) { |
<<<<<<<
readonly EventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
=======
readonly IEventStoreConnection _connection;
readonly SnapshotStoreReadConfiguration _configuration;
>>>>>>>
readonly IEventStoreConnection _connection;
readonly SnapshotReaderConfiguration _configuration;
<<<<<<<
public SnapshotReader(EventStoreConnection connection, SnapshotReaderConfiguration configuration) {
=======
public SnapshotReader(IEventStoreConnection connection, SnapshotStoreReadConfiguration configuration) {
>>>>>>>
public SnapshotReader(IEventStoreConnection connection, SnapshotReaderConfiguration configuration) { |
<<<<<<<
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job where Id = @id";
=======
string.Format(@"select InvocationData, StateName, Arguments, CreatedAt from [{0}].Job with (readcommittedlock) where Id = @id", _storage.GetSchemaName());
>>>>>>>
$@"select InvocationData, StateName, Arguments, CreatedAt from [{_storage.SchemaName}].Job with (readcommittedlock) where Id = @id";
<<<<<<<
string sql =
$@"select s.Name, s.Reason, s.Data
from [{_storage.SchemaName}].State s
inner join [{_storage.SchemaName}].Job j on j.StateId = s.Id
where j.Id = @jobId";
=======
string sql = string.Format(@"
select s.Name, s.Reason, s.Data
from [{0}].State s with (readcommittedlock)
inner join [{0}].Job j on j.StateId = s.Id
where j.Id = @jobId", _storage.GetSchemaName());
>>>>>>>
string sql =
$@"select s.Name, s.Reason, s.Data
from [{_storage.SchemaName}].State s with (readcommittedlock)
inner join [{_storage.SchemaName}].Job j with (readcommittedlock) on j.StateId = s.Id
where j.Id = @jobId";
<<<<<<<
$@"select Value from [{_storage.SchemaName}].JobParameter where JobId = @id and Name = @name",
=======
string.Format(@"select Value from [{0}].JobParameter with (readcommittedlock) where JobId = @id and Name = @name", _storage.GetSchemaName()),
>>>>>>>
$@"select Value from [{_storage.SchemaName}].JobParameter with (readcommittedlock) where JobId = @id and Name = @name",
<<<<<<<
$@"select Value from [{_storage.SchemaName}].[Set] where [Key] = @key",
=======
string.Format(@"select Value from [{0}].[Set] with (readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$@"select Value from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key",
<<<<<<<
$@"select top 1 Value from [{_storage.SchemaName}].[Set] where [Key] = @key and Score between @from and @to order by Score",
=======
string.Format(@"select top 1 Value from [{0}].[Set] with (readcommittedlock) where [Key] = @key and Score between @from and @to order by Score", _storage.GetSchemaName()),
>>>>>>>
$@"select top 1 Value from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key and Score between @from and @to order by Score",
<<<<<<<
$"select Field, Value from [{_storage.SchemaName}].Hash with (forceseek) where [Key] = @key",
=======
string.Format("select Field, Value from [{0}].Hash with (forceseek, readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$"select Field, Value from [{_storage.SchemaName}].Hash with (forceseek. readcommittedlock) where [Key] = @key",
<<<<<<<
$"select count([Key]) from [{_storage.SchemaName}].[Set] where [Key] = @key",
=======
string.Format("select count([Key]) from [{0}].[Set] with (readcommittedlock) where [Key] = @key", _storage.GetSchemaName()),
>>>>>>>
$"select count([Key]) from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key",
<<<<<<<
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].[Set] where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].[Set] with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].[Set] with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query =
$@"select sum(s.[Value]) from (select sum([Value]) as [Value] from [{_storage.SchemaName}].Counter
=======
string query = string.Format(@"
select sum(s.[Value]) from (select sum([Value]) as [Value] from [{0}].Counter with (readcommittedlock)
>>>>>>>
string query =
$@"select sum(s.[Value]) from (select sum([Value]) as [Value] from [{_storage.SchemaName}].Counter with (readcommittedlock)
<<<<<<<
select [Value] from [{_storage.SchemaName}].AggregatedCounter
where [Key] = @key) as s";
=======
select [Value] from [{0}].AggregatedCounter with (readcommittedlock)
where [Key] = @key) as s", _storage.GetSchemaName());
>>>>>>>
select [Value] from [{_storage.SchemaName}].AggregatedCounter with (readcommittedlock)
where [Key] = @key) as s";
<<<<<<<
string query = $@"select count([Id]) from [{_storage.SchemaName}].Hash where [Key] = @key";
=======
string query = string.Format(@"
select count([Id]) from [{0}].Hash with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select count([Id]) from [{_storage.SchemaName}].Hash with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].Hash where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].Hash with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query = $@"select min([ExpireAt]) from [{_storage.SchemaName}].Hash with (readcommittedlock) where [Key] = @key";
<<<<<<<
string query =
$@"select [Value] from [{_storage.SchemaName}].Hash
where [Key] = @key and [Field] = @field";
=======
string query = string.Format(@"
select [Value] from [{0}].Hash with (readcommittedlock)
where [Key] = @key and [Field] = @field", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select [Value] from [{_storage.SchemaName}].Hash with (readcommittedlock)
where [Key] = @key and [Field] = @field";
<<<<<<<
string query =
$@"select count([Id]) from [{_storage.SchemaName}].List
where [Key] = @key";
=======
string query = string.Format(@"
select count([Id]) from [{0}].List with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select count([Id]) from [{_storage.SchemaName}].List with (readcommittedlock)
where [Key] = @key";
<<<<<<<
string query =
$@"select min([ExpireAt]) from [{_storage.SchemaName}].List
where [Key] = @key";
=======
string query = string.Format(@"
select min([ExpireAt]) from [{0}].List with (readcommittedlock)
where [Key] = @key", _storage.GetSchemaName());
>>>>>>>
string query =
$@"select min([ExpireAt]) from [{_storage.SchemaName}].List with (readcommittedlock)
where [Key] = @key";
<<<<<<<
from [{_storage.SchemaName}].List
=======
from [{0}].List with (readcommittedlock)
>>>>>>>
from [{_storage.SchemaName}].List with (readcommittedlock)
<<<<<<<
string query =
$@"select [Value] from [{_storage.SchemaName}].List
=======
string query = string.Format(@"
select [Value] from [{0}].List with (readcommittedlock)
>>>>>>>
string query =
$@"select [Value] from [{_storage.SchemaName}].List with (readcommittedlock) |
<<<<<<<
#if NETFULL
using System.Transactions;
#else
using System.Data;
#endif
=======
>>>>>>>
<<<<<<<
$@"select * from [{_storage.SchemaName}].Server",
transaction: transaction)
=======
string.Format(@"select * from [{0}].Server with (nolock)", _storage.GetSchemaName()))
>>>>>>>
$@"select * from [{_storage.SchemaName}].Server with (nolock)")
<<<<<<<
string sql = String.Format(@"
select count(Id) from [{0}].Job where StateName = N'Enqueued';
select count(Id) from [{0}].Job where StateName = N'Failed';
select count(Id) from [{0}].Job where StateName = N'Processing';
select count(Id) from [{0}].Job where StateName = N'Scheduled';
select count(Id) from [{0}].Server;
=======
string sql = string.Format(@"
select count(Id) from [{0}].Job with (nolock) where StateName = N'Enqueued';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Failed';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Processing';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Scheduled';
select count(Id) from [{0}].Server with (nolock);
>>>>>>>
string sql = String.Format(@"
select count(Id) from [{0}].Job with (nolock) where StateName = N'Enqueued';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Failed';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Processing';
select count(Id) from [{0}].Job with (nolock) where StateName = N'Scheduled';
select count(Id) from [{0}].Server with (nolock);
<<<<<<<
select count(*) from [{0}].[Set] where [Key] = N'recurring-jobs';
", _storage.SchemaName);
=======
select count(*) from [{0}].[Set] with (nolock) where [Key] = N'recurring-jobs';
", _storage.GetSchemaName());
>>>>>>>
select count(*) from [{0}].[Set] with (nolock) where [Key] = N'recurring-jobs';
", _storage.SchemaName);
<<<<<<<
string sqlQuery =
$@"select [Key], [Value] as [Count] from [{_storage.SchemaName}].AggregatedCounter
where [Key] in @keys";
=======
string sqlQuery = string.Format(@"
select [Key], [Value] as [Count] from [{0}].AggregatedCounter with (nolock)
where [Key] in @keys", _storage.GetSchemaName());
>>>>>>>
string sqlQuery =
$@"select [Key], [Value] as [Count] from [{_storage.SchemaName}].AggregatedCounter with (nolock)
where [Key] in @keys";
<<<<<<<
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j
left join [{_storage.SchemaName}].State s on s.Id = j.StateId
where j.Id in @jobIds";
=======
string enqueuedJobsSql = string.Format(@"
select j.*, s.Reason as StateReason, s.Data as StateData
from [{0}].Job j with (nolock)
left join [{0}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds", _storage.GetSchemaName());
>>>>>>>
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds";
<<<<<<<
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job where StateName = @state";
=======
? string.Format(@"select count(j.Id) from (select top (@limit) Id from [{0}].Job with (nolock) where StateName = @state) as j", _storage.GetSchemaName())
: string.Format(@"select count(Id) from [{0}].Job with (nolock) where StateName = @state", _storage.GetSchemaName());
>>>>>>>
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job with (nolock) where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job with (nolock) where StateName = @state";
<<<<<<<
from [{_storage.SchemaName}].Job j with (forceseek)
left join [{_storage.SchemaName}].State s on j.StateId = s.Id
=======
from [{0}].Job j with (nolock, forceseek)
left join [{0}].State s with (nolock) on j.StateId = s.Id
>>>>>>>
from [{_storage.SchemaName}].Job j with (nolock, forceseek)
left join [{_storage.SchemaName}].State s with (nolock) on j.StateId = s.Id
<<<<<<<
string fetchedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j
left join [{_storage.SchemaName}].State s on s.Id = j.StateId
where j.Id in @jobIds";
=======
string fetchedJobsSql = string.Format(@"
select j.*, s.Reason as StateReason, s.Data as StateData
from [{0}].Job j with (nolock)
left join [{0}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds", _storage.GetSchemaName());
>>>>>>>
string enqueuedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds";
var jobs = connection.Query<SqlJob>(
enqueuedJobsSql,
new { jobIds = jobIds })
.ToDictionary(x => x.Id, x => x);
var sortedSqlJobs = jobIds
.Select(jobId => jobs.ContainsKey(jobId) ? jobs[jobId] : new SqlJob { Id = jobId })
.ToList();
return DeserializeJobs(
sortedSqlJobs,
(sqlJob, job, stateData) => new EnqueuedJobDto
{
Job = job,
State = sqlJob.StateName,
EnqueuedAt = sqlJob.StateName == EnqueuedState.StateName
? JobHelper.DeserializeNullableDateTime(stateData["EnqueuedAt"])
: null
});
}
private long GetNumberOfJobsByStateName(DbConnection connection, string stateName)
{
var sqlQuery = _jobListLimit.HasValue
? $@"select count(j.Id) from (select top (@limit) Id from [{_storage.SchemaName}].Job with (nolock) where StateName = @state) as j"
: $@"select count(Id) from [{_storage.SchemaName}].Job with (nolock) where StateName = @state";
var count = connection.Query<int>(
sqlQuery,
new { state = stateName, limit = _jobListLimit })
.Single();
return count;
}
private static Job DeserializeJob(string invocationData, string arguments)
{
var data = JobHelper.FromJson<InvocationData>(invocationData);
data.Arguments = arguments;
try
{
return data.Deserialize();
}
catch (JobLoadException)
{
return null;
}
}
private JobList<TDto> GetJobs<TDto>(
DbConnection connection,
int from,
int count,
string stateName,
Func<SqlJob, Job, Dictionary<string, string>, TDto> selector)
{
string jobsSql =
$@"select * from (
select j.*, s.Reason as StateReason, s.Data as StateData, row_number() over (order by j.Id desc) as row_num
from [{_storage.SchemaName}].Job j with (nolock, forceseek)
left join [{_storage.SchemaName}].State s with (nolock) on j.StateId = s.Id
where j.StateName = @stateName
) as j where j.row_num between @start and @end";
var jobs = connection.Query<SqlJob>(
jobsSql,
new { stateName = stateName, start = @from + 1, end = @from + count })
.ToList();
return DeserializeJobs(jobs, selector);
}
private static JobList<TDto> DeserializeJobs<TDto>(
ICollection<SqlJob> jobs,
Func<SqlJob, Job, Dictionary<string, string>, TDto> selector)
{
var result = new List<KeyValuePair<string, TDto>>(jobs.Count);
// ReSharper disable once LoopCanBeConvertedToQuery
foreach (var job in jobs)
{
var dto = default(TDto);
if (job.InvocationData != null)
{
var deserializedData = JobHelper.FromJson<Dictionary<string, string>>(job.StateData);
var stateData = deserializedData != null
? new Dictionary<string, string>(deserializedData, StringComparer.OrdinalIgnoreCase)
: null;
dto = selector(job, DeserializeJob(job.InvocationData, job.Arguments), stateData);
}
result.Add(new KeyValuePair<string, TDto>(
job.Id.ToString(), dto));
}
return new JobList<TDto>(result);
}
private JobList<FetchedJobDto> FetchedJobs(DbConnection connection, IEnumerable<int> jobIds)
{
string fetchedJobsSql =
$@"select j.*, s.Reason as StateReason, s.Data as StateData
from [{_storage.SchemaName}].Job j with (nolock)
left join [{_storage.SchemaName}].State s with (nolock) on s.Id = j.StateId
where j.Id in @jobIds"; |
<<<<<<<
DisplayStorageConnectionString = true;
=======
JobNameProvider = null;
>>>>>>>
DisplayStorageConnectionString = true;
JobNameProvider = null;
<<<<<<<
public bool DisplayStorageConnectionString { get; set; }
=======
/// <summary>
/// Display name provider for jobs
/// </summary>
public IDashboardJobNameProvider JobNameProvider { get; set; }
>>>>>>>
public bool DisplayStorageConnectionString { get; set; }
/// <summary>
/// Display name provider for jobs
/// </summary>
public IDashboardJobNameProvider JobNameProvider { get; set; } |
<<<<<<<
var backgroundJob = _factory.Create(new CreateContext(storage, connection, job, state));
var jobId = backgroundJob?.Id;
=======
var context = new CreateContext(storage, connection, job, state);
context.Parameters["RecurringJobId"] = recurringJobId;
var backgroundJob = _factory.Create(context);
var jobId = backgroundJob != null ? backgroundJob.Id : null;
>>>>>>>
var context = new CreateContext(storage, connection, job, state);
context.Parameters["RecurringJobId"] = recurringJobId;
var backgroundJob = _factory.Create(context);
var jobId = backgroundJob?.Id; |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string steamRememberLogin {
get {
return ((string)(this["steamRememberLogin"]));
}
set {
this["steamRememberLogin"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string steamMachineAuth {
get {
return ((string)(this["steamMachineAuth"]));
}
set {
this["steamMachineAuth"] = value;
}
}
=======
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint totalCardIdled {
get {
return ((uint)(this["totalCardIdled"]));
}
set {
this["totalCardIdled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint totalMinutesIdled {
get {
return ((uint)(this["totalMinutesIdled"]));
}
set {
this["totalMinutesIdled"] = value;
}
}
>>>>>>>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string steamRememberLogin {
get {
return ((string)(this["steamRememberLogin"]));
}
set {
this["steamRememberLogin"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string steamMachineAuth {
get {
return ((string)(this["steamMachineAuth"]));
}
set {
this["steamMachineAuth"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint totalCardIdled {
get {
return ((uint)(this["totalCardIdled"]));
}
set {
this["totalCardIdled"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public uint totalMinutesIdled {
get {
return ((uint)(this["totalMinutesIdled"]));
}
set {
this["totalMinutesIdled"] = value;
}
} |
<<<<<<<
break;
default:
break;
}
_defaultStack.MeshModifiers.AddRange(defaultMeshModifierStack);
_defaultStack.GoModifiers.AddRange(defaultGOModifierStack);
//Add any additional modifiers that were added.
_defaultStack.MeshModifiers.AddRange(_layerProperties.MeshModifiers);
_defaultStack.GoModifiers.AddRange(_layerProperties.GoModifiers);
}
=======
private HashSet<string> _activeIds;
private Dictionary<UnityTile, List<string>> _idPool; //necessary to keep _activeIds list up to date when unloading tiles
>>>>>>>
break;
default:
break;
}
_defaultStack.MeshModifiers.AddRange(defaultMeshModifierStack);
_defaultStack.GoModifiers.AddRange(defaultGOModifierStack);
//Add any additional modifiers that were added.
_defaultStack.MeshModifiers.AddRange(_layerProperties.MeshModifiers);
_defaultStack.GoModifiers.AddRange(_layerProperties.GoModifiers);
}
<<<<<<<
var feature = new VectorFeatureUnity(layer.GetFeature(i, 0), tile, layer.Extent);
=======
filterOut = false;
var feature = new VectorFeatureUnity(layer.GetFeature(i), tile, layer.Extent);
//skip existing features, only works on tilesets with unique ids
if (!string.IsNullOrEmpty(feature.Id) && _activeIds.Contains(feature.Id))
{
continue;
}
else
{
_activeIds.Add(feature.Id);
if (!_idPool.ContainsKey(tile))
{
_idPool.Add(tile, new List<string>());
}
else
{
_idPool[tile].Add(feature.Id);
}
}
foreach (var filter in Filters)
{
if (!string.IsNullOrEmpty(filter.Key) && !feature.Properties.ContainsKey(filter.Key))
continue;
if (!filter.Try(feature))
{
filterOut = true;
break;
}
}
>>>>>>>
var feature = new VectorFeatureUnity(layer.GetFeature(i), tile, layer.Extent);
//skip existing features, only works on tilesets with unique ids
if (!string.IsNullOrEmpty(feature.Id) && _activeIds.Contains(feature.Id))
{
continue;
}
else
{
_activeIds.Add(feature.Id);
if (!_idPool.ContainsKey(tile))
{
_idPool.Add(tile, new List<string>());
}
else
{
_idPool[tile].Add(feature.Id);
}
}
<<<<<<<
//foreach (var val in Stacks)
//{
// if (val != null && val.Stack != null)
// val.Stack.UnregisterTile(tile);
//}
=======
}
foreach (var val in Stacks)
{
if (val != null && val.Stack != null)
val.Stack.UnregisterTile(tile);
}
//removing ids from activeIds list so they'll be recreated next time tile loads (necessary when you're unloading/loading tiles)
if (_idPool.ContainsKey(tile))
{
foreach (var item in _idPool[tile])
{
_activeIds.Remove(item);
}
_idPool[tile].Clear();
}
>>>>>>>
}
// foreach (var val in Stacks)
// {
// if (val != null && val.Stack != null)
// val.Stack.UnregisterTile(tile);
// }
//removing ids from activeIds list so they'll be recreated next time tile loads (necessary when you're unloading/loading tiles)
if (_idPool.ContainsKey(tile))
{
foreach (var item in _idPool[tile])
{
_activeIds.Remove(item);
}
_idPool[tile].Clear();
} |
<<<<<<<
private string objectId = "";
bool showTexturing
{
get
{
return EditorPrefs.GetBool(objectId + "VectorSubLayerProperties_showTexturing");
}
set
{
EditorPrefs.SetBool(objectId + "VectorSubLayerProperties_showTexturing", value);
}
}
=======
static float colorCellSize = 16.0f;
static float colorCellSpacing = 20.0f;
>>>>>>>
private string objectId = "";
bool showTexturing
{
get
{
return EditorPrefs.GetBool(objectId + "VectorSubLayerProperties_showTexturing");
}
set
{
EditorPrefs.SetBool(objectId + "VectorSubLayerProperties_showTexturing", value);
}
}
static float colorCellSize = 16.0f;
static float colorCellSpacing = 20.0f;
<<<<<<<
GUIContent[] styleTypeGuiContent = new GUIContent[styleType.enumDisplayNames.Length];
for (int i = 0; i < styleType.enumDisplayNames.Length; i++)
=======
string descriptionLabel = EnumExtensions.Description((StyleTypes)styleType.enumValueIndex);
EditorGUILayout.LabelField(new GUIContent(" ", thumbnailTexture), Constants.GUI.Styles.EDITOR_TEXTURE_THUMBNAIL_STYLE, GUILayout.Height(60), GUILayout.Width(EditorGUIUtility.labelWidth - 60));
EditorGUILayout.TextArea(descriptionLabel, (GUIStyle)"wordWrappedLabel");
GUILayout.EndHorizontal();
switch ((StyleTypes)styleType.enumValueIndex)
{
case StyleTypes.Simple:
var samplePaletteType = property.FindPropertyRelative("samplePalettes");
var samplePaletteTypeLabel = new GUIContent { text = "Palette Type", tooltip = "Palette type for procedural colorization; choose from sample palettes or create your own by choosing Custom. " };
GUIContent[] samplePaletteTypeGuiContent = new GUIContent[samplePaletteType.enumDisplayNames.Length];
for (int i = 0; i < samplePaletteType.enumDisplayNames.Length; i++)
{
samplePaletteTypeGuiContent[i] = new GUIContent
{
text = samplePaletteType.enumDisplayNames[i]
};
}
samplePaletteType.enumValueIndex = EditorGUILayout.Popup(samplePaletteTypeLabel, samplePaletteType.enumValueIndex, samplePaletteTypeGuiContent);
//load the palette
SamplePalettes paletteValue = (SamplePalettes)samplePaletteType.enumValueIndex;
string paletteName = paletteValue.ToString();
string path = Path.Combine(Constants.Path.MAP_FEATURE_STYLES_SAMPLES, Path.Combine("Simple", Constants.Path.MAPBOX_STYLES_ASSETS_FOLDER));
string paletteFolderPath = Path.Combine(path, Constants.Path.MAPBOX_STYLES_PALETTES_FOLDER);
string palettePath = Path.Combine(paletteFolderPath, paletteName);
ScriptablePalette palette = Resources.Load(palettePath) as ScriptablePalette;
Color[] colors = palette.m_colors;
for (int i = 0; i < colors.Length; i++)
{
Color color = colors[i];
float x = position.x + 22;// 0 + (i * colorCellSpacing);
float y = position.y + 80;
EditorGUI.DrawRect(new Rect(x, y, colorCellSize, colorCellSize), color);
}
//draw a box for each one
//EditorGUI.DrawRect(new Rect(50, 350, m_Value, 70), Color.green);
break;
case StyleTypes.Light:
property.FindPropertyRelative("lightStyleOpacity").floatValue = EditorGUILayout.Slider("Opacity", property.FindPropertyRelative("lightStyleOpacity").floatValue, 0.0f, 1.0f);
break;
case StyleTypes.Dark:
property.FindPropertyRelative("darkStyleOpacity").floatValue = EditorGUILayout.Slider("Opacity", property.FindPropertyRelative("darkStyleOpacity").floatValue, 0.0f, 1.0f);
break;
case StyleTypes.Color:
property.FindPropertyRelative("colorStyleColor").colorValue = EditorGUILayout.ColorField("Color", property.FindPropertyRelative("colorStyleColor").colorValue);
break;
default:
break;
}
}
else
{
var texturingType = property.FindPropertyRelative("texturingType");
int valIndex = texturingType.enumValueIndex == 0 ? 0 : texturingType.enumValueIndex + 1;
var texturingTypeGUI = new GUIContent { text = "Texturing Type", tooltip = EnumExtensions.Description((UvMapType)valIndex) };
EditorGUILayout.PropertyField(texturingType, texturingTypeGUI);
var matList = property.FindPropertyRelative("materials");
if (matList.arraySize == 0)
>>>>>>>
GUIContent[] styleTypeGuiContent = new GUIContent[styleType.enumDisplayNames.Length];
for (int i = 0; i < styleType.enumDisplayNames.Length; i++) |
<<<<<<<
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading;
=======
>>>>>>>
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Threading;
<<<<<<<
public abstract Task SendActivities(IBotContext context, IEnumerable<Activity> activities);
=======
public abstract Task SendActivity(IBotContext context, params Activity[] activities);
>>>>>>>
public abstract Task SendActivity(IBotContext context, params Activity[] activities);
<<<<<<<
public abstract Task DeleteActivity(IBotContext context, string conversationId, string activityId);
=======
public abstract Task DeleteActivity(IBotContext context, ConversationReference reference);
>>>>>>>
public abstract Task DeleteActivity(IBotContext context, ConversationReference reference);
<<<<<<<
// Call any registered Middleware Components looking for SendActivity()
await _middlewareSet.SendActivity(context, context.Responses ?? new List<Activity>()).ConfigureAwait(false);
if (context.Responses != null)
{
await this.SendActivities(context, context.Responses).ConfigureAwait(false);
}
System.Diagnostics.Trace.TraceInformation($"Middleware: Ending Pipeline for {context.ConversationReference.ActivityId}");
=======
>>>>>>> |
<<<<<<<
this TSoapClient client, IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>> handlers)
=======
this TSoapClient client, IEnumerable<Func<string, SoapEnvelope, SoapEnvelope>> handlers, bool append = false)
>>>>>>>
this TSoapClient client, IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>> handlers, bool append = false)
<<<<<<<
return client.UsingRequestEnvelopeHandler(
(IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>>) handlers);
=======
return client.UsingRequestEnvelopeHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.RequestEnvelopeHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingRequestEnvelopeHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, SoapEnvelope, SoapEnvelope>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingRequestEnvelopeHandler(handlers, append);
>>>>>>>
return client.UsingRequestEnvelopeHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.RequestEnvelopeHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingRequestEnvelopeHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, SoapEnvelope, SoapEnvelope>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingRequestEnvelopeHandler(handlers, append);
<<<<<<<
this TSoapClient client, IEnumerable<Func<string, string, HttpRequestMessage, string, string>> handlers)
=======
this TSoapClient client, IEnumerable<Func<string, string, string>> handlers, bool append = false)
>>>>>>>
this TSoapClient client, IEnumerable<Func<string, string, HttpRequestMessage, string, string>> handlers, bool append = false)
<<<<<<<
return client.UsingRequestRawHandler(
(IEnumerable<Func<string, string, HttpRequestMessage, string, string>>) handlers);
=======
return client.UsingRequestRawHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.RequestRawHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingRequestRawHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, string>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingRequestRawHandler(handlers, append);
>>>>>>>
return client.UsingRequestRawHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.RequestRawHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingRequestRawHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, HttpRequestMessage, string, string>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingRequestRawHandler(handlers, append);
<<<<<<<
this TSoapClient client, IEnumerable<Func<string, string, HttpResponseMessage, string, string>> handlers)
=======
this TSoapClient client, IEnumerable<Func<string, string, string>> handlers, bool append = false)
>>>>>>>
this TSoapClient client, IEnumerable<Func<string, string, HttpResponseMessage, string, string>> handlers, bool append = false)
<<<<<<<
return client.UsingResponseRawHandler(
(IEnumerable<Func<string, string, HttpResponseMessage, string, string>>) handlers);
=======
return client.UsingResponseRawHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.ResponseRawHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingResponseRawHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, string>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingResponseRawHandler(handlers, append);
>>>>>>>
return client.UsingResponseRawHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.ResponseRawHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingResponseRawHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, HttpResponseMessage, string, string>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingResponseRawHandler(handlers, append);
<<<<<<<
this TSoapClient client, IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>> handlers)
=======
this TSoapClient client, IEnumerable<Func<string, SoapEnvelope, SoapEnvelope>> handlers, bool append = false)
>>>>>>>
this TSoapClient client, IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>> handlers, bool append = false)
<<<<<<<
return client.UsingResponseEnvelopeHandler(
(IEnumerable<Func<string, string, SoapEnvelope, SoapEnvelope>>)handlers);
=======
return client.UsingResponseEnvelopeHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.ResponseEnvelopeHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingResponseEnvelopeHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, SoapEnvelope, SoapEnvelope>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingResponseEnvelopeHandler(handlers, append);
>>>>>>>
return client.UsingResponseEnvelopeHandler(handlers, false);
}
/// <summary>
/// Attaches the provided collection handler collection to the
/// <see cref="ISoapClient.ResponseEnvelopeHandler"/> creating a pipeline.
/// </summary>
/// <typeparam name="TSoapClient">The SOAP client type</typeparam>
/// <param name="client">The client to be used</param>
/// <param name="append">Indicates if the handlers must be appended to existing one. By default they will be prepended.</param>
/// <param name="handlers">The handler collection to attach as a pipeline</param>
/// <returns>The SOAP client after changes</returns>
/// <exception cref="ArgumentNullException"></exception>
public static TSoapClient UsingResponseEnvelopeHandler<TSoapClient>(
this TSoapClient client, bool append, params Func<string, string, SoapEnvelope, SoapEnvelope>[] handlers)
where TSoapClient : ISoapClient
{
if (client == null) throw new ArgumentNullException(nameof(client));
if (handlers == null || handlers.Length == 0) return client;
return client.UsingResponseEnvelopeHandler(handlers, append); |
<<<<<<<
string serializedJson = SimpleJson.SimpleJson.SerializeObject(request, Util.ApiSerializerStrategy);
=======
if (_authKey == null) throw new Exception("Must be logged in to call this method");
string serializedJson = JsonConvert.SerializeObject(request, Util.JsonFormatting, Util.JsonSettings);
>>>>>>>
if (_authKey == null) throw new Exception("Must be logged in to call this method");
string serializedJson = SimpleJson.SimpleJson.SerializeObject(request, Util.ApiSerializerStrategy); |
<<<<<<<
NoteView.LoadScore(book.Score);
NoteViewScrollBar.Value = 0;
=======
NoteView.Load(book.Score.Notes);
NoteViewScrollBar.Value = NoteViewScrollBar.GetMaximumValue();
>>>>>>>
NoteView.LoadScore(book.Score);
NoteViewScrollBar.Value = NoteViewScrollBar.GetMaximumValue();
<<<<<<<
var insertTimeSignatureItem = new MenuItem("拍子", (s, e) =>
{
var form = new TimeSignatureSelectionForm();
if (form.ShowDialog(this) != DialogResult.OK) return;
var prev = noteView.ScoreEvents.TimeSignatureChangeEvents.SingleOrDefault(p => p.Tick == noteView.SelectedRange.StartTick);
var item = new Components.Events.TimeSignatureChangeEvent()
{
Tick = noteView.SelectedRange.StartTick,
Numerator = form.Numerator,
DenominatorExponent = form.DenominatorExponent
};
var insertOp = new InsertEventOperation<Components.Events.TimeSignatureChangeEvent>(noteView.ScoreEvents.TimeSignatureChangeEvents, item);
if (prev != null)
{
noteView.ScoreEvents.TimeSignatureChangeEvents.Remove(prev);
var removeOp = new RemoveEventOperation<Components.Events.TimeSignatureChangeEvent>(noteView.ScoreEvents.TimeSignatureChangeEvents, prev);
OperationManager.Push(new CompositeOperation(insertOp.Description, new IOperation[] { removeOp, insertOp }));
}
else
{
OperationManager.Push(insertOp);
}
noteView.ScoreEvents.TimeSignatureChangeEvents.Add(item);
noteView.Invalidate();
});
var insertMenuItems = new MenuItem[] { insertTimeSignatureItem };
=======
var viewModeItem = new MenuItem("譜面プレビュー", (s, e) =>
{
var item = (MenuItem)s;
item.Checked = !item.Checked;
NoteView.Editable = !item.Checked;
NoteView.LaneBorderLightColor = item.Checked ? Color.FromArgb(40, 40, 40) : Color.FromArgb(60, 60, 60);
NoteView.LaneBorderDarkColor = item.Checked ? Color.FromArgb(10, 10, 10) : Color.FromArgb(30, 30, 30);
NoteView.UnitLaneWidth = item.Checked ? 4 : 12;
NoteView.ShortNoteHeight = item.Checked ? 4 : 5;
NoteView.UnitBeatHeight = item.Checked ? 48 : 120;
});
var viewMenuItems = new MenuItem[] { viewModeItem };
>>>>>>>
var viewModeItem = new MenuItem("譜面プレビュー", (s, e) =>
{
var item = (MenuItem)s;
item.Checked = !item.Checked;
NoteView.Editable = !item.Checked;
NoteView.LaneBorderLightColor = item.Checked ? Color.FromArgb(40, 40, 40) : Color.FromArgb(60, 60, 60);
NoteView.LaneBorderDarkColor = item.Checked ? Color.FromArgb(10, 10, 10) : Color.FromArgb(30, 30, 30);
NoteView.UnitLaneWidth = item.Checked ? 4 : 12;
NoteView.ShortNoteHeight = item.Checked ? 4 : 5;
NoteView.UnitBeatHeight = item.Checked ? 48 : 120;
});
var viewMenuItems = new MenuItem[] { viewModeItem };
var insertTimeSignatureItem = new MenuItem("拍子", (s, e) =>
{
var form = new TimeSignatureSelectionForm();
if (form.ShowDialog(this) != DialogResult.OK) return;
var prev = noteView.ScoreEvents.TimeSignatureChangeEvents.SingleOrDefault(p => p.Tick == noteView.SelectedRange.StartTick);
var item = new Components.Events.TimeSignatureChangeEvent()
{
Tick = noteView.SelectedRange.StartTick,
Numerator = form.Numerator,
DenominatorExponent = form.DenominatorExponent
};
var insertOp = new InsertEventOperation<Components.Events.TimeSignatureChangeEvent>(noteView.ScoreEvents.TimeSignatureChangeEvents, item);
if (prev != null)
{
noteView.ScoreEvents.TimeSignatureChangeEvents.Remove(prev);
var removeOp = new RemoveEventOperation<Components.Events.TimeSignatureChangeEvent>(noteView.ScoreEvents.TimeSignatureChangeEvents, prev);
OperationManager.Push(new CompositeOperation(insertOp.Description, new IOperation[] { removeOp, insertOp }));
}
else
{
OperationManager.Push(insertOp);
}
noteView.ScoreEvents.TimeSignatureChangeEvents.Add(item);
noteView.Invalidate();
});
var insertMenuItems = new MenuItem[] { insertTimeSignatureItem };
<<<<<<<
new MenuItem("挿入(&I)", insertMenuItems),
=======
new MenuItem("表示(&V)", viewMenuItems),
>>>>>>>
new MenuItem("表示(&V)", viewMenuItems),
new MenuItem("挿入(&I)", insertMenuItems), |
<<<<<<<
/// <summary>
/// Create a new viewport
/// </summary>
=======
>>>>>>>
/// <summary>
/// Create a new viewport
/// </summary> |
<<<<<<<
_map.Viewport.ViewChanged(true);
PushSizeOntoViewport();
=======
_map.ViewChanged(true);
PushSizeOntoViewport(Width, Height);
>>>>>>>
_map.Viewport.ViewChanged(true);
PushSizeOntoViewport(Width, Height); |
<<<<<<<
using KeeAnywhere.StorageProviders.AmazonDrive;
=======
using KeeAnywhere.StorageProviders.AmazonS3;
>>>>>>>
using KeeAnywhere.StorageProviders.AmazonDrive;
using KeeAnywhere.StorageProviders.AmazonS3;
<<<<<<<
new StorageDescriptor(StorageType.AmazonDrive, "Amazon Drive", "adrive", account => new AmazonDriveStorageProvider(account), () => new AmazonDriveStorageConfigurator(), PluginResources.AmazonDrive_16x16),
=======
new StorageDescriptor(StorageType.AmazonS3, "Amazon S3", "s3", account => new AmazonS3StorageProvider(account), () => new AmazonS3StorageConfigurator(), PluginResources.AmazonS3_16x16),
>>>>>>>
new StorageDescriptor(StorageType.AmazonDrive, "Amazon Drive", "adrive", account => new AmazonDriveStorageProvider(account), () => new AmazonDriveStorageConfigurator(), PluginResources.AmazonDrive_16x16),
new StorageDescriptor(StorageType.AmazonS3, "Amazon S3", "s3", account => new AmazonS3StorageProvider(account), () => new AmazonS3StorageConfigurator(), PluginResources.AmazonS3_16x16), |
<<<<<<<
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DotNet2019.Api;
=======
using DotNet2019.Api;
>>>>>>>
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using DotNet2019.Api;
<<<<<<<
Configuration.ConfigureServices(services);
=======
Configuration.ConfigureServices(services, Environment);
services
.AddCustomAuthentication()
.AddCustomAuthorization()
.AddCustomHealthChecks()
.AddHostingDiagnosticHandler();
>>>>>>>
Configuration.ConfigureServices(services, Environment);
services
.AddCustomAuthentication()
.AddCustomAuthorization()
.AddCustomHealthChecks()
.AddHostingDiagnosticHandler();
<<<<<<<
Configuration.Configure(app, env, host =>
host
.UseRouting()
.UseEndpoints(endpoints =>
{
endpoints.MapGet("/", async context =>
{
await context.Response.WriteAsync("Hello DotNet 2019!");
});
})
);
=======
Configuration.Configure(app, host =>
{
return host
.UseCustomHealthchecks()
.UseHeaderDiagnostics();
});
>>>>>>>
Configuration.Configure(app, host =>
host
.UseRouting()
.UseEndpoints(endpoints =>
{
endpoints.MapGet("/", async context =>
{
await context.Response.WriteAsync("Hello DotNet 2019!");
});
})
);
Configuration.Configure(app, host =>
{
return host
.UseCustomHealthchecks()
.UseHeaderDiagnostics();
}); |
<<<<<<<
using Microsoft.Bot.Builder.Core.Extensions;
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime.Models;
=======
using Microsoft.Cognitive.LUIS.Models;
>>>>>>>
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime.Models; |
<<<<<<<
public class RandomPoolSurrogate : ISurrogate
{
public int NrOfInstances { get; set; }
public bool UsePoolDispatcher { get; set; }
public Resizer Resizer { get; set; }
public SupervisorStrategy SupervisorStrategy { get; set; }
public string RouterDispatcher { get; set; }
public ISurrogated FromSurrogate(ActorSystem system)
{
return new RandomPool(NrOfInstances, Resizer, SupervisorStrategy, RouterDispatcher, UsePoolDispatcher);
}
}
=======
public override Pool WithSupervisorStrategy(SupervisorStrategy strategy)
{
return new RandomPool(NrOfInstances, Resizer, strategy, RouterDispatcher, UsePoolDispatcher);
}
public override Pool WithResizer(Resizer resizer)
{
return new RandomPool(NrOfInstances, resizer, SupervisorStrategy, RouterDispatcher, UsePoolDispatcher);
}
public override RouterConfig WithFallback(RouterConfig routerConfig)
{
return OverrideUnsetConfig(routerConfig);
}
>>>>>>>
public class RandomPoolSurrogate : ISurrogate
{
public int NrOfInstances { get; set; }
public bool UsePoolDispatcher { get; set; }
public Resizer Resizer { get; set; }
public SupervisorStrategy SupervisorStrategy { get; set; }
public string RouterDispatcher { get; set; }
public ISurrogated FromSurrogate(ActorSystem system)
{
return new RandomPool(NrOfInstances, Resizer, SupervisorStrategy, RouterDispatcher, UsePoolDispatcher);
}
}
public override Pool WithSupervisorStrategy(SupervisorStrategy strategy)
{
return new RandomPool(NrOfInstances, Resizer, strategy, RouterDispatcher, UsePoolDispatcher);
}
public override Pool WithResizer(Resizer resizer)
{
return new RandomPool(NrOfInstances, resizer, SupervisorStrategy, RouterDispatcher, UsePoolDispatcher);
}
public override RouterConfig WithFallback(RouterConfig routerConfig)
{
return OverrideUnsetConfig(routerConfig);
} |
<<<<<<<
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
=======
}
private static string NormalizedIntent(string intent)
{
return intent.Replace('.', '_').Replace(' ', '_');
}
>>>>>>>
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
=======
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
>>>>>>>
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (!entity.AdditionalProperties.TryGetValue("resolution", out dynamic resolution))
{
return entity.Entity;
}
=======
if (entity.Resolution == null)
{
return entity.Entity;
}
>>>>>>>
if (!entity.AdditionalProperties.TryGetValue("resolution", out dynamic resolution))
{
{
return entity.Entity;
}
<<<<<<<
if (resolution.Values == null || resolution.Values.Count == 0)
{
return JArray.FromObject(resolution);
}
var resolutionValues = (IEnumerable<object>)resolution.values;
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
=======
if (entity.Resolution?.Values == null || entity.Resolution.Values.Count == 0)
{
return JArray.FromObject(entity.Resolution);
}
var resolutionValues = (IEnumerable<object>)entity.Resolution["values"];
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
>>>>>>>
if (resolution.Values == null || resolution.Values.Count == 0)
{
return JArray.FromObject(resolution);
}
var resolutionValues = (IEnumerable<object>)resolution.values;
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
var role = entity.AdditionalProperties.ContainsKey("Role") ? (string)entity.AdditionalProperties["Role"] : string.Empty;
if (!string.IsNullOrWhiteSpace(role))
=======
if (!string.IsNullOrWhiteSpace(entity.Role))
>>>>>>>
var role = entity.AdditionalProperties.ContainsKey("Role") ? (string)entity.AdditionalProperties["Role"] : string.Empty;
if (!string.IsNullOrWhiteSpace(role))
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (compositeEntityMetadata == null)
{
return entities;
}
=======
if (compositeEntityMetadata == null)
{
return entities;
}
>>>>>>>
if (compositeEntityMetadata == null)
{
return entities;
}
<<<<<<<
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
=======
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
>>>>>>>
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
<<<<<<<
private async Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisResult = await runtime.Prediction.ResolveAsync(
application.ApplicationId,
utterance,
timezoneOffset: options.TimezoneOffset,
verbose: options.Verbose,
staging: options.Staging,
spellCheck: options.SpellCheck,
bingSpellCheckSubscriptionKey: options.BingSpellCheckSubscriptionKey,
log: options.Log,
cancellationToken: ct)
.ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = utterance,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, options.IncludeInstanceData),
};
if (includeAPIResults)
{
recognizerResult.Properties.Add("luisResult", luisResult);
}
return recognizerResult;
}
=======
private Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisRequest = new LuisRequest(utterance);
_luisOptions.Apply(luisRequest);
return Recognize(luisRequest, ct, _luisRecognizerOptions.Verbose);
}
private async Task<RecognizerResult> Recognize(LuisRequest request, CancellationToken ct, bool verbose)
{
var luisResult = await _luisService.QueryAsync(request, ct).ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = request.Query,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, verbose),
};
recognizerResult.Properties.Add("luisResult", luisResult);
return recognizerResult;
}
>>>>>>>
private async Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisResult = await runtime.Prediction.ResolveAsync(
application.ApplicationId,
utterance,
timezoneOffset: options.TimezoneOffset,
verbose: options.Verbose,
staging: options.Staging,
spellCheck: options.SpellCheck,
bingSpellCheckSubscriptionKey: options.BingSpellCheckSubscriptionKey,
log: options.Log,
cancellationToken: ct)
.ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = utterance,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, options.IncludeInstanceData),
};
if (includeAPIResults)
{
recognizerResult.Properties.Add("luisResult", luisResult);
}
return recognizerResult;
} |
<<<<<<<
if (local.Resizer != null)
throw new ConfigurationException("Resizer can't be used together with cluster router.");
_settings = settings;
_local = local;
=======
Settings = settings;
Local = local;
Guard.Assert(local.Resizer == null, "Resizer can't be used together with cluster router.");
>>>>>>>
if (local.Resizer != null)
throw new ConfigurationException("Resizer can't be used together with cluster router.");
_settings = settings;
_local = local;
Guard.Assert(local.Resizer == null, "Resizer can't be used together with cluster router."); |
<<<<<<<
public class InterfaceConverter<T> : JsonConverter, IObservableConverter, IObservableJsonConverter
=======
/// <summary>
/// Converts an object to and from JSON.
/// </summary>
/// <typeparam name="T">The object type.</typeparam>
public class InterfaceConverter<T> : JsonConverter, IObservableConverter
>>>>>>>
/// <summary>
/// Converts an object to and from JSON.
/// </summary>
/// <typeparam name="T">The object type.</typeparam>
public class InterfaceConverter<T> : JsonConverter, IObservableConverter, IObservableJsonConverter
<<<<<<<
/// <inheritdoc/>
[Obsolete("Deprecated in favor of IJsonLoadObserver registration.")]
=======
/// <summary>
/// Registers a <see cref="IConverterObserver"/> to receive notifications on converter events.
/// </summary>
/// <param name="observer">The observer to be registered.</param>
>>>>>>>
[Obsolete("Deprecated in favor of IJsonLoadObserver registration.")]
/// <summary>
/// Registers a <see cref="IConverterObserver"/> to receive notifications on converter events.
/// </summary>
/// <param name="observer">The observer to be registered.</param> |
<<<<<<<
[JsonIgnore]
private bool exclusiveSelfAssignedRoles = false;
public bool ExclusiveSelfAssignedRoles
{
get { return exclusiveSelfAssignedRoles; }
set
{
exclusiveSelfAssignedRoles = value;
if (!SpecificConfigurations.Instantiated) return;
OnPropertyChanged();
}
}
=======
[JsonIgnore]
private ObservableCollection<StreamNotificationConfig> observingStreams;
>>>>>>>
[JsonIgnore]
private bool exclusiveSelfAssignedRoles = false;
public bool ExclusiveSelfAssignedRoles
{
get { return exclusiveSelfAssignedRoles; }
set
{
exclusiveSelfAssignedRoles = value;
if (!SpecificConfigurations.Instantiated) return;
OnPropertyChanged();
}
}
[JsonIgnore]
private ObservableCollection<StreamNotificationConfig> observingStreams; |
<<<<<<<
=======
using Discord.API;
using Embed = Discord.API.Embed;
using EmbedAuthor = Discord.API.EmbedAuthor;
using EmbedField = Discord.API.EmbedField;
using System.Net.Http;
>>>>>>>
using System.Net.Http;
<<<<<<<
public async Task WhosPlaying([Remainder] string game = null)
=======
public async Task TogetherTube(IUserMessage imsg)
{
var channel = (ITextChannel)imsg.Channel;
Uri target;
using (var http = new HttpClient())
{
var res = await http.GetAsync("https://togethertube.com/room/create").ConfigureAwait(false);
target = res.RequestMessage.RequestUri;
}
await channel.EmbedAsync(new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithIconUrl("https://togethertube.com/assets/img/favicons/favicon-32x32.png")
.WithName("Together Tube")
.WithUrl("https://togethertube.com/"))
.WithDescription($"{imsg.Author.Mention} Here is your room link:\n{target}")
.Build());
}
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task WhosPlaying(IUserMessage umsg, [Remainder] string game = null)
>>>>>>>
public async Task WhosPlaying([Remainder] string game = null)
public async Task TogetherTube(IUserMessage imsg)
{
Uri target;
using (var http = new HttpClient())
{
var res = await http.GetAsync("https://togethertube.com/room/create").ConfigureAwait(false);
target = res.RequestMessage.RequestUri;
}
await Context.Channel.EmbedAsync(new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithIconUrl("https://togethertube.com/assets/img/favicons/favicon-32x32.png")
.WithName("Together Tube")
.WithUrl("https://togethertube.com/"))
.WithDescription($"{imsg.Author.Mention} Here is your room link:\n{target}"));
}
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public async Task WhosPlaying(IUserMessage umsg, [Remainder] string game = null)
<<<<<<<
var arr = (await (Context.Channel as IGuildChannel).Guild.GetUsersAsync())
=======
var usrs = (await (umsg.Channel as IGuildChannel).Guild.GetUsersAsync())
>>>>>>>
var arr = (await (Context.Channel as IGuildChannel).Guild.GetUsersAsync())
<<<<<<<
var roles = target.GetRoles().Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.");
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of roles for {target.Username}**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```");
}
=======
var roles = target.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false);
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of roles for {target.Username}**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false);
}
>>>>>>>
var roles = target.GetRoles().Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false);
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of roles for {target.Username}**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false);
}
<<<<<<<
var roles = guild.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.");
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of all roles on this server:**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```");
}
=======
var roles = guild.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false);
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of all roles on this server:**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false);
}
>>>>>>>
var roles = guild.Roles.Except(new[] { guild.EveryoneRole }).OrderBy(r => -r.Position).Skip((page - 1) * RolesPerPage).Take(RolesPerPage);
if (!roles.Any())
{
await channel.SendErrorAsync("No roles on this page.").ConfigureAwait(false);
}
else
{
await channel.SendConfirmAsync($"⚔ **Page #{page} of all roles on this server:**", $"```css\n• " + string.Join("\n• ", roles).SanitizeMentions() + "\n```").ConfigureAwait(false);
}
<<<<<<<
new EmbedBuilder().WithColor(new Color(0x00bbd6))
.WithAuthor(eab => eab.WithName($"NadekoBot v{StatsService.BotVersion}")
.WithUrl("http://nadekobot.readthedocs.io/en/latest/")
.WithIconUrl("https://cdn.discordapp.com/avatars/116275390695079945/b21045e778ef21c96d175400e779f0fb.jpg"))
.AddField(efb => efb.WithName(Format.Bold("Author")).WithValue(stats.Author).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Library")).WithValue(stats.Library).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Bot ID")).WithValue(NadekoBot.Client.CurrentUser().Id.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Commands Ran")).WithValue(stats.CommandsRan.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Messages")).WithValue($"{stats.MessageCounter} ({stats.MessagesPerSecond:F2}/sec)").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Memory")).WithValue($"{stats.Heap} MB").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Owner ID(s)")).WithValue(stats.OwnerIds).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Uptime")).WithValue(stats.GetUptimeString("\n")).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Presence")).WithValue($"{NadekoBot.Client.GetGuilds().Count} Servers\n{stats.TextChannels} Text Channels\n{stats.VoiceChannels} Voice Channels").WithIsInline(true)));
=======
new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithName($"NadekoBot v{StatsService.BotVersion}")
.WithUrl("http://nadekobot.readthedocs.io/en/latest/")
.WithIconUrl("https://cdn.discordapp.com/avatars/116275390695079945/b21045e778ef21c96d175400e779f0fb.jpg"))
.AddField(efb => efb.WithName(Format.Bold("Author")).WithValue(stats.Author).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Library")).WithValue(stats.Library).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Bot ID")).WithValue(NadekoBot.Client.GetCurrentUser().Id.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Commands Ran")).WithValue(stats.CommandsRan.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Messages")).WithValue($"{stats.MessageCounter} ({stats.MessagesPerSecond:F2}/sec)").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Memory")).WithValue($"{stats.Heap} MB").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Owner ID(s)")).WithValue(stats.OwnerIds).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Uptime")).WithValue(stats.GetUptimeString("\n")).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Presence")).WithValue($"{NadekoBot.Client.GetGuilds().Count} Servers\n{stats.TextChannels} Text Channels\n{stats.VoiceChannels} Voice Channels").WithIsInline(true))
#if !GLOBAL_NADEKO
.WithFooter(efb => efb.WithText($"Playing {Music.Music.MusicPlayers.Where(mp => mp.Value.CurrentSong != null).Count()} songs, {Music.Music.MusicPlayers.Sum(mp => mp.Value.Playlist.Count)} queued."))
#endif
.Build());
>>>>>>>
new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithName($"NadekoBot v{StatsService.BotVersion}")
.WithUrl("http://nadekobot.readthedocs.io/en/latest/")
.WithIconUrl("https://cdn.discordapp.com/avatars/116275390695079945/b21045e778ef21c96d175400e779f0fb.jpg"))
.AddField(efb => efb.WithName(Format.Bold("Author")).WithValue(stats.Author).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Library")).WithValue(stats.Library).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Bot ID")).WithValue(NadekoBot.Client.GetCurrentUser().Id.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Commands Ran")).WithValue(stats.CommandsRan.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Messages")).WithValue($"{stats.MessageCounter} ({stats.MessagesPerSecond:F2}/sec)").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Memory")).WithValue($"{stats.Heap} MB").WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Owner ID(s)")).WithValue(stats.OwnerIds).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Uptime")).WithValue(stats.GetUptimeString("\n")).WithIsInline(true))
.AddField(efb => efb.WithName(Format.Bold("Presence")).WithValue($"{NadekoBot.Client.GetGuilds().Count} Servers\n{stats.TextChannels} Text Channels\n{stats.VoiceChannels} Voice Channels").WithIsInline(true))
#if !GLOBAL_NADEKO
.WithFooter(efb => efb.WithText($"Playing {Music.Music.MusicPlayers.Where(mp => mp.Value.CurrentSong != null).Count()} songs, {Music.Music.MusicPlayers.Sum(mp => mp.Value.Playlist.Count)} queued."))
#endif
); |
<<<<<<<
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(animeData.Synopsis)
.WithTitle(animeData.title_english)
.WithUrl(animeData.Link)
.WithImageUrl(animeData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(animeData.total_episodes.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(animeData.AiringStatus.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", animeData.Genres)).WithIsInline(true));
await channel.EmbedAsync(embed).ConfigureAwait(false);
=======
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(animeData.Synopsis.Replace("<br>", Environment.NewLine))
.WithTitle(animeData.title_english)
.WithUrl(animeData.Link)
.WithImageUrl(animeData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(animeData.total_episodes.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(animeData.AiringStatus.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", animeData.Genres)).WithIsInline(true))
.WithFooter(efb => efb.WithText("Score: " + animeData.average_score + " / 100"));
await channel.EmbedAsync(embed.Build()).ConfigureAwait(false);
>>>>>>>
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(animeData.Synopsis.Replace("<br>", Environment.NewLine))
.WithTitle(animeData.title_english)
.WithUrl(animeData.Link)
.WithImageUrl(animeData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(animeData.total_episodes.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(animeData.AiringStatus.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", animeData.Genres)).WithIsInline(true))
.WithFooter(efb => efb.WithText("Score: " + animeData.average_score + " / 100"));
await channel.EmbedAsync(embed.Build()).ConfigureAwait(false);
<<<<<<<
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(mangaData.Synopsis)
.WithTitle(mangaData.title_english)
.WithUrl(mangaData.Link)
.WithImageUrl(mangaData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(mangaData.total_chapters.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(mangaData.publishing_status.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", mangaData.Genres)).WithIsInline(true));
await channel.EmbedAsync(embed).ConfigureAwait(false);
=======
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(mangaData.Synopsis.Replace("<br>", Environment.NewLine))
.WithTitle(mangaData.title_english)
.WithUrl(mangaData.Link)
.WithImageUrl(mangaData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(mangaData.total_chapters.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(mangaData.publishing_status.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", mangaData.Genres)).WithIsInline(true))
.WithFooter(efb => efb.WithText("Score: " + mangaData.average_score + " / 100"));
await channel.EmbedAsync(embed.Build()).ConfigureAwait(false);
>>>>>>>
var embed = new EmbedBuilder().WithColor(NadekoBot.OkColor)
.WithDescription(mangaData.Synopsis.Replace("<br>", Environment.NewLine))
.WithTitle(mangaData.title_english)
.WithUrl(mangaData.Link)
.WithImageUrl(mangaData.image_url_lge)
.AddField(efb => efb.WithName("Episodes").WithValue(mangaData.total_chapters.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Status").WithValue(mangaData.publishing_status.ToString()).WithIsInline(true))
.AddField(efb => efb.WithName("Genres").WithValue(String.Join(", ", mangaData.Genres)).WithIsInline(true))
.WithFooter(efb => efb.WithText("Score: " + mangaData.average_score + " / 100"));
await channel.EmbedAsync(embed).ConfigureAwait(false); |
<<<<<<<
=======
using Discord.API;
using NadekoBot.Extensions;
>>>>>>>
using Discord.API;
using NadekoBot.Extensions;
<<<<<<<
public EmbedBuilder GetEmbed() =>
new EmbedBuilder().WithColor(NadekoBot.OkColor)
=======
public Embed GetEmbed() =>
new EmbedBuilder().WithOkColor()
>>>>>>>
public EmbedBuilder GetEmbed() =>
new EmbedBuilder().WithOkColor() |
<<<<<<<
return new BindingBuilder<T>(binding, this.KernelInstance, service.Format());
#endif
=======
return new BindingBuilder<T>(binding, this.Settings, service.Format());
>>>>>>>
return new BindingBuilder<T>(binding, this.Settings, service.Format());
#endif
<<<<<<<
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format() };
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
#endif
=======
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format() };
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
>>>>>>>
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format() };
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
#endif
<<<<<<<
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format() };
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
#endif
=======
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format() };
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
>>>>>>>
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format() };
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
#endif
<<<<<<<
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format(), typeof(T4).Format() };
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
#endif
=======
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format(), typeof(T4).Format() };
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
>>>>>>>
var serviceNames = new[] { typeof(T1).Format(), typeof(T2).Format(), typeof(T3).Format(), typeof(T4).Format() };
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
#endif
<<<<<<<
return new BindingBuilder<object>(firstBinding, this.KernelInstance, string.Join(", ", services.Select(service => service.Format()).ToArray()));
#endif
=======
return new BindingBuilder<object>(firstBinding, this.Settings, string.Join(", ", services.Select(service => service.Format()).ToArray()));
>>>>>>>
return new BindingBuilder<object>(firstBinding, this.Settings, string.Join(", ", services.Select(service => service.Format()).ToArray()));
#endif |
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
var plugins = Kernel.Components.GetAll<IModuleLoaderPlugin>();
=======
var plugins = KernelConfiguration.Components.GetAll<IModuleLoaderPlugin>();
>>>>>>>
#if PCL
throw new NotImplementedException();
#else
var plugins = KernelConfiguration.Components.GetAll<IModuleLoaderPlugin>(); |
<<<<<<<
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
=======
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", servceNames));
>>>>>>>
return new BindingBuilder<T1, T2>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
<<<<<<<
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
=======
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", servceNames));
>>>>>>>
return new BindingBuilder<T1, T2, T3>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames));
<<<<<<<
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.KernelInstance, string.Join(", ", serviceNames));
=======
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", servceNames));
>>>>>>>
return new BindingBuilder<T1, T2, T3, T4>(firstBinding.BindingConfiguration, this.Settings, string.Join(", ", serviceNames)); |
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
Ensure.ArgumentNotNull(attributeType, "attributeType");
=======
>>>>>>>
#if PCL
throw new NotImplementedException();
#else
<<<<<<<
#if PCL
throw new NotImplementedException();
#else
Ensure.ArgumentNotNull(attributeType, "attributeType");
=======
>>>>>>>
#if PCL
throw new NotImplementedException();
#else |
<<<<<<<
public float __PAD00;
=======
>>>>>>>
<<<<<<<
=======
// Build SATs
// ComputeSAT( new System.IO.FileInfo( "Dummy.png" ), new System.IO.FileInfo( "DummySAT.dds" ) );
// ComputeSAT( new System.IO.FileInfo( "StainedGlass.png" ), new System.IO.FileInfo( "AreaLightSAT.dds" ) );
// ComputeSAT( new System.IO.FileInfo( "StainedGlass2.jpg" ), new System.IO.FileInfo( "AreaLightSAT2.dds" ) );
// ComputeSAT( new System.IO.FileInfo( "StainedGlass3.png" ), new System.IO.FileInfo( "AreaLightSAT3.dds" ) );
// ComputeSAT( new System.IO.FileInfo( "StainedGlass2Fade.png" ), new System.IO.FileInfo( "AreaLightSAT2Fade.dds" ) );
>>>>>>> |
<<<<<<<
_window.SetSelectionOfMenuItem("FutureTasks", User.Default.FilterFutureTasks);
=======
_window.SetSelectionOfMenuItem("HiddenTasks", User.Default.ShowHidenTasks);
>>>>>>>
_window.SetSelectionOfMenuItem("FutureTasks", User.Default.FilterFutureTasks);
_window.SetSelectionOfMenuItem("HiddenTasks", User.Default.ShowHidenTasks);
<<<<<<<
public void ApplyHideFutureTasks()
{
User.Default.FilterFutureTasks = !User.Default.FilterFutureTasks;
GetSelectedTasks();
UpdateDisplayedTasks();
SetSelectedTasks();
User.Default.Save();
}
private void ApplyFilterPreset(int filterPresetNumber)
=======
public void ApplyShowHiddenTasks()
{
User.Default.ShowHidenTasks = !User.Default.ShowHidenTasks;
GetSelectedTasks();
UpdateDisplayedTasks();
SetSelectedTasks();
User.Default.Save();
}
private void ApplyFilterPreset(int filterPresetNumber)
>>>>>>>
public void ApplyHideFutureTasks()
{
User.Default.FilterFutureTasks = !User.Default.FilterFutureTasks;
UpdateDisplayedTasks();
SetSelectedTasks();
User.Default.Save();
}
public void ApplyShowHiddenTasks()
{
User.Default.ShowHidenTasks = !User.Default.ShowHidenTasks;
GetSelectedTasks();
UpdateDisplayedTasks();
SetSelectedTasks();
User.Default.Save();
}
private void ApplyFilterPreset(int filterPresetNumber) |
<<<<<<<
using Microsoft.Win32;
=======
using System.Windows.Threading;
>>>>>>>
using Microsoft.Win32;
using System.Windows.Threading; |
<<<<<<<
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FilterFutureTasks {
get {
return ((bool)(this["FilterFutureTasks"]));
}
set {
this["FilterFutureTasks"] = value;
}
}
=======
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowHidenTasks {
get {
return ((bool)(this["ShowHidenTasks"]));
}
set {
this["ShowHidenTasks"] = value;
}
}
>>>>>>>
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FilterFutureTasks {
get {
return ((bool)(this["FilterFutureTasks"]));
}
set {
this["FilterFutureTasks"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowHidenTasks {
get {
return ((bool)(this["ShowHidenTasks"]));
}
set {
this["ShowHidenTasks"] = value;
}
} |
<<<<<<<
[Obsolete("This member has been renamed `IsProtected` to better reflect its purpose.")]
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
=======
public bool IsWatched { get; set; }
>>>>>>>
[JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)] |
<<<<<<<
public WorkspacesResourceGroup Workspaces => new WorkspacesResourceGroup(this);
public async Task<ResourceGroup> LoadResourceGroupAsync(string name)
=======
public async Task<ResourceGroup> LoadResourceGroupAsync(string name, CancellationToken token = default)
>>>>>>>
public WorkspacesResourceGroup Workspaces => new WorkspacesResourceGroup(this);
public async Task<ResourceGroup> LoadResourceGroupAsync(string name, CancellationToken token = default) |
<<<<<<<
var request = reference.GetContinuationActivity().ApplyConversationReference(reference, true);
=======
if (reference == null)
{
throw new ArgumentNullException(nameof(reference));
}
if (logic == null)
{
throw new ArgumentNullException(nameof(logic));
}
var request = reference.GetContinuationActivity().ApplyConversationReference(reference, true); // TODO: check on this
>>>>>>>
if (reference == null)
{
throw new ArgumentNullException(nameof(reference));
}
if (logic == null)
{
throw new ArgumentNullException(nameof(logic));
}
var request = reference.GetContinuationActivity().ApplyConversationReference(reference, true); |
<<<<<<<
private double moonEjectionAngle;
private double ejectionAltitude;
private double targetBodyDeltaV;
=======
>>>>>>>
private double moonEjectionAngle;
private double ejectionAltitude;
private double targetBodyDeltaV;
<<<<<<<
private double CalculateDeltaV(CelestialBody dest) //calculates ejection v to reach destination
{
if (vessel.mainBody == dest.orbit.referenceBody) {
double radius = dest.referenceBody.Radius;
double u = dest.referenceBody.gravParameter;
double d_alt = CalcMeanAlt(dest.orbit);
double alt = (vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass())) + radius;
double v = Math.Sqrt(u / alt) * (Math.Sqrt((2 * d_alt) / (alt + d_alt)) - 1);
return Math.Abs((Math.Sqrt(u / alt) + v) - vessel.orbit.GetVel().magnitude);
} else {
CelestialBody orig = vessel.mainBody;
double d_alt = CalcMeanAlt(dest.orbit);
double o_radius = orig.Radius;
double u = orig.referenceBody.gravParameter;
double o_mu = orig.gravParameter;
double o_soi = orig.sphereOfInfluence;
double o_alt = CalcMeanAlt(orig.orbit);
double exitalt = o_alt + o_soi;
double v2 = Math.Sqrt(u / exitalt) * (Math.Sqrt((2 * d_alt) / (exitalt + d_alt)) - 1);
double r = o_radius + (vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass()));
double v = Math.Sqrt((r * (o_soi * v2 * v2 - 2 * o_mu) + 2 * o_soi * o_mu) / (r * o_soi));
return Math.Abs(v - vessel.orbit.GetVel().magnitude);
}
}
private double MoonAngle() //calculates eject angle for moon -> planet in preparation for planet -> planet transfer
{
CelestialBody orig = vessel.mainBody;
double o_alt = CalcMeanAlt(orig.orbit);
double d_alt = (orig.orbit.referenceBody.Radius + orig.orbit.referenceBody.maxAtmosphereAltitude) * 1.05;
double o_soi = orig.sphereOfInfluence;
double o_radius = orig.Radius;
double o_mu = orig.gravParameter;
double u = orig.referenceBody.gravParameter;
double exitalt = o_alt + o_soi;
double v2 = Math.Sqrt(u / exitalt) * (Math.Sqrt((2.0 * d_alt) / (exitalt + d_alt)) - 1.0);
double r = o_radius + (orig.GetAltitude(vessel.findWorldCenterOfMass()));
double v = Math.Sqrt((r * (o_soi * v2 * v2 - 2.0 * o_mu) + 2 * o_soi * o_mu) / (r * o_soi));
double eta = Math.Abs(v * v / 2.0 - o_mu / r);
double h = r * v;
double e = Math.Sqrt(1.0 + ((2.0 * eta * h * h) / (o_mu * o_mu)));
double eject = (180.0 - (Math.Acos(1.0 / e) * (180.0 / Math.PI))) % 360.0;
eject = (o_alt > d_alt) ? (180.0 - eject) : (360.0 - eject);
return (vessel.orbit.inclination > 90.0 && !(vessel.Landed)) ? (360.0 - eject) : eject;
}
=======
>>>>>>>
private double CalculateDeltaV(CelestialBody dest) //calculates ejection v to reach destination
{
if (vessel.mainBody == dest.orbit.referenceBody) {
double radius = dest.referenceBody.Radius;
double u = dest.referenceBody.gravParameter;
double d_alt = CalcMeanAlt(dest.orbit);
double alt = (vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass())) + radius;
double v = Math.Sqrt(u / alt) * (Math.Sqrt((2 * d_alt) / (alt + d_alt)) - 1);
return Math.Abs((Math.Sqrt(u / alt) + v) - vessel.orbit.GetVel().magnitude);
} else {
CelestialBody orig = vessel.mainBody;
double d_alt = CalcMeanAlt(dest.orbit);
double o_radius = orig.Radius;
double u = orig.referenceBody.gravParameter;
double o_mu = orig.gravParameter;
double o_soi = orig.sphereOfInfluence;
double o_alt = CalcMeanAlt(orig.orbit);
double exitalt = o_alt + o_soi;
double v2 = Math.Sqrt(u / exitalt) * (Math.Sqrt((2 * d_alt) / (exitalt + d_alt)) - 1);
double r = o_radius + (vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass()));
double v = Math.Sqrt((r * (o_soi * v2 * v2 - 2 * o_mu) + 2 * o_soi * o_mu) / (r * o_soi));
return Math.Abs(v - vessel.orbit.GetVel().magnitude);
}
}
private double MoonAngle() //calculates eject angle for moon -> planet in preparation for planet -> planet transfer
{
CelestialBody orig = vessel.mainBody;
double o_alt = CalcMeanAlt(orig.orbit);
double d_alt = (orig.orbit.referenceBody.Radius + orig.orbit.referenceBody.maxAtmosphereAltitude) * 1.05;
double o_soi = orig.sphereOfInfluence;
double o_radius = orig.Radius;
double o_mu = orig.gravParameter;
double u = orig.referenceBody.gravParameter;
double exitalt = o_alt + o_soi;
double v2 = Math.Sqrt(u / exitalt) * (Math.Sqrt((2.0 * d_alt) / (exitalt + d_alt)) - 1.0);
double r = o_radius + (orig.GetAltitude(vessel.findWorldCenterOfMass()));
double v = Math.Sqrt((r * (o_soi * v2 * v2 - 2.0 * o_mu) + 2 * o_soi * o_mu) / (r * o_soi));
double eta = Math.Abs(v * v / 2.0 - o_mu / r);
double h = r * v;
double e = Math.Sqrt(1.0 + ((2.0 * eta * h * h) / (o_mu * o_mu)));
double eject = (180.0 - (Math.Acos(1.0 / e) * (180.0 / Math.PI))) % 360.0;
eject = (o_alt > d_alt) ? (180.0 - eject) : (360.0 - eject);
return (vessel.orbit.inclination > 90.0 && !(vessel.Landed)) ? (360.0 - eject) : eject;
}
<<<<<<<
case "TARGETBODYCLOSESTAPPROACH":
return targetClosestApproach;
case "TARGETBODYMOONEJECTIONANGLE":
return moonEjectionAngle;
case "TARGETBODYEJECTIONALTITUDE":
return ejectionAltitude;
case "TARGETBODYDELTAV":
return targetBodyDeltaV;
=======
// MOARdV: The following is not implemented yet.
//case "TARGETBODYCLOSESTAPPROACH":
// return targetClosestApproach;
>>>>>>>
case "TARGETBODYCLOSESTAPPROACH":
return targetClosestApproach;
case "TARGETBODYMOONEJECTIONANGLE":
return moonEjectionAngle;
case "TARGETBODYEJECTIONALTITUDE":
return ejectionAltitude;
case "TARGETBODYDELTAV":
return targetBodyDeltaV; |
<<<<<<<
public override HttpRequestMessage CreateRequest(string url, string method)
=======
/// <inheritdoc/>
public override HttpWebRequest CreateRequest(string url, string method)
>>>>>>>
/// <inheritdoc/>
public override HttpRequestMessage CreateRequest(string url, string method)
<<<<<<<
protected override HttpRequestMessage CreateRequest(Uri uri, string method)
=======
/// <inheritdoc/>
protected override HttpWebRequest CreateRequest(Uri uri, string method)
>>>>>>>
/// <inheritdoc/>
protected override HttpRequestMessage CreateRequest(Uri uri, string method) |
<<<<<<<
public async Task<SubredditStyle> GetStylesheetAsync()
=======
/// <summary>
/// Get the subreddit stylesheet.
/// </summary>
public SubredditStyle Stylesheet
>>>>>>>
/// <summary>
/// Get the subreddit stylesheet.
/// </summary>
public async Task<SubredditStyle> GetStylesheetAsync()
<<<<<<<
public async Task<IEnumerable<ModeratorUser>> GetModeratorsAsync()
=======
/// <summary>
/// Get an <see cref="IEnumerable{T}"/> of the subreddit moderators.
/// </summary>
public IEnumerable<ModeratorUser> Moderators
>>>>>>>
/// <summary>
/// Get an <see cref="IEnumerable{T}"/> of the subreddit moderators.
/// </summary>
public async Task<IEnumerable<ModeratorUser>> GetModeratorsAsync()
<<<<<<<
public Task<IEnumerable<TBUserNote>> GetUserNotesAsync()
=======
/// <summary>
/// Get an <see cref="IEnumerable{T}"/> of toolbox user notes.
/// </summary>
public IEnumerable<TBUserNote> UserNotes
>>>>>>>
/// <summary>
/// Get an <see cref="IEnumerable{T}"/> of toolbox user notes.
/// </summary>
public Task<IEnumerable<TBUserNote>> GetUserNotesAsync()
<<<<<<<
public async Task ClearFlairTemplatesAsync(FlairType flairType)
=======
/// <summary>
/// Clear templates of specified <see cref="FlairType"/>
/// </summary>
/// <param name="flairType"><see cref="FlairType"/></param>
public void ClearFlairTemplates(FlairType flairType)
>>>>>>>
/// <summary>
/// Clear templates of specified <see cref="FlairType"/>
/// </summary>
/// <param name="flairType"><see cref="FlairType"/></param>
public async Task ClearFlairTemplatesAsync(FlairType flairType)
<<<<<<<
public async Task AddFlairTemplateAsync(string cssClass, FlairType flairType, string text, bool userEditable)
=======
/// <summary>
/// Add a new flair template.
/// </summary>
/// <param name="cssClass">css class name</param>
/// <param name="flairType"><see cref="FlairType"/></param>
/// <param name="text">flair text</param>
/// <param name="userEditable">set flair user editable</param>
public void AddFlairTemplate(string cssClass, FlairType flairType, string text, bool userEditable)
>>>>>>>
/// <summary>
/// Add a new flair template.
/// </summary>
/// <param name="cssClass">css class name</param>
/// <param name="flairType"><see cref="FlairType"/></param>
/// <param name="text">flair text</param>
/// <param name="userEditable">set flair user editable</param>
public async Task AddFlairTemplateAsync(string cssClass, FlairType flairType, string text, bool userEditable)
<<<<<<<
=======
/// <summary>
/// Get the css class of the specified users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <returns></returns>
public string GetFlairCssClass(string user)
{
var request = WebAgent.CreateGet(string.Format(FlairListUrl + "?name=" + user, Name));
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
var json = JToken.Parse(data);
return (string)json["users"][0]["flair_css_class"];
}
/// <summary>
/// Get the css class of the specified users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <returns></returns>
>>>>>>>
/// <summary>
/// Get the css class of the specified users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <returns></returns>
<<<<<<<
=======
/// <summary>
/// Set a users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <param name="cssClass">flair css class</param>
/// <param name="text">flair text</param>
public void SetUserFlair(string user, string cssClass, string text)
{
var request = WebAgent.CreatePost(SetUserFlairUrl);
var stream = request.GetRequestStream();
WebAgent.WritePostBody(stream, new
{
css_class = cssClass,
text = text,
uh = Reddit.User.Modhash,
r = Name,
name = user
});
stream.Close();
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
}
/// <summary>
/// Set a users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <param name="cssClass">flair css class</param>
/// <param name="text">flair text</param>
/// <returns></returns>
>>>>>>>
/// <summary>
/// Set a users flair.
/// </summary>
/// <param name="user">reddit username</param>
/// <param name="cssClass">flair css class</param>
/// <param name="text">flair text</param>
<<<<<<<
public async Task AddModerator(RedditUser user)
=======
/// <summary>
/// Adds a moderator
/// </summary>
/// <param name="user">User to add</param>
public void AddModerator(RedditUser user)
>>>>>>>
/// <summary>
/// Adds a moderator
/// </summary>
/// <param name="user">User to add</param>
public async Task AddModerator(RedditUser user)
<<<<<<<
public async Task AcceptModeratorInviteAsync()
=======
/// <summary>
/// Accept invitation to moderate this subreddit.
/// </summary>
public void AcceptModeratorInvite()
>>>>>>>
/// <summary>
/// Accept invitation to moderate this subreddit.
/// </summary>
public async Task AcceptModeratorInviteAsync()
<<<<<<<
public async Task RemoveModeratorAsync(string id)
=======
/// <summary>
/// Remove a moderator from this subreddit.
/// </summary>
/// <param name="id">reddit user fullname</param>
public void RemoveModerator(string id)
>>>>>>>
/// <summary>
/// Remove a moderator from this subreddit.
/// </summary>
/// <param name="id">reddit user fullname</param>
public async Task RemoveModeratorAsync(string id)
<<<<<<<
public async Task AddContributorAsync(string user)
=======
/// <summary>
/// Add a contributor to this subreddit.
/// </summary>
/// <param name="user">reddit username.</param>
public void AddContributor(string user)
>>>>>>>
/// <summary>
/// Add a contributor to this subreddit.
/// </summary>
/// <param name="user">reddit username.</param>
public async Task AddContributorAsync(string user)
<<<<<<<
var response = await WebAgent.GetResponseAsync(request);
var data = await response.Content.ReadAsStringAsync();
=======
var response = request.GetResponse();
var result = WebAgent.GetResponseString(response.GetResponseStream());
}
/// <summary>
/// Remove a contributor from this subreddit.
/// </summary>
/// <param name="id">reddit user full name</param>
public void RemoveContributor(string id)
{
var request = WebAgent.CreatePost(LeaveModerationUrl);
WebAgent.WritePostBody(request.GetRequestStream(), new
{
api_type = "json",
uh = Reddit.User.Modhash,
r = Name,
type = "contributor",
id
});
var response = request.GetResponse();
var result = WebAgent.GetResponseString(response.GetResponseStream());
>>>>>>>
var response = await WebAgent.GetResponseAsync(request);
var data = await response.Content.ReadAsStringAsync();
<<<<<<<
=======
public void BanUser(string user, string reason, string note, int duration, string message)
{
var request = WebAgent.CreatePost(BanUserUrl);
WebAgent.WritePostBody(request.GetRequestStream(), new
{
api_type = "json",
uh = Reddit.User.Modhash,
r = Name,
container = FullName,
type = "banned",
name = user,
ban_reason = reason,
note = note,
duration = duration <= 0 ? "" : duration.ToString(),
ban_message = message
});
var response = request.GetResponse();
var result = WebAgent.GetResponseString(response.GetResponseStream());
}
/// <summary>
/// Bans a user
/// </summary>
/// <param name="user">User to ban, by username</param>
/// <param name="reason">Reason for ban, shows in ban note as 'reason: note' or just 'note' if blank</param>
/// <param name="note">Mod notes about ban, shows in ban note as 'reason: note'</param>
/// <param name="duration">Number of days to ban user, 0 for permanent</param>
/// <param name="message">Message to include in ban PM</param>
>>>>>>>
<<<<<<<
=======
public void UnBanUser(string user)
{
var request = WebAgent.CreatePost(UnBanUserUrl);
WebAgent.WritePostBody(request.GetRequestStream(), new
{
uh = Reddit.User.Modhash,
r = Name,
type = "banned",
container = FullName,
executed = "removed",
name = user,
});
var response = request.GetResponse();
var result = WebAgent.GetResponseString(response.GetResponseStream());
}
/// <summary>
/// Unbans a user
/// </summary>
/// <param name="user">User to unban, by username</param>
>>>>>>>
/// <summary>
<<<<<<<
=======
public Post SubmitPost(string title, string url, string captchaId = "", string captchaAnswer = "", bool resubmit = false)
{
return
Submit(
new LinkData
{
Subreddit = Name,
UserHash = Reddit.User.Modhash,
Title = title,
URL = url,
Resubmit = resubmit,
Iden = captchaId,
Captcha = captchaAnswer
});
}
/// <summary>
/// Submits a link post in the current subreddit using the logged-in user
/// </summary>
/// <param name="title">The title of the submission</param>
/// <param name="url">The url of the submission link</param>
>>>>>>>
<<<<<<<
=======
public Post SubmitTextPost(string title, string text, string captchaId = "", string captchaAnswer = "")
{
return
Submit(
new TextData
{
Subreddit = Name,
UserHash = Reddit.User.Modhash,
Title = title,
Text = text,
Iden = captchaId,
Captcha = captchaAnswer
});
}
/// <summary>
/// Submits a text post in the current subreddit using the logged-in user
/// </summary>
/// <param name="title">The title of the submission</param>
/// <param name="text">The raw markdown text of the submission</param>
>>>>>>> |
<<<<<<<
#endregion
public async Task<IEnumerable<string>> GetPageNamesAsync()
=======
/// <summary>
/// Get a list of wiki page names for this subreddit.
/// </summary>
public IEnumerable<string> PageNames
>>>>>>>
#endregion
/// <summary>
/// Get a list of wiki page names for this subreddit.
/// </summary>
public async Task<IEnumerable<string>> GetPageNamesAsync()
<<<<<<<
public async Task<WikiPage> GetPageAsync(string page, string version = null)
=======
/// <summary>
/// Get a wiki page
/// </summary>
/// <param name="page">wiki page name</param>
/// <param name="version">page version</param>
/// <returns></returns>
public WikiPage GetPage(string page, string version = null)
>>>>>>>
/// <summary>
/// Get a wiki page
/// </summary>
/// <param name="page">wiki page name</param>
/// <param name="version">page version</param>
/// <returns></returns>
public async Task<WikiPage> GetPageAsync(string page, string version = null)
<<<<<<<
public async Task<WikiPageSettings> GetPageSettingsAsync(string name)
=======
/// <summary>
/// Get wiki settings for specified wiki page.
/// </summary>
/// <param name="name">wiki page</param>
/// <returns></returns>
public WikiPageSettings GetPageSettings(string name)
>>>>>>>
/// <summary>
/// Get wiki settings for specified wiki page.
/// </summary>
/// <param name="name">wiki page</param>
/// <returns></returns>
public async Task<WikiPageSettings> GetPageSettingsAsync(string name)
<<<<<<<
public Task SetPageSettingsAsync(string name, WikiPageSettings settings)
=======
/// <summary>
/// Set settings for the specified wiki page.
/// </summary>
/// <param name="name">wiki page</param>
/// <param name="settings">settings</param>
public void SetPageSettings(string name, WikiPageSettings settings)
>>>>>>>
/// <summary>
/// Set settings for the specified wiki page.
/// </summary>
/// <param name="name">wiki page</param>
/// <param name="settings">settings</param>
public Task SetPageSettingsAsync(string name, WikiPageSettings settings)
<<<<<<<
return WebAgent.GetResponseAsync(request);
=======
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
>>>>>>>
return WebAgent.GetResponseAsync(request);
<<<<<<<
public Task EditPageAsync(string page, string content, string previous = null, string reason = null)
=======
/// <summary>
/// Edit a wiki page.
/// </summary>
/// <param name="page">wiki page</param>
/// <param name="content">new content</param>
/// <param name="previous">previous</param>
/// <param name="reason">reason for edit</param>
public void EditPage(string page, string content, string previous = null, string reason = null)
>>>>>>>
/// <summary>
/// Edit a wiki page.
/// </summary>
/// <param name="page">wiki page</param>
/// <param name="content">new content</param>
/// <param name="previous">previous</param>
/// <param name="reason">reason for edit</param>
public Task EditPageAsync(string page, string content, string previous = null, string reason = null)
<<<<<<<
return WebAgent.GetResponseAsync(request);
=======
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
}
#region Obsolete Getter Methods
[Obsolete("Use PageNames property instead")]
public IEnumerable<string> GetPageNames()
{
return PageNames;
}
[Obsolete("Use Revisions property instead")]
public Listing<WikiPageRevision> GetRevisions()
{
return Revisions;
>>>>>>>
return WebAgent.GetResponseAsync(request); |
<<<<<<<
=======
#region Obsolete Getter Methods
[Obsolete("Use Thread property instead")]
public Listing<PrivateMessage> GetThread()
{
return Thread;
}
#endregion Obsolete Gettter Methods
>>>>>>>
<<<<<<<
=======
public void SetAsRead()
{
var request = WebAgent.CreatePost(SetAsReadUrl);
WebAgent.WritePostBody(request.GetRequestStream(), new
{
id = FullName,
uh = Reddit.User.Modhash,
api_type = "json"
});
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
}
/// <summary>
/// Mark the message as read.
/// </summary>
/// <returns></returns>
>>>>>>>
<<<<<<<
/// <param name="message">Text to reply with</param>
=======
/// <param name="message">Markdown text.</param>
public void Reply(string message)
{
if (Reddit.User == null)
throw new AuthenticationException("No user logged in.");
var request = WebAgent.CreatePost(CommentUrl);
var stream = request.GetRequestStream();
WebAgent.WritePostBody(stream, new
{
text = message,
thing_id = FullName,
uh = Reddit.User.Modhash
});
stream.Close();
var response = request.GetResponse();
var data = WebAgent.GetResponseString(response.GetResponseStream());
var json = JObject.Parse(data);
}
/// <summary>
/// Reply to the message async.
/// </summary>
/// <param name="message">Markdown text</param>
/// <returns></returns>
>>>>>>>
/// <param name="message">Markdown text.</param> |
<<<<<<<
public Task DownvoteAsync()
=======
/// <summary>
/// Downvote this item.
/// </summary>
public void Downvote()
>>>>>>>
/// <summary>
/// Downvote this item.
/// </summary>
public Task DownvoteAsync()
<<<<<<<
public async Task SetVoteAsync(VoteType type)
=======
/// <summary>
/// Vote on this item.
/// </summary>
/// <param name="type"></param>
public void SetVote(VoteType type)
>>>>>>>
/// <summary>
/// Vote on this item.
/// </summary>
/// <param name="type"></param>
public async Task SetVoteAsync(VoteType type)
<<<<<<<
public async Task SaveAsync()
=======
/// <summary>
/// Save this item.
/// </summary>
public void Save()
>>>>>>>
/// <summary>
/// Save this item.
/// </summary>
public async Task SaveAsync()
<<<<<<<
public async Task UnsaveAsync()
=======
/// <summary>
/// Unsave this item.
/// </summary>
public void Unsave()
>>>>>>>
/// <summary>
/// Unsave this item.
/// </summary>
public async Task UnsaveAsync()
<<<<<<<
//TODO clean this up, unnecessary calls
public async Task ClearVote()
=======
/// <summary>
/// Clear you vote on this item.
/// </summary>
public void ClearVote()
>>>>>>>
//TODO clean this up, unnecessary calls
/// <summary>
/// Clear you vote on this item.
/// </summary>
public async Task ClearVote()
<<<<<<<
throw new Exception("You are not permitted to distinguish this comment.");
=======
throw new AuthenticationException("You are not permitted to distinguish this item.");
}
/// <summary>
/// Approve this item. Logged in user must be a moderator of parent subreddit.
/// </summary>
public void Approve()
{
var data = SimpleAction(ApproveUrl);
}
/// <summary>
/// Remove this item. Logged in user must be a moderator of parent subreddit.
/// </summary>
public void Remove()
{
RemoveImpl(false);
}
/// <summary>
/// Remove this item, flagging it as spam. Logged in user must be a moderator of parent subreddit.
/// </summary>
public void RemoveSpam()
{
RemoveImpl(true);
}
/// <summary>
/// Delete this item. Logged in user must be the items author.
/// </summary>
public void Del()
{
var data = SimpleAction(DelUrl);
}
/// <summary>
/// Ignore reports on this item. Logged in user must be a moderator of parent subreddit.
/// </summary>
public void IgnoreReports()
{
var data = SimpleAction(IgnoreReportsUrl);
}
/// <summary>
/// Unignore reports on this item. Logged in user must be a moderator of parent subreddit.
/// </summary>
public void UnIgnoreReports()
{
var data = SimpleAction(UnIgnoreReportsUrl);
>>>>>>>
throw new Exception("You are not permitted to distinguish this comment.");
}
public Task ApproveAsync()
{
return SimpleActionAsync(ApproveUrl);
}
public Task RemoveAsync()
{
return RemoveImplAsync(false);
}
public Task RemoveSpamAsync()
{
return RemoveImplAsync(true);
}
protected async Task RemoveImplAsync(bool spam)
{
var request = WebAgent.CreatePost(RemoveUrl);
WebAgent.WritePostBody(request, new
{
id = FullName,
spam = spam,
uh = Reddit.User.Modhash
});
var response = await WebAgent.GetResponseAsync(request);
var data = await response.Content.ReadAsStringAsync();
}
public Task DelAsync()
{
return SimpleActionAsync(DelUrl);
}
public Task IgnoreReportsAsync()
{
return SimpleActionAsync(IgnoreReportsUrl);
}
public Task UnIgnoreReportsAsync()
{
return SimpleActionAsync(UnIgnoreReportsUrl); |
<<<<<<<
=======
/// <summary>
/// DEPRECATED: Avoid use as Reddit will be removing this option eventually
/// </summary>
/// <param name="username"></param>
/// <param name="password"></param>
/// <param name="useSsl"></param>
[Obsolete("OAuth is recommended.", false)]
public Reddit(string username, string password, bool useSsl = true)
: this(useSsl)
{
LogIn(username, password, useSsl);
}
>>>>>>>
<<<<<<<
public async Task<RedditUser> GetUserAsync(string name)
=======
/// <summary>
/// Get a reddit user by name.
/// </summary>
/// <param name="name">user name</param>
/// <returns></returns>
public RedditUser GetUser(string name)
>>>>>>>
/// <summary>
/// Get a reddit user by name.
/// </summary>
/// <param name="name">user name</param>
/// <returns></returns>
public async Task<RedditUser> GetUserAsync(string name)
<<<<<<<
=======
#region Obsolete Getter Methods
[Obsolete("Use User property instead")]
public AuthenticatedUser GetMe()
{
return User;
}
#endregion Obsolete Getter Methods
/// <summary>
/// Get a subreddit by name.
/// </summary>
/// <param name="name">subreddit name with or without preceding /r/</param>
/// <returns></returns>
public Subreddit GetSubreddit(string name)
{
name = System.Text.RegularExpressions.Regex.Replace(name, "(r/|/)", "");
return GetThing<Subreddit>(string.Format(SubredditAboutUrl, name));
}
>>>>>>>
<<<<<<<
public async Task<JToken> GetTokenAsync(Uri uri)
=======
/// <summary>
/// Get a <see cref="JToken"/> from a url.
/// </summary>
/// <param name="uri">uri to fetch</param>
/// <param name="isLive">bool indicating if it's a live thread or not</param>
/// <returns></returns>
public JToken GetToken(Uri uri, bool isLive = false)
>>>>>>>
/// <summary>
/// Get a <see cref="JToken"/> from a url.
/// </summary>
/// <param name="uri">uri to fetch</param>
/// <param name="isLive">bool indicating if it's a live thread or not</param>
/// <returns></returns>
public async Task<JToken> GetTokenAsync(Uri uri, bool isLive = false)
<<<<<<<
public async Task<Thing> GetThingByFullnameAsync(string fullname)
=======
/// <summary>
/// Get a <see cref="Thing"/> by full name.
/// </summary>
/// <param name="fullname"></param>
/// <returns></returns>
public Thing GetThingByFullname(string fullname)
>>>>>>>
/// <summary>
/// Get a <see cref="Thing"/> by full name.
/// </summary>
/// <param name="fullname"></param>
/// <returns></returns>
public async Task<Thing> GetThingByFullnameAsync(string fullname)
<<<<<<<
public Task<Comment> GetCommentAsync(string subreddit, string name, string linkName)
=======
/// <summary>
/// Get a <see cref="Comment"/>.
/// </summary>
/// <param name="subreddit">subreddit name in which the comment resides</param>
/// <param name="name">comment base36 id</param>
/// <param name="linkName">post base36 id</param>
/// <returns></returns>
public Comment GetComment(string subreddit, string name, string linkName)
>>>>>>>
/// <summary>
/// Get a <see cref="Comment"/>.
/// </summary>
/// <param name="subreddit">subreddit name in which the comment resides</param>
/// <param name="name">comment base36 id</param>
/// <param name="linkName">post base36 id</param>
/// <returns></returns>
public Task<Comment> GetCommentAsync(string subreddit, string name, string linkName)
<<<<<<<
public async Task<Comment> GetCommentAsync(Uri uri)
=======
/// <summary>
/// Get a <see cref="Comment"/>.
/// </summary>
/// <param name="uri"></param>
/// <returns></returns>
public Comment GetComment(Uri uri)
>>>>>>>
/// <summary>
/// Get a <see cref="Comment"/>.
/// </summary>
/// <param name="uri"></param>
/// <returns></returns>
public async Task<Comment> GetCommentAsync(Uri uri) |
<<<<<<<
=======
using EnvDTE;
using Microsoft.VisualStudio.TextManager.Interop;
using NGit.Api;
>>>>>>>
<<<<<<<
using CancellationToken = System.Threading.CancellationToken;
=======
using System.Diagnostics;
using TextRange = System.Windows.Documents.TextRange;
>>>>>>>
using CancellationToken = System.Threading.CancellationToken;
<<<<<<<
foreach (var item in this.dataGrid1.SelectedItems)
{
((GitFile)item).IsSelected = checkBox.IsChecked == true;
}
=======
foreach (GitFile item in dataGrid1.SelectedItems)
item.IsSelected = checkBox != null && checkBox.IsChecked.HasValue && checkBox.IsChecked.Value;
e.Handled = true;
>>>>>>>
foreach (var item in this.dataGrid1.SelectedItems)
{
((GitFile)item).IsSelected = checkBox.IsChecked == true;
}
e.Handled = true;
<<<<<<<
GetSelectedFileFullName((fileName) =>
{
OpenFile(fileName);
});
=======
if (dataGrid1.SelectedItems.Count != 1)
return;
var dep = (DependencyObject) e.OriginalSource;
while ((dep != null) && !(dep is DataGridCell))
dep = VisualTreeHelper.GetParent(dep);
if (dep == null)
return;
var cell = dep as DataGridCell;
if (cell.Column.DisplayIndex == 0) // Checkbox
return;
GetSelectedFileFullName(fileName => {
fileName = Path.Combine(tracker.GitWorkingDirectory, fileName);
if (!File.Exists(fileName))
return;
var dte = BasicSccProvider.GetServiceEx<DTE>();
dte.ItemOperations.OpenFile(fileName);
});
>>>>>>>
if (dataGrid1.SelectedItems.Count != 1)
return;
var dep = (DependencyObject) e.OriginalSource;
while ((dep != null) && !(dep is DataGridCell))
dep = VisualTreeHelper.GetParent(dep);
if (dep == null)
return;
var cell = dep as DataGridCell;
if (cell.Column.DisplayIndex == 0) // Checkbox
return;
GetSelectedFileFullName((fileName) =>
{
OpenFile(fileName);
}); |
<<<<<<<
private readonly ITextBuffer _documentBuffer;
=======
private readonly FileSystemWatcher _watcher;
>>>>>>>
private readonly ITextBuffer _documentBuffer;
private readonly FileSystemWatcher _watcher;
<<<<<<<
public ITextBuffer DocumentBuffer
{
get
{
return _documentBuffer;
}
}
=======
private void HandleFileSystemChanged(object sender, FileSystemEventArgs e)
{
Action action = () => ProcessFileSystemChange(e);
Task.Factory.StartNew(action, CancellationToken.None, TaskCreationOptions.None, SccProviderService.TaskScheduler)
.HandleNonCriticalExceptions();
}
private void ProcessFileSystemChange(FileSystemEventArgs e)
{
if (e.ChangeType == WatcherChangeTypes.Changed && Directory.Exists(e.FullPath))
return;
if (string.Equals(Path.GetExtension(e.Name), ".lock", StringComparison.OrdinalIgnoreCase))
return;
MarkDirty(true);
}
protected override void Dispose(bool disposing)
{
if (disposing)
{
_watcher.Dispose();
}
base.Dispose(disposing);
}
>>>>>>>
private void HandleFileSystemChanged(object sender, FileSystemEventArgs e)
{
Action action = () => ProcessFileSystemChange(e);
Task.Factory.StartNew(action, CancellationToken.None, TaskCreationOptions.None, SccProviderService.TaskScheduler)
.HandleNonCriticalExceptions();
}
private void ProcessFileSystemChange(FileSystemEventArgs e)
{
if (e.ChangeType == WatcherChangeTypes.Changed && Directory.Exists(e.FullPath))
return;
if (string.Equals(Path.GetExtension(e.Name), ".lock", StringComparison.OrdinalIgnoreCase))
return;
MarkDirty(true);
}
protected override void Dispose(bool disposing)
{
if (disposing)
{
_watcher.Dispose();
}
base.Dispose(disposing);
}
public ITextBuffer DocumentBuffer
{
get
{
return _documentBuffer;
}
} |
<<<<<<<
{ ExpressionType.Dialog, "dialog." },
=======
{ ExpressionType.SimpleEntity, "turn.recognized.entities." },
{ ExpressionType.Title, "dialog." },
>>>>>>>
{ ExpressionType.Dialog, "dialog." },
{ ExpressionType.SimpleEntity, "turn.recognized.entities." },
<<<<<<<
new ExpressionEvaluator(ExpressionType.Callstack, Callstack, ReturnType.Object, ValidateUnaryString),
=======
new ExpressionEvaluator(ExpressionType.Entity, ApplyShorthand(ExpressionType.Entity), ReturnType.Object, ValidateUnaryString),
>>>>>>>
new ExpressionEvaluator(ExpressionType.Entity, ApplyShorthand(ExpressionType.Entity), ReturnType.Object, ValidateUnaryString), |
<<<<<<<
using FluentAssertions;
using NUnit.Framework;
=======
using FluentAssertions;
>>>>>>>
using FluentAssertions;
using NUnit.Framework;
<<<<<<<
=======
using NUnit.Framework;
>>>>>>>
<<<<<<<
[Test]
public void Command_should_create_new_aggregate_root_with_static_method()
{
var command = new AggregateRootTargetStaticCreateCommand { Title = "AggregateRootTargetStaticCreateCommand" };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootTargetStaticCreateCommand");
}
=======
[Test]
public void Command_should_create_and_then_use_existing()
{
var command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootCreateNewCommand", Id = Guid.NewGuid() };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootCreateNewCommand");
var arId = AggRoot.ArId;
command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootCreateNewCommand2", Id = Guid.NewGuid() };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootCreateNewCommand2");
Assert.AreNotEqual(arId, AggRoot.ArId, "Id's should be different.");
var createTicks = AggRoot.created;
arId = AggRoot.ArId;
command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootUpdatedCommand", Id = arId };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootUpdatedCommand");
AggRoot.ArId.Should().Be(arId);
AggRoot.created.Should().Be(createTicks);
}
>>>>>>>
[Test]
public void Command_should_create_new_aggregate_root_with_static_method()
{
var command = new AggregateRootTargetStaticCreateCommand { Title = "AggregateRootTargetStaticCreateCommand" };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootTargetStaticCreateCommand");
}
[Test]
public void Command_should_create_and_then_use_existing()
{
var command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootCreateNewCommand", Id = Guid.NewGuid() };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootCreateNewCommand");
var arId = AggRoot.ArId;
command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootCreateNewCommand2", Id = Guid.NewGuid() };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootCreateNewCommand2");
Assert.AreNotEqual(arId, AggRoot.ArId, "Id's should be different.");
var createTicks = AggRoot.created;
arId = AggRoot.ArId;
command = new AggregateRootTargetCreateOrUpdateTitleCommand { Title = "AggregateRootUpdatedCommand", Id = arId };
TheService.Execute(command);
AggRoot.Title.Should().Be("AggregateRootUpdatedCommand");
AggRoot.ArId.Should().Be(arId);
AggRoot.created.Should().Be(createTicks);
} |
<<<<<<<
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
=======
}
private static string NormalizedIntent(string intent)
{
return intent.Replace('.', '_').Replace(' ', '_');
}
>>>>>>>
}
private static string NormalizedIntent(string intent) => intent.Replace('.', '_').Replace(' ', '_');
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
=======
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
>>>>>>>
if (compositeEntityTypes.Contains(entity.Type))
{
continue;
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (!entity.AdditionalProperties.TryGetValue("resolution", out dynamic resolution))
{
return entity.Entity;
}
=======
if (entity.Resolution == null)
{
return entity.Entity;
}
>>>>>>>
if (!entity.AdditionalProperties.TryGetValue("resolution", out dynamic resolution))
{
{
return entity.Entity;
}
<<<<<<<
if (resolution.Values == null || resolution.Values.Count == 0)
{
return JArray.FromObject(resolution);
}
var resolutionValues = (IEnumerable<object>)resolution.values;
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
=======
if (entity.Resolution?.Values == null || entity.Resolution.Values.Count == 0)
{
return JArray.FromObject(entity.Resolution);
}
var resolutionValues = (IEnumerable<object>)entity.Resolution["values"];
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
>>>>>>>
if (resolution.Values == null || resolution.Values.Count == 0)
{
return JArray.FromObject(resolution);
}
var resolutionValues = (IEnumerable<object>)resolution.values;
var type = ((IDictionary<string, object>)resolutionValues.First())["type"];
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
var role = entity.AdditionalProperties.ContainsKey("Role") ? (string)entity.AdditionalProperties["Role"] : string.Empty;
if (!string.IsNullOrWhiteSpace(role))
=======
if (!string.IsNullOrWhiteSpace(entity.Role))
>>>>>>>
var role = entity.AdditionalProperties.ContainsKey("Role") ? (string)entity.AdditionalProperties["Role"] : string.Empty;
if (!string.IsNullOrWhiteSpace(role))
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (compositeEntityMetadata == null)
{
return entities;
}
=======
if (compositeEntityMetadata == null)
{
return entities;
}
>>>>>>>
if (compositeEntityMetadata == null)
{
return entities;
}
<<<<<<<
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
=======
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
>>>>>>>
if (coveredSet.Contains(entity))
{
continue;
}
// This entity doesn't belong to this composite entity
if (child.Type != entity.Type || !CompositeContainsEntity(compositeEntityMetadata, entity))
{
continue;
}
// Add to the set to ensure that we don't consider the same child entity more than once per composite
<<<<<<<
private async Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisResult = await runtime.Prediction.ResolveAsync(
application.ApplicationId,
utterance,
timezoneOffset: options.TimezoneOffset,
verbose: options.Verbose,
staging: options.Staging,
spellCheck: options.SpellCheck,
bingSpellCheckSubscriptionKey: options.BingSpellCheckSubscriptionKey,
log: options.Log,
cancellationToken: ct)
.ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = utterance,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, options.IncludeInstanceData),
};
if (includeAPIResults)
{
recognizerResult.Properties.Add("luisResult", luisResult);
}
return recognizerResult;
}
=======
private Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisRequest = new LuisRequest(utterance);
_luisOptions.Apply(luisRequest);
return Recognize(luisRequest, ct, _luisRecognizerOptions.Verbose);
}
private async Task<RecognizerResult> Recognize(LuisRequest request, CancellationToken ct, bool verbose)
{
var luisResult = await _luisService.QueryAsync(request, ct).ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = request.Query,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, verbose),
};
recognizerResult.Properties.Add("luisResult", luisResult);
return recognizerResult;
}
>>>>>>>
private async Task<RecognizerResult> RecognizeInternal(string utterance, CancellationToken ct)
{
if (string.IsNullOrEmpty(utterance))
{
throw new ArgumentNullException(nameof(utterance));
}
var luisResult = await runtime.Prediction.ResolveAsync(
application.ApplicationId,
utterance,
timezoneOffset: options.TimezoneOffset,
verbose: options.Verbose,
staging: options.Staging,
spellCheck: options.SpellCheck,
bingSpellCheckSubscriptionKey: options.BingSpellCheckSubscriptionKey,
log: options.Log,
cancellationToken: ct)
.ConfigureAwait(false);
var recognizerResult = new RecognizerResult
{
Text = utterance,
AlteredText = luisResult.AlteredQuery,
Intents = GetIntents(luisResult),
Entities = ExtractEntitiesAndMetadata(luisResult.Entities, luisResult.CompositeEntities, options.IncludeInstanceData),
};
if (includeAPIResults)
{
recognizerResult.Properties.Add("luisResult", luisResult);
}
return recognizerResult;
} |
<<<<<<<
using Microsoft.AspNet.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal;
=======
>>>>>>>
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Internal; |
<<<<<<<
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Microsoft.Bot.Builder.Core.Extensions;
using Newtonsoft.Json.Linq;
=======
using Microsoft.Cognitive.LUIS.Models;
using Newtonsoft.Json.Linq;
>>>>>>>
using Microsoft.Azure.CognitiveServices.Language.LUIS.Runtime;
using Newtonsoft.Json.Linq; |
<<<<<<<
nameof(IsMarkerClicked),
typeof(bool),
typeof(MapView),
default(bool),
BindingMode.TwoWay
);
=======
nameof(IsMarkerClicked),
typeof(bool),
typeof(MapView),
default(bool),
BindingMode.TwoWay
);
>>>>>>>
nameof(IsMarkerClicked),
typeof(bool),
typeof(MapView),
default(bool),
BindingMode.TwoWay
);
<<<<<<<
=======
>>>>>>>
<<<<<<<
BindingMode.TwoWay);
=======
BindingMode.TwoWay,
propertyChanged: OnAnnotationChanged
);
private static void OnAnnotationChanged(BindableObject bindable, object oldValue, object newValue)
{
if (bindable is MapView control)
{
control.OnAnnotationChanged((IEnumerable<Annotation>)oldValue, (IEnumerable<Annotation>)newValue);
}
}
>>>>>>>
BindingMode.TwoWay,
propertyChanged: OnAnnotationChanged
);
private static void OnAnnotationChanged(BindableObject bindable, object oldValue, object newValue)
{
if (bindable is MapView control)
{
control.OnAnnotationChanged((IEnumerable<Annotation>)oldValue, (IEnumerable<Annotation>)newValue);
}
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
public static BindableProperty ItemsSourceProperty = BindableProperty.Create(
propertyName: nameof(ItemsSource),
returnType: typeof(IEnumerable),
declaringType: typeof(MapView),
defaultValue: default(IEnumerable),
defaultBindingMode: BindingMode.OneWay
);
public IEnumerable ItemsSource
{
get { return (IEnumerable)GetValue(ItemsSourceProperty); }
set { SetValue(ItemsSourceProperty, value); }
}
void OnAnnotationChanged(IEnumerable<Annotation> oldAnnotation, IEnumerable<Annotation> newAnnotation)
{
AnnotationChanged?.Invoke(this, new AnnotationChangeEventArgs
{
OldAnnotation = oldAnnotation,
NewAnnotation = newAnnotation
});
}
>>>>>>>
void OnAnnotationChanged(IEnumerable<Annotation> oldAnnotation, IEnumerable<Annotation> newAnnotation)
{
AnnotationChanged?.Invoke(this, new AnnotationChangeEventArgs
{
OldAnnotation = oldAnnotation,
NewAnnotation = newAnnotation
});
} |
<<<<<<<
Annotations = new ObservableCollection<Annotation> {
new PointAnnotation {
Coordinate = new Position(21.004142f, 105.847607f),
Title = "Naxam Company Limited",
SubTitle = "A software development agency from Hanoi, Vietnam"
, }
};
=======
MBService = new MapBoxQs.Services.MapBoxService();
Annotations = new ObservableCollection<Annotation>();
>>>>>>>
MBService = new MapBoxQs.Services.MapBoxService();
Annotations = new ObservableCollection<Annotation>();
Annotations = new ObservableCollection<Annotation> {
new PointAnnotation {
Coordinate = new Position(21.004142f, 105.847607f),
Title = "Naxam Company Limited",
SubTitle = "A software development agency from Hanoi, Vietnam"
, }
}; |
<<<<<<<
var activity = (AppCompatActivity)Context;
var view = new Android.Widget.FrameLayout(Context)
=======
var activity = (AppCompatActivity)Context;
var view = new Android.Widget.FrameLayout(activity)
>>>>>>>
var activity = (AppCompatActivity)Context;
var view = new Android.Widget.FrameLayout(activity)
<<<<<<<
var options = markerOptions.Select(x => map.AddMarker(x)).ToArray();
=======
var options = map.AddMarkers(markerOptions.Cast<BaseMarkerOptions>().ToList()).ToArray();
>>>>>>>
var options = map.AddMarkers(markerOptions.Cast<BaseMarkerOptions>().ToList()).ToArray();
<<<<<<<
}
if (Element.Annotations != null)
{
AddAnnotations(Element.Annotations.ToArray());
if (Element.Annotations is INotifyCollectionChanged notifyCollection)
{
notifyCollection.CollectionChanged += OnAnnotationsCollectionChanged;
}
=======
>>>>>>>
}
if (Element.Annotations != null)
{
AddAnnotations(Element.Annotations.ToArray());
if (Element.Annotations is INotifyCollectionChanged notifyCollection)
{
notifyCollection.CollectionChanged += OnAnnotationsCollectionChanged;
} |
<<<<<<<
logError("Exported method name is null or empty, method: {0} (0x{1:X8})", new object[] { info.Method, info.Method.MDToken.Raw });
=======
error = true;
logError("Exported method name is null or empty, method: {0} (0x{1:X8})", info.Method, info.Method.MDToken.Raw);
>>>>>>>
error = true;
logError("Exported method name is null or empty, method: {0} (0x{1:X8})", new object[] { info.Method, info.Method.MDToken.Raw }); |
<<<<<<<
// This file was auto-generated by 'NAnt.BuildTools.Tasks' version '1.0.0.0' from 'ProductVersion.xml'
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.2.1505.1")]
[assembly: AssemblyConfiguration("")]
=======
// This file is auto-generated
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.0.1.83")]
[assembly: AssemblyConfiguration("")]
>>>>>>>
// This file was auto-generated by 'NAnt.BuildTools.Tasks' version '1.0.0.0' from 'ProductVersion.xml'
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("1.0.1.83")]
[assembly: AssemblyConfiguration("")] |
<<<<<<<
using Microsoft.Bot.Builder.Dialogs.Declarative;
=======
using Microsoft.Bot.Builder.Dialogs.Declarative.Debugger;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
>>>>>>>
using Microsoft.Bot.Builder.Dialogs.Declarative.Debugger;
using Microsoft.Bot.Builder.Dialogs.Declarative;
<<<<<<<
string jsonFile;
string jsonPointer = null;
var dialogResources = resourceExplorer.GetResources("dialog").ToArray();
var refResources = dialogResources?.Where(r => Path.GetFileNameWithoutExtension(r.Name) == targetFragments[0]).ToList();
=======
var dialogResources = await resourceProvider.GetResources("dialog").ConfigureAwait(false);
var refResources = dialogResources?.Where(r => r.Name == targetFragments[0]).ToList();
>>>>>>>
var dialogResources = resourceExplorer.GetResources("dialog").ToArray();
var refResources = dialogResources?.Where(r => Path.GetFileNameWithoutExtension(r.Name) == targetFragments[0]).ToList();
<<<<<<<
var text = File.ReadAllText(refResources.First().FullName);
=======
var refResource = refResources.Single();
var text = await refResource.GetTextAsync().ConfigureAwait(false);
>>>>>>>
var file = refResources.Single();
var text = File.ReadAllText(file.FullName); |
<<<<<<<
Dictionary<string, string> renames = null;
var renamesFile = Path.Combine(resourceInfo.FullPath, "renames.txt");
if (io::File.Exists(renamesFile))
{
renames = (from l in io::File.ReadAllLines(renamesFile)
where !string.IsNullOrWhiteSpace(l)
let parts = l.Split("=".ToArray(), 2)
select new KeyValuePair<string, string>(parts[0], parts[1])).ToDictionary(i => i.Key, i => i.Value);
}
var userImpacts = GitUtilities.GetUserImpacts(resourceInfo.FullPath, renames);
=======
AddRepoBreadCrumb(repo);
this.BreadCrumbs.Append("Browse", "ViewRepoImpact", "Impact", new { repo });
var userImpacts = GitUtilities.GetUserImpacts(resourceInfo.FullPath);
>>>>>>>
AddRepoBreadCrumb(repo);
this.BreadCrumbs.Append("Browse", "ViewRepoImpact", "Impact", new { repo });
Dictionary<string, string> renames = null;
var renamesFile = Path.Combine(resourceInfo.FullPath, "renames.txt");
if (io::File.Exists(renamesFile))
{
renames = (from l in io::File.ReadAllLines(renamesFile)
where !string.IsNullOrWhiteSpace(l)
let parts = l.Split("=".ToArray(), 2)
select new KeyValuePair<string, string>(parts[0], parts[1])).ToDictionary(i => i.Key, i => i.Value);
}
var userImpacts = GitUtilities.GetUserImpacts(resourceInfo.FullPath, renames); |
<<<<<<<
public BrokeredMessageFactory(ReplyQueueNameSetting replyQueueName, GzipMessageCompressionSetting gzipCompression, IClock clock)
=======
public BrokeredMessageFactory(ReplyQueueNameSetting replyQueueName, ISerializer serializer, IClock clock)
>>>>>>>
public BrokeredMessageFactory(ReplyQueueNameSetting replyQueueName, ISerializer serializer, GzipMessageCompressionSetting gzipCompression, IClock clock)
<<<<<<<
_gzipCompression = gzipCompression;
=======
_serializer = serializer;
>>>>>>>
_serializer = serializer;
_gzipCompression = gzipCompression;
<<<<<<<
{
// We need to serialize the message ourselves if we want to be in control of the BrokeredMessage.BodyStream
var message = new BrokeredMessage(serializableObject); // It's safe to pass the ctor a null
=======
{
BrokeredMessage message;
if (serializableObject == null)
{
message = new BrokeredMessage();
}
else
{
var stream = _serializer.Serialize(serializableObject);
message = new BrokeredMessage(stream, true);
}
>>>>>>>
{
BrokeredMessage message;
if (serializableObject == null)
{
message = new BrokeredMessage();
}
else
{
var stream = _serializer.Serialize(serializableObject);
message = new BrokeredMessage(stream, true);
} |
<<<<<<<
m_localfile.Protected = false;
=======
if (m_localFileStream != null)
try { m_localFileStream.Dispose(); }
finally { m_localFileStream = null; }
>>>>>>>
m_localfile.Protected = false;
if (m_localFileStream != null)
try { m_localFileStream.Dispose(); }
finally { m_localFileStream = null; } |
<<<<<<<
public void RunNoMetadata()
{
PrepareSourceData();
RunCommands(1024 * 10, modifyOptions: opts => {
opts["skip-metadata"] = "true";
});
}
[Test]
=======
[Category("Border")]
>>>>>>>
[Category("Border")]
public void RunNoMetadata()
{
PrepareSourceData();
RunCommands(1024 * 10, modifyOptions: opts => {
opts["skip-metadata"] = "true";
});
}
[Test]
[Category("Border")]
<<<<<<<
[Test]
=======
//[Test]
[Category("Border")]
>>>>>>>
[Test]
[Category("Border")]
<<<<<<<
[Test]
=======
//[Test]
[Category("Border")]
>>>>>>>
[Test]
[Category("Border")] |
<<<<<<<
var enumeratorTask = Backup.FileEnumerationProcess.Run(sources, snapshot, null, options.FileAttributeFilter, sourcefilter, filter, options.SymlinkPolicy, options.HardlinkPolicy, options.ChangedFilelist, taskreader);
=======
var enumeratorTask = Backup.FileEnumerationProcess.Run(snapshot, options.FileAttributeFilter, sourcefilter, filter, options.SymlinkPolicy, options.HardlinkPolicy, options.ExcludeEmptyFolders, options.IgnoreFilenames, options.ChangedFilelist, taskreader);
>>>>>>>
var enumeratorTask = Backup.FileEnumerationProcess.Run(sources, snapshot, null, options.FileAttributeFilter, sourcefilter, filter, options.SymlinkPolicy, options.HardlinkPolicy, options.ExcludeEmptyFolders, options.IgnoreFilenames, options.ChangedFilelist, taskreader); |
<<<<<<<
using(new Logging.Timer(LC.L("ExecuteNonQuery: {0}", self.GetPrintableCommandText())))
=======
using(new Logging.Timer(LOGTAG, "ExecuteNonQuery", string.Format("ExecuteNonQuery: {0}", self.CommandText)))
>>>>>>>
using(new Logging.Timer(LOGTAG, "ExecuteNonQuery", string.Format("ExecuteNonQuery: {0}", self.GetPrintableCommandText())))
<<<<<<<
using(new Logging.Timer(LC.L("ExecuteScalar: {0}", self.GetPrintableCommandText())))
=======
using(new Logging.Timer(LOGTAG, "ExecuteScalar", string.Format("ExecuteScalar: {0}", self.CommandText)))
>>>>>>>
using(new Logging.Timer(LOGTAG, "ExecuteScalar", string.Format("ExecuteScalar: {0}", self.GetPrintableCommandText())))
<<<<<<<
using(new Logging.Timer(LC.L("ExecuteScalarInt64: {0}", self.GetPrintableCommandText())))
=======
using(new Logging.Timer(LOGTAG, "ExecuteScalarInt64", string.Format("ExecuteScalarInt64: {0}", self.CommandText)))
>>>>>>>
using(new Logging.Timer(LOGTAG, "ExecuteScalarInt64", string.Format("ExecuteScalarInt64: {0}", self.GetPrintableCommandText())))
<<<<<<<
using(new Logging.Timer(LC.L("ExecuteReader: {0}", self.GetPrintableCommandText())))
=======
using(new Logging.Timer(LOGTAG, "ExcuteReader", string.Format("ExecuteReader: {0}", self.CommandText)))
>>>>>>>
using(new Logging.Timer(LOGTAG, "ExcuteReader", string.Format("ExecuteReader: {0}", self.GetPrintableCommandText()))) |
<<<<<<<
m_selectremotevolumeCommand.CommandText = m_selectremotevolumesCommand.CommandText + @" WHERE ""Name"" = ?";
=======
m_selectduplicateRemoteVolumesCommand.CommandText = string.Format(@"SELECT DISTINCT ""Name"", ""State"" FROM ""Remotevolume"" WHERE ""Name"" IN (SELECT ""Name"" FROM ""Remotevolume"" WHERE ""State"" IN (""{0}"", ""{1}"")) AND NOT ""State"" IN (""{0}"", ""{1}"")", RemoteVolumeState.Deleted.ToString(), RemoteVolumeState.Deleting.ToString());
m_selectremotevolumeCommand.CommandText = @"SELECT ""Type"", ""Size"", ""Hash"", ""State"" FROM ""Remotevolume"" WHERE ""Name"" = ?";
>>>>>>>
m_selectremotevolumeCommand.CommandText = m_selectremotevolumesCommand.CommandText + @" WHERE ""Name"" = ?";
m_selectduplicateRemoteVolumesCommand.CommandText = string.Format(@"SELECT DISTINCT ""Name"", ""State"" FROM ""Remotevolume"" WHERE ""Name"" IN (SELECT ""Name"" FROM ""Remotevolume"" WHERE ""State"" IN (""{0}"", ""{1}"")) AND NOT ""State"" IN (""{0}"", ""{1}"")", RemoteVolumeState.Deleted.ToString(), RemoteVolumeState.Deleting.ToString());
<<<<<<<
return new RemoteVolumeEntry(
rd.ConvertValueToInt64(0),
rd.GetValue(1).ToString(),
(rd.GetValue(4) == null || rd.GetValue(4) == DBNull.Value) ? null : rd.GetValue(4).ToString(),
rd.ConvertValueToInt64(3, -1),
(RemoteVolumeType)Enum.Parse(typeof(RemoteVolumeType), rd.GetValue(2).ToString()),
(RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(5).ToString()),
new DateTime(rd.ConvertValueToInt64(6, 0), DateTimeKind.Utc)
);
=======
{
type = (RemoteVolumeType)Enum.Parse(typeof(RemoteVolumeType), rd.GetValue(0).ToString());
size = (rd.GetValue(1) == null || rd.GetValue(1) == DBNull.Value) ? -1 : rd.GetInt64(1);
hash = (rd.GetValue(2) == null || rd.GetValue(2) == DBNull.Value) ? null : rd.GetValue(2).ToString();
state = (RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(3).ToString());
return true;
}
>>>>>>>
return new RemoteVolumeEntry(
rd.ConvertValueToInt64(0),
rd.GetValue(1).ToString(),
(rd.GetValue(4) == null || rd.GetValue(4) == DBNull.Value) ? null : rd.GetValue(4).ToString(),
rd.ConvertValueToInt64(3, -1),
(RemoteVolumeType)Enum.Parse(typeof(RemoteVolumeType), rd.GetValue(2).ToString()),
(RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(5).ToString()),
new DateTime(rd.ConvertValueToInt64(6, 0), DateTimeKind.Utc)
);
<<<<<<<
public IEnumerable<RemoteVolumeEntry> GetRemoteVolumes(System.Data.IDbTransaction transaction = null)
=======
public IEnumerable<KeyValuePair<string, RemoteVolumeState>> DuplicateRemoteVolumes()
{
foreach(var rd in m_selectduplicateRemoteVolumesCommand.ExecuteReaderEnumerable(null))
{
yield return new KeyValuePair<string, RemoteVolumeState>(
rd.GetValue(0).ToString(),
(RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(1).ToString())
);
}
}
public IEnumerable<RemoteVolumeEntry> GetRemoteVolumes()
>>>>>>>
public IEnumerable<KeyValuePair<string, RemoteVolumeState>> DuplicateRemoteVolumes()
{
foreach(var rd in m_selectduplicateRemoteVolumesCommand.ExecuteReaderEnumerable(null))
{
yield return new KeyValuePair<string, RemoteVolumeState>(
rd.GetValue(0).ToString(),
(RemoteVolumeState)Enum.Parse(typeof(RemoteVolumeState), rd.GetValue(1).ToString())
);
}
}
public IEnumerable<RemoteVolumeEntry> GetRemoteVolumes(System.Data.IDbTransaction transaction = null) |
<<<<<<<
/// <param name="filehash">The hash of the metadata</param>
/// <param name="size">The size of the metadata</param>
/// <param name="blocksetid">The ID of the blockset with the data</param>
/// <param name="transaction">The transaction to use</param>
=======
/// <param name="filehash">The metadata hash</param>
/// <param name="size">The size of the metadata</param>
/// <param name="transaction">The transaction to execute under</param>
/// <param name="blocksetid">The id of the blockset to add</param>
>>>>>>>
/// <param name="filehash">The metadata hash</param>
/// <param name="size">The size of the metadata</param>
/// <param name="transaction">The transaction to execute under</param>
/// <param name="blocksetid">The id of the blockset to add</param>
<<<<<<<
m_findfilesetCommand.Transaction = transaction;
m_findfilesetCommand.SetParameterValue(0, blocksetID);
m_findfilesetCommand.SetParameterValue(1, metadataID);
m_findfilesetCommand.SetParameterValue(2, filename);
m_findfilesetCommand.SetParameterValue(3, pathprefixid);
fileidobj = m_findfilesetCommand.ExecuteScalarInt64();
=======
PathEntryKeeper entry = null;
var entryFound = false;
if (m_pathLookup != null)
{
if (entryFound = (m_pathLookup.TryFind(filename, out entry) && entry != null))
{
var fid = entry.GetFilesetID(blocksetID, metadataID);
if (fid >= 0)
fileidobj = fid;
}
}
else
{
m_findfilesetCommand.Transaction = transaction;
m_findfilesetCommand.SetParameterValue(0, blocksetID);
m_findfilesetCommand.SetParameterValue(1, metadataID);
m_findfilesetCommand.SetParameterValue(2, filename);
fileidobj = m_findfilesetCommand.ExecuteScalarInt64(m_logQueries);
}
>>>>>>>
m_findfilesetCommand.Transaction = transaction;
m_findfilesetCommand.SetParameterValue(0, blocksetID);
m_findfilesetCommand.SetParameterValue(1, metadataID);
m_findfilesetCommand.SetParameterValue(2, filename);
m_findfilesetCommand.SetParameterValue(3, pathprefixid);
fileidobj = m_findfilesetCommand.ExecuteScalarInt64(m_logQueries);
<<<<<<<
m_insertfileCommand.SetParameterValue(0, pathprefixid);
m_insertfileCommand.SetParameterValue(1, filename);
m_insertfileCommand.SetParameterValue(2, blocksetID);
m_insertfileCommand.SetParameterValue(3, metadataID);
=======
m_insertfileCommand.SetParameterValue(0, filename);
m_insertfileCommand.SetParameterValue(1, blocksetID);
m_insertfileCommand.SetParameterValue(2, metadataID);
fileidobj = m_insertfileCommand.ExecuteScalarInt64(m_logQueries);
tr.Commit();
>>>>>>>
m_insertfileCommand.SetParameterValue(0, pathprefixid);
m_insertfileCommand.SetParameterValue(1, filename);
m_insertfileCommand.SetParameterValue(2, blocksetID);
m_insertfileCommand.SetParameterValue(3, metadataID);
<<<<<<<
m_insertfileOperationCommand.ExecuteNonQuery();
}
=======
m_insertfileOperationCommand.ExecuteNonQuery(m_logQueries);
>>>>>>>
m_insertfileOperationCommand.ExecuteNonQuery(m_logQueries);
}
<<<<<<<
m_selectfilelastmodifiedCommand.Transaction = transaction;
m_selectfilelastmodifiedCommand.SetParameterValue(0, prefixid);
m_selectfilelastmodifiedCommand.SetParameterValue(1, path);
m_selectfilelastmodifiedCommand.SetParameterValue(2, filesetid);
using (var rd = m_selectfilelastmodifiedCommand.ExecuteReader())
=======
m_selectfileHashCommand.Transaction = transaction;
m_selectfilelastmodifiedCommand.SetParameterValue(0, path);
m_selectfilelastmodifiedCommand.SetParameterValue(1, filesetid);
using (var rd = m_selectfilelastmodifiedCommand.ExecuteReader(m_logQueries, null))
>>>>>>>
m_selectfilelastmodifiedCommand.Transaction = transaction;
m_selectfilelastmodifiedCommand.SetParameterValue(0, prefixid);
m_selectfilelastmodifiedCommand.SetParameterValue(1, path);
m_selectfilelastmodifiedCommand.SetParameterValue(2, filesetid);
using (var rd = m_selectfilelastmodifiedCommand.ExecuteReader(m_logQueries, null))
<<<<<<<
=======
}
else
{
m_findfileCommand.SetParameterValue(0, path);
using(var rd = m_findfileCommand.ExecuteReader(m_logQueries, null))
if (rd.Read())
{
oldModified = new DateTime(rd.ConvertValueToInt64(1), DateTimeKind.Utc);
lastFileSize = rd.GetInt64(2);
oldMetahash = rd.GetString(3);
oldMetasize = rd.GetInt64(4);
return rd.ConvertValueToInt64(0);
}
else
{
oldModified = new DateTime(0, DateTimeKind.Utc);
lastFileSize = -1;
oldMetahash = null;
oldMetasize = -1;
return -1;
}
}
>>>>>>> |
<<<<<<<
/// <summary>
/// Retrieves change journal data for file set
/// </summary>
/// <param name="fileSetId">Fileset-ID</param>
public IEnumerable<Interface.USNJournalDataEntry> GetChangeJournalData(long fileSetId)
{
var data = new List<Interface.USNJournalDataEntry>();
using (var cmd = m_connection.CreateCommand())
using (var rd =
cmd.ExecuteReader(
@"SELECT ""VolumeName"", ""JournalID"", ""NextUSN"", ""ConfigHash"" FROM ""ChangeJournalData"" WHERE ""FilesetID"" = ?",
fileSetId))
{
while (rd.Read())
{
data.Add(new Interface.USNJournalDataEntry
{
Volume = rd.ConvertValueToString(0),
JournalId = rd.ConvertValueToInt64(1),
NextUsn = rd.ConvertValueToInt64(2),
ConfigHash = rd.ConvertValueToString(3)
});
}
}
return data;
}
/// <summary>
/// Adds NTFS change journal data for file set and volume
/// </summary>
/// <param name="data">Data to add</param>
/// <param name="transaction">An optional external transaction</param>
public void CreateChangeJournalData(IEnumerable<Interface.USNJournalDataEntry> data, System.Data.IDbTransaction transaction = null)
{
using (var tr = new TemporaryTransactionWrapper(m_connection, transaction))
{
foreach (var entry in data)
{
using(var cmd = m_connection.CreateCommand())
{
cmd.Transaction = tr.Parent;
var c = cmd.ExecuteNonQuery(
@"INSERT INTO ""ChangeJournalData"" (""FilesetID"", ""VolumeName"", ""JournalID"", ""NextUSN"", ""ConfigHash"") VALUES (?, ?, ?, ?, ?);",
m_filesetId, entry.Volume, entry.JournalId, entry.NextUsn, entry.ConfigHash);
if (c != 1)
throw new Exception("Unable to add change journal entry");
}
}
tr.Commit();
}
}
/// <summary>
/// Adds NTFS change journal data for file set and volume
/// </summary>
/// <param name="data">Data to add</param>
/// <param name="fileSetId">Existing file set to update</param>
/// <param name="transaction">An optional external transaction</param>
public void UpdateChangeJournalData(IEnumerable<Interface.USNJournalDataEntry> data, long fileSetId, System.Data.IDbTransaction transaction = null)
{
using (var tr = new TemporaryTransactionWrapper(m_connection, transaction))
{
foreach (var entry in data)
{
using(var cmd = m_connection.CreateCommand())
{
cmd.Transaction = tr.Parent;
cmd.ExecuteNonQuery(
@"UPDATE ""ChangeJournalData"" SET ""NextUSN"" = ? WHERE ""FilesetID"" = ? AND ""VolumeName"" = ? AND ""JournalID"" = ?;",
entry.NextUsn, fileSetId, entry.Volume, entry.JournalId);
}
}
tr.Commit();
}
}
=======
>>>>>>>
/// <summary>
/// Retrieves change journal data for file set
/// </summary>
/// <param name="fileSetId">Fileset-ID</param>
public IEnumerable<Interface.USNJournalDataEntry> GetChangeJournalData(long fileSetId)
{
var data = new List<Interface.USNJournalDataEntry>();
using (var cmd = m_connection.CreateCommand())
using (var rd =
cmd.ExecuteReader(
@"SELECT ""VolumeName"", ""JournalID"", ""NextUSN"", ""ConfigHash"" FROM ""ChangeJournalData"" WHERE ""FilesetID"" = ?",
fileSetId))
{
while (rd.Read())
{
data.Add(new Interface.USNJournalDataEntry
{
Volume = rd.ConvertValueToString(0),
JournalId = rd.ConvertValueToInt64(1),
NextUsn = rd.ConvertValueToInt64(2),
ConfigHash = rd.ConvertValueToString(3)
});
}
}
return data;
}
/// <summary>
/// Adds NTFS change journal data for file set and volume
/// </summary>
/// <param name="data">Data to add</param>
/// <param name="transaction">An optional external transaction</param>
public void CreateChangeJournalData(IEnumerable<Interface.USNJournalDataEntry> data, System.Data.IDbTransaction transaction = null)
{
using (var tr = new TemporaryTransactionWrapper(m_connection, transaction))
{
foreach (var entry in data)
{
using(var cmd = m_connection.CreateCommand())
{
cmd.Transaction = tr.Parent;
var c = cmd.ExecuteNonQuery(
@"INSERT INTO ""ChangeJournalData"" (""FilesetID"", ""VolumeName"", ""JournalID"", ""NextUSN"", ""ConfigHash"") VALUES (?, ?, ?, ?, ?);",
m_filesetId, entry.Volume, entry.JournalId, entry.NextUsn, entry.ConfigHash);
if (c != 1)
throw new Exception("Unable to add change journal entry");
}
}
tr.Commit();
}
}
/// <summary>
/// Adds NTFS change journal data for file set and volume
/// </summary>
/// <param name="data">Data to add</param>
/// <param name="fileSetId">Existing file set to update</param>
/// <param name="transaction">An optional external transaction</param>
public void UpdateChangeJournalData(IEnumerable<Interface.USNJournalDataEntry> data, long fileSetId, System.Data.IDbTransaction transaction = null)
{
using (var tr = new TemporaryTransactionWrapper(m_connection, transaction))
{
foreach (var entry in data)
{
using(var cmd = m_connection.CreateCommand())
{
cmd.Transaction = tr.Parent;
cmd.ExecuteNonQuery(
@"UPDATE ""ChangeJournalData"" SET ""NextUSN"" = ? WHERE ""FilesetID"" = ? AND ""VolumeName"" = ? AND ""JournalID"" = ?;",
entry.NextUsn, fileSetId, entry.Volume, entry.JournalId);
}
}
tr.Commit();
}
} |
<<<<<<<
log.AddWarning(Strings.RSyncDir.SnapshotFailedError(ex.ToString()), ex);
=======
{
log.AddWarning(Strings.Common.SnapshotFailedError(ex.ToString()), ex);
}
>>>>>>>
log.AddWarning(Strings.Common.SnapshotFailedError(ex.ToString()), ex);
<<<<<<<
=======
if (m_database.RepairInProgress)
throw new Exception("The database was attempted repaired, but the repair did not complete. This database may be incomplete and the backup process cannot continue. You may delete the local database and attempt to repair it again.");
m_blocksize = m_options.Blocksize;
m_blockbuffer = new byte[m_options.Blocksize * Math.Max(1, m_options.FileReadBufferSize / m_options.Blocksize)];
m_blocklistbuffer = new byte[m_options.Blocksize];
m_blockhasher = System.Security.Cryptography.HashAlgorithm.Create(m_options.BlockHashAlgorithm);
m_filehasher = System.Security.Cryptography.HashAlgorithm.Create(m_options.FileHashAlgorithm);
if (m_blockhasher == null)
throw new Exception(Strings.Common.InvalidHashAlgorithm(m_options.BlockHashAlgorithm));
if (m_filehasher == null)
throw new Exception(Strings.Common.InvalidHashAlgorithm(m_options.FileHashAlgorithm));
if (!m_blockhasher.CanReuseTransform)
throw new Exception(Strings.Common.InvalidCryptoSystem(m_options.BlockHashAlgorithm));
if (!m_filehasher.CanReuseTransform)
throw new Exception(Strings.Common.InvalidCryptoSystem(m_options.FileHashAlgorithm));
m_database.VerifyConsistency(null, m_options.Blocksize, m_options.BlockhashSize);
>>>>>>>
if (m_database.RepairInProgress)
throw new Exception("The database was attempted repaired, but the repair did not complete. This database may be incomplete and the backup process cannot continue. You may delete the local database and attempt to repair it again.");
<<<<<<<
// Prepare the operation by registering the filelist
m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_ProcessingFiles);
var filesetvolumeid = await db.RegisterRemoteVolumeAsync(filesetvolume.RemoteFilename, RemoteVolumeType.Files, RemoteVolumeState.Temporary);
filesetid = await db.CreateFilesetAsync(filesetvolumeid, VolumeBase.ParseFilename(filesetvolume.RemoteFilename).Time);
=======
m_database.BuildLookupTable(m_options);
m_transaction = m_database.BeginTransaction();
var repcnt = 0;
while(repcnt < 100 && m_database.GetRemoteVolumeID(filesetvolume.RemoteFilename) >= 0)
filesetvolume.ResetRemoteFilename(m_options, m_database.OperationTimestamp.AddSeconds(repcnt++));
if (m_database.GetRemoteVolumeID(filesetvolume.RemoteFilename) >= 0)
throw new Exception("Unable to generate a unique fileset name");
m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_ProcessingFiles);
var filesetvolumeid = m_database.RegisterRemoteVolume(filesetvolume.RemoteFilename, RemoteVolumeType.Files, RemoteVolumeState.Temporary, m_transaction);
m_database.CreateFileset(filesetvolumeid, VolumeBase.ParseFilename(filesetvolume.RemoteFilename).Time, m_transaction);
RunMainOperation(snapshot, backend);
>>>>>>>
// Prepare the operation by registering the filelist
m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_ProcessingFiles);
var repcnt = 0;
while(repcnt < 100 && await db.GetRemoteVolumeIDAsync(filesetvolume.RemoteFilename) >= 0)
filesetvolume.ResetRemoteFilename(m_options, m_database.OperationTimestamp.AddSeconds(repcnt++));
if (await db.GetRemoteVolumeIDAsync(filesetvolume.RemoteFilename) >= 0)
throw new Exception("Unable to generate a unique fileset name");
var filesetvolumeid = await db.RegisterRemoteVolumeAsync(filesetvolume.RemoteFilename, RemoteVolumeType.Files, RemoteVolumeState.Temporary);
filesetid = await db.CreateFilesetAsync(filesetvolumeid, VolumeBase.ParseFilename(filesetvolume.RemoteFilename).Time); |
<<<<<<<
Utility.UpdateOptionsFromDb(db, m_options);
=======
if (db.RepairInProgress)
m_result.AddWarning("The database is marked as \"in-progress\" and may be incomplete.", null);
>>>>>>>
Utility.UpdateOptionsFromDb(db, m_options);
if (db.RepairInProgress)
m_result.AddWarning("The database is marked as \"in-progress\" and may be incomplete.", null); |
<<<<<<<
var req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT + "?get-nonce=1");
req.Method = "GET";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.Headers.Add(TRAYICON_HEADER_NAME, "");
=======
var req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT);
req.Method = "POST";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.ContentType = "application/x-www-form-urlencoded";
Duplicati.Library.Utility.AsyncHttpRequest areq = new Library.Utility.AsyncHttpRequest(req);
var body = System.Text.Encoding.ASCII.GetBytes("get-nonce=1");
using (var f = areq.GetRequestStream(body.Length))
f.Write(body, 0, body.Length);
>>>>>>>
var req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT);
req.Method = "POST";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.Headers.Add(TRAYICON_HEADER_NAME, "");
req.ContentType = "application/x-www-form-urlencoded";
Duplicati.Library.Utility.AsyncHttpRequest areq = new Library.Utility.AsyncHttpRequest(req);
var body = System.Text.Encoding.ASCII.GetBytes("get-nonce=1");
using (var f = areq.GetRequestStream(body.Length))
f.Write(body, 0, body.Length);
<<<<<<<
System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT + "?password=" + Duplicati.Library.Utility.Uri.UrlEncode(password));
req.Method = "GET";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.Headers.Add(TRAYICON_HEADER_NAME, "");
if (req.CookieContainer == null)
=======
System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT);
req.Method = "POST";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.ContentType = "application/x-www-form-urlencoded";
if (req.CookieContainer == null)
>>>>>>>
System.Net.HttpWebRequest req = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(m_baseUri + LOGIN_SCRIPT);
req.Method = "POST";
req.UserAgent = "Duplicati TrayIcon Monitor, v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
req.Headers.Add(TRAYICON_HEADER_NAME, "");
req.ContentType = "application/x-www-form-urlencoded";
if (req.CookieContainer == null) |
<<<<<<<
new CommandLineArgument("exclude-empty-folders", CommandLineArgument.ArgumentType.Boolean, Strings.Options.ExcludeemptyfoldersShort, Strings.Options.ExcludeemptyfoldersLong, "false"),
=======
new CommandLineArgument("ignore-filenames", CommandLineArgument.ArgumentType.Path, Strings.Options.IgnorefilenamesShort, Strings.Options.IgnorefilenamesLong),
>>>>>>>
new CommandLineArgument("exclude-empty-folders", CommandLineArgument.ArgumentType.Boolean, Strings.Options.ExcludeemptyfoldersShort, Strings.Options.ExcludeemptyfoldersLong, "false"),
new CommandLineArgument("ignore-filenames", CommandLineArgument.ArgumentType.Path, Strings.Options.IgnorefilenamesShort, Strings.Options.IgnorefilenamesLong), |
<<<<<<<
=======
PreBackupVerify(backend);
// Verify before uploading a synthetic list
m_database.VerifyConsistency(null, m_options.Blocksize, m_options.BlockhashSize);
UploadSyntheticFilelist(backend);
m_database.BuildLookupTable(m_options);
m_transaction = m_database.BeginTransaction();
m_result.OperationProgressUpdater.UpdatePhase(OperationPhase.Backup_ProcessingFiles);
var filesetvolumeid = m_database.RegisterRemoteVolume(filesetvolume.RemoteFilename, RemoteVolumeType.Files, RemoteVolumeState.Temporary, m_transaction);
m_database.CreateFileset(filesetvolumeid, VolumeBase.ParseFilename(filesetvolume.RemoteFilename).Time, m_transaction);
RunMainOperation(snapshot, backend);
//If the scanner is still running for some reason, make sure we kill it now
if (parallelScanner != null && parallelScanner.IsAlive)
parallelScanner.Abort();
>>>>>>> |
<<<<<<<
public static Task Run(IEnumerable<string> sources, Snapshots.ISnapshotService snapshot, UsnJournalService journalService, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.HardlinkStrategy hardlinkPolicy, string[] changedfilelist, ITaskReader taskreader)
=======
public static Task Run(Snapshots.ISnapshotService snapshot, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.HardlinkStrategy hardlinkPolicy, bool excludeemptyfolders, string[] ignorenames, string[] changedfilelist, Common.ITaskReader taskreader)
>>>>>>>
public static Task Run(IEnumerable<string> sources, Snapshots.ISnapshotService snapshot, UsnJournalService journalService, FileAttributes attributeFilter, Duplicati.Library.Utility.IFilter sourcefilter, Duplicati.Library.Utility.IFilter emitfilter, Options.SymlinkStrategy symlinkPolicy, Options.HardlinkStrategy hardlinkPolicy, bool excludeemptyfolders, string[] ignorenames, string[] changedfilelist, ITaskReader taskreader)
<<<<<<<
worklist = snapshot.EnumerateFilesAndFolders(sources, (root, path, attr) => {
return AttributeFilterAsync(root, path, attr, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, attributeFilter, enumeratefilter, mixinqueue).WaitForTask().Result;
}, (rootpath, path, ex) => {
=======
worklist = snapshot.EnumerateFilesAndFolders((root, path, attr) =>
{
return AttributeFilterAsync(root, path, attr, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, attributeFilter, enumeratefilter, ignorenames, mixinqueue).WaitForTask().Result;
}, (rootpath, path, ex) =>
{
>>>>>>>
worklist = snapshot.EnumerateFilesAndFolders(sources, (root, path, attr) =>
{
return AttributeFilterAsync(root, path, attr, snapshot, sourcefilter, hardlinkPolicy, symlinkPolicy, hardlinkmap, attributeFilter, enumeratefilter, ignorenames, mixinqueue).WaitForTask().Result;
}, (rootpath, path, ex) =>
{ |
<<<<<<<
// Runtime Version:4.0.30319.296
=======
// Runtime Version:4.0.30319.1
>>>>>>>
// Runtime Version:4.0.30319.1
<<<<<<<
/// Looks up a localized string similar to When using the foresthash storage method, the option --{0} must be set.
/// </summary>
internal static string MissingDatabasepathError {
get {
return ResourceManager.GetString("MissingDatabasepathError", resourceCulture);
}
}
/// <summary>
=======
/// Looks up a localized string similar to The manifest file {0} specifies that there should be {1} volume pairs, but the following pairs were not found: {2}.
/// </summary>
internal static string MissingFilesDetected {
get {
return ResourceManager.GetString("MissingFilesDetected", resourceCulture);
}
}
/// <summary>
>>>>>>>
/// Looks up a localized string similar to When using the foresthash storage method, the option --{0} must be set.
/// </summary>
internal static string MissingDatabasepathError {
get {
return ResourceManager.GetString("MissingDatabasepathError", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The manifest file {0} specifies that there should be {1} volume pairs, but the following pairs were not found: {2}.
/// </summary>
internal static string MissingFilesDetected {
get {
return ResourceManager.GetString("MissingFilesDetected", resourceCulture);
}
}
/// <summary> |
<<<<<<<
if (result.ParsedResult != Library.Interface.ParsedResultType.Success)
{
var type = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? NotificationType.Warning
: NotificationType.Error;
var title = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? (backup.IsTemporary ?
"Warning" : string.Format("Warning while running {0}", backup.Name))
: (backup.IsTemporary ?
"Error" : string.Format("Error while running {0}", backup.Name));
var message = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? string.Format("Got {0} warning(s) ", result.Warnings.Count())
: string.Format("Got {0} error(s) ", result.Errors.Count());
Program.DataConnection.RegisterNotification(
type,
title,
message,
null,
backup.ID,
"backup:show-log",
null,
null,
"backup:show-log",
(n, a) => n
);
}
=======
var type = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? NotificationType.Warning
: NotificationType.Error;
var title = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? (backup.IsTemporary ?
"Warning" : string.Format("Warning while running {0}", backup.Name))
: (backup.IsTemporary ?
"Error" : string.Format("Error while running {0}", backup.Name));
var message = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? string.Format("Got {0} warning(s)", result.Warnings.Count())
: string.Format("Got {0} error(s)", result.Errors.Count());
Program.DataConnection.RegisterNotification(
type,
title,
message,
null,
backup.ID,
null,
null,
null,
"backup:show-log",
(n, a) => n
);
>>>>>>>
var type = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? NotificationType.Warning
: NotificationType.Error;
var title = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? (backup.IsTemporary ?
"Warning" : string.Format("Warning while running {0}", backup.Name))
: (backup.IsTemporary ?
"Error" : string.Format("Error while running {0}", backup.Name));
var message = result.ParsedResult == Library.Interface.ParsedResultType.Warning
? string.Format("Got {0} warning(s)", result.Warnings.Count())
: string.Format("Got {0} error(s)", result.Errors.Count());
Program.DataConnection.RegisterNotification(
type,
title,
message,
null,
backup.ID,
"backup:show-log",
null,
null,
"backup:show-log",
(n, a) => n
); |
<<<<<<<
try
{
m_is_reporting = true;
Logging.Log.WriteMessage(message, Duplicati.Library.Logging.LogMessageType.Warning, ex);
var s = ex == null ? message : string.Format("{0} => {1}", message, VerboseErrors ? ex.ToString() : ex.Message);
m_retryAttempts.Add(s);
if (MessageSink != null)
MessageSink.RetryEvent(message, ex);
lock (m_lock)
if (m_db != null && !m_db.IsDisposed)
LogDbMessage("Retry", message, ex);
}
finally
{
m_is_reporting = false;
}
}
}
}
public void AddError(string message, Exception ex)
{
if (m_parent != null)
m_parent.AddError(message, ex);
else
{
lock (Logging.Log.Lock)
{
if (m_is_reporting)
return;
try
{
m_is_reporting = true;
Logging.Log.WriteMessage(message, Duplicati.Library.Logging.LogMessageType.Error, ex);
var s = ex == null ? message : string.Format("{0} => {1}", message, VerboseErrors ? ex.ToString() : ex.Message);
m_errors.Add(s);
if (MessageSink != null)
MessageSink.ErrorEvent(message, ex);
lock (m_lock)
if (m_db != null && !m_db.IsDisposed)
LogDbMessage("Error", message, ex);
}
finally
{
m_is_reporting = false;
}
}
}
}
public IEnumerable<string> Messages { get { return m_messages; } }
public IEnumerable<string> Warnings { get { return m_warnings; } }
public IEnumerable<string> Errors { get { return m_errors; } }
protected Operation.Common.TaskControl m_taskController;
public Operation.Common.ITaskReader TaskReader { get { return m_taskController; } }
public BasicResults()
{
this.BeginTime = DateTime.UtcNow;
=======
protected BasicResults()
{
this.BeginTime = DateTime.UtcNow;
>>>>>>>
protected Operation.Common.TaskControl m_taskController;
public Operation.Common.ITaskReader TaskReader { get { return m_taskController; } }
protected BasicResults()
{
this.BeginTime = DateTime.UtcNow; |
<<<<<<<
=======
private static Size m_trayIconSize = Size.Empty;
/// <summary> Set size of icons to return. </summary>
public static void SetTrayIconSize(Size useTrayIconSize)
{
lock (LOCK)
{
ICONS.Clear();
m_trayIconSize = useTrayIconSize;
}
}
>>>>>>> |
<<<<<<<
=======
using System.Collections.Generic;
using System.IO;
using System.Text;
>>>>>>>
using System.IO;
<<<<<<<
=======
finally
{
System.Environment.SetEnvironmentVariable("SQLITE_TMPDIR", prev);
}
>>>>>>>
<<<<<<<
/// <summary>
/// Set environment variables to be used by SQLite to determine which folder to use for temporary files.
/// From SQLite's documentation, SQLITE_TMPDIR is used for unix-like systems.
/// For Windows, TMP and TEMP environment variables are used.
/// </summary>
private static void SetEnvironmentVariablesForSQLiteTempDir()
{
System.Environment.SetEnvironmentVariable("SQLITE_TMPDIR", Library.Utility.TempFolder.SystemTempPath);
System.Environment.SetEnvironmentVariable("TMP", Library.Utility.TempFolder.SystemTempPath);
System.Environment.SetEnvironmentVariable("TEMP", Library.Utility.TempFolder.SystemTempPath);
}
private static void DisposeConnection(System.Data.IDbConnection con)
{
if (con != null)
try { con.Dispose(); }
catch { }
}
=======
/// <summary>
/// Opens the SQLite file in the given connection, creating the file if required
/// </summary>
/// <param name="con">The connection to use.</param>
/// <param name="path">Path to the file to open, which may not exist.</param>
private static void OpenSQLiteFile(System.Data.IDbConnection con, string path)
{
// Check if SQLite database exists before opening a connection to it.
// This information is used to 'fix' permissions on a newly created file.
var fileExists = false;
if (!Library.Utility.Utility.IsClientWindows)
fileExists = File.Exists(path);
con.ConnectionString = "Data Source=" + path;
con.Open();
// If we are non-Windows, make the file only accessible by the current user
if (!Library.Utility.Utility.IsClientWindows && !fileExists)
SetUnixPermissionUserRWOnly(path);
}
/// <summary>
/// Sets the unix permission user read-write Only.
/// </summary>
/// <param name="path">The file to set permissions on.</param>
/// <remarks> Make sure we do not inline this, as we might eventually load Mono.Posix, which is not present on Windows</remarks>
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void SetUnixPermissionUserRWOnly(string path)
{
var fi = UnixSupport.File.GetUserGroupAndPermissions(path);
UnixSupport.File.SetUserGroupAndPermissions(
path,
fi.UID,
fi.GID,
0x180 /* FilePermissions.S_IRUSR | FilePermissions.S_IWUSR*/
);
}
private static void TestSQLiteFile(System.Data.IDbConnection con)
{
// Do a dummy query to make sure we have a working db
using (var cmd = con.CreateCommand())
{
cmd.CommandText = "SELECT COUNT(*) FROM SQLITE_MASTER";
cmd.ExecuteScalar();
}
}
>>>>>>>
/// <summary>
/// Set environment variables to be used by SQLite to determine which folder to use for temporary files.
/// From SQLite's documentation, SQLITE_TMPDIR is used for unix-like systems.
/// For Windows, TMP and TEMP environment variables are used.
/// </summary>
private static void SetEnvironmentVariablesForSQLiteTempDir()
{
System.Environment.SetEnvironmentVariable("SQLITE_TMPDIR", Library.Utility.TempFolder.SystemTempPath);
System.Environment.SetEnvironmentVariable("TMP", Library.Utility.TempFolder.SystemTempPath);
System.Environment.SetEnvironmentVariable("TEMP", Library.Utility.TempFolder.SystemTempPath);
}
/// <summary>
/// Wrapper to dispose the SQLite connection
/// </summary>
/// <param name="con">The connection to close.</param>
private static void DisposeConnection(System.Data.IDbConnection con)
{
if (con != null)
try { con.Dispose(); }
catch (Exception ex) { Logging.Log.WriteExplicitMessage(LOGTAG, "ConnectionDisposeError", ex, "Failed to dispose connection"); }
}
/// <summary>
/// Opens the SQLite file in the given connection, creating the file if required
/// </summary>
/// <param name="con">The connection to use.</param>
/// <param name="path">Path to the file to open, which may not exist.</param>
private static void OpenSQLiteFile(System.Data.IDbConnection con, string path)
{
// Check if SQLite database exists before opening a connection to it.
// This information is used to 'fix' permissions on a newly created file.
var fileExists = false;
if (!Library.Utility.Utility.IsClientWindows)
fileExists = File.Exists(path);
con.ConnectionString = "Data Source=" + path;
con.Open();
// If we are non-Windows, make the file only accessible by the current user
if (!Library.Utility.Utility.IsClientWindows && !fileExists)
SetUnixPermissionUserRWOnly(path);
}
/// <summary>
/// Sets the unix permission user read-write Only.
/// </summary>
/// <param name="path">The file to set permissions on.</param>
/// <remarks> Make sure we do not inline this, as we might eventually load Mono.Posix, which is not present on Windows</remarks>
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.NoInlining)]
private static void SetUnixPermissionUserRWOnly(string path)
{
var fi = UnixSupport.File.GetUserGroupAndPermissions(path);
UnixSupport.File.SetUserGroupAndPermissions(
path,
fi.UID,
fi.GID,
0x180 /* FilePermissions.S_IRUSR | FilePermissions.S_IWUSR*/
);
}
/// <summary>
/// Tests the SQLite connection, throwing an exception if the connection does not work
/// </summary>
/// <param name="con">The connection to test.</param>
private static void TestSQLiteFile(System.Data.IDbConnection con)
{
// Do a dummy query to make sure we have a working db
using (var cmd = con.CreateCommand())
{
cmd.CommandText = "SELECT COUNT(*) FROM SQLITE_MASTER";
cmd.ExecuteScalar();
}
} |
<<<<<<<
ResumeDataArrived(srda.Handle, srda.ResumeData);
continue;
=======
main_thread_dispatcher.Invoke(() => ResumeDataArrived(srda.Handle, srda.ResumeData));
>>>>>>>
main_thread_dispatcher.Invoke(() => ResumeDataArrived(srda.Handle, srda.ResumeData));
continue;
<<<<<<<
TorrentAdded(taa.Handle);
continue;
=======
main_thread_dispatcher.Invoke(() => TorrentAdded(taa.Handle));
>>>>>>>
main_thread_dispatcher.Invoke(() => TorrentAdded(taa.Handle));
continue;
<<<<<<<
TorrentStateChanged(taa.Handle, taa.PreviousState, taa.State);
continue;
=======
main_thread_dispatcher.Invoke(() => TorrentStateChanged(taa.Handle, taa.PreviousState, taa.State));
>>>>>>>
main_thread_dispatcher.Invoke(() => TorrentStateChanged(taa.Handle, taa.PreviousState, taa.State));
continue;
<<<<<<<
TorrentFinished(tfa.Handle);
continue;
=======
main_thread_dispatcher.Invoke(() => TorrentFinished(tfa.Handle));
>>>>>>>
main_thread_dispatcher.Invoke(() => TorrentFinished(tfa.Handle));
continue;
<<<<<<<
MetadataReceived(mra.Handle);
continue;
=======
main_thread_dispatcher.Invoke(() => MetadataReceived(mra.Handle));
>>>>>>>
main_thread_dispatcher.Invoke(() => MetadataReceived(mra.Handle));
continue; |
<<<<<<<
new TextButton(new Vector2(UIScaler.GetHCenter(-6f), 9f), new Vector2(12, 2), CommonStringKeys.FINISHED, delegate { Destroyer.Dialog(); });
=======
new TextButton(new Vector2(UIScaler.GetHCenter(-6f), 9f), new Vector2(12, 2), "Finished", delegate { Destroyer.Dialog(); });
MonsterDialogMoM.DrawMonster(m);
>>>>>>>
new TextButton(new Vector2(UIScaler.GetHCenter(-6f), 9f), new Vector2(12, 2), CommonStringKeys.FINISHED, delegate { Destroyer.Dialog(); });
MonsterDialogMoM.DrawMonster(m); |
<<<<<<<
public StringKey uniqueTitle = StringKey.NULL;
public StringKey uniqueText = StringKey.NULL;
=======
public string uniqueTitle = "";
public string uniqueText = "";
public float uniqueHealthBase = 0;
public float uniqueHealthHero = 0;
>>>>>>>
public StringKey uniqueTitle = StringKey.NULL;
public StringKey uniqueText = StringKey.NULL;
public float uniqueHealthBase = 0;
public float uniqueHealthHero = 0;
<<<<<<<
r += "uniquetitle=" +
(uniqueTitle.isKey()?uniqueTitle.key: "\"" + uniqueTitle + "\"") + nl;
=======
r += "uniquehealth=" + uniqueHealthBase + nl;
>>>>>>>
r += "uniquehealth=" + uniqueHealthBase + nl;
<<<<<<<
r += "uniquetext=" +
(uniqueText.isKey() ? uniqueText.key : "\"" + uniqueText + "\"") + nl;
=======
r += "uniquehealthhero=" + uniqueHealthHero + nl;
>>>>>>>
r += "uniquehealthhero=" + uniqueHealthHero + nl;
<<<<<<<
public StringKey text = StringKey.NULL;
public StringKey originalText = StringKey.NULL;
public List<StringKey> buttons;
=======
public string text = "";
public string originalText = "";
public List<string> buttons;
public List<string> buttonColors;
>>>>>>>
public StringKey text = StringKey.NULL;
public StringKey originalText = StringKey.NULL;
public List<StringKey> buttons;
public List<string> buttonColors;
<<<<<<<
buttons = new List<StringKey>();
=======
buttons = new List<string>();
buttonColors = new List<string>();
>>>>>>>
buttons = new List<StringKey>();
buttonColors = new List<string>();
<<<<<<<
buttons = new List<StringKey>();
=======
buttons = new List<string>();
buttonColors = new List<string>();
>>>>>>>
buttons = new List<StringKey>();
buttonColors = new List<string>();
<<<<<<<
=======
// Depreciated support for format 2
if (nextEvent.Count == 2)
{
if (buttons[0].Equals("Pass"))
{
buttonColors[0] = "green";
}
if (buttons[1].Equals("Fail"))
{
buttonColors[1] = "red";
}
}
>>>>>>>
// Depreciated support for format 2
if (nextEvent.Count == 2)
{
if (buttons[0].Equals(CommonStringKeys.PASS))
{
buttonColors[0] = "green";
}
if (buttons[1].Equals(CommonStringKeys.FAIL))
{
buttonColors[1] = "red";
}
}
<<<<<<<
r.Append("health=").AppendLine(health.ToString());
=======
r += "health=" + healthBase.ToString() + nl;
r += "healthperhero=" + healthPerHero.ToString() + nl;
>>>>>>>
r.Append("health=").AppendLine(healthBase.ToString());
r.Append("healthperhero=").AppendLine(healthPerHero.ToString()); |
<<<<<<<
using Assets.Scripts.Content;
=======
using Assets.Scripts.UI.Screens;
using System.Collections.Generic;
>>>>>>>
using Assets.Scripts.Content;
using Assets.Scripts.UI.Screens;
using System.Collections.Generic; |
<<<<<<<
public StringKey ability = null;
public StringKey minionActions = null;
public StringKey masterActions = null;
=======
public string ability = "-";
public string minionActions = "-";
public string masterActions = "-";
public string moveButton = "";
public string move = "";
>>>>>>>
public StringKey ability = null;
public StringKey minionActions = null;
public StringKey masterActions = null;
public StringKey moveButton = null;
public StringKey move = null; |
<<<<<<<
new TextButton(new Vector2(hOffset, offset), new Vector2(length, 2),
eb.label, delegate { onButton(numTmp); }, eb.colour);
=======
new TextButton(new Vector2(hOffset, offset), new Vector2(buttonWidth, 2),
new StringKey(eb.label,false), delegate { onButton(numTmp); }, eb.colour);
>>>>>>>
new TextButton(new Vector2(hOffset, offset), new Vector2(buttonWidth, 2),
eb.label, delegate { onButton(numTmp); }, eb.colour);
<<<<<<<
public EventButton(StringKey l)
=======
public EventButton(string l, string c)
>>>>>>>
public EventButton(StringKey newLabel,string newColour) |
<<<<<<<
using Assets.Scripts.Content;
using UnityEngine;
=======
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
>>>>>>>
using Assets.Scripts.Content;
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
<<<<<<<
DialogBox db = new DialogBox(
new Vector2(UIScaler.GetHCenter(-14f), 0.5f), new Vector2(28, 24.5f),
new StringKey(log,false),
Color.black, new Color(1, 1, 1, 0.9f));
=======
DialogBox db = null;
if (developerToggle)
{
db = new DialogBox(new Vector2(UIScaler.GetHCenter(-18f), 0.5f), new Vector2(20, 24.5f), log, Color.black, new Color(1, 1, 1, 0.9f));
}
else
{
db = new DialogBox(new Vector2(UIScaler.GetHCenter(-14f), 0.5f), new Vector2(28, 24.5f), log, Color.black, new Color(1, 1, 1, 0.9f));
}
>>>>>>>
DialogBox db = null;
if (developerToggle)
{
db = new DialogBox(new Vector2(UIScaler.GetHCenter(-18f), 0.5f), new Vector2(20, 24.5f), new StringKey(log,false), Color.black, new Color(1, 1, 1, 0.9f));
}
else
{
db = new DialogBox(new Vector2(UIScaler.GetHCenter(-14f), 0.5f), new Vector2(28, 24.5f), new StringKey(log,false), Color.black, new Color(1, 1, 1, 0.9f));
}
<<<<<<<
new TextButton(new Vector2(UIScaler.GetHCenter(-3f), 25f), new Vector2(6, 2), CommonStringKeys.CLOSE, delegate { Destroyer.Dialog(); });
=======
new TextButton(new Vector2(UIScaler.GetHCenter(-3f), 25f), new Vector2(6, 2), "Close", delegate { Destroyer.Dialog(); });
if (developerToggle)
{
DrawVarList();
}
}
public void DrawVarList()
{
DialogBox db = new DialogBox(new Vector2(UIScaler.GetHCenter(2f), 0.5f), new Vector2(16, 24.5f), "");
db.AddBorder();
db.background.AddComponent<UnityEngine.UI.Mask>();
UnityEngine.UI.ScrollRect scrollRect = db.background.AddComponent<UnityEngine.UI.ScrollRect>();
GameObject scrollArea = new GameObject("scroll");
RectTransform scrollInnerRect = scrollArea.AddComponent<RectTransform>();
scrollArea.transform.parent = db.background.transform;
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, 0, 16f * UIScaler.GetPixelsPerUnit());
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, 0, 1);
scrollRect.content = scrollInnerRect;
scrollRect.horizontal = false;
// List of vars
float offset = 1;
valueDBE = new Dictionary<string, DialogBoxEditable>();
foreach (KeyValuePair<string, float> kv in Game.Get().quest.vars.vars)
{
if (kv.Value != 0)
{
string key = kv.Key;
db = new DialogBox(new Vector2(UIScaler.GetHCenter(2.5f), offset), new Vector2(12, 1.2f), key, Color.black, Color.white);
db.textObj.GetComponent<UnityEngine.UI.Text>().material = (Material)Resources.Load("Fonts/FontMaterial");
db.background.transform.parent = scrollArea.transform;
db.AddBorder();
DialogBoxEditable dbe = new DialogBoxEditable(new Vector2(UIScaler.GetHCenter(14.5f), offset), new Vector2(3, 1.2f), kv.Value.ToString(), delegate { UpdateValue(key); }, Color.black, Color.white);
dbe.textObj.GetComponent<UnityEngine.UI.Text>().material = (Material)Resources.Load("Fonts/FontMaterial");
dbe.background.transform.parent = scrollArea.transform;
dbe.AddBorder();
valueDBE.Add(key, dbe);
offset += 1.4f;
}
}
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, 0, (offset - 1) * UIScaler.GetPixelsPerUnit());
}
public void UpdateValue(string key)
{
float value;
float.TryParse(valueDBE[key].uiInput.text, out value);
Game.Get().quest.vars.SetValue(key, value);
Destroyer.Dialog();
Update();
>>>>>>>
new TextButton(new Vector2(UIScaler.GetHCenter(-3f), 25f), new Vector2(6, 2), CommonStringKeys.CLOSE, delegate { Destroyer.Dialog(); });
if (developerToggle)
{
DrawVarList();
}
}
public void DrawVarList()
{
DialogBox db = new DialogBox(new Vector2(UIScaler.GetHCenter(2f), 0.5f), new Vector2(16, 24.5f), StringKey.NULL);
db.AddBorder();
db.background.AddComponent<UnityEngine.UI.Mask>();
UnityEngine.UI.ScrollRect scrollRect = db.background.AddComponent<UnityEngine.UI.ScrollRect>();
GameObject scrollArea = new GameObject("scroll");
RectTransform scrollInnerRect = scrollArea.AddComponent<RectTransform>();
scrollArea.transform.parent = db.background.transform;
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Left, 0, 16f * UIScaler.GetPixelsPerUnit());
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, 0, 1);
scrollRect.content = scrollInnerRect;
scrollRect.horizontal = false;
// List of vars
float offset = 1;
valueDBE = new Dictionary<string, DialogBoxEditable>();
foreach (KeyValuePair<string, float> kv in Game.Get().quest.vars.vars)
{
if (kv.Value != 0)
{
string key = kv.Key;
db = new DialogBox(new Vector2(UIScaler.GetHCenter(2.5f), offset), new Vector2(12, 1.2f),
new StringKey(key,false), Color.black, Color.white);
db.textObj.GetComponent<UnityEngine.UI.Text>().material = (Material)Resources.Load("Fonts/FontMaterial");
db.background.transform.parent = scrollArea.transform;
db.AddBorder();
DialogBoxEditable dbe = new DialogBoxEditable(new Vector2(UIScaler.GetHCenter(14.5f), offset), new Vector2(3, 1.2f),
new StringKey(kv.Value.ToString(),false), delegate { UpdateValue(key); }, Color.black, Color.white);
dbe.textObj.GetComponent<UnityEngine.UI.Text>().material = (Material)Resources.Load("Fonts/FontMaterial");
dbe.background.transform.parent = scrollArea.transform;
dbe.AddBorder();
valueDBE.Add(key, dbe);
offset += 1.4f;
}
}
scrollInnerRect.SetInsetAndSizeFromParentEdge(RectTransform.Edge.Top, 0, (offset - 1) * UIScaler.GetPixelsPerUnit());
}
public void UpdateValue(string key)
{
float value;
float.TryParse(valueDBE[key].uiInput.text, out value);
Game.Get().quest.vars.SetValue(key, value);
Destroyer.Dialog();
Update(); |
Subsets and Splits