conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
public VixenPreviewData Data {
set {
if (value == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay: Data set as null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
=======
public VixenPreviewData Data
{
set
{
if (value == null) {
Logging.Warn("VixenPreviewDisplay: Data set as null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
>>>>>>>
public VixenPreviewData Data {
set {
if (value == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay: Data set as null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
if (value == null) {
Logging.Warn("VixenPreviewDisplay: Data set as null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
<<<<<<<
get {
if (_data == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay: Data get, _data is null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
return _data;
}
=======
get
{
if (_data == null) {
Logging.Warn("VixenPreviewDisplay: Data get, _data is null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
return _data;
}
>>>>>>>
get
{
if (_data == null) {
Logging.Warn("VixenPreviewDisplay: Data get, _data is null! (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
}
return _data;
}
<<<<<<<
private void VixenPreviewDisplay_Move(object sender, EventArgs e) {
if (Data == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay_Move: Data is null. abandoning move. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
=======
private void VixenPreviewDisplay_Move(object sender, EventArgs e)
{
if (Data == null) {
Logging.Warn("VixenPreviewDisplay_Move: Data is null. abandoning move. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
>>>>>>>
private void VixenPreviewDisplay_Move(object sender, EventArgs e) {
if (Data == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay_Move: Data is null. abandoning move. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
if (Data == null) {
Logging.Warn("VixenPreviewDisplay_Move: Data is null. abandoning move. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
<<<<<<<
private void VixenPreviewDisplay_Resize(object sender, EventArgs e) {
if (Data == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay_Resize: Data is null. abandoning resize. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
=======
private void VixenPreviewDisplay_Resize(object sender, EventArgs e)
{
if (Data == null) {
Logging.Warn("VixenPreviewDisplay_Resize: Data is null. abandoning resize. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
>>>>>>>
private void VixenPreviewDisplay_Resize(object sender, EventArgs e) {
if (Data == null) {
VixenSystem.Logging.Warning("VixenPreviewDisplay_Resize: Data is null. abandoning resize. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
}
if (Data == null) {
Logging.Warn("VixenPreviewDisplay_Resize: Data is null. abandoning resize. (Thread ID: " +
System.Threading.Thread.CurrentThread.ManagedThreadId + ")");
return;
} |
<<<<<<<
public Element _workingElement; //This is the element that was left clicked, is set to null on mouse up
=======
>>>>>>>
public Element _workingElement; //This is the element that was left clicked, is set to null on mouse up |
<<<<<<<
Logging.ErrorException("TimedSequenceEditor: <LoadSequence> - Error loading sequence.", ee);
=======
Logging.Error("Error loading sequence.", ee);
>>>>>>>
Logging.Error("TimedSequenceEditor: <LoadSequence> - Error loading sequence.", ee);
<<<<<<<
Logging.ErrorException("TimedSequenceEditor: <OnRenderProgressChanged> - Error updating rendering progress indicator.", ex);
=======
Logging.Error("TimedSequenceEditor: Error updating rendering progress indicator.",ex);
>>>>>>>
Logging.Error("TimedSequenceEditor: <OnRenderProgressChanged> - Error updating rendering progress indicator.", ex);
<<<<<<<
newEffects.Add(CreateEffectNode(newEffect, drawingRow, e.StartTime, e.Duration));
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor: <DrawElement> - error adding effect of type " +
newEffect.Descriptor.TypeId + " to row " +
((drawingRow == null) ? "<null>" : drawingRow.Name);
Logging.ErrorException(msg, ex);
=======
var newEffect = ApplicationServices.Get<IEffectModuleInstance>(e.Guid);
try
{
newEffects.Add(CreateEffectNode(newEffect, drawingRow, e.StartTime,e.Duration));
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor DrawMultipleElements: error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((drawingRow == null) ? "<null>" : drawingRow.Name);
Logging.Error(msg, ex);
}
>>>>>>>
newEffects.Add(CreateEffectNode(newEffect, drawingRow, e.StartTime, e.Duration));
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor: <DrawElement> - error adding effect of type " +
newEffect.Descriptor.TypeId + " to row " +
((drawingRow == null) ? "<null>" : drawingRow.Name);
Logging.Error(msg, ex);
<<<<<<<
newEffects.Add(CreateEffectNode(newEffect, row, nextStartTime, eDialog.Duration));
nextStartTime = nextStartTime + eDialog.Duration + eDialog.DurationBetween;
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor: <AddMultipleEffects> - error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((row == null) ? "<null>" : row.Name);
Logging.ErrorException(msg, ex);
=======
var newEffect = ApplicationServices.Get<IEffectModuleInstance>(EffectID);
try
{
newEffects.Add(CreateEffectNode(newEffect, Row, NextStartTime, eDialog.Duration));
NextStartTime = NextStartTime + eDialog.Duration + eDialog.DurationBetween;
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor AddMultipleElements: error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((Row == null) ? "<null>" : Row.Name);
Logging.Error(msg, ex);
}
>>>>>>>
newEffects.Add(CreateEffectNode(newEffect, row, nextStartTime, eDialog.Duration));
nextStartTime = nextStartTime + eDialog.Duration + eDialog.DurationBetween;
}
catch (Exception ex)
{
string msg = "TimedSequenceEditor: <AddMultipleEffects> - error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((row == null) ? "<null>" : row.Name);
Logging.Error(msg, ex);
<<<<<<<
string msg = "TimedSequenceEditor: <AddEffectsToBeatMarks> - error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((row == null) ? "<null>" : row.Name);
Logging.ErrorException(msg, ex);
=======
string msg = "TimedSequenceEditor AddMultipleElements: error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((Row == null) ? "<null>" : Row.Name);
Logging.Error(msg, ex);
>>>>>>>
string msg = "TimedSequenceEditor: <AddEffectsToBeatMarks> - error adding effect of type " + newEffect.Descriptor.TypeId + " to row " +
((row == null) ? "<null>" : row.Name);
Logging.Error(msg, ex); |
<<<<<<<
this.allowItemEditCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.allowItemCopyCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.skipTitleCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastCharacterCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastVaultCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.vaultPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.vaultPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.cancelButton = new TQVaultAE.GUI.ScalingButton();
this.okayButton = new TQVaultAE.GUI.ScalingButton();
=======
this.allowItemEditCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.allowItemCopyCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.skipTitleCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastCharacterCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastVaultCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.noFilterRadioButton = new TQVaultAE.GUI.ScalingRadioButton();
this.filterITCharsRadioButton = new TQVaultAE.GUI.ScalingRadioButton();
this.filterTQCharsRadioButton = new TQVaultAE.GUI.ScalingRadioButton();
this.vaultPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.vaultPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.playerListGroupBox = new System.Windows.Forms.GroupBox();
this.cancelButton = new TQVaultAE.GUI.ScalingButton();
this.okayButton = new TQVaultAE.GUI.ScalingButton();
>>>>>>>
this.allowItemEditCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.allowItemCopyCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.skipTitleCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastCharacterCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadLastVaultCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.vaultPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.vaultPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.cancelButton = new TQVaultAE.GUI.ScalingButton();
this.okayButton = new TQVaultAE.GUI.ScalingButton();
<<<<<<<
this.enableCustomMapsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadAllFilesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkForUpdatesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.suppressWarningsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkNowButton = new TQVaultAE.GUI.ScalingButton();
this.enableNewUICheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.playerReadonlyCheckbox = new TQVaultAE.GUI.ScalingCheckBox();
this.languageComboBox = new TQVaultAE.GUI.ScalingComboBox();
this.languageLabel = new TQVaultAE.GUI.ScalingLabel();
this.detectLanguageCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.titanQuestPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.detectGamePathsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.immortalThronePathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.customMapLabel = new TQVaultAE.GUI.ScalingLabel();
this.mapListComboBox = new TQVaultAE.GUI.ScalingComboBox();
=======
this.enableCustomMapsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadAllFilesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkForUpdatesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.suppressWarningsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkNowButton = new TQVaultAE.GUI.ScalingButton();
this.languageComboBox = new TQVaultAE.GUI.ScalingComboBox();
this.languageLabel = new TQVaultAE.GUI.ScalingLabel();
this.detectLanguageCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.titanQuestPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.detectGamePathsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.immortalThronePathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.customMapLabel = new TQVaultAE.GUI.ScalingLabel();
this.mapListComboBox = new TQVaultAE.GUI.ScalingComboBox();
this.playerListGroupBox.SuspendLayout();
>>>>>>>
this.enableCustomMapsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.loadAllFilesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkForUpdatesCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.suppressWarningsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.checkNowButton = new TQVaultAE.GUI.ScalingButton();
this.playerReadonlyCheckbox = new TQVaultAE.GUI.ScalingCheckBox();
this.languageComboBox = new TQVaultAE.GUI.ScalingComboBox();
this.languageLabel = new TQVaultAE.GUI.ScalingLabel();
this.detectLanguageCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.titanQuestPathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathLabel = new TQVaultAE.GUI.ScalingLabel();
this.immortalThronePathTextBox = new TQVaultAE.GUI.ScalingTextBox();
this.detectGamePathsCheckBox = new TQVaultAE.GUI.ScalingCheckBox();
this.titanQuestPathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.immortalThronePathBrowseButton = new TQVaultAE.GUI.ScalingButton();
this.customMapLabel = new TQVaultAE.GUI.ScalingLabel();
this.mapListComboBox = new TQVaultAE.GUI.ScalingComboBox();
<<<<<<<
this.allowItemEditCheckBox.Size = new System.Drawing.Size(204, 22);
=======
this.allowItemEditCheckBox.Size = new System.Drawing.Size(202, 22);
>>>>>>>
this.allowItemEditCheckBox.Size = new System.Drawing.Size(204, 22);
<<<<<<<
this.allowItemCopyCheckBox.Size = new System.Drawing.Size(152, 22);
=======
this.allowItemCopyCheckBox.Size = new System.Drawing.Size(154, 22);
>>>>>>>
this.allowItemCopyCheckBox.Size = new System.Drawing.Size(152, 22);
<<<<<<<
this.skipTitleCheckBox.Size = new System.Drawing.Size(249, 22);
=======
this.skipTitleCheckBox.Size = new System.Drawing.Size(239, 22);
>>>>>>>
this.skipTitleCheckBox.Size = new System.Drawing.Size(249, 22);
<<<<<<<
this.loadLastCharacterCheckBox.Size = new System.Drawing.Size(324, 22);
=======
this.loadLastCharacterCheckBox.Size = new System.Drawing.Size(314, 22);
>>>>>>>
this.loadLastCharacterCheckBox.Size = new System.Drawing.Size(324, 22);
<<<<<<<
this.loadLastVaultCheckBox.Size = new System.Drawing.Size(291, 22);
=======
this.loadLastVaultCheckBox.Size = new System.Drawing.Size(286, 22);
>>>>>>>
this.loadLastVaultCheckBox.Size = new System.Drawing.Size(291, 22);
<<<<<<<
=======
// noFilterRadioButton
//
this.noFilterRadioButton.AutoSize = true;
this.noFilterRadioButton.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.noFilterRadioButton.Location = new System.Drawing.Point(6, 20);
this.noFilterRadioButton.Name = "noFilterRadioButton";
this.noFilterRadioButton.Size = new System.Drawing.Size(83, 22);
this.noFilterRadioButton.TabIndex = 8;
this.noFilterRadioButton.TabStop = true;
this.noFilterRadioButton.Text = "No Filter";
this.toolTip.SetToolTip(this.noFilterRadioButton, "No filtration of the character list.\r\nChanging these items causes the character l" +
"ist\r\nto be reloaded.");
this.noFilterRadioButton.UseVisualStyleBackColor = true;
this.noFilterRadioButton.CheckedChanged += new System.EventHandler(this.NoFilterRadioButtonCheckedChanged);
//
// filterITCharsRadioButton
//
this.filterITCharsRadioButton.AutoSize = true;
this.filterITCharsRadioButton.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.filterITCharsRadioButton.Location = new System.Drawing.Point(6, 68);
this.filterITCharsRadioButton.Name = "filterITCharsRadioButton";
this.filterITCharsRadioButton.Size = new System.Drawing.Size(148, 22);
this.filterITCharsRadioButton.TabIndex = 10;
this.filterITCharsRadioButton.TabStop = true;
this.filterITCharsRadioButton.Text = "Filter IT Characters";
this.toolTip.SetToolTip(this.filterITCharsRadioButton, "Only original TQ Characters are shown on the\r\ncharacter list. Changing these ite" +
"ms causes \r\nthe character list to be reloaded.");
this.filterITCharsRadioButton.UseVisualStyleBackColor = true;
this.filterITCharsRadioButton.CheckedChanged += new System.EventHandler(this.FilterITCharsRadioButtonCheckedChanged);
//
// filterTQCharsRadioButton
//
this.filterTQCharsRadioButton.AutoSize = true;
this.filterTQCharsRadioButton.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.filterTQCharsRadioButton.Location = new System.Drawing.Point(6, 44);
this.filterTQCharsRadioButton.Name = "filterTQCharsRadioButton";
this.filterTQCharsRadioButton.Size = new System.Drawing.Size(157, 22);
this.filterTQCharsRadioButton.TabIndex = 9;
this.filterTQCharsRadioButton.TabStop = true;
this.filterTQCharsRadioButton.Text = "Filter TQ Characters";
this.toolTip.SetToolTip(this.filterTQCharsRadioButton, "Only IT Characters are shown on the character list.\r\nChanging these items causes " +
"the character list\r\nto be reloaded.");
this.filterTQCharsRadioButton.UseVisualStyleBackColor = true;
this.filterTQCharsRadioButton.CheckedChanged += new System.EventHandler(this.FilterTQCharsRadioButtonCheckedChanged);
//
>>>>>>>
<<<<<<<
this.vaultPathLabel.Size = new System.Drawing.Size(74, 18);
=======
this.vaultPathLabel.Size = new System.Drawing.Size(72, 18);
>>>>>>>
this.vaultPathLabel.Size = new System.Drawing.Size(74, 18);
<<<<<<<
this.enableCustomMapsCheckBox.Size = new System.Drawing.Size(170, 22);
=======
this.enableCustomMapsCheckBox.Size = new System.Drawing.Size(160, 22);
>>>>>>>
this.enableCustomMapsCheckBox.Size = new System.Drawing.Size(170, 22);
<<<<<<<
this.loadAllFilesCheckBox.Size = new System.Drawing.Size(276, 22);
=======
this.loadAllFilesCheckBox.Size = new System.Drawing.Size(273, 22);
>>>>>>>
this.loadAllFilesCheckBox.Size = new System.Drawing.Size(276, 22);
<<<<<<<
this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(484, 288);
=======
this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(481, 316);
>>>>>>>
this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(484, 288);
<<<<<<<
this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(247, 22);
=======
this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(242, 22);
>>>>>>>
this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(247, 22);
<<<<<<<
this.suppressWarningsCheckBox.Size = new System.Drawing.Size(238, 22);
=======
this.suppressWarningsCheckBox.Size = new System.Drawing.Size(221, 22);
>>>>>>>
this.suppressWarningsCheckBox.Size = new System.Drawing.Size(238, 22);
<<<<<<<
// enableNewUICheckBox
//
this.enableNewUICheckBox.AutoSize = true;
this.enableNewUICheckBox.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.enableNewUICheckBox.Location = new System.Drawing.Point(484, 264);
this.enableNewUICheckBox.Name = "enableNewUICheckBox";
this.enableNewUICheckBox.Size = new System.Drawing.Size(202, 22);
this.enableNewUICheckBox.TabIndex = 32;
this.enableNewUICheckBox.Text = "Enable New User Interface";
this.toolTip.SetToolTip(this.enableNewUICheckBox, "Selecting this item will enable the new\r\nTitan Quest themed user interface.");
this.enableNewUICheckBox.UseVisualStyleBackColor = true;
this.enableNewUICheckBox.CheckedChanged += new System.EventHandler(this.EnableNewUICheckBoxCheckedChanged);
//
// playerReadonlyCheckbox
//
this.playerReadonlyCheckbox.AutoSize = true;
this.playerReadonlyCheckbox.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.playerReadonlyCheckbox.Location = new System.Drawing.Point(12, 384);
this.playerReadonlyCheckbox.Name = "playerReadonlyCheckbox";
this.playerReadonlyCheckbox.Size = new System.Drawing.Size(211, 22);
this.playerReadonlyCheckbox.TabIndex = 33;
this.playerReadonlyCheckbox.Text = "Player Equipment ReadOnly";
this.toolTip.SetToolTip(this.playerReadonlyCheckbox, "Avoid save game corruption that occurs (randomly). When enabled, player equipment" +
" will be read-only, you won\'t be able to select or move any item.");
this.playerReadonlyCheckbox.UseVisualStyleBackColor = true;
this.playerReadonlyCheckbox.CheckedChanged += new System.EventHandler(this.PlayerReadonlyCheckboxCheckedChanged);
//
=======
>>>>>>>
// playerReadonlyCheckbox
//
this.playerReadonlyCheckbox.AutoSize = true;
this.playerReadonlyCheckbox.Font = new System.Drawing.Font("Albertus MT Light", 11.25F);
this.playerReadonlyCheckbox.Location = new System.Drawing.Point(12, 384);
this.playerReadonlyCheckbox.Name = "playerReadonlyCheckbox";
this.playerReadonlyCheckbox.Size = new System.Drawing.Size(211, 22);
this.playerReadonlyCheckbox.TabIndex = 33;
this.playerReadonlyCheckbox.Text = "Player Equipment ReadOnly";
this.toolTip.SetToolTip(this.playerReadonlyCheckbox, "Avoid save game corruption that occurs (randomly). When enabled, player equipment" +
" will be read-only, you won\'t be able to select or move any item.");
this.playerReadonlyCheckbox.UseVisualStyleBackColor = true;
this.playerReadonlyCheckbox.CheckedChanged += new System.EventHandler(this.PlayerReadonlyCheckboxCheckedChanged);
//
<<<<<<<
this.languageLabel.Size = new System.Drawing.Size(117, 18);
=======
this.languageLabel.Size = new System.Drawing.Size(108, 18);
>>>>>>>
this.languageLabel.Size = new System.Drawing.Size(117, 18);
<<<<<<<
this.detectLanguageCheckBox.Size = new System.Drawing.Size(165, 22);
=======
this.detectLanguageCheckBox.Size = new System.Drawing.Size(162, 22);
>>>>>>>
this.detectLanguageCheckBox.Size = new System.Drawing.Size(165, 22);
<<<<<<<
this.titanQuestPathLabel.Size = new System.Drawing.Size(108, 18);
=======
this.titanQuestPathLabel.Size = new System.Drawing.Size(103, 18);
>>>>>>>
this.titanQuestPathLabel.Size = new System.Drawing.Size(108, 18);
<<<<<<<
this.immortalThronePathLabel.Size = new System.Drawing.Size(99, 18);
=======
this.immortalThronePathLabel.Size = new System.Drawing.Size(94, 18);
>>>>>>>
this.immortalThronePathLabel.Size = new System.Drawing.Size(99, 18);
<<<<<<<
this.detectGamePathsCheckBox.Size = new System.Drawing.Size(184, 22);
=======
this.detectGamePathsCheckBox.Size = new System.Drawing.Size(178, 22);
>>>>>>>
this.detectGamePathsCheckBox.Size = new System.Drawing.Size(184, 22);
<<<<<<<
this.customMapLabel.Size = new System.Drawing.Size(94, 18);
=======
this.customMapLabel.Size = new System.Drawing.Size(90, 18);
>>>>>>>
this.customMapLabel.Size = new System.Drawing.Size(94, 18); |
<<<<<<<
=======
#if FEATURE_WPF
//This test requires PresentationCore.dll (specified in Configuration2/config_with_using_assembly.xml)
>>>>>>>
#if FEATURE_WPF //This test requires PresentationCore.dll (specified in Configuration2/config_with_using_assembly.xml) |
<<<<<<<
using System.Linq.Expressions;
using System.Threading;
using System.Threading.Tasks;
=======
>>>>>>>
using System.Threading;
using System.Threading.Tasks;
<<<<<<<
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
=======
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, new BridgeDataReaderFactory());
>>>>>>>
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
<<<<<<<
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
=======
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, new BridgeDataReaderFactory());
>>>>>>>
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
<<<<<<<
public class ExecuteNonQueryAsync
{
[Fact]
public async void Calls_ExecuteReaderAsync_with_CommandBehavior_set_to_SequentialAccess()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int expectedRecordsAffected = 1;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
entityDataReaderMock.Setup(m => m.RecordsAffected).Returns(expectedRecordsAffected);
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommandMock = new Mock<EntityCommand>(
entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object)
{
CallBase = true
};
int actualRecordsAffected = await entityCommandMock.Object.ExecuteNonQueryAsync();
Assert.Equal(expectedRecordsAffected, actualRecordsAffected);
}
[Fact]
public async void Iterates_over_all_results_of_EntityDataReader_without_touching_individual_rows()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int readNextCount = 0;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Callback((CancellationToken ct) => readNextCount++).Returns(() => Task.FromResult(readNextCount < 5));
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommand = new EntityCommand(entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object);
await entityCommand.ExecuteNonQueryAsync();
entityDataReaderMock.Verify(m => m.NextResultAsync(It.IsAny<CancellationToken>()), Times.Exactly(5));
}
[Fact]
public async void Returns_EntityDataReader_RecordsAffected_as_a_result()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int readNextCount = 0;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Callback(() => readNextCount++).Returns(() => Task.FromResult(readNextCount < 5));
entityDataReaderMock.SetupGet(m => m.RecordsAffected).Returns(10);
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommand = new EntityCommand(entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object);
var result = await entityCommand.ExecuteNonQueryAsync();
Assert.Equal(10, result);
}
}
private static EntityConnection InitializeEntityConnection()
{
var providerFactory = new Mock<DbProviderFactory>(MockBehavior.Strict).Object;
var dbConnection = new Mock<DbConnection>(MockBehavior.Strict).Object;
var entityConnectionMock = new Mock<EntityConnection>();
entityConnectionMock.SetupGet(m => m.StoreProviderFactory).Returns(providerFactory);
entityConnectionMock.SetupGet(m => m.StoreConnection).Returns(dbConnection);
entityConnectionMock.SetupGet(m => m.State).Returns(ConnectionState.Open);
var entityConnection = entityConnectionMock.Object;
return entityConnection;
}
private static EntityCommandDefinition InitializeEntityCommandDefinition()
{
var storeDataReaderMock = new Mock<DbDataReader>();
storeDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
entityCommandDefinitionMock.SetupGet(m => m.Parameters).Returns(Enumerable.Empty<EntityParameter>());
entityCommandDefinitionMock.Setup(m => m.Execute(It.IsAny<EntityCommand>(), It.IsAny<CommandBehavior>())).
Returns(storeDataReaderMock.Object);
entityCommandDefinitionMock.Setup(m => m.ExecuteAsync(It.IsAny<EntityCommand>(), It.IsAny<CommandBehavior>(), It.IsAny<CancellationToken>())).
Returns((EntityCommand ec, CommandBehavior cb, CancellationToken ct) => Task.FromResult(storeDataReaderMock.Object));
return entityCommandDefinitionMock.Object;
}
private static void AssertThrowsInAsyncMethod<TException>(string expectedMessage, Xunit.Assert.ThrowsDelegate testCode)
where TException : Exception
{
var exception = Assert.Throws<AggregateException>(testCode);
var innerException = exception.InnerExceptions.Single();
Assert.IsType<TException>(innerException);
Assert.Equal(expectedMessage, innerException.Message);
}
=======
>>>>>>>
public class ExecuteNonQueryAsync
{
[Fact]
public async void Calls_ExecuteReaderAsync_with_CommandBehavior_set_to_SequentialAccess()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int expectedRecordsAffected = 1;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
entityDataReaderMock.Setup(m => m.RecordsAffected).Returns(expectedRecordsAffected);
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommandMock = new Mock<EntityCommand>(
entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object)
{
CallBase = true
};
int actualRecordsAffected = await entityCommandMock.Object.ExecuteNonQueryAsync();
Assert.Equal(expectedRecordsAffected, actualRecordsAffected);
}
[Fact]
public async void Iterates_over_all_results_of_EntityDataReader_without_touching_individual_rows()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int readNextCount = 0;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Callback((CancellationToken ct) => readNextCount++).Returns(() => Task.FromResult(readNextCount < 5));
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommand = new EntityCommand(entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object);
await entityCommand.ExecuteNonQueryAsync();
entityDataReaderMock.Verify(m => m.NextResultAsync(It.IsAny<CancellationToken>()), Times.Exactly(5));
}
[Fact]
public async void Returns_EntityDataReader_RecordsAffected_as_a_result()
{
var entityConnection = InitializeEntityConnection();
var entityCommandDefinition = InitializeEntityCommandDefinition();
int readNextCount = 0;
var entityDataReaderMock = new Mock<EntityDataReader>();
entityDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Callback(() => readNextCount++).Returns(() => Task.FromResult(readNextCount < 5));
entityDataReaderMock.SetupGet(m => m.RecordsAffected).Returns(10);
var entityDataReaderFactoryMock = new Mock<EntityCommand.EntityDataReaderFactory>();
entityDataReaderFactoryMock.Setup(m => m.CreateEntityDataReader(It.IsAny<EntityCommand>(), It.IsAny<DbDataReader>(), It.IsAny<CommandBehavior>())).
Returns(entityDataReaderMock.Object);
var entityCommand = new EntityCommand(entityConnection, entityCommandDefinition, entityDataReaderFactoryMock.Object);
var result = await entityCommand.ExecuteNonQueryAsync();
Assert.Equal(10, result);
}
}
private static EntityConnection InitializeEntityConnection()
{
var providerFactory = new Mock<DbProviderFactory>(MockBehavior.Strict).Object;
var dbConnection = new Mock<DbConnection>(MockBehavior.Strict).Object;
var entityConnectionMock = new Mock<EntityConnection>();
entityConnectionMock.SetupGet(m => m.StoreProviderFactory).Returns(providerFactory);
entityConnectionMock.SetupGet(m => m.StoreConnection).Returns(dbConnection);
entityConnectionMock.SetupGet(m => m.State).Returns(ConnectionState.Open);
var entityConnection = entityConnectionMock.Object;
return entityConnection;
}
private static EntityCommandDefinition InitializeEntityCommandDefinition()
{
var storeDataReaderMock = new Mock<DbDataReader>();
storeDataReaderMock.Setup(m => m.NextResultAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
var entityCommandDefinitionMock = new Mock<EntityCommandDefinition>(MockBehavior.Strict, null, null);
entityCommandDefinitionMock.SetupGet(m => m.Parameters).Returns(Enumerable.Empty<EntityParameter>());
entityCommandDefinitionMock.Setup(m => m.Execute(It.IsAny<EntityCommand>(), It.IsAny<CommandBehavior>())).
Returns(storeDataReaderMock.Object);
entityCommandDefinitionMock.Setup(m => m.ExecuteAsync(It.IsAny<EntityCommand>(), It.IsAny<CommandBehavior>(), It.IsAny<CancellationToken>())).
Returns((EntityCommand ec, CommandBehavior cb, CancellationToken ct) => Task.FromResult(storeDataReaderMock.Object));
return entityCommandDefinitionMock.Object;
}
private static void AssertThrowsInAsyncMethod<TException>(string expectedMessage, Xunit.Assert.ThrowsDelegate testCode)
where TException : Exception
{
var exception = Assert.Throws<AggregateException>(testCode);
var innerException = exception.InnerExceptions.Single();
Assert.IsType<TException>(innerException);
Assert.Equal(expectedMessage, innerException.Message);
} |
<<<<<<<
if (classServices.Length != 1)
=======
if (classServices.Count() != 1)
>>>>>>>
if (classServices.Count() != 1)
<<<<<<<
var classService = classServices[0];
=======
var classService = classServices.Single();
>>>>>>>
var classService = classServices.Single();
<<<<<<<
if (registration.Services.Count == 1)
=======
if (registration.ServicesCount == 1) // the delegate is the only service we expose
>>>>>>>
if (registration.ServicesCount == 1) // the delegate is the only service we expose
<<<<<<<
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as it's service. Delegate-based typed factories can't expose any additional services.",
classService, registration.Services.Count - 1));
=======
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as its service. Delegate-based typed factories can't expose any additional services.",
classService.Name, registration.ServicesCount - 1));
>>>>>>>
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as its service. Delegate-based typed factories can't expose any additional services.",
classService.Name, registration.ServicesCount - 1));
<<<<<<<
var delegateType = registration.Services.Single();
=======
>>>>>>> |
<<<<<<<
if (classServices.Length != 1)
=======
if (classServices.Count() != 1)
>>>>>>>
if (classServices.Count() != 1)
<<<<<<<
var classService = classServices[0];
=======
var classService = classServices.Single();
>>>>>>>
var classService = classServices.Single();
<<<<<<<
if (registration.Services.Count == 1)
=======
if (registration.ServicesCount == 1) // the delegate is the only service we expose
>>>>>>>
if (registration.ServicesCount == 1) // the delegate is the only service we expose
<<<<<<<
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as it's service. Delegate-based typed factories can't expose any additional services.",
classService, registration.Services.Count - 1));
=======
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as its service. Delegate-based typed factories can't expose any additional services.",
classService.Name, registration.ServicesCount - 1));
>>>>>>>
"Type {0} is a delegate, however the component has also {1} inteface(s) specified as its service. Delegate-based typed factories can't expose any additional services.",
classService.Name, registration.ServicesCount - 1));
<<<<<<<
var delegateType = registration.Services.Single();
=======
>>>>>>> |
<<<<<<<
private readonly Func<IKernel, CreationContext, T> creator;
=======
public FactoryMethodActivator(ComponentModel model, IKernel kernel, ComponentInstanceDelegate onCreation, ComponentInstanceDelegate onDestruction)
: base(model, kernel, onCreation, onDestruction)
{
}
>>>>>>>
private readonly Func<IKernel, CreationContext, T> creator;
<<<<<<<
protected override object Instantiate(CreationContext context)
{
return creator(Kernel, context);
}
=======
>>>>>>>
protected override object Instantiate(CreationContext context)
{
return creator(Kernel, context);
} |
<<<<<<<
var service = serverAsClient.Resolve<ICalcService>();
=======
ICalcService service = (ICalcService) clientContainer.Resolve("calc.service.c1");
>>>>>>>
var service = serverAsClient.Resolve<ICalcService>();
<<<<<<<
=======
public void ServerClientContainerConsumingRemoteComponentCallback()
{
IWindsorContainer serverAsClient = GetRemoteContainer(serverClient, ConfigHelper.ResolveConfigPath("Facilities/Remoting/Configs/server_client_kernelcomponent.xml"));
ICalcService service = serverAsClient.Resolve<ICalcService>();
>>>>>>> |
<<<<<<<
using System.Reflection;
=======
using System.Text;
>>>>>>>
using System.Reflection;
using System.Text;
<<<<<<<
=======
public string Dump(string tab)
{
StringBuilder dump = new StringBuilder();
dump.AppendLine($"{tab}({Name} [");
Children.ForEach(c => dump.AppendLine($"{c.Dump(tab + "\t")},"));
dump.AppendLine($"{tab}]");
return dump.ToString();
}
>>>>>>>
public string Dump(string tab)
{
StringBuilder dump = new StringBuilder();
dump.AppendLine($"{tab}({Name} [");
Children.ForEach(c => dump.AppendLine($"{c.Dump(tab + "\t")},"));
dump.AppendLine($"{tab}]");
return dump.ToString();
} |
<<<<<<<
protected readonly IList<ISortInformation> _sortInformation;
=======
protected readonly IFilter _subqueryFilter;
protected readonly IList<SortInformation> _sortInformation;
>>>>>>>
protected readonly IFilter _subqueryFilter;
protected readonly IList<ISortInformation> _sortInformation;
<<<<<<<
IFilter filter, IList<ISortInformation> sortInformation, Guid? userProfileId = null, uint? limit = null, uint? offset = null)
=======
IFilter filter, IFilter subqueryFilter, IList<SortInformation> sortInformation, uint? limit = null, uint? offset = null)
>>>>>>>
IFilter filter, IFilter subqueryFilter, IList<ISortInformation> sortInformation, Guid? userProfileId = null, uint? limit = null, uint? offset = null) |
<<<<<<<
using MediaPortal.Backend.MediaLibrary;
=======
using HttpServer.Sessions;
>>>>>>>
using MediaPortal.Backend.MediaLibrary;
using HttpServer.Sessions; |
<<<<<<<
=======
HttpParam httpParam = request.Param;
string identifier = httpParam["identifier"].Value;
string hls = httpParam["hls"].Value;
string file = httpParam["file"].Value;
>>>>>>>
<<<<<<<
string hlsFile = Path.Combine(streamItem.TranscoderObject.SegmentDir, fileName);
if (File.Exists(hlsFile) == true)
{
resourceStream = MediaConverter.GetReadyFileBuffer(hlsFile);
httpContext.Response.ContentType = MediaConverter.GetHlsFileMime(hlsFile);
onlyHeaders = httpContext.Request.Method == Method.Header || httpContext.Response.StatusCode == StatusCodes.Status304NotModified;
Logger.Debug("RetrieveStream: Sending file header only: {0}", onlyHeaders.ToString());
if (hls.EndsWith(".m3u8", StringComparison.InvariantCultureIgnoreCase) == true)
{
SendWholeFile(httpContext, CorrectPlaylist(identifier, resourceStream), onlyHeaders);
}
else
{
SendWholeFile(httpContext, resourceStream, onlyHeaders);
//Update current segment
long sequenceNo = MediaConverter.GetHlsSegmentSequence(hlsFile);
if (sequenceNo >= 0)
{
streamItem.StreamContext.CurrentSegment = sequenceNo;
}
}
return true;
}
else
=======
return true;
}
else if(streamItem.ItemType != Common.WebMediaType.TV &&
streamItem.ItemType != Common.WebMediaType.Radio &&
MediaConverter.GetSegmentSequence(hls) > 0)
{
long segmentRequest = MediaConverter.GetSegmentSequence(hls);
if(streamItem.RequestSegment(segmentRequest) == false)
>>>>>>>
return true;
}
else if (streamItem.ItemType != Common.WebMediaType.TV &&
streamItem.ItemType != Common.WebMediaType.Radio &&
MediaConverter.GetSegmentSequence(hls) > 0)
{
long segmentRequest = MediaConverter.GetSegmentSequence(hls);
if (streamItem.RequestSegment(segmentRequest) == false)
<<<<<<<
Logger.Debug("RetrieveStream: Transcoding busy for mediaitem {0}", streamItem.ItemId.ToString());
httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
// TODO: fix
//response.Chunked = false;
httpContext.Response.ContentLength = 0;
httpContext.Response.ContentType = null;
=======
Logger.Debug("RetrieveStream: Transcoding busy for mediaitem {0}", streamItem.RequestedMediaItem.MediaItemId);
response.Status = HttpStatusCode.InternalServerError;
response.Chunked = false;
response.ContentLength = 0;
response.ContentType = null;
>>>>>>>
Logger.Debug("RetrieveStream: Transcoding busy for mediaitem {0}", streamItem.RequestedMediaItem.MediaItemId);
httpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;
// TODO: fix
//response.Chunked = false;
httpContext.Response.ContentLength = 0;
httpContext.Response.ContentType = null;
<<<<<<<
Logger.Debug("RetrieveStream: Sending file header only: {0}", onlyHeaders.ToString());
SendWholeFile(httpContext, resourceStream, streamItem.TranscoderObject, endPointSettings, onlyHeaders, partialResource, mediaTransferMode);
=======
>>>>>>> |
<<<<<<<
private List<CodecInfo> _disabledCodecs = null;
=======
private CodecInfo _splitter = null;
>>>>>>>
private CodecInfo _splitter = null;
private List<CodecInfo> _disabledCodecs = null; |
<<<<<<<
NfoMovieReader nfoReader = new NfoMovieReader(_debugLogger, miNumber, importOnly, forceQuickMode, isStub, _httpClient, _settings);
=======
var nfoReader = new NfoMovieReader(_debugLogger, miNumber, false, importOnly, forceQuickMode, _httpClient, _settings);
>>>>>>>
NfoMovieReader nfoReader = new NfoMovieReader(_debugLogger, miNumber, false, importOnly, forceQuickMode, isStub, _httpClient, _settings); |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
using MediaPortal.Plugins.MP2Extended.MAS;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
using MediaPortal.Plugins.MP2Extended.MAS.FileSystem;
using MediaPortal.Plugins.MP2Extended.Extensions;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
base(PersonAspect.ROLE_COMPOSER, AudioAspect.ROLE_TRACK, Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending))
=======
base(Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new SortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending))
>>>>>>>
base(Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending)) |
<<<<<<<
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System.Linq;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
=======
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System;
using System.Linq;
using System.Collections.Generic;
using HttpServer;
using HttpServer.Exceptions;
using HttpServer.Sessions;
>>>>>>>
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System;
using System.Linq;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
using HttpServer.Exceptions;
<<<<<<<
using MediaPortal.Plugins.Transcoding.Service;
=======
>>>>>>>
<<<<<<<
using MediaPortal.Plugins.MP2Extended.Exceptions;
=======
>>>>>>>
<<<<<<<
=======
using MediaPortal.Plugins.Transcoding.Service;
using MediaPortal.Plugins.Transcoding.Service.Objects;
using MediaPortal.Plugins.SlimTv.Interfaces.LiveTvMediaItem;
>>>>>>>
using MediaPortal.Plugins.Transcoding.Service.Objects;
using MediaPortal.Plugins.SlimTv.Interfaces.LiveTvMediaItem;
using MediaPortal.Plugins.Transcoding.Service;
<<<<<<<
streamItem.StartPosition = startPosition;
bool isLive = false;
if (streamItem.ItemType == Common.WebMediaType.TV || streamItem.ItemType == Common.WebMediaType.Radio)
=======
if (streamItem.RequestedMediaItem is LiveTvMediaItem)
>>>>>>>
if (streamItem.RequestedMediaItem is LiveTvMediaItem) |
<<<<<<<
using MediaPortal.UI.Players.Video.Native;
=======
using MediaPortal.Common.UserManagement;
using MediaPortal.Common.UserProfileDataManagement;
>>>>>>>
using MediaPortal.UI.Players.Video.Native;
using MediaPortal.Common.UserManagement;
using MediaPortal.Common.UserProfileDataManagement; |
<<<<<<<
using System.Reflection;
using System.Threading;
=======
using System.Reflection;
using System.Threading;
using System.Drawing.Imaging;
using System.Drawing;
using System.Globalization;
>>>>>>>
using System.Reflection;
using System.Threading;
<<<<<<<
=======
using MediaPortal.Utilities.SystemAPI;
using MediaPortal.Plugins.Transcoding.Service;
>>>>>>>
using MediaPortal.Utilities.SystemAPI;
using MediaPortal.Plugins.Transcoding.Service;
<<<<<<<
using MediaPortal.Plugins.Transcoding.Service;
=======
>>>>>>>
<<<<<<<
using MediaPortal.Utilities.FileSystem;
using MediaPortal.Utilities.SystemAPI;
=======
using MediaPortal.Plugins.Transcoding.Service.Objects;
>>>>>>>
using MediaPortal.Plugins.Transcoding.Service.Objects;
using MediaPortal.Utilities.FileSystem; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
using MediaPortal.Plugins.MP2Extended.Extensions;
using MediaPortal.Plugins.MP2Extended.MAS;
using MediaPortal.Plugins.MP2Extended.MAS.General;
using MediaPortal.Plugins.MP2Extended.MAS.Movie;
using MediaPortal.Plugins.MP2Extended.MAS.Picture;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
=======
using MediaPortal.Common.MediaManagement;
using MediaPortal.Common.MediaManagement.DefaultItemAspects;
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
using MediaPortal.Plugins.MP2Extended.Extensions;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
using MediaPortal.Backend.ClientCommunication;
using MediaPortal.Common.Async;
using MediaPortal.Common.Services.GenreConverter;
=======
using IChannel = MediaPortal.Plugins.SlimTv.Interfaces.Items.IChannel;
using ILogger = MediaPortal.Common.Logging.ILogger;
using IPathManager = MediaPortal.Common.PathManager.IPathManager;
using ScheduleRecordingType = MediaPortal.Plugins.SlimTv.Interfaces.ScheduleRecordingType;
>>>>>>>
using IChannel = MediaPortal.Plugins.SlimTv.Interfaces.Items.IChannel;
using ScheduleRecordingType = MediaPortal.Plugins.SlimTv.Interfaces.ScheduleRecordingType; |
<<<<<<<
using System.Linq;
using MediaPortal.UiComponents.Media.Helpers;
=======
using MediaPortal.UiComponents.Media.Settings;
using System;
using System.Collections.Generic;
using System.Linq;
>>>>>>>
using MediaPortal.UiComponents.Media.Settings;
using System;
using System.Collections.Generic;
using System.Linq;
using MediaPortal.UiComponents.Media.Helpers;
<<<<<<<
public RelationshipMLFilterCriterion(Guid role, Guid linkedRole, IEnumerable<Guid> necessaryMIATypeIds, IEnumerable<Guid> optionalMIATypeIds, ISortInformation sortInformation)
=======
public RelationshipMLFilterCriterion(IEnumerable<Guid> necessaryMIATypeIds, IEnumerable<Guid> optionalMIATypeIds, SortInformation sortInformation)
>>>>>>>
public RelationshipMLFilterCriterion(IEnumerable<Guid> necessaryMIATypeIds, IEnumerable<Guid> optionalMIATypeIds, ISortInformation sortInformation)
<<<<<<<
bool showVirtual = VirtualMediaHelper.ShowVirtualMedia(necessaryMIATypeIds);
IFilter queryFilter = CreateQueryFilter(necessaryMIATypeIds, filter, showVirtual);
=======
bool showVirtual = ShowVirtualSetting.ShowVirtualMedia(necessaryMIATypeIds);
>>>>>>>
bool showVirtual = VirtualMediaHelper.ShowVirtualMedia(necessaryMIATypeIds); |
<<<<<<<
dd.CloseCallback(dd.DialogScreen.Name, dd.DialogInstanceId);
CompleteDialogClosures();
=======
dd.CloseCallback(dd.DialogScreen.ResourceName, dd.DialogInstanceId);
>>>>>>>
dd.CloseCallback(dd.DialogScreen.ResourceName, dd.DialogInstanceId);
CompleteDialogClosures(); |
<<<<<<<
lock (_syncObj)
{
ShareWatcher watcher = new ShareWatcher(share, this, false);
_shareWatchers.Add(share.ShareId, watcher);
_shareDeleteSync.Add(share.BaseResourcePath, new object());
}
=======
>>>>>>>
<<<<<<<
lock (_syncObj)
{
if (_shareWatchers.ContainsKey(shareId))
{
_shareWatchers[shareId].Dispose();
_shareWatchers.Remove(shareId);
}
}
=======
>>>>>>>
<<<<<<<
_shareDeleteSync.Remove(share.BaseResourcePath);
Logger.Info("MediaLibrary: Share '{0}' removed ({1} ms)", shareId, swDelete.ElapsedMilliseconds);
=======
lock (_syncObj)
_shareDeleteSync.Remove(share.BaseResourcePath);
>>>>>>>
lock (_syncObj)
_shareDeleteSync.Remove(share.BaseResourcePath);
Logger.Info("MediaLibrary: Share '{0}' removed ({1} ms)", shareId, swDelete.ElapsedMilliseconds);
<<<<<<<
lock (_syncObj)
{
foreach (Guid shareId in _shareWatchers.Keys)
{
_shareWatchers[shareId].Dispose();
}
_shareWatchers.Clear();
_shareDeleteSync.Clear();
}
=======
>>>>>>> |
<<<<<<<
=======
if (result != null && !result.IsAllocated)
{
_imageSourceSetup = false;
result.Allocate();
//FIXME: this breaks asynch loading, because FallbackSource is used before the load finishes.
// better solution would be to show FallbackSource _while_ loading the image asynch.
//if (!result.IsAllocated)
//{
// result.Deallocate();
// result.Dispose();
// result = null;
//}
}
>>>>>>> |
<<<<<<<
AttributeSortInformation attributeSort = sortInformation as AttributeSortInformation;
if (attributeSort != null)
{
if (attributeSort.AttributeType.ParentMIAM.IsTransientAspect)
continue;
if (!Include(attributeSort.AttributeType.ParentMIAM))
continue;
MediaItemAspectMetadata.AttributeSpecification attr = attributeSort.AttributeType;
if (attr.Cardinality != Cardinality.Inline && attr.Cardinality != Cardinality.ManyToOne)
// Sorting can only be done for Inline and MTO attributes
continue;
RequestedAttribute ra;
RequestSimpleAttribute(new QueryAttribute(attr), tableQueries, tableJoins, "LEFT OUTER JOIN", requestedAttributes,
miaTypeTableQueries, miaIdAttribute, out ra);
compiledSortInformation.Add(new CompiledSortInformation(ra, attributeSort.Direction));
=======
if (sortInformation.AttributeType.ParentMIAM.IsTransientAspect)
continue;
MediaItemAspectMetadata.AttributeSpecification attr = sortInformation.AttributeType;
if (attr.Cardinality != Cardinality.Inline && attr.Cardinality != Cardinality.ManyToOne)
// Sorting can only be done for Inline and MTO attributes
>>>>>>>
AttributeSortInformation attributeSort = sortInformation as AttributeSortInformation;
if (attributeSort != null)
{
if (attributeSort.AttributeType.ParentMIAM.IsTransientAspect)
continue;
MediaItemAspectMetadata.AttributeSpecification attr = attributeSort.AttributeType;
if (attr.Cardinality != Cardinality.Inline && attr.Cardinality != Cardinality.ManyToOne)
// Sorting can only be done for Inline and MTO attributes
continue;
RequestedAttribute ra;
RequestSimpleAttribute(new QueryAttribute(attr), tableQueries, tableJoins, "LEFT OUTER JOIN", requestedAttributes,
miaTypeTableQueries, miaIdAttribute, out ra);
compiledSortInformation.Add(new CompiledSortInformation(ra, attributeSort.Direction)); |
<<<<<<<
public NfoMovieReader(ILogger debugLogger, long miNumber, bool importOnly, bool forceQuickMode, bool readFileDetails, HttpClient httpClient, NfoMovieMetadataExtractorSettings settings)
=======
public NfoMovieReader(ILogger debugLogger, long miNumber, bool videoOnly, bool importOnly, bool forceQuickMode, HttpClient httpClient, NfoMovieMetadataExtractorSettings settings)
>>>>>>>
public NfoMovieReader(ILogger debugLogger, long miNumber, bool videoOnly, bool importOnly, bool forceQuickMode, bool readFileDetails, HttpClient httpClient, NfoMovieMetadataExtractorSettings settings)
<<<<<<<
_readFileDetails = readFileDetails;
InitializeSupportedElements();
InitializeSupportedAttributes();
=======
InitializeSupportedElements(videoOnly);
InitializeSupportedAttributes(videoOnly);
>>>>>>>
_readFileDetails = readFileDetails;
InitializeSupportedElements(videoOnly);
InitializeSupportedAttributes(videoOnly); |
<<<<<<<
/// See comments on <see cref="ObjectContext"/> class.
/// </summary>
public virtual Task<int> ExecuteStoreCommandAsync(string commandText, CancellationToken cancellationToken, params object[] parameters)
{
throw new NotImplementedException();
}
/// <summary>
/// Execute the sequence returning query against the database server.
/// The query is specified using the server's native query language, such as SQL.
=======
/// See comments on <see cref="ObjectContext"/> class.
>>>>>>>
/// See comments on <see cref="ObjectContext"/> class.
/// </summary>
public virtual Task<int> ExecuteStoreCommandAsync(string commandText, CancellationToken cancellationToken, params object[] parameters)
{
throw new NotImplementedException();
}
/// <summary>
/// See comments on <see cref="ObjectContext"/> class.
<<<<<<<
/// See comments on <see cref="ObjectContext"/> class.
/// </summary>
public virtual Task<ObjectResult<TElement>> ExecuteStoreQueryAsync<TElement>(string commandText, string entitySetName,
MergeOption mergeOption, CancellationToken cancellationToken, params object[] parameters)
{
throw new NotImplementedException();
}
/// <summary>
/// Translates the data from a DbDataReader into sequence of objects.
=======
/// See comments on <see cref="ObjectContext"/> class.
>>>>>>>
/// See comments on <see cref="ObjectContext"/> class.
/// </summary>
public virtual Task<ObjectResult<TElement>> ExecuteStoreQueryAsync<TElement>(string commandText, string entitySetName,
MergeOption mergeOption, CancellationToken cancellationToken, params object[] parameters)
{
throw new NotImplementedException();
}
/// <summary>
/// See comments on <see cref="ObjectContext"/> class. |
<<<<<<<
public bool MatchSeries(string folderOrFileName, out SeriesInfo seriesInfo, ref IDictionary<Guid, IList<MediaItemAspect>> extractedAspectData)
=======
public bool MatchSeries(ILocalFsResourceAccessor folderOrFileLfsra, out SeriesInfo seriesInfo, ref IDictionary<Guid, MediaItemAspect> extractedAspectData)
>>>>>>>
public bool MatchSeries(ILocalFsResourceAccessor folderOrFileLfsra, out SeriesInfo seriesInfo, ref IDictionary<Guid, IList<MediaItemAspect>> extractedAspectData)
<<<<<<<
{
seriesInfo.ImdbId = imdbId;
break;
}
}
// On Series, the counting tag is "TVDB"
if (extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID] != null)
{
int tmp;
foreach (string candidate in extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID])
if(int.TryParse(candidate, out tmp))
=======
{
seriesInfo.ImdbId = imdbId;
break;
}
}
// On Series, the counting tag is "TVDB"
if (extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID] != null)
{
int tmp;
foreach (string candidate in extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID])
if(int.TryParse(candidate, out tmp) == true)
>>>>>>>
{
seriesInfo.ImdbId = imdbId;
break;
}
}
// On Series, the counting tag is "TVDB"
if (extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID] != null)
{
int tmp;
foreach (string candidate in extractedTags[MatroskaConsts.TAG_SERIES_TVDB_ID])
if(int.TryParse(candidate, out tmp) == true) |
<<<<<<<
using System;
using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles;
=======
using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles;
using MediaPortal.Plugins.Transcoding.Service.Transcoders.Base;
using System;
using System.Collections.Generic;
using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
>>>>>>>
using System;
using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles;
using MediaPortal.Plugins.MP2Extended.ResourceAccess.WSS.Profiles;
using MediaPortal.Plugins.Transcoding.Service.Transcoders.Base;
using System;
using System.Collections.Generic;
using System.Diagnostics.Eventing.Reader;
using System.Linq;
using System.Text;
using System.Threading.Tasks; |
<<<<<<<
base(AudioAlbumAspect.ROLE_ALBUM, AudioAspect.ROLE_TRACK, Consts.NECESSARY_ALBUM_MIAS, Consts.OPTIONAL_ALBUM_MIAS,
new AttributeSortInformation(AudioAlbumAspect.ATTR_ALBUM, SortDirection.Ascending))
=======
base(Consts.NECESSARY_ALBUM_MIAS, Consts.OPTIONAL_ALBUM_MIAS,
new SortInformation(AudioAlbumAspect.ATTR_ALBUM, SortDirection.Ascending))
>>>>>>>
base(Consts.NECESSARY_ALBUM_MIAS, Consts.OPTIONAL_ALBUM_MIAS,
new AttributeSortInformation(AudioAlbumAspect.ATTR_ALBUM, SortDirection.Ascending)) |
<<<<<<<
=======
using HttpServer.Exceptions;
using HttpServer.Sessions;
>>>>>>>
using HttpServer.Sessions; |
<<<<<<<
=======
using HttpServer.Exceptions;
using HttpServer.Sessions;
>>>>>>>
using HttpServer.Sessions; |
<<<<<<<
// For supporting CC
// AddClosedCaptionsFilter();
=======
>>>>>>>
// AddClosedCaptionsFilter(); |
<<<<<<<
using MediaPortal.UiComponents.Media.Helpers;
=======
using MediaPortal.UiComponents.Media.Settings;
using MediaPortal.UiComponents.Media.FilterTrees;
>>>>>>>
using MediaPortal.UiComponents.Media.Helpers;
using MediaPortal.UiComponents.Media.FilterTrees;
<<<<<<<
protected IFilter _filter;
protected IDictionary<Guid, IFilter> _linkedAspectfilters;
=======
protected IFilterTree _filterTree;
protected FilterTreePath _filterPath;
>>>>>>>
protected IFilterTree _filterTree;
protected FilterTreePath _filterPath;
protected IDictionary<Guid, IFilter> _linkedAspectfilters; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
using MediaPortal.Plugins.MP2Extended.Extensions;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
=======
public override bool CreateScheduleDetailed(IChannel channel, string title, DateTime from, DateTime to, ScheduleRecordingType recordingType, int preRecordInterval, int postRecordInterval, string directory, int priority, out ISchedule schedule)
{
IScheduleService scheduleService = GlobalServiceProvider.Get<IScheduleService>();
Schedule tvSchedule = ScheduleFactory.CreateSchedule(channel.ChannelId, title, from, to);
tvSchedule.PreRecordInterval = preRecordInterval >= 0 ? preRecordInterval : ServiceAgents.Instance.SettingServiceAgent.GetValue("preRecordInterval", 5);
tvSchedule.PostRecordInterval = postRecordInterval >= 0 ? postRecordInterval : ServiceAgents.Instance.SettingServiceAgent.GetValue("postRecordInterval", 5);
tvSchedule.ScheduleType = (int)recordingType;
if (!String.IsNullOrEmpty(directory))
{
tvSchedule.Directory = directory;
}
if (priority >= 0)
{
tvSchedule.Priority = priority;
}
scheduleService.SaveSchedule(tvSchedule);
schedule = tvSchedule.ToSchedule();
return true;
}
public override bool EditSchedule(ISchedule schedule, IChannel channel = null, string title = null, DateTime? from = null, DateTime? to = null, ScheduleRecordingType? recordingType = null, int? preRecordInterval = null, int? postRecordInterval = null, string directory = null, int? priority = null)
{
try
{
ServiceRegistration.Get<ILogger>().Debug("Editing schedule {0} on channel {1} for {2}, {3} till {4}, type {5}", schedule.ScheduleId, channel.ChannelId, title, from, to, recordingType);
IScheduleService scheduleService = GlobalServiceProvider.Get<IScheduleService>();
Schedule tvSchedule = scheduleService.GetSchedule(schedule.ScheduleId);
tvSchedule.IdChannel = channel.ChannelId;
if (title != null)
{
tvSchedule.ProgramName = title;
}
if (from != null)
{
tvSchedule.StartTime = from.Value;
}
if (to != null)
{
tvSchedule.EndTime = to.Value;
}
if (recordingType != null)
{
ScheduleRecordingType scheduleRecType = recordingType.Value;
tvSchedule.ScheduleType = (int)scheduleRecType;
}
if (preRecordInterval != null)
{
tvSchedule.PreRecordInterval = preRecordInterval.Value;
}
if (postRecordInterval != null)
{
tvSchedule.PostRecordInterval = postRecordInterval.Value;
}
if (directory != null)
{
tvSchedule.Directory = directory;
}
if (priority != null)
{
tvSchedule.Priority = priority.Value;
}
scheduleService.SaveSchedule(tvSchedule);
return true;
}
catch (Exception ex)
{
ServiceRegistration.Get<ILogger>().Warn(String.Format("Failed to edit schedule {0}", schedule.ScheduleId), ex);
return false;
}
}
>>>>>>>
public override bool CreateScheduleDetailed(IChannel channel, string title, DateTime from, DateTime to, ScheduleRecordingType recordingType, int preRecordInterval, int postRecordInterval, string directory, int priority, out ISchedule schedule)
{
IScheduleService scheduleService = GlobalServiceProvider.Get<IScheduleService>();
Schedule tvSchedule = ScheduleFactory.CreateSchedule(channel.ChannelId, title, from, to);
tvSchedule.PreRecordInterval = preRecordInterval >= 0 ? preRecordInterval : ServiceAgents.Instance.SettingServiceAgent.GetValue("preRecordInterval", 5);
tvSchedule.PostRecordInterval = postRecordInterval >= 0 ? postRecordInterval : ServiceAgents.Instance.SettingServiceAgent.GetValue("postRecordInterval", 5);
if (!String.IsNullOrEmpty(directory))
{
tvSchedule.Directory = directory;
}
if (priority >= 0)
{
tvSchedule.Priority = priority;
}
tvSchedule.PreRecordInterval = preRecordInterval;
tvSchedule.PostRecordInterval = postRecordInterval;
tvSchedule.ScheduleType = (int)recordingType;
tvSchedule.Directory = directory;
tvSchedule.Priority = priority;
scheduleService.SaveSchedule(tvSchedule);
schedule = tvSchedule.ToSchedule();
return true;
}
public override bool EditSchedule(ISchedule schedule, IChannel channel = null, string title = null, DateTime? from = null, DateTime? to = null, ScheduleRecordingType? recordingType = null, int? preRecordInterval = null, int? postRecordInterval = null, string directory = null, int? priority = null)
{
try
{
ServiceRegistration.Get<ILogger>().Debug("Editing schedule {0} on channel {1} for {2}, {3} till {4}, type {5}", schedule.ScheduleId, channel.ChannelId, title, from, to, recordingType);
IScheduleService scheduleService = GlobalServiceProvider.Get<IScheduleService>();
Schedule tvSchedule = scheduleService.GetSchedule(schedule.ScheduleId);
tvSchedule.IdChannel = channel.ChannelId;
if (title != null)
{
tvSchedule.ProgramName = title;
}
if (from != null)
{
tvSchedule.StartTime = from.Value;
}
if (to != null)
{
tvSchedule.EndTime = to.Value;
}
if (recordingType != null)
{
ScheduleRecordingType scheduleRecType = recordingType.Value;
tvSchedule.ScheduleType = (int)scheduleRecType;
}
if (preRecordInterval != null)
{
tvSchedule.PreRecordInterval = preRecordInterval.Value;
}
if (postRecordInterval != null)
{
tvSchedule.PostRecordInterval = postRecordInterval.Value;
}
if (directory != null)
{
tvSchedule.Directory = directory;
}
if (priority != null)
{
tvSchedule.Priority = priority.Value;
}
scheduleService.SaveSchedule(tvSchedule);
return true;
}
catch (Exception ex)
{
ServiceRegistration.Get<ILogger>().Warn(String.Format("Failed to edit schedule {0}", schedule.ScheduleId), ex);
return false;
}
} |
<<<<<<<
=======
command.CommandText = SELECT_MEDIAITEM_ID_FROM_PATH_SQL;
>>>>>>>
<<<<<<<
command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL;
=======
command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL;
>>>>>>>
command.CommandText = SELECT_MEDIAITEM_FROM_PATH_SQL;
<<<<<<<
//Only delete the resource
using (IDbCommand command = transaction.CreateCommand())
{
database.AddParameter(command, "ITEM_ID", mediaItemId.Value, typeof(Guid));
string path = StringUtils.RemoveSuffixIfPresent(basePath.Serialize(), "/");
database.AddParameter(command, "EXACT_PATH", path, typeof(string));
command.CommandText = DELETE_MEDIAITEM_RESOURCE_FROM_ID_SQL;
affectedRows = command.ExecuteNonQuery();
if (!hasStubResources)
{
//Remove stub tag
command.CommandText = UPDATE_MEDIAITEM_STUB_ATTRIBUTE_FROM_ID_SQL;
affectedRows = command.ExecuteNonQuery();
}
}
=======
database.AddParameter(command, "SYSTEM_ID", systemId, typeof(string));
string path = StringUtils.RemoveSuffixIfPresent(basePath.Serialize(), "/");
database.AddParameter(command, "EXACT_PATH", path, typeof(string));
command.CommandText = DELETE_MEDIAITEM_RESOURCE_FROM_PATH_SQL;
affectedRows = command.ExecuteNonQuery();
>>>>>>>
//Only delete the resource
using (IDbCommand command = transaction.CreateCommand())
{
database.AddParameter(command, "ITEM_ID", mediaItemId.Value, typeof(Guid));
string path = StringUtils.RemoveSuffixIfPresent(basePath.Serialize(), "/");
database.AddParameter(command, "EXACT_PATH", path, typeof(string));
command.CommandText = DELETE_MEDIAITEM_RESOURCE_FROM_ID_SQL;
affectedRows = command.ExecuteNonQuery();
if (!hasStubResources)
{
//Remove stub tag
command.CommandText = UPDATE_MEDIAITEM_STUB_ATTRIBUTE_FROM_ID_SQL;
affectedRows = command.ExecuteNonQuery();
}
}
<<<<<<<
if (mia.Metadata.AspectId == MediaAspect.ASPECT_ID)
{
playCount = mia.GetAttributeValue<int?>(MediaAspect.ATTR_PLAYCOUNT);
}
}
//Check if user watch count need to be updated
if (wasCreated && playCount.HasValue && playCount.Value > 0)
{
//Update user watch data
using (IDbCommand command = transaction.CreateCommand())
{
command.CommandText = INSERT_USER_PLAYCOUNT_SQL;
database.AddParameter(command, "MEDIA_ITEM_ID", mediaItemId.Value, typeof(Guid));
IDbDataParameter dataKey = database.AddParameter(command, "DATA_KEY", UserDataKeysKnown.KEY_PLAY_PERCENTAGE, typeof(string));
IDbDataParameter dataValue = database.AddParameter(command, "MEDIA_ITEM_DATA", "100", typeof(string));
command.ExecuteNonQuery();
dataKey.Value = UserDataKeysKnown.KEY_PLAY_COUNT;
dataValue.Value = playCount.Value.ToString();
command.ExecuteNonQuery();
}
//Update parent watch data
UpdateAllParentPlayUserData(database, transaction, mediaItemId.Value, false);
=======
if(mia.Metadata.AspectId == MediaAspect.ASPECT_ID)
{
playCount = mia.GetAttributeValue<int?>(MediaAspect.ATTR_PLAYCOUNT);
}
}
//Check if user watch count need to be updated
if (wasCreated && playCount.HasValue && playCount.Value > 0)
{
//Update user watch data
using (IDbCommand command = transaction.CreateCommand())
{
command.CommandText = INSERT_USER_PLAYCOUNT_SQL;
database.AddParameter(command, "MEDIA_ITEM_ID", mediaItemId.Value, typeof(Guid));
IDbDataParameter dataKey = database.AddParameter(command, "DATA_KEY", UserDataKeysKnown.KEY_PLAY_PERCENTAGE, typeof(string));
IDbDataParameter dataValue = database.AddParameter(command, "MEDIA_ITEM_DATA", "100", typeof(string));
command.ExecuteNonQuery();
dataKey.Value = UserDataKeysKnown.KEY_PLAY_COUNT;
dataValue.Value = playCount.Value.ToString();
command.ExecuteNonQuery();
}
//Update parent watch data
UpdateAllParentPlayUserData(database, transaction, mediaItemId.Value);
>>>>>>>
if (mia.Metadata.AspectId == MediaAspect.ASPECT_ID)
{
playCount = mia.GetAttributeValue<int?>(MediaAspect.ATTR_PLAYCOUNT);
}
}
//Check if user watch count need to be updated
if (wasCreated && playCount.HasValue && playCount.Value > 0)
{
//Update user watch data
using (IDbCommand command = transaction.CreateCommand())
{
command.CommandText = INSERT_USER_PLAYCOUNT_SQL;
database.AddParameter(command, "MEDIA_ITEM_ID", mediaItemId.Value, typeof(Guid));
IDbDataParameter dataKey = database.AddParameter(command, "DATA_KEY", UserDataKeysKnown.KEY_PLAY_PERCENTAGE, typeof(string));
IDbDataParameter dataValue = database.AddParameter(command, "MEDIA_ITEM_DATA", "100", typeof(string));
command.ExecuteNonQuery();
dataKey.Value = UserDataKeysKnown.KEY_PLAY_COUNT;
dataValue.Value = playCount.Value.ToString();
command.ExecuteNonQuery();
}
//Update parent watch data
UpdateAllParentPlayUserData(database, transaction, mediaItemId.Value, false);
<<<<<<<
=======
private bool TryFindParent(ISQLDatabase database, ITransaction transaction, Guid mediaItemId, Guid childRole, Guid parentRole, out Guid? parentId,
out string childIdColumn, out string childRoleColumn, out string parentIdColumn, out string parentRoleColumn)
{
parentId = null;
parentIdColumn = null;
parentRoleColumn = null;
childIdColumn = null;
childRoleColumn = null;
try
{
using (IDbCommand command = transaction.CreateCommand())
{
command.Parameters.Clear();
database.AddParameter(command, "ITEM_ID", mediaItemId, typeof(Guid));
database.AddParameter(command, "ROLE_ID", childRole, typeof(Guid));
database.AddParameter(command, "PARENT_ROLE_ID", parentRole, typeof(Guid));
command.CommandText = SELECT_PARENT_FROM_ID_AND_ROLES_SQL;
using (IDataReader reader = command.ExecuteReader(CommandBehavior.SingleRow))
{
if (reader.Read())
parentId = database.ReadDBValue<Guid>(reader, 0);
}
parentIdColumn = MediaLibrary_SubSchema.MEDIA_ITEMS_ITEM_ID_COL_NAME;
parentRoleColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_ROLE);
childIdColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_LINKED_ID);
childRoleColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_LINKED_ROLE);
if (!parentId.HasValue)
{
//Try reverse lookup
command.CommandText = SELECT_PARENT_FROM_ID_AND_INVERTED_ROLES_SQL;
using (IDataReader reader = command.ExecuteReader(CommandBehavior.SingleRow))
{
if (reader.Read())
parentId = database.ReadDBValue<Guid>(reader, 0);
}
parentIdColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_LINKED_ID);
parentRoleColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_LINKED_ROLE);
childIdColumn = MediaLibrary_SubSchema.MEDIA_ITEMS_ITEM_ID_COL_NAME;
childRoleColumn = _miaManagement.GetMIAAttributeColumnName(RelationshipAspect.ATTR_ROLE);
}
}
//if(parentId.HasValue)
//Logger.Debug("MediaLibrary: Found parent {0} with role {1} for child {2} with role {3}", parentId, parentRole, mediaItemId, childRole);
return parentId.HasValue;
}
catch (Exception e)
{
Logger.Error("MediaLibrary: Error finding parent for media item {0}", e, mediaItemId);
throw;
}
}
>>>>>>>
<<<<<<<
command.CommandText = SELECT_CHILDS_FROM_PARENT_AND_ROLES_SQL;
foreach (var parent in parents)
{
hasParent = true;
=======
//Find all childs
List<Guid> childs = new List<Guid>();
bool? allChildsAreVirtual = null;
command.CommandText = string.Format(SELECT_CHILDS_FROM_PARENT_AND_ROLES_SQL, childIdColumn, childRoleColumn, parentIdColumn, parentRoleColumn);
using (IDataReader reader = command.ExecuteReader())
{
while (reader.Read())
{
if (allChildsAreVirtual == null)
allChildsAreVirtual = true;
>>>>>>>
command.CommandText = SELECT_CHILDS_FROM_PARENT_AND_ROLES_SQL;
foreach (var parent in parents)
{
hasParent = true;
<<<<<<<
=======
if (!parentsToDelete.ContainsKey(parentId.Value))
parentsToDelete.Add(parentId.Value, _hierarchies.Where(h => h.ChildRole == hierarchy.ParentRole && h.ParentCountAttribute != null).Any());
>>>>>>>
<<<<<<<
if (childParent.Value) //Parent has a parent
{
UpdateVirtualParents(database, transaction, childParent.Key, false);
}
DeleteMediaItemAndReleationships(transaction, childParent.Key);
=======
if (childParent.Value) //Parent has a parent
{
UpdateVirtualParents(database, transaction, childParent.Key);
}
DeleteMediaItemAndReleationships(transaction, childParent.Key);
>>>>>>>
if (childParent.Value) //Parent has a parent
{
UpdateVirtualParents(database, transaction, childParent.Key, false);
}
DeleteMediaItemAndReleationships(transaction, childParent.Key);
<<<<<<<
command.CommandText = SELECT_ORPHAN_COUNT_SQL;
=======
database.AddParameter(command, "EXACT_PATH", VirtualResourceProvider.ToResourcePath(mediaItemId).Serialize(), typeof(string));
command.CommandText = SELECT_ORPHAN_COUNT_SQL;
>>>>>>>
command.CommandText = SELECT_ORPHAN_COUNT_SQL;
<<<<<<<
command.Parameters.Clear();
database.AddParameter(command, "ITEM_ID", parent.Key, typeof(Guid));
database.AddParameter(command, "CHILD_ROLE", hierarchy.ChildRole, typeof(Guid));
database.AddParameter(command, "PARENT_ROLE", hierarchy.ParentRole, typeof(Guid));
=======
command.CommandText = string.Format(SELECT_CHILD_COLLECTIONS_FROM_PARENT_AND_ROLES_SQL,
childIdColumn, childRoleColumn, parentIdColumn, parentRoleColumn, collectionJoin);
>>>>>>>
command.Parameters.Clear();
database.AddParameter(command, "ITEM_ID", parent.Key, typeof(Guid));
database.AddParameter(command, "CHILD_ROLE", hierarchy.ChildRole, typeof(Guid));
database.AddParameter(command, "PARENT_ROLE", hierarchy.ParentRole, typeof(Guid));
<<<<<<<
=======
command.Parameters.Clear();
database.AddParameter(command, "PARENT_ITEM", parentId.Value, typeof(Guid));
var dataValue = database.AddParameter(command, "DATA_VALUE", isVirtual, typeof(int));
>>>>>>>
<<<<<<<
command.CommandText = UPDATE_PARENT_VIRTUAL_ATTRIBUTE_SQL;
var paramVal = database.AddParameter(command, "PARAM_VAL", isVirtual, typeof(int));
=======
command.CommandText = UPDATE_PARENT_VIRTUAL_ATTRIBUTE_SQL;
>>>>>>>
command.CommandText = UPDATE_PARENT_VIRTUAL_ATTRIBUTE_SQL;
var paramVal = database.AddParameter(command, "PARAM_VAL", isVirtual, typeof(int));
<<<<<<<
command.CommandText = string.Format(UPDATE_PARENT_CHILD_COUNT_ATTRIBUTE_SQL, _miaManagement.GetMIATableName(hierarchy.ParentCountAttribute.ParentMIAM),
_miaManagement.GetMIAAttributeColumnName(hierarchy.ParentCountAttribute), availableCount);
=======
dataValue.Value = availableCount;
command.CommandText = string.Format(UPDATE_PARENT_CHILD_COUNT_ATTRIBUTE_SQL, _miaManagement.GetMIATableName(hierarchy.ParentCountAttribute.ParentMIAM),
_miaManagement.GetMIAAttributeColumnName(hierarchy.ParentCountAttribute));
>>>>>>>
command.CommandText = string.Format(UPDATE_PARENT_CHILD_COUNT_ATTRIBUTE_SQL, _miaManagement.GetMIATableName(hierarchy.ParentCountAttribute.ParentMIAM),
_miaManagement.GetMIAAttributeColumnName(hierarchy.ParentCountAttribute), availableCount);
<<<<<<<
//Find user profiles
List<Guid> userDataParent = new List<Guid>();
command.CommandText = SELECT_USER_FROM_USER_DATA_SQL;
=======
//Find parents
Dictionary<Guid, List<Guid>> userDataParent = new Dictionary<Guid, List<Guid>>();
command.CommandText = SELECT_PARENT_USER_PLAY_DATA_FROM_ID_AND_ROLES_SQL;
>>>>>>>
//Find user profiles
List<Guid> userDataParent = new List<Guid>();
command.CommandText = SELECT_USER_FROM_USER_DATA_SQL;
<<<<<<<
while (reader.Read())
=======
command.Parameters.Clear();
database.AddParameter(command, "ITEM_ID", parentId.Value, typeof(Guid));
database.AddParameter(command, "ROLE_ID", hierarchy.ChildRole, typeof(Guid));
database.AddParameter(command, "PARENT_ROLE_ID", hierarchy.ParentRole, typeof(Guid));
database.AddParameter(command, "USER_PROFILE_ID", userProfileId, typeof(Guid));
database.AddParameter(command, "USER_DATA_KEY", UserDataKeysKnown.KEY_PLAY_COUNT, typeof(string));
//Find all childs
float nonVirtualChildCount = 0;
float watchedCount = 0;
command.CommandText = string.Format(SELECT_CHILD_USER_PLAY_DATA_FROM_PARENT_SQL, childIdColumn, childRoleColumn, parentIdColumn, parentRoleColumn);
using (IDataReader reader = command.ExecuteReader())
>>>>>>>
while (reader.Read()) |
<<<<<<<
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System.Collections.Generic;
=======
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System;
using System.Collections.Generic;
>>>>>>>
#region Copyright (C) 2007-2012 Team MediaPortal
/*
Copyright (C) 2007-2012 Team MediaPortal
http://www.team-mediaportal.com
This file is part of MediaPortal 2
MediaPortal 2 is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
MediaPortal 2 is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with MediaPortal 2. If not, see <http://www.gnu.org/licenses/>.
*/
#endregion
using System;
using System.Collections.Generic;
<<<<<<<
using Microsoft.AspNet.Http;
=======
using HttpServer;
using HttpServer.Exceptions;
using HttpServer.Sessions;
>>>>>>>
using Microsoft.AspNet.Http;
using HttpServer.Exceptions;
<<<<<<<
streamItem.StartPosition = startPosition;
bool isLive = false;
if (streamItem.ItemType == Common.WebMediaType.TV || streamItem.ItemType == Common.WebMediaType.Radio)
=======
if (streamItem.RequestedMediaItem is LiveTvMediaItem)
>>>>>>>
if (streamItem.RequestedMediaItem is LiveTvMediaItem) |
<<<<<<<
protected AbstractProperty _groupingValueProviderProperty;
=======
protected AbstractProperty _restoreFocusProperty;
>>>>>>>
protected AbstractProperty _groupingValueProviderProperty;
protected AbstractProperty _restoreFocusProperty;
<<<<<<<
public AbstractProperty ItemsCountProperty
{
get { return _itemsCountProperty; }
}
public int ItemsCount
{
get { return (int)_itemsCountProperty.GetValue(); }
set { _itemsCountProperty.SetValue(value); }
}
=======
public AbstractProperty RestoreFocusProperty
{
get { return _restoreFocusProperty; }
}
public bool RestoreFocus
{
get { return (bool)_restoreFocusProperty.GetValue(); }
set { _restoreFocusProperty.SetValue(value); }
}
>>>>>>>
public AbstractProperty ItemsCountProperty
{
get { return _itemsCountProperty; }
}
public int ItemsCount
{
get { return (int)_itemsCountProperty.GetValue(); }
set { _itemsCountProperty.SetValue(value); }
}
public AbstractProperty RestoreFocusProperty
{
get { return _restoreFocusProperty; }
}
public bool RestoreFocus
{
get { return (bool)_restoreFocusProperty.GetValue(); }
set { _restoreFocusProperty.SetValue(value); }
} |
<<<<<<<
base(CompanyAspect.ROLE_MUSIC_LABEL, AudioAlbumAspect.ROLE_ALBUM, Consts.NECESSARY_COMPANY_MIAS, Consts.OPTIONAL_COMPANY_MIAS,
new AttributeSortInformation(CompanyAspect.ATTR_COMPANY_NAME, SortDirection.Ascending))
=======
base(Consts.NECESSARY_COMPANY_MIAS, Consts.OPTIONAL_COMPANY_MIAS,
new SortInformation(CompanyAspect.ATTR_COMPANY_NAME, SortDirection.Ascending))
>>>>>>>
base(Consts.NECESSARY_COMPANY_MIAS, Consts.OPTIONAL_COMPANY_MIAS,
new AttributeSortInformation(CompanyAspect.ATTR_COMPANY_NAME, SortDirection.Ascending)) |
<<<<<<<
Label m_PathLabel;
TextField m_PathLabelTextField;
bool m_EditPathCancelled = false;
public Action onDragFinished
{
get { return m_WindowDraggable.OnDragFinished; }
set { m_WindowDraggable.OnDragFinished = value; }
}
=======
//public Action onDragFinished
//{
// get { return m_WindowDraggable.OnDragFinished; }
// set { m_WindowDraggable.OnDragFinished = value; }
//}
>>>>>>>
Label m_PathLabel;
TextField m_PathLabelTextField;
bool m_EditPathCancelled = false;
//public Action onDragFinished
//{
// get { return m_WindowDraggable.OnDragFinished; }
// set { m_WindowDraggable.OnDragFinished = value; }
//}
<<<<<<<
m_PathLabel = blackboard.shadow.ElementAt(0).Q<Label>("subTitleLabel");
m_PathLabel.RegisterCallback<MouseDownEvent>(OnMouseDownEvent);
m_PathLabelTextField = new TextField { visible = false };
m_PathLabelTextField.RegisterCallback<FocusOutEvent>(e => { OnEditPathTextFinished();});
m_PathLabelTextField.RegisterCallback<KeyDownEvent>(OnPathTextFieldKeyPressed);
blackboard.shadow.Add(m_PathLabelTextField);
m_WindowDraggable = new WindowDraggable(blackboard.shadow.Children().First().Q("header"));
blackboard.AddManipulator(m_WindowDraggable);
=======
// m_WindowDraggable = new WindowDraggable(blackboard.shadow.Children().First().Q("header"));
// blackboard.AddManipulator(m_WindowDraggable);
>>>>>>>
m_PathLabel = blackboard.shadow.ElementAt(0).Q<Label>("subTitleLabel");
m_PathLabel.RegisterCallback<MouseDownEvent>(OnMouseDownEvent);
m_PathLabelTextField = new TextField { visible = false };
m_PathLabelTextField.RegisterCallback<FocusOutEvent>(e => { OnEditPathTextFinished();});
m_PathLabelTextField.RegisterCallback<KeyDownEvent>(OnPathTextFieldKeyPressed);
blackboard.shadow.Add(m_PathLabelTextField);
// m_WindowDraggable = new WindowDraggable(blackboard.shadow.Children().First().Q("header"));
// blackboard.AddManipulator(m_WindowDraggable); |
<<<<<<<
using MediaPortal.Plugins.MediaServer.Profiles;
using MediaPortal.Plugins.Transcoding.Service;
using MediaPortal.Utilities.Network;
=======
using MediaPortal.Plugins.Transcoding.Service.Objects;
>>>>>>>
using MediaPortal.Plugins.MediaServer.Profiles;
using MediaPortal.Plugins.Transcoding.Service;
using MediaPortal.Utilities.Network;
using MediaPortal.Plugins.Transcoding.Service.Objects; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.MAS.General;
using MediaPortal.Plugins.MP2Extended.TAS;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
=======
using MediaPortal.Common.MediaManagement;
using MediaPortal.Common.MediaManagement.DefaultItemAspects;
using MediaPortal.Plugins.MP2Extended.Attributes;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
public FilterByActorCriterion(Guid linkedRole) :
base(PersonAspect.ROLE_ACTOR, linkedRole, Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending))
=======
public FilterByActorCriterion() :
base(Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new SortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending))
>>>>>>>
public FilterByActorCriterion() :
base(Consts.NECESSARY_PERSON_MIAS, Consts.OPTIONAL_PERSON_MIAS,
new AttributeSortInformation(PersonAspect.ATTR_PERSON_NAME, SortDirection.Ascending)) |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
public AudioSortByAlbum() : base(Consts.RES_SORT_BY_ALBUM, Consts.RES_GROUP_BY_ALBUM, AudioAspect.ATTR_ALBUM)
{
_includeMias = new[] { AudioAspect.ASPECT_ID };
}
=======
public AudioSortByAlbum() : base(Consts.RES_SORT_BY_ALBUM, Consts.RES_GROUP_BY_ALBUM, new[] { AudioAspect.ATTR_ALBUM, AudioAlbumAspect.ATTR_ALBUM }) {}
>>>>>>>
public AudioSortByAlbum() : base(Consts.RES_SORT_BY_ALBUM, Consts.RES_GROUP_BY_ALBUM, new[] { AudioAspect.ATTR_ALBUM, AudioAlbumAspect.ATTR_ALBUM })
{
_includeMias = new[] { AudioAspect.ASPECT_ID };
} |
<<<<<<<
TranscoderBinPath = ServiceRegistration.Get<IFFMpegLib>().FFMpegBinaryPath;
=======
TranscoderBinPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "ffmpeg.exe");
AllowIntelHWAccelleration = false;
AllowNvidiaHWAccelleration = false;
>>>>>>>
TranscoderBinPath = ServiceRegistration.Get<IFFMpegLib>().FFMpegBinaryPath;
AllowIntelHWAccelleration = false;
AllowNvidiaHWAccelleration = false; |
<<<<<<<
=======
using MediaPortal.Plugins.MP2Extended.Attributes;
using MediaPortal.Plugins.MP2Extended.Common;
>>>>>>>
using MediaPortal.Plugins.MP2Extended.Attributes; |
<<<<<<<
Factory?.UpdateDockable(value, this);
=======
_factory?.UpdateDockable(value, this);
value.OnSelected();
>>>>>>>
Factory?.UpdateDockable(value, this);
value.OnSelected(); |
<<<<<<<
Factory?.UpdateDockable(value, this);
=======
_factory?.UpdateDockable(value, this);
value.OnSelected();
>>>>>>>
Factory?.UpdateDockable(value, this);
value.OnSelected(); |
<<<<<<<
=======
using System.IO;
using System.Net;
using System.Net.Http.Headers;
>>>>>>>
using System.IO;
<<<<<<<
// Handle CORS issue
if (request.Method == HttpMethods.Options)
{
response.StatusCode = StatusCodes.Status200OK;
response.ContentType = "application/json; charset=utf-8";
return;
}
response.StatusCode = StatusCodes.Status405MethodNotAllowed;
=======
response.Headers.Add(_allowHeader.Name, _allowHeader.Value);
response.StatusCode = 405; // MethodNotAllowed
>>>>>>>
// Handle CORS issue
if (request.Method == HttpMethods.Options)
{
response.StatusCode = StatusCodes.Status200OK;
response.ContentType = _contentType;
return;
}
response.Headers.Add(_allowHeader.Name, _allowHeader.Value);
response.StatusCode = StatusCodes.Status405MethodNotAllowed;
<<<<<<<
options.ValidationRules = _options.ValidationRules;
=======
options.EnableMetrics = _options.EnableMetrics;
if (_options.EnableMetrics)
{
options.FieldMiddleware.Use<InstrumentFieldsMiddleware>();
}
>>>>>>>
options.ValidationRules = _options.ValidationRules;
options.EnableMetrics = _options.EnableMetrics;
if (_options.EnableMetrics)
{
options.FieldMiddleware.Use<InstrumentFieldsMiddleware>();
}
<<<<<<<
response.StatusCode = StatusCodes.Status200OK;
response.ContentType = "application/json; charset=utf-8";
=======
response.StatusCode = 200;
response.ContentType = _contentType;
>>>>>>>
response.StatusCode = StatusCodes.Status200OK;
response.ContentType = _contentType; |
<<<<<<<
mat = new Material(Shader.Find("GLTFUtility/Standard (Metallic)"));
mat.color = baseColorFactor;
mat.SetFloat("_Metallic", metallicFactor);
mat.SetFloat("_Glossiness", 1 - roughnessFactor);
=======
Shader sh = null;
#if UNITY_2019_1_OR_NEWER
// LWRP support
if (GraphicsSettings.renderPipelineAsset) sh = GraphicsSettings.renderPipelineAsset.defaultShader;
#endif
if (sh == null) sh = Shader.Find("GLTFUtility/Standard (Metallic)");
Material = new Material(sh);
Material.color = baseColor;
Material.SetFloat("_Metallic", metallicFactor);
Material.SetFloat("_Glossiness", 1 - roughnessFactor);
>>>>>>>
Shader sh = null;
#if UNITY_2019_1_OR_NEWER
// LWRP support
if (GraphicsSettings.renderPipelineAsset) sh = GraphicsSettings.renderPipelineAsset.defaultShader;
#endif
if (sh == null) sh = Shader.Find("GLTFUtility/Standard (Metallic)");
mat = new Material(sh);
mat.color = baseColorFactor;
mat.SetFloat("_Metallic", metallicFactor);
mat.SetFloat("_Glossiness", 1 - roughnessFactor);
<<<<<<<
return mat;
=======
// After the texture and color is extracted from the glTFObject
if (Material.HasProperty("_BaseMap")) Material.SetTexture("_BaseMap", Material.mainTexture);
if (Material.HasProperty("_BaseColor")) Material.SetColor("_BaseColor", baseColor);
return true;
}
/// <summary> JSONUtility sometimes sets nulls to new empty classes instead of null. Check if any values are set </summary>
public bool IsValid() {
if (baseColorFactor != null && baseColorFactor.Length != 0) return true;
else if (metallicFactor != 1f) return true;
else if (roughnessFactor != 1f) return true;
else if (baseColorTexture != null) return true;
else if (metallicRoughnessTexture != null) return true;
else return false;
>>>>>>>
// After the texture and color is extracted from the glTFObject
if (mat.HasProperty("_BaseMap")) mat.SetTexture("_BaseMap", mat.mainTexture);
if (mat.HasProperty("_BaseColor")) mat.SetColor("_BaseColor", baseColorFactor);
return mat; |
<<<<<<<
// Copyright 2004-2010 Castle Project - http://www.castleproject.org/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
namespace Castle.MonoRail.Mvc.Typed
{
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;
=======
#region License
// Copyright 2004-2010 Castle Project - http://www.castleproject.org/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#endregion
namespace Castle.MonoRail.Mvc.Typed
{
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;
>>>>>>>
#region License
// Copyright 2004-2010 Castle Project - http://www.castleproject.org/
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#endregion
namespace Castle.MonoRail.Mvc.Typed
{
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Linq;
<<<<<<<
using Hosting.Internal;
using Primitives.Mvc;
[Export(typeof(ControllerProvider))]
[ExportMetadata("Order", 10000)]
[PartCreationPolicy(CreationPolicy.Shared)]
public class ReflectionBasedControllerProvider : ControllerProvider
{
private readonly List<Tuple<string, Type>> _validTypes;
[ImportingConstructor]
public ReflectionBasedControllerProvider(IHostingBridge source)
{
var assemblies = source.ReferencedAssemblies;
// very naive impl
_validTypes = new List<Tuple<string, Type>>(
assemblies
.SelectMany(a => a.GetTypes())
.Where(t => t.Name.EndsWith("Controller") && !t.IsAbstract)
.Select(t => new Tuple<string, Type>(t.Name.Substring(0, t.Name.Length - "Controller".Length).ToLowerInvariant(), t)));
}
[Import]
public ControllerDescriptorBuilder DescriptorBuilder { get; set; }
// No side effects
public override ControllerMeta Create(RouteData data)
{
var controllerName = (string) data.Values["controller"];
if (controllerName == null)
return null;
var controllerType = _validTypes
.Where(t => string.CompareOrdinal(t.Item1, controllerName) == 0)
.Select(t => t.Item2)
.FirstOrDefault();
if (controllerType == null)
return null;
var descriptor = DescriptorBuilder.Build(controllerType);
var controller = Activator.CreateInstance(controllerType);
var meta = new TypedControllerMeta(controller, descriptor);
return meta;
}
}
}
=======
using Internal;
using Primitives.Mvc;
[Export(typeof(ControllerProvider))]
[ExportMetadata("Order", int.MaxValue)]
[PartCreationPolicy(CreationPolicy.Shared)]
public class ReflectionBasedControllerProvider : ControllerProvider
{
private readonly List<Tuple<string, Type>> _validTypes;
[ImportingConstructor]
public ReflectionBasedControllerProvider(IHostingBridge source)
{
var assemblies = source.ReferencedAssemblies;
// very naive impl
_validTypes = new List<Tuple<string, Type>>(
assemblies
.SelectMany(a => a.GetTypes())
.Where(t => t.Name.EndsWith("Controller") && !t.IsAbstract)
.Select(t => new Tuple<string, Type>(t.Name.Substring(0, t.Name.Length - "Controller".Length).ToLowerInvariant(), t)));
}
[Import]
public ControllerDescriptorBuilder DescriptorBuilder { get; set; }
// No side effects
public override ControllerMeta Create(RouteData data)
{
var controllerName = (string) data.Values["controller"];
if (controllerName == null)
return null;
var controllerType = _validTypes
.Where(t => string.CompareOrdinal(t.Item1, controllerName) == 0)
.Select(t => t.Item2)
.FirstOrDefault();
if (controllerType == null)
return null;
var descriptor = DescriptorBuilder.Build(controllerType);
var controller = Activator.CreateInstance(controllerType);
var meta = new TypedControllerMeta(controller, descriptor);
return meta;
}
}
}
>>>>>>>
using Internal;
using Primitives.Mvc;
[Export(typeof(ControllerProvider))]
[ExportMetadata("Order", 10000)]
[PartCreationPolicy(CreationPolicy.Shared)]
public class ReflectionBasedControllerProvider : ControllerProvider
{
private readonly List<Tuple<string, Type>> _validTypes;
[ImportingConstructor]
public ReflectionBasedControllerProvider(IHostingBridge source)
{
var assemblies = source.ReferencedAssemblies;
// very naive impl
_validTypes = new List<Tuple<string, Type>>(
assemblies
.SelectMany(a => a.GetTypes())
.Where(t => t.Name.EndsWith("Controller") && !t.IsAbstract)
.Select(t => new Tuple<string, Type>(t.Name.Substring(0, t.Name.Length - "Controller".Length).ToLowerInvariant(), t)));
}
[Import]
public ControllerDescriptorBuilder DescriptorBuilder { get; set; }
// No side effects
public override ControllerMeta Create(RouteData data)
{
var controllerName = (string) data.Values["controller"];
if (controllerName == null)
return null;
var controllerType = _validTypes
.Where(t => string.CompareOrdinal(t.Item1, controllerName) == 0)
.Select(t => t.Item2)
.FirstOrDefault();
if (controllerType == null)
return null;
var descriptor = DescriptorBuilder.Build(controllerType);
var controller = Activator.CreateInstance(controllerType);
var meta = new TypedControllerMeta(controller, descriptor);
return meta;
}
}
} |
<<<<<<<
// <inheritdoc />
[Obsolete("The queries are now streaming by default")]
=======
/// <inheritdoc />
[Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")]
>>>>>>>
// <inheritdoc />
[Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")] |
<<<<<<<
/// <summary>
/// Creates a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="edgeDefinitions">If true then the data is synchronised to disk before returning from a document create, update, replace or removal operation</param>
/// <param name="orphanCollection">Whether or not the collection will be compacted</param>
/// <returns>CreateGraphResult</returns>
CreateGraphResult CreateGraph(string name, List<EdgeDefinitionData> edgeDefinitions, List<string> orphanCollections = null);
/// <summary>
/// Creates a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="edgeDefinitions">If true then the data is synchronised to disk before returning from a document create, update, replace or removal operation</param>
/// <param name="orphanCollection">Whether or not the collection will be compacted</param>
/// <returns>CreateGraphResult</returns>
Task<CreateGraphResult> CreateGraphAsync(string name, List<EdgeDefinitionData> edgeDefinitions, List<string> orphanCollections = null);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="dropCollections">Drop collections of this graph as well. Collections will only be dropped if they are not used in other graphs.</param>
/// <returns></returns>
void DeleteGraph(string name, bool dropCollections = false);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="dropCollections">Drop collections of this graph as well. Collections will only be dropped if they are not used in other graphs.</param>
/// <returns>Task</returns>
Task DeleteGraphAsync(string name, bool dropCollections = false);
/// <summary>
/// Get a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <returns>GraphIdentifierResult</returns>
GraphIdentifierResult GetGraph(string name);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <returns>GraphIdentifierResult</returns>
Task<GraphIdentifierResult> GetGraphAsync(string name);
=======
Task<TResult> ExecuteTransactionAsync<TResult>(TransactionData data, Action<BaseResult> baseResult = null);
Task ExecuteTransactionAsync(TransactionData data, Action<BaseResult> baseResult = null);
TResult ExecuteTransaction<TResult>(TransactionData data, Action<BaseResult> baseResult = null);
void ExecuteTransaction(TransactionData data, Action<BaseResult> baseResult = null);
>>>>>>>
/// <summary>
/// Creates a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="edgeDefinitions">If true then the data is synchronised to disk before returning from a document create, update, replace or removal operation</param>
/// <param name="orphanCollection">Whether or not the collection will be compacted</param>
/// <returns>CreateGraphResult</returns>
CreateGraphResult CreateGraph(string name, List<EdgeDefinitionData> edgeDefinitions, List<string> orphanCollections = null);
/// <summary>
/// Creates a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="edgeDefinitions">If true then the data is synchronised to disk before returning from a document create, update, replace or removal operation</param>
/// <param name="orphanCollection">Whether or not the collection will be compacted</param>
/// <returns>CreateGraphResult</returns>
Task<CreateGraphResult> CreateGraphAsync(string name, List<EdgeDefinitionData> edgeDefinitions, List<string> orphanCollections = null);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="dropCollections">Drop collections of this graph as well. Collections will only be dropped if they are not used in other graphs.</param>
/// <returns></returns>
void DeleteGraph(string name, bool dropCollections = false);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <param name="dropCollections">Drop collections of this graph as well. Collections will only be dropped if they are not used in other graphs.</param>
/// <returns>Task</returns>
Task DeleteGraphAsync(string name, bool dropCollections = false);
/// <summary>
/// Get a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <returns>GraphIdentifierResult</returns>
GraphIdentifierResult GetGraph(string name);
/// <summary>
/// Deletes a graph
/// </summary>
/// <param name="name">Name of the graph</param>
/// <returns>GraphIdentifierResult</returns>
Task<GraphIdentifierResult> GetGraphAsync(string name);
Task<TResult> ExecuteTransactionAsync<TResult>(TransactionData data, Action<BaseResult> baseResult = null);
Task ExecuteTransactionAsync(TransactionData data, Action<BaseResult> baseResult = null);
TResult ExecuteTransaction<TResult>(TransactionData data, Action<BaseResult> baseResult = null);
void ExecuteTransaction(TransactionData data, Action<BaseResult> baseResult = null); |
<<<<<<<
AllEdges=5,
Collection=6,
Graph=7
=======
AllEdges = 5,
Collection = 6,
Transaction = 7
>>>>>>>
AllEdges=5,
Collection=6,
Graph=7,
Transaction = 8
<<<<<<<
{CommandApi.Collection,"collection"},
{CommandApi.Graph,"gharial"}
=======
{CommandApi.Collection,"collection"},
{CommandApi.Transaction,"transaction"}
>>>>>>>
{CommandApi.Collection,"collection"},
{CommandApi.Graph,"gharial"}
{CommandApi.Transaction,"transaction"} |
<<<<<<<
public static bool HS { get { return m_Expansion >= Expansion.HS; } }
public static bool TOL { get { return m_Expansion >= Expansion.TOL; } }
=======
public static bool HS { get { return Expansion >= Expansion.HS; } }
>>>>>>>
public static bool HS { get { return Expansion >= Expansion.HS; } }
public static bool TOL { get { return Expansion >= Expansion.TOL; } } |
<<<<<<<
using Autofac;
=======
using System.Reflection;
using Autofac;
>>>>>>>
using System.Linq;
using System.Reflection;
using Autofac;
<<<<<<<
using KenticoInspector.Core.Tokens;
using System.Linq;
using System.Reflection;
=======
>>>>>>>
using KenticoInspector.Core.Tokens; |
<<<<<<<
public WindowPadding viewPadding {
get { return this._displayMetrics.viewPadding; }
}
public WindowPadding viewInsets {
get { return this._displayMetrics.viewInsets; }
}
protected override void OnDisable() {
D.assert(this._windowAdapter != null);
this._windowAdapter.OnDisable();
this._windowAdapter = null;
base.OnDisable();
}
=======
>>>>>>>
public WindowPadding viewPadding {
get { return this._displayMetrics.viewPadding; }
}
public WindowPadding viewInsets {
get { return this._displayMetrics.viewInsets; }
} |
<<<<<<<
var timer = new TimerImpl(DateTime.Now + duration, callback);
lock (this._queue) {
this._queue.enqueue(timer);
}
=======
var timer = new TimerImpl(duration, callback);
this._queue.enqueue(timer);
>>>>>>>
var timer = new TimerImpl(duration, callback);
lock (this._queue) {
this._queue.enqueue(timer);
}
<<<<<<<
var timers = new List<TimerImpl>();
lock (this._queue) {
while (this._queue.count > 0 && this._queue.peek().deadline <= now) {
var timer = this._queue.dequeue();
timers.Add(timer);
}
}
foreach (var timer in timers) {
=======
List<TimerImpl> appendList = null;
while (this._queue.count > 0 && this._queue.peek().deadline <= now) {
var timer = this._queue.dequeue();
>>>>>>>
List<TimerImpl> timers = null;
List<TimerImpl> appendList = null;
lock (this._queue) {
while (this._queue.count > 0 && this._queue.peek().deadline <= now) {
var timer = this._queue.dequeue();
if (timers == null) {
timers = new List<TimerImpl>();
}
timers.Add(timer);
}
}
if (timers != null) {
foreach (var timer in timers) { |
<<<<<<<
static readonly MaterialByBlendModeStencilComp _strokeAlphaMat;
=======
static readonly Material _shadowBox;
static readonly Material _shadowRBox;
>>>>>>>
static readonly MaterialByBlendModeStencilComp _strokeAlphaMat;
static readonly Material _shadowBox;
static readonly Material _shadowRBox;
<<<<<<<
var stroke1Shader = Shader.Find("UIWidgets/canvas_stroke1");
if (stroke1Shader == null) {
throw new Exception("UIWidgets/canvas_stroke1 not found");
}
var strokeAlphaShader = Shader.Find("UIWidgets/canvas_strokeAlpha");
if (strokeAlphaShader == null) {
throw new Exception("UIWidgets/canvas_strokeAlpha not found");
}
var texShader = Shader.Find("UIWidgets/canvas_tex");
if (texShader == null) {
throw new Exception("UIWidgets/canvas_tex not found");
}
var stencilShader = Shader.Find("UIWidgets/canvas_stencil");
if (stencilShader == null) {
throw new Exception("UIWidgets/canvas_stencil not found");
}
=======
return shader;
}
>>>>>>>
return shader;
} |
<<<<<<<
this._updateScrollInput();
=======
if (this._textInput != null) {
this._textInput.keyboardManager.Update();
}
>>>>>>>
this._updateScrollInput();
if (this._textInput != null) {
this._textInput.keyboardManager.Update();
} |
<<<<<<<
public void drawTextBlob(TextBlob textBlob, Offset offset) {
var mesh = MeshGenrator.generateMesh(textBlob, offset.dx, offset.dy);
var font = FontManager.instance.getOrCreate(textBlob.style.fontFamily, textBlob.style.UnityFontSize);
=======
public void drawTextBlob(TextBlob textBlob, double x, double y)
{
var mesh = MeshGenrator.generateMesh(textBlob);
var font = FontManager.instance.getOrCreate(textBlob.style.fontFamily).font;
>>>>>>>
public void drawTextBlob(TextBlob textBlob, Offset offset)
{
var mesh = MeshGenrator.generateMesh(textBlob);
var font = FontManager.instance.getOrCreate(textBlob.style.fontFamily).font;
<<<<<<<
Graphics.DrawMeshNow(mesh, this._transform);
if (Camera.current != null) {
=======
var textBlobOffset = textBlob.positions[textBlob.start];
Graphics.DrawMeshNow(mesh, this._transform * Matrix4x4.Translate(
new Vector3((float) Utils.PixelCorrectRound(x + textBlobOffset.x),
(float) Utils.PixelCorrectRound(y + textBlobOffset.y), 0)));
if (Camera.current != null)
{
>>>>>>>
var textBlobOffset = textBlob.positions[textBlob.start];
Graphics.DrawMeshNow(mesh, this._transform * Matrix4x4.Translate(
new Vector3((float) Utils.PixelCorrectRound(offset.dx + textBlobOffset.x),
(float) Utils.PixelCorrectRound(offset.dy + textBlobOffset.y), 0)));
if (Camera.current != null) { |
<<<<<<<
CardTheme cardTheme = null,
=======
ChipThemeData chipTheme = null,
>>>>>>>
CardTheme cardTheme = null,
ChipThemeData chipTheme = null,
<<<<<<<
cardTheme = cardTheme ?? new CardTheme();
=======
chipTheme = chipTheme ?? ChipThemeData.fromDefaults(
secondaryColor: primaryColor,
brightness: brightness,
labelStyle: textTheme.body2
);
>>>>>>>
cardTheme = cardTheme ?? new CardTheme();
chipTheme = chipTheme ?? ChipThemeData.fromDefaults(
secondaryColor: primaryColor,
brightness: brightness,
labelStyle: textTheme.body2
);
<<<<<<<
D.assert(cardTheme != null);
=======
D.assert(chipTheme != null);
>>>>>>>
D.assert(cardTheme != null);
D.assert(chipTheme != null);
<<<<<<<
this.cardTheme = cardTheme;
=======
this.chipTheme = chipTheme;
>>>>>>>
this.cardTheme = cardTheme;
this.chipTheme = chipTheme;
<<<<<<<
CardTheme cardTheme = null,
=======
ChipThemeData chipTheme = null,
>>>>>>>
CardTheme cardTheme = null,
ChipThemeData chipTheme = null,
<<<<<<<
D.assert(cardTheme != null);
=======
D.assert(chipTheme != null);
>>>>>>>
D.assert(cardTheme != null);
D.assert(chipTheme != null);
<<<<<<<
cardTheme: cardTheme,
=======
chipTheme: chipTheme,
>>>>>>>
cardTheme: cardTheme,
chipTheme: chipTheme,
<<<<<<<
public readonly CardTheme cardTheme;
=======
public readonly ChipThemeData chipTheme;
>>>>>>>
public readonly CardTheme cardTheme;
public readonly ChipThemeData chipTheme;
<<<<<<<
CardTheme cardTheme = null,
=======
ChipThemeData chipTheme = null,
>>>>>>>
CardTheme cardTheme = null,
ChipThemeData chipTheme = null,
<<<<<<<
cardTheme: cardTheme ?? this.cardTheme,
=======
chipTheme: chipTheme ?? this.chipTheme,
>>>>>>>
cardTheme: cardTheme ?? this.cardTheme,
chipTheme: chipTheme ?? this.chipTheme,
<<<<<<<
cardTheme: CardTheme.lerp(a.cardTheme, b.cardTheme, t),
=======
chipTheme: ChipThemeData.lerp(a.chipTheme, b.chipTheme, t),
>>>>>>>
cardTheme: CardTheme.lerp(a.cardTheme, b.cardTheme, t),
chipTheme: ChipThemeData.lerp(a.chipTheme, b.chipTheme, t),
<<<<<<<
other.cardTheme == this.cardTheme &&
=======
other.chipTheme == this.chipTheme &&
>>>>>>>
other.cardTheme == this.cardTheme &&
other.chipTheme == this.chipTheme &&
<<<<<<<
hashCode = (hashCode * 397) ^ this.cardTheme.GetHashCode();
=======
hashCode = (hashCode * 397) ^ this.chipTheme.GetHashCode();
>>>>>>>
hashCode = (hashCode * 397) ^ this.cardTheme.GetHashCode();
hashCode = (hashCode * 397) ^ this.chipTheme.GetHashCode();
<<<<<<<
properties.add(new DiagnosticsProperty<CardTheme>("cardTheme", this.cardTheme));
=======
properties.add(new DiagnosticsProperty<ChipThemeData>("chipTheme", this.chipTheme));
>>>>>>>
properties.add(new DiagnosticsProperty<CardTheme>("cardTheme", this.cardTheme));
properties.add(new DiagnosticsProperty<ChipThemeData>("chipTheme", this.chipTheme)); |
<<<<<<<
using System.Collections.Concurrent;
using System.Collections.ObjectModel;
=======
using System.Security.Cryptography.X509Certificates;
>>>>>>>
using System.Collections.Concurrent;
using System.Collections.ObjectModel;
using System.Security.Cryptography.X509Certificates;
<<<<<<<
private ObservableCollection<AutomationRunbook> runbookListViewModel;
private BlockingCollection<RunbookDownloadJob> downloadQueue;
private Task downloadWorker;
=======
private LocalRunbookStore runbookStore;
private bool tokenExpired = false;
>>>>>>>
private ObservableCollection<AutomationRunbook> runbookListViewModel;
private BlockingCollection<RunbookDownloadJob> downloadQueue;
private Task downloadWorker;
private bool tokenExpired = false;
<<<<<<<
RunbooksListView.ItemsSource = runbookListViewModel;
=======
RunbooksListView.ItemsSource = runbooks;
assetsComboBox.SelectedValue = AutomationISE.Model.Constants.assetVariable;
>>>>>>>
RunbooksListView.ItemsSource = runbookListViewModel;
assetsComboBox.SelectedValue = AutomationISE.Model.Constants.assetVariable; |
<<<<<<<
=======
using System.Collections.Concurrent;
using System.Collections.ObjectModel;
using System.Security.Cryptography.X509Certificates;
>>>>>>>
using System.Collections.Concurrent;
using System.Collections.ObjectModel;
using System.Security.Cryptography.X509Certificates;
<<<<<<<
ISet<AutomationRunbook> runbooks = await AutomationRunbookManager.GetAllRunbookMetadata(iseClient.automationManagementClient,
iseClient.currWorkspace, iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount.Name);
=======
runbookListViewModel = new ObservableCollection<AutomationRunbook>(await AutomationRunbookManager.GetAllRunbookMetadata(iseClient.automationManagementClient,
iseClient.currWorkspace, iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount.Name));
>>>>>>>
runbookListViewModel = new ObservableCollection<AutomationRunbook>(await AutomationRunbookManager.GetAllRunbookMetadata(iseClient.automationManagementClient,
iseClient.currWorkspace, iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount.Name));
<<<<<<<
try
{
await AutomationRunbookManager.UploadRunbookAsDraft(selectedRunbook, iseClient.automationManagementClient,
iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount);
}
catch (Exception ex)
{
MessageBox.Show("The runbook could not be uploaded.\r\nError details: " + ex.Message, "Error");
}
finally
{
ButtonUploadRunbook.IsEnabled = true;
}
=======
if (fileTransferQueue.TryAdd(new RunbookTransferJob(selectedRunbook, RunbookTransferJob.TransferOperation.Upload))) //TryAdd() immediately returns false if queue is at capacity
JobsRemainingLabel.Text = "(" + fileTransferQueue.Count + " tasks remaining)";
else
MessageBox.Show("Too many runbooks are waiting to be downloaded/uploaded right now. Hold your horses!");
/* Make sure the worker is alive, start a new one if not */
if (fileTransferWorker == null || fileTransferWorker.Status == TaskStatus.Canceled || fileTransferWorker.Status == TaskStatus.Faulted)
fileTransferWorker = Task.Factory.StartNew(() => processJobsFromQueue(fileTransferWorkerProgress), TaskCreationOptions.LongRunning);
ButtonUploadRunbook.IsEnabled = true;
>>>>>>>
if (fileTransferQueue.TryAdd(new RunbookTransferJob(selectedRunbook, RunbookTransferJob.TransferOperation.Upload))) //TryAdd() immediately returns false if queue is at capacity
JobsRemainingLabel.Text = "(" + fileTransferQueue.Count + " tasks remaining)";
else
MessageBox.Show("Too many runbooks are waiting to be downloaded/uploaded right now. Hold your horses!");
/* Make sure the worker is alive, start a new one if not */
if (fileTransferWorker == null || fileTransferWorker.Status == TaskStatus.Canceled || fileTransferWorker.Status == TaskStatus.Faulted)
fileTransferWorker = Task.Factory.StartNew(() => processJobsFromQueue(fileTransferWorkerProgress), TaskCreationOptions.LongRunning);
ButtonUploadRunbook.IsEnabled = true;
<<<<<<<
private void certificateTextBox_TextChanged(object sender, TextChangedEventArgs e)
{
}
private async void ButtonSourceControlRunbook_Click(object sender, RoutedEventArgs e)
{
try
{
JobCreateResponse sourceControlJob = await AutomationSourceControl.startSouceControlJob(iseClient.automationManagementClient,
iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount.Name);
JobOutputWindow jobWindow = new JobOutputWindow(sourceControlJob.Job.Properties.Runbook.Name, sourceControlJob, iseClient);
jobWindow.Show();
}
catch (Exception ex)
{
MessageBox.Show("The source control job could not be started. " + ex.Message, "Error");
return;
}
}
=======
>>>>>>>
private async void ButtonSourceControlRunbook_Click(object sender, RoutedEventArgs e)
{
try
{
JobCreateResponse sourceControlJob = await AutomationSourceControl.startSouceControlJob(iseClient.automationManagementClient,
iseClient.accountResourceGroups[iseClient.currAccount].Name, iseClient.currAccount.Name);
JobOutputWindow jobWindow = new JobOutputWindow(sourceControlJob.Job.Properties.Runbook.Name, sourceControlJob, iseClient);
jobWindow.Show();
}
catch (Exception ex)
{
MessageBox.Show("The source control job could not be started. " + ex.Message, "Error");
return;
}
} |
<<<<<<<
// <inheritdoc />
[Obsolete("The queries are now streaming by default")]
=======
/// <inheritdoc />
[Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")]
>>>>>>>
// <inheritdoc />
[Obsolete("Queries are now streaming by default unless a retrying ExecutionStrategy is used. Calling this method will have no effect.")] |
<<<<<<<
using System.ComponentModel;
=======
using System.Windows.Media.Animation;
>>>>>>>
using System.ComponentModel;
using System.Windows.Media.Animation;
<<<<<<<
=======
if (fileTransferQueue.TryAdd(new RunbookTransferJob(selectedRunbook, RunbookTransferJob.TransferOperation.Download))) //TryAdd() immediately returns false if queue is at capacity
JobsRemainingLabel.Content = "(" + fileTransferQueue.Count + " tasks remaining)";
else
MessageBox.Show("Too many runbooks are waiting to be downloaded/uploaded right now. Cool your jets!");
/* Make sure the worker is alive, start a new one if not */
if (fileTransferWorker == null || fileTransferWorker.Status == TaskStatus.Canceled || fileTransferWorker.Status == TaskStatus.Faulted)
fileTransferWorker = Task.Factory.StartNew(() => processJobsFromQueue(fileTransferWorkerProgress), TaskCreationOptions.LongRunning);
ButtonDownloadRunbook.IsEnabled = true;
>>>>>>>
<<<<<<<
=======
AutomationRunbook selectedRunbook = (AutomationRunbook)RunbooksListView.SelectedItem;
if (selectedRunbook == null)
{
MessageBox.Show("No runbook selected.");
return;
}
ButtonUploadRunbook.IsEnabled = false;
if (fileTransferQueue.TryAdd(new RunbookTransferJob(selectedRunbook, RunbookTransferJob.TransferOperation.Upload))) //TryAdd() immediately returns false if queue is at capacity
JobsRemainingLabel.Content = "(" + fileTransferQueue.Count + " tasks remaining)";
else
MessageBox.Show("Too many runbooks are waiting to be downloaded/uploaded right now. Hold your horses!");
/* Make sure the worker is alive, start a new one if not */
if (fileTransferWorker == null || fileTransferWorker.Status == TaskStatus.Canceled || fileTransferWorker.Status == TaskStatus.Faulted)
fileTransferWorker = Task.Factory.StartNew(() => processJobsFromQueue(fileTransferWorkerProgress), TaskCreationOptions.LongRunning);
ButtonUploadRunbook.IsEnabled = true;
}
private async void ButtonTestRunbook_Click(object sender, RoutedEventArgs e)
{
AutomationRunbook selectedRunbook = (AutomationRunbook)RunbooksListView.SelectedItem;
if (selectedRunbook == null)
{
MessageBox.Show("No runbook selected.");
return;
}
RunbookDraft draft = null;
>>>>>>> |
<<<<<<<
var completemap = GetStrategy(strategy).Generate(rng, reqs);
#if DEBUG
Console.Write(completemap.AsText());
#endif
return completemap;
}
private IMapGeneratorEngine GetStrategy(MapGeneratorStrategy strategy)
{
switch (strategy)
{
case MapGeneratorStrategy.Cellular:
return new CellularGenerator();
case MapGeneratorStrategy.WaterfallClone:
return new WaterfallEngine();
default:
return null;
}
}
}
interface IMapGeneratorEngine
{
CompleteMap Generate(MT19337 rng, MapRequirements reqs);
}
class WaterfallEngine : IMapGeneratorEngine
{
private enum Directions : int
{
up = 0,
left,
right,
down
}
public CompleteMap Generate(MT19337 rng, MapRequirements reqs)
{
CompleteMap complete = new CompleteMap
{
Map = new Map((byte)Tile.WaterfallInside),
Requirements = reqs
};
//Map map = complete.Map;
var start_loc = (x: 0x39, y: 0x38); //Currently in (y,x) notation
var room_loc = (x: 0x35, y: 0x30);
byte[,] WaterfallRoom = new byte[,] {
{ 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02 },
{ 0x03, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x05 },
{ 0x03, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x05 },
{ 0x06, 0x07, 0x48, 0x07, 0x07, 0x07, 0x07, 0x08 },
{ 0x30, 0x30, 0x36, 0x30, 0x30, 0x30, 0x30, 0x30 },
{ 0x49, 0x49, 0x3A, 0x49, 0x49, 0x49, 0x49, 0x49 }};
var starting_x = rng.Between(-3, 0) + start_loc.x;
var starting_y = rng.Between(-4, 0) + start_loc.y;
var endPoint = (x: starting_x, y: starting_y);
fillSquare(complete.Map, endPoint.x, 4, endPoint.y, 5, 0x49);
List<(int x, int y)> visited = new List<(int x, int y)>();
List<List<Directions>> visited_dir = new List<List<Directions>>();
var index = 0;
var outerLoops = 0;
Directions curDirection = (Directions)rng.Between(0, 3);
visited.Add(endPoint);
visited_dir.Add(fullDirs());
visited_dir[0].Remove(curDirection);
do
{
var iterCount = rng.Between(8, 20);
var offset = endPoint;
for (int j = 0; j < iterCount; j++)
{
var newOffset = (x: 0, y: 0);
switch (curDirection)
{
case Directions.up:
newOffset = (x: offset.x + rng.Between(-2, 2), y: offset.y - rng.Between(2, 4));
break;
case Directions.down:
newOffset = (x: offset.x + rng.Between(-2, 2), y: offset.y + rng.Between(2, 4));
break;
case Directions.right:
newOffset = (x: offset.x + rng.Between(2, 4), y: offset.y + rng.Between(-2, 3));
break;
case Directions.left:
newOffset = (x: offset.x - rng.Between(2, 4), y: offset.y + rng.Between(-2, 3));
break;
}
if (newOffset.x < 2 || newOffset.x > 57 || newOffset.y < 2 || newOffset.y > 56)
break;
offset = newOffset;
fillSquare(complete.Map, offset.x, 4, offset.y, 5, 0x49);
}
if (offset.x != endPoint.x && offset.y != endPoint.y)
{
visited.Add(offset);
List<Directions> newDirs = fullDirs();
newDirs.Remove(3 - curDirection);
visited_dir.Add(newDirs);
}
//--------//
index = rng.Between(0, visited.Count - 1);
endPoint = visited[index];
var randDirection = rng.Between(0, visited_dir[index].Count - 1);
curDirection = visited_dir[index][randDirection];
//curDirection = (Directions)rng.Between(0, 3);
outerLoops++;
} while (outerLoops < 35);
var distances = FloodFillDist(complete.Map, start_loc, 0x49);
int max_dist = distances.Cast<int>().Max();
List<(int x, int y)> roomPlacements = new List<(int x, int y)>();
for (var i = 1; i < 54; i++)
{
for (var j = 1; j < 54; j++)
{
if (Math.Abs(i - start_loc.x) + Math.Abs(j - start_loc.y) < 64)
{
roomPlacements.Add((x: i, y: j));
}
}
}
var doneWithRoomPlacement = false;
//Now, pick a place for the room.
do
{
var targetPlace = rng.Between(0, roomPlacements.Count - 1);
room_loc = roomPlacements[targetPlace];
roomPlacements.RemoveAt(targetPlace);
var tempRoom = (byte[,])WaterfallRoom.Clone();
// Place the room
for (var i = 0; i < 6; i++)
{
for (var j = 0; j < 8; j++)
{
tempRoom[i, j] = complete.Map[room_loc.y + i, room_loc.x + j];
complete.Map[room_loc.y + i, room_loc.x + j] = WaterfallRoom[i, j];
}
}
// Test the room
doneWithRoomPlacement = FloodFillReachable(complete.Map, start_loc, 0x49, 0x3A);
//If not done, reverse
if (!doneWithRoomPlacement)
{
for (var i = 0; i < 6; i++)
{
for (var j = 0; j < 8; j++)
{
complete.Map[room_loc.y + i, room_loc.x + j] = tempRoom[i, j];
}
}
}
} while (!doneWithRoomPlacement);
byte[] tempOutside = { (byte) Tile.WaterfallRandomEncounters, (byte) Tile.Doorway, (byte) Tile.InsideWall };
List<byte> outsideTiles = new List<byte>(tempOutside);
//Okay, now, we need to to do the touch up!
for (var i = 0; i < 63; i++)
{
for (var j = 0; j < 63; j++)
{
var curTile = (Tile) complete.Map[j, i];
if (curTile == Tile.WaterfallInside && i != 0 && outsideTiles.Contains(complete.Map[j, i - 1]))
{
curTile = Tile.RoomLeft;
}
if (curTile == Tile.WaterfallInside && i != 63 && outsideTiles.Contains(complete.Map[j, i + 1]))
{
curTile = Tile.RoomRight;
}
if (curTile == Tile.WaterfallInside && j != 63 && outsideTiles.Contains(complete.Map[j + 1, i]))
{
curTile = Tile.RoomFrontCenter;
}
if (curTile == Tile.RoomLeft && j != 63 && outsideTiles.Contains(complete.Map[j + 1, i]))
{
curTile = Tile.RoomFrontLeft;
}
if (curTile == Tile.RoomRight && j != 63 && outsideTiles.Contains(complete.Map[j + 1, i]))
{
curTile = Tile.RoomFrontRight;
}
if (curTile == Tile.WaterfallInside && j != 0 && outsideTiles.Contains(complete.Map[j - 1, i]))
{
curTile = Tile.RoomBackCenter;
}
if (curTile == Tile.RoomLeft && j != 0 && outsideTiles.Contains(complete.Map[j - 1, i]))
{
curTile = Tile.RoomBackLeft;
}
if (curTile == Tile.RoomRight && j != 0 && outsideTiles.Contains(complete.Map[j - 1, i]))
{
curTile = Tile.RoomBackRight;
}
if (curTile == Tile.WaterfallRandomEncounters && j != 0 && (complete.Map[j - 1, i] <= 0x08 || complete.Map[j - 1, i] == 0x46))
curTile = Tile.InsideWall;
complete.Map[j, i] = (byte) curTile;
}
}
//Finally, add the start
complete.Map[start_loc.y, start_loc.x] = (byte) Tile.WarpUp;
//and the robot.
reqs.Rom.MoveNpc(reqs.MapId, 0, room_loc.x + 5, room_loc.y + 2, true, false);
complete.Entrance = new Coordinate((byte)start_loc.x, (byte)start_loc.y, CoordinateLocale.Standard);
return complete;
}
private List<Directions> fullDirs()
{
List<Directions> allDirs = new List<Directions>
{
Directions.up,
Directions.down,
Directions.left,
Directions.right
};
return allDirs;
}
//Given a map, a rectangle and a value, fill in that section of the map with the given value
private void fillSquare(Map map, int x_origin, int x_size, int y_origin, int y_size, byte value)
{
for (int x = 0; x < x_size; x++)
{
for (int y = 0; y < y_size; y++)
{
map[y_origin + y, x_origin + x] = value;
}
}
}
private int[,] FloodFillDist(Map map, (int x, int y) start, byte live)
{
int[,] dist = new int[64, 64];
dist[start.x, start.y] = 1;
Queue<(int x, int y)> exploreQueue = new Queue<(int x, int y)>();
exploreQueue.Enqueue(start);
int[,] changes = { { 1, 0 }, { -1, 0 }, { 0, 1 }, { 0, -1 } };
while (exploreQueue.Count != 0)
{
var expand = exploreQueue.Dequeue();
for (var i = 0; i < 4; i++)
{
var cur_x = expand.x + changes[i, 0];
var cur_y = expand.y + changes[i, 1];
if (dist[cur_x, cur_y] == 0 && map[cur_y, cur_x] == live)
{
exploreQueue.Enqueue((cur_x, y: cur_y));
dist[cur_x, cur_y] = dist[expand.x, expand.y] + 1;
}
}
}
return dist;
}
=======
CompleteMap map;
>>>>>>>
<<<<<<<
}
}
return false;
}
}
class CellularGenerator : IMapGeneratorEngine
{
public double InitialAliveChance { get; set; }
public int BirthLimit = 4;
public int DeathLimit = 3;
public int Steps = 5;
public CellularGenerator()
{
InitialAliveChance = 0.4;
}
public CompleteMap Generate(MT19337 rng, MapRequirements reqs)
{
int sanity = 0;
while (true)
{
if (++sanity == 500)
throw new InsaneException("Failed to generate map!");
CompleteMap complete = new CompleteMap
{
Map = new Map((byte)Tile.Lava),
Requirements = reqs
=======
>>>>>>> |
<<<<<<<
#region IWordLibraryTextImport Members
public Encoding Encoding
{
get { return Encoding.GetEncoding("GBK"); }
}
#endregion
#endregion
=======
>>>>>>>
#region IWordLibraryTextImport Members
public Encoding Encoding
{
get { return Encoding.GetEncoding("GBK"); }
}
#endregion |
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new SixLabors.Shapes.Rectangle(10, 10, 190, 140))
.Save($"{path}/Rectangle.png");
=======
using (FileStream output = File.OpenWrite($"{path}/Rectangle.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new SixLabors.Shapes.RectangularePolygon(10, 10, 190, 140))
.Save(output);
}
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new SixLabors.Shapes.RectangularePolygon(10, 10, 190, 140))
.Save($"{path}/Rectangle.png");
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new Ellipse(50, 50, 30, 50)
.Rotate((float)(Math.PI / 3)))
.Save($"{path}/ellipse.png");
=======
using (FileStream output = File.OpenWrite($"{path}/ellipse.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new EllipsePolygon(50, 50, 30, 50)
.Rotate((float)(Math.PI / 3)))
.Save(output);
}
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.Fill(Rgba32.HotPink, new EllipsePolygon(50, 50, 30, 50)
.Rotate((float)(Math.PI / 3)))
.Save($"{path}/ellipse.png");
<<<<<<<
image
.Fill(Rgba32.Blue)
.FillPolygon(Rgba32.HotPink, new[]
{
=======
using (FileStream output = File.OpenWrite($"{path}/clipped-corner.png"))
{
image
.Fill(Rgba32.Blue)
.FillPolygon(Rgba32.HotPink, new SixLabors.Primitives.PointF[]
{
>>>>>>>
image
.Fill(Rgba32.Blue)
.FillPolygon(Rgba32.HotPink, new SixLabors.Primitives.PointF[]
{ |
<<<<<<<
// Note: This format can be called OS/2 BMPv1, or Windows BMPv2
public const string WinBmpv2 = "Bmp/pal8os2v1_winv2.bmp";
public const string Bit8Palette4 = "Bmp/pal8-0.bmp";
=======
public const string Os2v2Short = "Bmp/pal8os2v2-16.bmp";
>>>>>>>
// Note: This format can be called OS/2 BMPv1, or Windows BMPv2
public const string WinBmpv2 = "Bmp/pal8os2v1_winv2.bmp";
public const string Bit8Palette4 = "Bmp/pal8-0.bmp";
public const string Os2v2Short = "Bmp/pal8os2v2-16.bmp"; |
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new SixLabors.Primitives.PointF[]{
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Simple_noantialias.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 5,
new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dash(Rgba32.HotPink, 5),
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Dashed.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dash(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dash(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dot(Rgba32.HotPink, 5),
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Dot.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dot(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.Dot(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDot(Rgba32.HotPink, 5),
new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/DashDot.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDot(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDot(Rgba32.HotPink, 5),
new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDotDot(Rgba32.HotPink, 5), new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/DashDotDot.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDotDot(Rgba32.HotPink, 5), new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Pens.DashDotDot(Rgba32.HotPink, 5), new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(color, 10, new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(color, 10, new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(color, 10, new SixLabors.Primitives.PointF[] {
<<<<<<<
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 10, new[] {
=======
using (FileStream output = File.OpenWrite($"{path}/Rectangle.png"))
{
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 10, new SixLabors.Primitives.PointF[] {
>>>>>>>
image
.BackgroundColor(Rgba32.Blue)
.DrawLines(Rgba32.HotPink, 10, new SixLabors.Primitives.PointF[] { |
<<<<<<<
options.Service.GlobalFilters.Add<MyFilterAttribute>(); // Register filter by type.
options.Service.GlobalFilters.Add(new MyFilterUsingFactoryAttribute("Global")); // Register filter with IMagicOnionFilterFactory.
// options.Service.GlobalFilters.Add(new MyFilterAttribute(null));
=======
options.Service.GlobalFilters.Add<MyFilterAttribute>();
options.Service.GlobalFilters.Add<MyFilter2Attribute>();
options.Service.GlobalFilters.Add<MyFilter3Attribute>();
// options.Service.GlobalFilters.Add(new MyFilterAttribute(logger));
// options.ServerPorts = new[]{ new MagicOnionHostingServerPortOptions(){ Port = opti
>>>>>>>
options.Service.GlobalFilters.Add<MyFilterAttribute>(); // Register filter by type.
options.Service.GlobalFilters.Add(new MyFilterUsingFactoryAttribute("Global")); // Register filter with IMagicOnionFilterFactory.
// options.Service.GlobalFilters.Add(new MyFilterAttribute(null));
options.Service.GlobalFilters.Add<MyFilterAttribute>();
options.Service.GlobalFilters.Add<MyFilter2Attribute>();
options.Service.GlobalFilters.Add<MyFilter3Attribute>();
<<<<<<<
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
public class MyFilterUsingFactoryAttribute : Attribute, IMagicOnionFilterFactory<MagicOnionFilterAttribute>
{
public int Order { get; set; }
public string Label { get; set; }
public MyFilterUsingFactoryAttribute(string label)
{
Label = label;
}
MagicOnionFilterAttribute IMagicOnionFilterFactory<MagicOnionFilterAttribute>.CreateInstance(IServiceLocator serviceLocator)
{
return new FilterImpl(serviceLocator.GetService<ILoggerFactory>().CreateLogger<MyFilterUsingFactoryAttribute>(), Label);
}
internal class FilterImpl : MagicOnionFilterAttribute
{
private readonly ILogger _logger;
private readonly string _label;
public FilterImpl(ILogger logger, string label)
{
this._logger = logger;
this._label = label;
}
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next)
{
_logger.LogInformation($"MyFilterFactoryFilterImpl[{_label}] Begin: {context.CallContext.Method}");
await next(context);
_logger.LogInformation($"MyFilterFactoryFilterImpl[{_label}] End: {context.CallContext.Method}");
}
}
}
=======
public class MyFilter2Attribute : MagicOnionFilterAttribute
{
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next) => await next(context);
}
public class MyFilter3Attribute : MagicOnionFilterAttribute
{
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next) => await next(context);
}
>>>>>>>
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, Inherited = true, AllowMultiple = true)]
public class MyFilterUsingFactoryAttribute : Attribute, IMagicOnionFilterFactory<MagicOnionFilterAttribute>
{
public int Order { get; set; }
public string Label { get; set; }
public MyFilterUsingFactoryAttribute(string label)
{
Label = label;
}
MagicOnionFilterAttribute IMagicOnionFilterFactory<MagicOnionFilterAttribute>.CreateInstance(IServiceLocator serviceLocator)
{
return new FilterImpl(serviceLocator.GetService<ILoggerFactory>().CreateLogger<MyFilterUsingFactoryAttribute>(), Label);
}
internal class FilterImpl : MagicOnionFilterAttribute
{
private readonly ILogger _logger;
private readonly string _label;
public FilterImpl(ILogger logger, string label)
{
this._logger = logger;
this._label = label;
}
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next)
{
_logger.LogInformation($"MyFilterFactoryFilterImpl[{_label}] Begin: {context.CallContext.Method}");
await next(context);
_logger.LogInformation($"MyFilterFactoryFilterImpl[{_label}] End: {context.CallContext.Method}");
}
}
}
public class MyFilter2Attribute : MagicOnionFilterAttribute
{
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next) => await next(context);
}
public class MyFilter3Attribute : MagicOnionFilterAttribute
{
public override async ValueTask Invoke(ServiceContext context, Func<ServiceContext, ValueTask> next) => await next(context);
} |
<<<<<<<
il.Emit(OpCodes.Ldfld, resolverField);
// );
=======
il.Emit(OpCodes.Ldfld, serializerOptionsField);
>>>>>>>
il.Emit(OpCodes.Ldfld, serializerOptionsField);
// );
<<<<<<<
=======
il.Emit(OpCodes.Ldloc_0);
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldfld, serializerOptionsField);
>>>>>>> |
<<<<<<<
if (settings.ViewSettings.ListViewColumsOrder == null)
{
settings.ViewSettings.ListViewColumsOrder = new List<GameField>
{
GameField.Icon,
GameField.Name,
GameField.ReleaseDate,
GameField.Genres,
GameField.LastActivity,
GameField.Playtime,
GameField.PluginId
};
}
if (settings.ViewSettings.ListViewColumns == null)
{
var columns = new ListViewColumnsProperties();
columns.Icon.Visible = true;
columns.Name.Visible = true;
columns.ReleaseDate.Visible = true;
columns.Genres.Visible = true;
columns.LastActivity.Visible = true;
columns.Playtime.Visible = true;
columns.PluginId.Visible = true;
settings.ViewSettings.ListViewColumns = columns;
}
if (settings != null)
=======
if (settings.MetadataSettings == null)
>>>>>>>
if (settings.ViewSettings.ListViewColumsOrder == null)
{
settings.ViewSettings.ListViewColumsOrder = new List<GameField>
{
GameField.Icon,
GameField.Name,
GameField.ReleaseDate,
GameField.Genres,
GameField.LastActivity,
GameField.Playtime,
GameField.PluginId
};
}
if (settings.ViewSettings.ListViewColumns == null)
{
var columns = new ListViewColumnsProperties();
columns.Icon.Visible = true;
columns.Name.Visible = true;
columns.ReleaseDate.Visible = true;
columns.Genres.Visible = true;
columns.LastActivity.Visible = true;
columns.Playtime.Visible = true;
columns.PluginId.Visible = true;
settings.ViewSettings.ListViewColumns = columns;
}
if (settings.MetadataSettings == null) |
<<<<<<<
if (extensions.LibraryPlugins.TryGetValue(game.PluginId, out var plugin))
{
=======
if (extensions.LibraryPlugins.TryGetValue(tempGame.PluginId, out var plugin))
{
>>>>>>>
if (extensions.LibraryPlugins.TryGetValue(game.PluginId, out var plugin))
{
<<<<<<<
metadata = downloader.GetMetadata(game.CloneJson());
tempGame = metadata.GameInfo;
=======
try
{
metadata = downloader.GetMetadata(tempGame);
metadata?.GameData?.CopyProperties(tempGame, false);
}
finally
{
// TODO move to proper disposable
if (downloader.HasMethod("Dispose"))
{
(downloader as dynamic)?.Dispose();
}
}
>>>>>>>
try
{
metadata = downloader.GetMetadata(game.CloneJson());
tempGame = metadata.GameInfo;
}
finally
{
// TODO move to proper disposable
if (downloader.HasMethod("Dispose"))
{
(downloader as dynamic)?.Dispose();
}
} |
<<<<<<<
//// ------------------ Publisher
//bool publisherResult = false;
//if (filterSettings.Publishers == null || filterSettings.Publishers.Count == 0)
//{
// publisherResult = true;
//}
//else
//{
// //if (game.Publishers == null)
// //{
// // publisherResult = false;
// //}
// //else
// //{
// // publisherResult = filterSettings.Publishers.IntersectsPartiallyWith(game.Publishers);
// //}
//}
//// ------------------ Developer
//bool developerResult = false;
//if (filterSettings.Developers == null || filterSettings.Developers.Count == 0)
//{
// developerResult = true;
//}
//else
//{
// //if (game.Developers == null)
// //{
// // developerResult = false;
// //}
// //else
// //{
// // developerResult = filterSettings.Developers.IntersectsPartiallyWith(game.Developers);
// //}
//}
//// ------------------ Category
//bool categoryResult = false;
//if (filterSettings.Categories == null || filterSettings.Categories.Count == 0)
//{
// categoryResult = true;
//}
//else
//{
// //if (game.Categories == null)
// //{
// // categoryResult = false;
// //}
// //else
// //{
// // if (ViewType == GamesViewType.Standard)
// // {
// // categoryResult = filterSettings.Categories.IntersectsPartiallyWith(game.Categories);
// // }
// // else
// // {
// // categoryResult = filterSettings.Categories.Any(a => entry.Category.Category.IndexOf(a, StringComparison.OrdinalIgnoreCase) >= 0);
// // }
// //}
//}
//// ------------------ Tags
//bool tagResult = false;
//if (filterSettings.Tags == null || filterSettings.Tags.Count == 0)
//{
// tagResult = true;
//}
//else
//{
// //if (game.Tags == null)
// //{
// // tagResult = false;
// //}
// //else
// //{
// // tagResult = filterSettings.Tags.IntersectsPartiallyWith(game.Tags);
// //}
//}
=======
// ------------------ Publisher
bool publisherResult = false;
if (filterSettings.Publishers == null || filterSettings.Publishers.Count == 0)
{
publisherResult = true;
}
else
{
if (game.Publishers == null)
{
publisherResult = false;
}
else
{
publisherResult = filterSettings.Publishers.IntersectsPartiallyWith(game.Publishers);
}
}
// ------------------ Developer
bool developerResult = false;
if (filterSettings.Developers == null || filterSettings.Developers.Count == 0)
{
developerResult = true;
}
else
{
if (game.Developers == null)
{
developerResult = false;
}
else
{
developerResult = filterSettings.Developers.IntersectsPartiallyWith(game.Developers);
}
}
// ------------------ Category
bool categoryResult = false;
if (filterSettings.Categories == null || filterSettings.Categories.Count == 0)
{
categoryResult = true;
}
else
{
if (game.Categories == null)
{
categoryResult = false;
}
else
{
if (ViewType == GamesViewType.Standard)
{
categoryResult = filterSettings.Categories.IntersectsPartiallyWith(game.Categories);
}
else
{
categoryResult = filterSettings.Categories.Any(a => entry.Category.Category?.IndexOf(a, StringComparison.OrdinalIgnoreCase) >= 0);
}
}
}
// ------------------ Tags
bool tagResult = false;
if (filterSettings.Tags == null || filterSettings.Tags.Count == 0)
{
tagResult = true;
}
else
{
if (game.Tags == null)
{
tagResult = false;
}
else
{
tagResult = filterSettings.Tags.IntersectsPartiallyWith(game.Tags);
}
}
>>>>>>>
//// ------------------ Publisher
//bool publisherResult = false;
//if (filterSettings.Publishers == null || filterSettings.Publishers.Count == 0)
//{
// publisherResult = true;
//}
//else
//{
// //if (game.Publishers == null)
// //{
// // publisherResult = false;
// //}
// //else
// //{
// // publisherResult = filterSettings.Publishers.IntersectsPartiallyWith(game.Publishers);
// //}
//}
//// ------------------ Developer
//bool developerResult = false;
//if (filterSettings.Developers == null || filterSettings.Developers.Count == 0)
//{
// developerResult = true;
//}
//else
//{
// //if (game.Developers == null)
// //{
// // developerResult = false;
// //}
// //else
// //{
// // developerResult = filterSettings.Developers.IntersectsPartiallyWith(game.Developers);
// //}
//}
//// ------------------ Category
//bool categoryResult = false;
//if (filterSettings.Categories == null || filterSettings.Categories.Count == 0)
//{
// categoryResult = true;
//}
//else
//{
// //if (game.Categories == null)
// //{
// // categoryResult = false;
// //}
// //else
// //{
// // if (ViewType == GamesViewType.Standard)
// // {
// // categoryResult = filterSettings.Categories.IntersectsPartiallyWith(game.Categories);
// // }
// // else
// // {
// // categoryResult = filterSettings.Categories.Any(a => entry.Category.Category?.IndexOf(a, StringComparison.OrdinalIgnoreCase) >= 0);
// // }
// //}
//}
//// ------------------ Tags
//bool tagResult = false;
//if (filterSettings.Tags == null || filterSettings.Tags.Count == 0)
//{
// tagResult = true;
//}
//else
//{
// //if (game.Tags == null)
// //{
// // tagResult = false;
// //}
// //else
// //{
// // tagResult = filterSettings.Tags.IntersectsPartiallyWith(game.Tags);
// //}
//} |
<<<<<<<
using Playnite.SDK.Metadata;
=======
using System.Diagnostics;
>>>>>>>
using Playnite.SDK.Metadata;
using System.Diagnostics;
<<<<<<<
var import = new ImportableProgram(new Program()
=======
var productName = FileVersionInfo.GetVersionInfo(path).ProductName;
var program = new ImportableProgram()
>>>>>>>
var productName = FileVersionInfo.GetVersionInfo(path).ProductName;
var import = new ImportableProgram(new Program() |
<<<<<<<
public void SubjectBuffersConnected(IWpfTextView textView, ConnectionReason reason, Collection<ITextBuffer> subjectBuffers)
=======
[Import]
internal ITextDocumentFactoryService TextDocumentFactoryService { get; set; }
public void VsTextViewCreated(IVsTextView textViewAdapter)
>>>>>>>
[Import]
public ITextDocumentFactoryService TextDocumentFactoryService { get; set; }
public void VsTextViewCreated(IVsTextView textViewAdapter)
<<<<<<<
jsBuffer.Properties.TryGetProperty(typeof(ITextDocument), out document);
if (document != null)
=======
if (TextDocumentFactoryService.TryGetTextDocument(textView.TextDataModel.DocumentBuffer, out document))
>>>>>>>
if (TextDocumentFactoryService.TryGetTextDocument(textView.TextDataModel.DocumentBuffer, out document)) |
<<<<<<<
using MadsKristensen.EditorExtensions.Misc.Autoprefixer;
=======
using Newtonsoft.Json.Linq;
>>>>>>>
using MadsKristensen.EditorExtensions.Misc.Autoprefixer;
using Newtonsoft.Json.Linq; |
<<<<<<<
=======
//ball range finder
gameObject.AddComponent ("netTransferToSwing");
//hitball
gameObject.AddComponent ("netSwing");
//pause
gameObject.AddComponent ("netPause");
>>>>>>>
//ball range finder
gameObject.AddComponent ("netTransferToSwing");
//hitball
gameObject.AddComponent ("netSwing");
//pause
gameObject.AddComponent ("netPause");
<<<<<<<
// add the swing script
//gameObject.AddComponent("netSwing");
=======
>>>>>>> |
<<<<<<<
using System.Threading;
=======
using Windows.System;
>>>>>>>
using System.Threading;
using Windows.System;
<<<<<<<
StartWatcher();
// Display a message
bluetoothMessageText.Text = Common.GetResourceText("BluetoothOn");
=======
if (StartWatcher())
{
// Display a message
string confirmationMessage = Common.GetResourceText("BluetoothOn");
DisplayMessagePanelAsync(confirmationMessage, MessageType.InformationalMessage);
}
>>>>>>>
if (StartWatcher())
{
// Display a message
bluetoothMessageText.Text = Common.GetResourceText("BluetoothOn");
}
<<<<<<<
// Start the Device Watcher
deviceWatcher.Start();
=======
handlerEnumCompleted = new TypedEventHandler<DeviceWatcher, Object>(async (watcher, obj) =>
{
await MainPage.Current.UIThreadDispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
{
// Finished enumerating
StackLoading.Visibility = Visibility.Collapsed;
var index = confirmationText.Text.IndexOf(Common.GetResourceText("BluetoothOn"));
if (index != -1)
{
DisplayMessagePanelAsync(confirmationText.Text.Substring(0, index), MessageType.InformationalMessage, true);
}
});
});
deviceWatcher.EnumerationCompleted += handlerEnumCompleted;
handlerStopped = new TypedEventHandler<DeviceWatcher, Object>(async (watcher, obj) =>
{
await MainPage.Current.UIThreadDispatcher.RunAsync(CoreDispatcherPriority.Low, () =>
{
// Device watcher stopped
StackLoading.Visibility = Visibility.Collapsed;
});
});
deviceWatcher.Stopped += handlerStopped;
// Start the Device Watcher
deviceWatcher.Start();
StackLoading.Visibility = Visibility.Visible;
}
catch (Exception e)
{
string formatString = Common.GetResourceText("BluetoothListenerCreationFailedFormat");
string confirmationMessage = string.Format(formatString, e.Message);
DisplayMessagePanelAsync(confirmationMessage, MessageType.InformationalMessage);
StackLoading.Visibility = Visibility.Collapsed;
deviceWatcher = null;
return false;
}
return true;
>>>>>>>
// Start the Device Watcher
deviceWatcher.Start();
}
catch (Exception e)
{
string formatString = Common.GetResourceText("BluetoothListenerCreationFailedFormat");
string confirmationMessage = string.Format(formatString, e.Message);
bluetoothMessageText.Text = confirmationMessage;
deviceWatcher = null;
return false;
}
return true;
<<<<<<<
=======
private void TimeZoneComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
ComboBox comboBox = sender as ComboBox;
if (comboBox == null || comboBox.SelectedItem == null)
{
return;
}
if (TimeZoneSettings.CanChangeTimeZone)
{
string newTimeZone = comboBox.SelectedItem as string;
TimeZoneSettings.ChangeTimeZoneByDisplayName(newTimeZone);
}
}
>>>>>>>
private void TimeZoneComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
ComboBox comboBox = sender as ComboBox;
if (comboBox == null || comboBox.SelectedItem == null)
{
return;
}
if (TimeZoneSettings.CanChangeTimeZone)
{
string newTimeZone = comboBox.SelectedItem as string;
TimeZoneSettings.ChangeTimeZoneByDisplayName(newTimeZone);
}
} |
<<<<<<<
{
// As this is a demo, we always show the rich exception page.
// Make sure to hide it in production environments in real-world scearios to
// hide your code from attackers.
//if (env.IsDevelopment())
//{
app.UseDeveloperExceptionPage();
//}
// Activate Swagger and cofigure its UI
=======
{
// As this is a demo, we always show the rich exception page.
// Make sure to hide it in production environments in real-world scearios to
// hide your code from attackers.
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.UseHsts();
app.UseHttpsRedirection();
}
// Activate Swagger and cofigure its UI
>>>>>>>
{
// As this is a demo, we always show the rich exception page.
// Make sure to hide it in production environments in real-world scearios to
// hide your code from attackers.
app.UseDeveloperExceptionPage();
// As this is a demo, we always show the rich exception page.
// Make sure to hide it in production environments in real-world scearios to
// hide your code from attackers.
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
app.UseHsts();
app.UseHttpsRedirection();
}
// Activate Swagger and cofigure its UI |
<<<<<<<
// aapt resource value: 0x7f0d00f3
public const int masked = 2131558643;
=======
// aapt resource value: 0x7f0d001d
public const int lottie_layer_name = 2131558429;
>>>>>>>
// aapt resource value: 0x7f0d00f3
public const int masked = 2131558643;
// aapt resource value: 0x7f0d001d
public const int lottie_layer_name = 2131558429;
<<<<<<<
// aapt resource value: 0x7f0d00f2
public const int visible = 2131558642;
=======
// aapt resource value: 0x7f0d00f8
public const int visible = 2131558648;
>>>>>>>
// aapt resource value: 0x7f0d00f8
public const int visible = 2131558648; |
<<<<<<<
var projectIssue = new ProjectIssue
=======
var description = p.description;
if (description.Contains(".*"))
{
description = calledMethod.DeclaringType.FullName + "::" + calledMethod.Name;
}
if (!config.exceptions.Contains(p.id))
>>>>>>>
if (!config.exceptions.Contains(p.id))
{
var projectIssue = new ProjectIssue
<<<<<<<
description = description,
category = IssueCategory.ApiCalls,
descriptor = p,
callingMethod = m.FullName,
url = s.Document.Url.Replace("\\", "/"),
line = s.StartLine,
column = s.StartColumn
};
projectReport.AddIssue(projectIssue);
methodBobyIssues.Add(projectIssue);
=======
projectReport.AddIssue(new ProjectIssue
{
description = description,
category = IssueCategory.ApiCalls,
descriptor = p,
callingMethod = m.FullName,
url = s.Document.Url.Replace("\\", "/"),
line = s.StartLine,
column = s.StartColumn
});
}
>>>>>>>
description = description,
category = IssueCategory.ApiCalls,
descriptor = p,
callingMethod = m.FullName,
url = s.Document.Url.Replace("\\", "/"),
line = s.StartLine,
column = s.StartColumn
};
projectReport.AddIssue(projectIssue);
methodBobyIssues.Add(projectIssue);
} |
<<<<<<<
private bool m_SearchCallTree = false;
private bool m_SearchMatchCase = false;
=======
private CallHierarchyView m_CallHierarchyView;
private CallTreeNode m_CurrentCallTree;
>>>>>>>
<<<<<<<
if (string.IsNullOrEmpty(m_SearchText))
return true;
// return true if the issue matches the any of the following string search criteria
if (MatchesSearch(issue.description))
return true;
if (MatchesSearch(issue.filename))
return true;
var dependencies = issue.dependencies;
if (dependencies != null)
{
if (MatchesSearch(dependencies, m_SearchCallTree))
return true;
}
// no string match
return false;
=======
return m_TextFilter.Match(issue);
>>>>>>>
return m_TextFilter.Match(issue);
<<<<<<<
private bool MatchesSearch(string text)
{
return !string.IsNullOrEmpty(text) &&
text.IndexOf(m_SearchText, m_SearchMatchCase ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase) >= 0;
}
private bool MatchesSearch(DependencyNode node, bool recursive)
{
if (node == null)
return false;
var callTreeNode = node as CallTreeNode;
if (callTreeNode != null)
{
if (MatchesSearch(callTreeNode.typeName) || MatchesSearch(callTreeNode.methodName))
return true;
}
if (recursive)
for (int i = 0; i < callTreeNode.GetNumChildren(); i++)
{
if (MatchesSearch(callTreeNode.GetChild(i), true))
return true;
}
return false;
}
=======
>>>>>>>
<<<<<<<
GUI.enabled = m_ActiveAnalysisView.desc.showDependencyView;
m_SearchCallTree = EditorGUILayout.ToggleLeft("Call Tree (slow)",
m_SearchCallTree, GUILayout.Width(160));
=======
GUI.enabled = m_ActiveAnalysisView.desc.showInvertedCallTree;
m_TextFilter.searchDependencies = EditorGUILayout.ToggleLeft("Call Tree (slow)",
m_TextFilter.searchDependencies, GUILayout.Width(160));
>>>>>>>
GUI.enabled = m_ActiveAnalysisView.desc.showDependencyView;
m_TextFilter.searchDependencies = EditorGUILayout.ToggleLeft("Call Tree (slow)",
m_TextFilter.searchDependencies, GUILayout.Width(160)); |
<<<<<<<
private IssueTable m_IssueTable;
private ProjectIssue m_SelectedIssue = null;
private CallHierarchyView m_CallHierarchyView;
private bool m_EnableCPU = true;
private bool m_EnableGPU = true;
private bool m_EnableMemory = true;
private bool m_EnableBuildSize = true;
private bool m_EnableLoadTimes = true;
private bool m_EnablePackages = false;
// private bool m_EnableResolvedItems = false;
private bool m_ShowDetails = false;
private bool m_ShowRecommendation = false;
private bool m_ShowCallTree = false;
=======
private List<IssueTable> m_IssueTables = new List<IssueTable>();
private IssueTable m_ActiveIssueTable
{
get { return m_IssueTables[(int) m_ActiveMode]; }
}
private string[] m_AssemblyNames;
private const int AllAssembliesIndex = 0;
private const string m_DefaultAssemblyName = "Assembly-CSharp";
private int m_ActiveAssembly = AllAssembliesIndex;
private Area m_ActiveArea = Area.All;
>>>>>>>
private List<IssueTable> m_IssueTables = new List<IssueTable>();
private CallHierarchyView m_CallHierarchyView;
private IssueTable m_ActiveIssueTable
{
get { return m_IssueTables[(int) m_ActiveMode]; }
}
private string[] m_AssemblyNames;
private const int AllAssembliesIndex = 0;
private const string m_DefaultAssemblyName = "Assembly-CSharp";
private int m_ActiveAssembly = AllAssembliesIndex;
private Area m_ActiveArea = Area.All;
<<<<<<<
public static readonly GUIContent CallTreeFoldout = new GUIContent("Call Hierarchy", "Call Hierarchy");
=======
public static readonly GUIContent CallTreeFoldout = new GUIContent("Call Tree", "Call Tree");
>>>>>>>
public static readonly GUIContent CallTreeFoldout = new GUIContent("Call Hierarchy", "Call Hierarchy");
<<<<<<<
m_CallHierarchyView = new CallHierarchyView(new TreeViewState());
=======
var assemblyNames = new List<string>(new []{"All Assemblies"});
assemblyNames.AddRange(m_ProjectAuditor.GetAuditor<ScriptAuditor>().assemblyNames);
m_ActiveAssembly = assemblyNames.IndexOf(m_DefaultAssemblyName);
m_AssemblyNames = assemblyNames.ToArray();
>>>>>>>
var assemblyNames = new List<string>(new []{"All Assemblies"});
assemblyNames.AddRange(m_ProjectAuditor.GetAuditor<ScriptAuditor>().assemblyNames);
m_ActiveAssembly = assemblyNames.IndexOf(m_DefaultAssemblyName);
m_AssemblyNames = assemblyNames.ToArray();
m_CallHierarchyView = new CallHierarchyView(new TreeViewState()); |
<<<<<<<
// Update the selection color
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service
=======
// Create Uri for the feature service.
>>>>>>>
// Update the selection color.
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service.
<<<<<<<
// Initialize a new feature layer based on the feature table
_featureLayer = new FeatureLayer(featureTable);
=======
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable)
{
SelectionColor = Color.Cyan,
SelectionWidth = 3
};
>>>>>>>
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable); |
<<<<<<<
// Set the selection color.
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service
=======
// Create Uri for the feature service.
>>>>>>>
// Set the selection color.
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service.
<<<<<<<
// Initialize a new feature layer based on the feature table
_featureLayer = new FeatureLayer(featureTable);
=======
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable)
{
SelectionColor = Color.Cyan,
SelectionWidth = 3
};
>>>>>>>
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable); |
<<<<<<<
// Set the selection color.
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service
=======
// Create Uri for the feature service.
>>>>>>>
// Set the selection color.
MyMapView.SelectionProperties.Color = Color.Cyan;
// Create Uri for the feature service.
<<<<<<<
// Initialize a new feature layer based on the feature table
_featureLayer = new FeatureLayer(featureTable);
=======
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable)
{
SelectionColor = Color.Cyan,
SelectionWidth = 3
};
>>>>>>>
// Initialize a new feature layer based on the feature table.
_featureLayer = new FeatureLayer(featureTable); |
<<<<<<<
=======
public void Quit() => Close();
private void checkForNewVersionToolStripMenuItem_Click(object sender, EventArgs e)
{
this.mDoc.CheckForUpdates();
}
>>>>>>>
public void Quit() => Close();
private void checkForNewVersionToolStripMenuItem_Click(object sender, EventArgs e)
{
this.mDoc.CheckForUpdates();
} |
<<<<<<<
this.showSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
=======
this.checkForNewVersionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
>>>>>>>
this.showSummaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.checkForNewVersionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
<<<<<<<
// visitSupportForumToolStripMenuItem
//
this.visitSupportForumToolStripMenuItem.Name = "visitSupportForumToolStripMenuItem";
this.visitSupportForumToolStripMenuItem.Size = new System.Drawing.Size(179, 22);
this.visitSupportForumToolStripMenuItem.Text = "Visit Support Forum";
this.visitSupportForumToolStripMenuItem.Click += new System.EventHandler(this.visitSupportForumToolStripMenuItem_Click);
//
=======
// visitSupportForumToolStripMenuItem
//
this.visitSupportForumToolStripMenuItem.Name = "visitSupportForumToolStripMenuItem";
this.visitSupportForumToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.visitSupportForumToolStripMenuItem.Text = "Visit Support Forum";
this.visitSupportForumToolStripMenuItem.Click += new System.EventHandler(this.visitSupportForumToolStripMenuItem_Click);
//
>>>>>>>
// visitSupportForumToolStripMenuItem
//
this.visitSupportForumToolStripMenuItem.Name = "visitSupportForumToolStripMenuItem";
this.visitSupportForumToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.visitSupportForumToolStripMenuItem.Text = "Visit Support Forum";
this.visitSupportForumToolStripMenuItem.Click += new System.EventHandler(this.visitSupportForumToolStripMenuItem_Click);
//
<<<<<<<
// showSummaryToolStripMenuItem
//
this.showSummaryToolStripMenuItem.Name = "showSummaryToolStripMenuItem";
this.showSummaryToolStripMenuItem.Size = new System.Drawing.Size(264, 22);
this.showSummaryToolStripMenuItem.Text = "ShowSummary";
this.showSummaryToolStripMenuItem.Click += new System.EventHandler(this.showSummaryToolStripMenuItem_Click);
=======
// checkForNewVersionToolStripMenuItem
//
this.checkForNewVersionToolStripMenuItem.Name = "checkForNewVersionToolStripMenuItem";
this.checkForNewVersionToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.checkForNewVersionToolStripMenuItem.Text = "Check for new Version";
this.checkForNewVersionToolStripMenuItem.Click += new System.EventHandler(this.checkForNewVersionToolStripMenuItem_Click);
>>>>>>>
// showSummaryToolStripMenuItem
//
this.showSummaryToolStripMenuItem.Name = "showSummaryToolStripMenuItem";
this.showSummaryToolStripMenuItem.Size = new System.Drawing.Size(264, 22);
this.showSummaryToolStripMenuItem.Text = "ShowSummary";
this.showSummaryToolStripMenuItem.Click += new System.EventHandler(this.showSummaryToolStripMenuItem_Click);
// checkForNewVersionToolStripMenuItem
//
this.checkForNewVersionToolStripMenuItem.Name = "checkForNewVersionToolStripMenuItem";
this.checkForNewVersionToolStripMenuItem.Size = new System.Drawing.Size(191, 22);
this.checkForNewVersionToolStripMenuItem.Text = "Check for new Version";
this.checkForNewVersionToolStripMenuItem.Click += new System.EventHandler(this.checkForNewVersionToolStripMenuItem_Click);
<<<<<<<
private System.Windows.Forms.ToolStripMenuItem showSummaryToolStripMenuItem;
=======
private System.Windows.Forms.ToolStripMenuItem checkForNewVersionToolStripMenuItem;
>>>>>>>
private System.Windows.Forms.ToolStripMenuItem showSummaryToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem checkForNewVersionToolStripMenuItem; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.