conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
using System;
=======
#region license
// Copyright (C) 2020 ClassicUO Development Community on Github
//
// This project is an alternative client for the game Ultima Online.
// The goal of this is to develop a lightweight client considering
// new technologies.
//
// This program 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.
//
// This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
#endregion
using ClassicUO.Utility.Logging;
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
>>>>>>>
using System;
using System.Diagnostics;
using System.Runtime.InteropServices; |
<<<<<<<
private StbTextBox _autoOpenCorpseRange;
private Checkbox _buffBarTime,_castSpellsByOneClick, _queryBeforAttackCheckbox, _spellColoringCheckbox, _spellFormatCheckbox;
=======
private TextBox _autoOpenCorpseRange;
private Checkbox _buffBarTime,_castSpellsByOneClick, _queryBeforAttackCheckbox, _queryBeforeBeneficialCheckbox, _spellColoringCheckbox, _spellFormatCheckbox;
>>>>>>>
private StbTextBox _autoOpenCorpseRange;
private Checkbox _buffBarTime,_castSpellsByOneClick, _queryBeforAttackCheckbox, _queryBeforeBeneficialCheckbox, _spellColoringCheckbox, _spellFormatCheckbox; |
<<<<<<<
using Composite.Data;
=======
using Composite.Core.WebClient.Services.WampRouter;
>>>>>>>
using Composite.Core.WebClient.Services.WampRouter;
using Composite.Data; |
<<<<<<<
s_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
s_DistortionBufferRT = new RenderTargetIdentifier(s_DistortionBuffer);
=======
m_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
>>>>>>>
m_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
s_DistortionBufferRT = new RenderTargetIdentifier(s_DistortionBuffer);
<<<<<<<
//m_TilePassLightLoop.OnDisable();
Utilities.Destroy(m_DeferredMaterial);
Utilities.Destroy(m_FinalPassMaterial);
Utilities.Destroy(m_DebugViewMaterialGBuffer);
=======
m_TilePassLightLoop.OnDisable();
if (m_SkyboxMaterial) DestroyImmediate(m_SkyboxMaterial);
if (m_SkyHDRIMaterial) DestroyImmediate(m_SkyHDRIMaterial);
if (m_DeferredMaterial) DestroyImmediate(m_DeferredMaterial);
if (m_FinalPassMaterial) DestroyImmediate(m_FinalPassMaterial);
if (m_DebugViewMaterialGBuffer) DestroyImmediate(m_DebugViewMaterialGBuffer);
>>>>>>>
m_TilePassLightLoop.OnDisable();
Utilities.Destroy(m_DeferredMaterial);
Utilities.Destroy(m_FinalPassMaterial);
Utilities.Destroy(m_DebugViewMaterialGBuffer);
<<<<<<<
=======
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
cmd.ClearRenderTarget(true, false, new Color(0, 0, 0, 0));
>>>>>>>
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear HDR target");
=======
var cmd = new CommandBuffer();
cmd.name = "Clear HDR target";
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
cmd.ClearRenderTarget(false, true, new Color(0, 0, 0, 0));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear HDR target");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear GBuffer");
=======
var cmd = new CommandBuffer();
cmd.name = "Clear GBuffer";
// Write into the Camera Depth buffer
cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(cmd), new RenderTargetIdentifier(m_CameraDepthBuffer));
// Clear everything
// TODO: Clear is not required for color as we rewrite everything, will save performance.
cmd.ClearRenderTarget(false, true, new Color(0, 0, 0, 0));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
>>>>>>>
Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, ClearFlag.ClearColor, Color.black, "Clear GBuffer");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Depth Prepass");
RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
=======
var cmd = new CommandBuffer { name = "Depth Prepass" };
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraDepthBuffer));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
RenderOpaqueNoLightingRenderList(cull, camera, renderLoop, "DepthOnly");
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Depth Prepass");
RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, "GBuffer Pass");
=======
var cmd = new CommandBuffer { name = "GBuffer Pass" };
cmd.SetRenderTarget(m_gbufferManager.GetGBuffers(cmd), new RenderTargetIdentifier(m_CameraDepthBuffer));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
>>>>>>>
Utilities.SetRenderTarget(renderLoop, m_gbufferManager.GetGBuffers(), s_CameraDepthBufferRT, "GBuffer Pass");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Clear HDR target");
RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
=======
var cmd = new CommandBuffer { name = "Depth Prepass" };
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraDepthBuffer));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
RenderOpaqueNoLightingRenderList(cull, camera, renderLoop, "DepthOnly");
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraDepthBufferRT, "Clear HDR target");
RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, Utilities.kClearAll, Color.black, "DebugView Material Mode Pass");
=======
var cmd = new CommandBuffer { name = "DebugView Material Mode Pass" };
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
cmd.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, Utilities.kClearAll, Color.black, "DebugView Material Mode Pass");
<<<<<<<
cmd.Blit(null, s_CameraColorBufferRT, m_DebugViewMaterialGBuffer, 0);
=======
cmd.Blit(null, new RenderTargetIdentifier(m_CameraColorBuffer), m_DebugViewMaterialGBuffer, 0);
>>>>>>>
cmd.Blit(null, s_CameraColorBufferRT, m_DebugViewMaterialGBuffer, 0);
<<<<<<<
cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget);
=======
cmd.Blit(new RenderTargetIdentifier(m_CameraColorBuffer), BuiltinRenderTextureType.CameraTarget);
>>>>>>>
cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget);
<<<<<<<
cmd.Blit(null, s_CameraColorBufferRT, m_DeferredMaterial, 0);
=======
cmd.Blit(null, new RenderTargetIdentifier(m_CameraColorBuffer), m_DeferredMaterial, 0);
>>>>>>>
cmd.Blit(null, s_CameraColorBufferRT, m_DeferredMaterial, 0);
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Pass");
=======
var cmd = new CommandBuffer { name = "Forward Pass" };
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Pass");
<<<<<<<
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Unlit Pass");
RenderOpaqueRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
RenderTransparentRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
=======
var cmd = new CommandBuffer { name = "Forward Unlit Pass" };
cmd.SetRenderTarget(new RenderTargetIdentifier(m_CameraColorBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
renderLoop.ExecuteCommandBuffer(cmd);
cmd.Dispose();
RenderOpaqueNoLightingRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
RenderTransparentNoLightingRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
>>>>>>>
Utilities.SetRenderTarget(renderLoop, s_CameraColorBufferRT, s_CameraDepthBufferRT, "Forward Unlit Pass");
RenderOpaqueRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
RenderTransparentRenderList(cullResults, camera, renderLoop, "ForwardUnlit");
<<<<<<<
cmd.GetTemporaryRT(s_VelocityBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetVelocityBufferFormat(), Builtin.RenderLoop.GetVelocityBufferReadWrite());
cmd.SetRenderTarget(s_VelocityBufferRT, s_CameraDepthBufferRT);
=======
cmd.GetTemporaryRT(m_VelocityBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetVelocityBufferFormat(), Builtin.RenderLoop.GetVelocityBufferReadWrite());
cmd.SetRenderTarget(new RenderTargetIdentifier(m_VelocityBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
>>>>>>>
cmd.GetTemporaryRT(m_VelocityBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetVelocityBufferFormat(), Builtin.RenderLoop.GetVelocityBufferReadWrite());
cmd.SetRenderTarget(s_VelocityBufferRT, s_CameraDepthBufferRT);
<<<<<<<
cmd.GetTemporaryRT(s_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetDistortionBufferFormat(), Builtin.RenderLoop.GetDistortionBufferReadWrite());
cmd.SetRenderTarget(s_DistortionBufferRT, s_CameraDepthBufferRT);
=======
cmd.GetTemporaryRT(m_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetDistortionBufferFormat(), Builtin.RenderLoop.GetDistortionBufferReadWrite());
cmd.SetRenderTarget(new RenderTargetIdentifier(m_DistortionBuffer), new RenderTargetIdentifier(m_CameraDepthBuffer));
>>>>>>>
cmd.GetTemporaryRT(m_DistortionBuffer, w, h, 0, FilterMode.Point, Builtin.RenderLoop.GetDistortionBufferFormat(), Builtin.RenderLoop.GetDistortionBufferReadWrite());
cmd.SetRenderTarget(s_DistortionBufferRT, s_CameraDepthBufferRT);
<<<<<<<
cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget, m_FinalPassMaterial, 0);
=======
cmd.Blit(new RenderTargetIdentifier(m_CameraColorBuffer), BuiltinRenderTextureType.CameraTarget, m_FinalPassMaterial, 0);
>>>>>>>
cmd.Blit(s_CameraColorBufferRT, BuiltinRenderTextureType.CameraTarget, m_FinalPassMaterial, 0); |
<<<<<<<
input = GetComponent<AIInput>();
controller.collisions.OnLeftWall += OnLeftWall;
controller.collisions.OnRightWall += OnRightWall;
=======
controller.collisions.onLeftWall += onLeftWall;
controller.collisions.onRightWall += onRightWall;
>>>>>>>
input = GetComponent<AIInput>();
controller.collisions.onLeftWall += OnLeftWall;
controller.collisions.onRightWall += OnRightWall; |
<<<<<<<
/// Calls <see cref="Win32Interop.SetWindowThemeAttribute"/> to set various attributes on the window.
/// </summary>
/// <param name="attributes">Attributes to set on the window.</param>
private void SetWindowThemeAttributes(WTNCA attributes)
{
if (!IsCompositionEnabled)
return;
WTA_OPTIONS options = new WTA_OPTIONS
{
dwFlags = attributes,
dwMask = WTNCA.VALIDBITS
};
// The SetWindowThemeAttribute API call takes care of everything
Win32Interop.SetWindowThemeAttribute(Handle, WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT, ref options,
(uint) Marshal.SizeOf(typeof (WTA_OPTIONS)));
}
/// <summary>
=======
>>>>>>>
<<<<<<<
=======
/// <summary>
/// Overridden method that allows us to specify a transparent background for the window, meaning that the
/// title bar won't show up as black when we maximize the window.
/// </summary>
protected override CreateParams CreateParams
{
get
{
CreateParams createParams = base.CreateParams;
createParams.ExStyle |= Win32Constants.WS_EX_TRANSPARENT;
return createParams;
}
}
/// <summary>
/// Flag indicating whether the application itself should exit when the last tab is closed.
/// </summary>
>>>>>>>
/// <summary>
/// Flag indicating whether the application itself should exit when the last tab is closed.
/// </summary> |
<<<<<<<
vCache = (from cv in _db.CommentSaveTrackers.AsNoTracking()
join c in _db.Comments on cv.CommentID equals c.ID
where c.SubmissionID == submissionID && cv.UserName.Equals(User.Identity.Name, StringComparison.OrdinalIgnoreCase)
=======
vCache = (from cv in _db.Commentsavingtrackers.AsNoTracking()
join c in _db.Comments on cv.CommentId equals c.Id
where c.MessageId == submissionID && cv.UserName.Equals(User.Identity.Name, StringComparison.OrdinalIgnoreCase) && !c.IsDeleted
>>>>>>>
vCache = (from cv in _db.CommentSaveTrackers.AsNoTracking()
join c in _db.Comments on cv.CommentID equals c.ID
where c.SubmissionID == submissionID && cv.UserName.Equals(User.Identity.Name, StringComparison.OrdinalIgnoreCase) && !c.IsDeleted
<<<<<<<
if (existingComment.UserName.Trim() == User.Identity.Name)
=======
if (existingComment.Name.Trim() == User.Identity.Name && !existingComment.IsDeleted)
>>>>>>>
if (existingComment.UserName.Trim() == User.Identity.Name && !existingComment.IsDeleted) |
<<<<<<<
clientMock.Verify(x => x.GetStatusAsync(It.IsAny<OrchestrationStatusQueryCondition>(), It.IsAny<CancellationToken>()));
=======
clientMock.Verify(x => x.GetStatusAsync(createdTimeFrom, createdTimeTo, runtimeStatus, pageSize, continuationToken, It.IsAny<CancellationToken>()));
Assert.Equal("DoThis", actual[0].Name);
>>>>>>>
clientMock.Verify(x => x.GetStatusAsync(It.IsAny<OrchestrationStatusQueryCondition>(), It.IsAny<CancellationToken>()));
Assert.Equal("DoThis", actual[0].Name); |
<<<<<<<
// Todo:
// - implement history missing
=======
using static CommandRights;
>>>>>>>
using static CommandRights;
<<<<<<<
public PlayManager PlayManager { get; private set; }
=======
public WebDisplay WebInterface { get; private set; }
>>>>>>>
public WebDisplay WebInterface { get; private set; }
public PlayManager PlayManager { get; private set; }
<<<<<<<
PlayManager = new PlayManager(this);
=======
WebInterface = new WebDisplay(this);
WebInterface.StartServerAsync();
>>>>>>>
WebInterface = new WebDisplay(this);
WebInterface.StartServerAsync();
PlayManager = new PlayManager(this);
<<<<<<<
PlayManager.AfterResourceStarted += BobController.OnResourceStarted;
PlayManager.AfterResourceStopped += BobController.OnPlayStopped;
=======
AudioFramework.OnResourceStarting += BobController.OnResourceStarting;
AudioFramework.OnResourceStopped += BobController.OnResourceStopped;
>>>>>>>
PlayManager.AfterResourceStarted += BobController.OnResourceStarted;
PlayManager.AfterResourceStopped += BobController.OnPlayStopped;
<<<<<<<
PlayManager.AfterResourceStarted += SongUpdateEvent;
=======
AudioFramework.OnResourceStarted += SongUpdateEvent;
AudioFramework.OnResourceStopped += SongStopEvent;
>>>>>>>
PlayManager.AfterResourceStarted += SongUpdateEvent;
<<<<<<<
var command = CommandManager.CommandSystem.AstToCommandResult(parsedAst);
try
{
var res = command.Execute(execInfo, Enumerable.Empty<ICommand>(),
new[] { CommandResultType.String, CommandResultType.Empty });
if (res.ResultType == CommandResultType.String)
{
var sRes = (StringCommandResult)res;
// Write result to user
if (!string.IsNullOrEmpty(sRes.Content))
session.Write(sRes.Content);
}
}
catch (CommandException ex)
{
session.Write("Error: " + ex.Message);
}
catch (Exception ex)
{
Log.Write(Log.Level.Error, "MB Unexpected command error: {0}", ex);
session.Write("An unexpected error occured: " + ex.Message);
}
=======
session.Write("An unexpected error occured: " + ex.Message);
Log.Write(Log.Level.Error, "MB Unexpected command error: {0}", ex);
>>>>>>>
var command = CommandManager.CommandSystem.AstToCommandResult(parsedAst);
try
{
var res = command.Execute(execInfo, Enumerable.Empty<ICommand>(),
new[] { CommandResultType.String, CommandResultType.Empty });
if (res.ResultType == CommandResultType.String)
{
var sRes = (StringCommandResult)res;
// Write result to user
if (!string.IsNullOrEmpty(sRes.Content))
session.Write(sRes.Content);
}
}
catch (CommandException ex)
{
session.Write("Error: " + ex.Message);
}
catch (Exception ex)
{
Log.Write(Log.Level.Error, "MB Unexpected command error: {0}", ex);
session.Write("An unexpected error occured: " + ex.Message);
} |
<<<<<<<
path = null;
=======
this.path = GetDefaultPath();
>>>>>>>
this.path = null; |
<<<<<<<
private static readonly int DEFAULT_DURATION = 200;
=======
// bool used to determine if cancel was called during vibrateWithPattern
private bool cancelWasCalled = false;
>>>>>>>
private static readonly int DEFAULT_DURATION = 200;
// bool used to determine if cancel was called during vibrateWithPattern
private bool cancelWasCalled = false;
<<<<<<<
public void cancelVibration(string options)
{
VibrateController.Default.Stop();
DispatchCommandResult();
}
=======
public async Task vibrateWithPattern(string options)
{
// clear the cancelWasCalled flag
cancelWasCalled = false;
// get options
string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
int[] pattern = JSON.JsonHelper.Deserialize<int[]>(args[0]);
for (int i = 0; i < pattern.Length && !cancelWasCalled; i++)
{
int msecs = pattern[i];
if (msecs < 1)
{
msecs = 1;
}
if (i % 2 == 0)
{
msecs = (msecs > 5000) ? 5000 : msecs;
VibrateController.Default.Start(TimeSpan.FromMilliseconds(msecs));
}
await Task.Delay(TimeSpan.FromMilliseconds(msecs));
}
DispatchCommandResult();
}
public void cancelVibration(string options)
{
VibrateController.Default.Stop();
cancelWasCalled = true;
DispatchCommandResult();
}
>>>>>>>
private static void vibrateMs(int msecs)
{
VibrateController.Default.Start(TimeSpan.FromMilliseconds(msecs));
}
public async Task vibrateWithPattern(string options)
{
// clear the cancelWasCalled flag
cancelWasCalled = false;
// get options
string[] args = JSON.JsonHelper.Deserialize<string[]>(options);
int[] pattern = JSON.JsonHelper.Deserialize<int[]>(args[0]);
for (int i = 0; i < pattern.Length && !cancelWasCalled; i++)
{
int msecs = pattern[i];
if (msecs < 1)
{
msecs = 1;
}
if (i % 2 == 0)
{
msecs = (msecs > 5000) ? 5000 : msecs;
VibrateController.Default.Start(TimeSpan.FromMilliseconds(msecs));
}
await Task.Delay(TimeSpan.FromMilliseconds(msecs));
}
DispatchCommandResult();
}
public void cancelVibration(string options)
{
VibrateController.Default.Stop();
cancelWasCalled = true;
DispatchCommandResult();
} |
<<<<<<<
using Gate.Helpers;
=======
using System;
using System.Collections.Generic;
using Gate;
using Gate.Helpers;
>>>>>>>
using System;
using System.Collections.Generic;
using Gate;
using Gate.Helpers; |
<<<<<<<
/*
* extension methods take an AppDelegate factory func and it's associated parameters
*/
=======
>>>>>>>
/*
* extension methods take an AppDelegate factory func and it's associated parameters
*/ |
<<<<<<<
var facade = FacadeServiceResolver.Current.Service.CreateFacade(null); // fixme
=======
var uniqueTypes = new HashSet<string>();
>>>>>>>
var uniqueTypes = new HashSet<string>();
var facade = FacadeServiceResolver.Current.Service.CreateFacade(null); // fixme
<<<<<<<
PublishedContentType publishedContentType;
=======
// of course this should never happen, but when it happens, better detect it
// else we end up with weird nullrefs everywhere
if (uniqueTypes.Contains(typeModel.ClrName))
throw new Exception($"Panic: duplicate type ClrName \"{typeModel.ClrName}\".");
uniqueTypes.Add(typeModel.ClrName);
>>>>>>>
// of course this should never happen, but when it happens, better detect it
// else we end up with weird nullrefs everywhere
if (uniqueTypes.Contains(typeModel.ClrName))
throw new Exception($"Panic: duplicate type ClrName \"{typeModel.ClrName}\".");
uniqueTypes.Add(typeModel.ClrName);
PublishedContentType publishedContentType; |
<<<<<<<
ModelsBuilderBackOfficeController.GenerateModels(appData, config.EnableDllModels ? bin : null);
=======
ModelsBuilderController.GenerateModels(appData, config.ModelsMode.IsAnyDll() ? bin : null);
>>>>>>>
ModelsBuilderBackOfficeController.GenerateModels(appData, config.ModelsMode.IsAnyDll() ? bin : null);
<<<<<<<
if (config.EnableAppCodeModels)
ModelsBuilderBackOfficeController.TouchModelsFile(appCode);
=======
if (config.ModelsMode.IsAnyAppCode())
ModelsBuilderController.TouchModelsFile(appCode);
>>>>>>>
if (config.ModelsMode.IsAnyAppCode())
ModelsBuilderBackOfficeController.TouchModelsFile(appCode); |
<<<<<<<
[assembly: AssemblyCopyright("Copyright © 2014 John Gietzen")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")]
=======
[assembly: AssemblyCopyright("Copyright © 2015 John Gietzen")]
[assembly: AssemblyVersion("3.2.0.0")]
[assembly: AssemblyFileVersion("3.2.0.0")]
>>>>>>>
[assembly: AssemblyCopyright("Copyright © 2015 John Gietzen")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.0.0.0")] |
<<<<<<<
[Browsable(false)]
=======
>>>>>>> |
<<<<<<<
using NutzCode.CloudFileSystem;
using Directory = System.IO.Directory;
=======
using JMMServer.Commands.TvDB;
>>>>>>>
using NutzCode.CloudFileSystem;
using Directory = System.IO.Directory;
using JMMServer.Commands.TvDB; |
<<<<<<<
using NutzCode.CloudFileSystem;
=======
using Path = Pri.LongPath.Path;
using Directory = Pri.LongPath.Directory;
using DirectoryInfo = Pri.LongPath.DirectoryInfo;
using File = Pri.LongPath.File;
>>>>>>>
using Path = Pri.LongPath.Path;
using Directory = Pri.LongPath.Directory;
using DirectoryInfo = Pri.LongPath.DirectoryInfo;
using File = Pri.LongPath.File;
using NutzCode.CloudFileSystem; |
<<<<<<<
ret.MediaContainer.Title1 = ret.MediaContainer.Title2 = basegrp.GroupName;
List<AnimeSeries> sers2 = grp.GetSeries(session);
ret.MediaContainer.Art = KodiHelper.GetRandomFanartFromSeries(sers2, session);
foreach (AnimeGroup grpChild in grp.GetChildGroups())
{
Video v = grpChild.GetUserRecord(userid)?.KodiContract;
if (v != null)
{
v = v.Clone();
v.Type = "show";
retGroups.Add(v);
}
}
foreach (AnimeSeries ser in grp.GetSeries())
{
Video v = ser.GetUserRecord(userid)?.KodiContract?.Clone();
if (v != null)
{
v.AirDate = ser.AirDate.HasValue ? ser.AirDate.Value : DateTime.MinValue;
v.Group = basegrp;
retGroups.Add(v);
}
}
=======
Video v = StatsCache.Instance.StatKodiGroupsCache[userid][grpChild.AnimeGroupID];
v.Type = "show";
if (v != null)
retGroups.Add(v.Clone());
}
foreach (AnimeSeries ser in grp.GetSeries())
{
Contract_AnimeSeries cserie = ser.ToContract(ser.GetUserRecord(session, userid), true);
Video v = KodiHelper.FromSerieWithPossibleReplacement(cserie, ser, userid);
v.AirDate = ser.AirDate.HasValue ? ser.AirDate.Value : DateTime.MinValue;
v.Group = basegrp;
v.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
retGroups.Add(v);
>>>>>>>
ret.MediaContainer.Title1 = ret.MediaContainer.Title2 = basegrp.GroupName;
List<AnimeSeries> sers2 = grp.GetSeries(session);
ret.MediaContainer.Art = KodiHelper.GetRandomFanartFromSeries(sers2, session);
foreach (AnimeGroup grpChild in grp.GetChildGroups())
{
Video v = grpChild.GetUserRecord(userid)?.KodiContract;
if (v != null)
{
v = v.Clone();
v.Type = "show";
retGroups.Add(v);
}
}
foreach (AnimeSeries ser in grp.GetSeries())
{
Video v = ser.GetUserRecord(userid)?.KodiContract?.Clone();
if (v != null)
{
v.AirDate = ser.AirDate.HasValue ? ser.AirDate.Value : DateTime.MinValue;
v.Group = basegrp;
retGroups.Add(v);
}
}
}
}
foreach (AnimeSeries ser in grp.GetSeries())
{
Contract_AnimeSeries cserie = ser.ToContract(ser.GetUserRecord(session, userid), true);
Video v = KodiHelper.FromSerieWithPossibleReplacement(cserie, ser, userid);
v.AirDate = ser.AirDate.HasValue ? ser.AirDate.Value : DateTime.MinValue;
v.Group = basegrp;
v.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
retGroups.Add(v);
<<<<<<<
=======
v.OriginalTitle = v.OriginalTitle.Substring(0, v.OriginalTitle.Length - 1);
//proper naming end
List<AnimeSeries> sers = grp.GetAllSeries();
AnimeSeries ser = sers[0];
v.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
retGroups.Add(v.Clone());
>>>>>>>
<<<<<<<
=======
j.OriginalTitle = j.OriginalTitle.Substring(0, j.OriginalTitle.Length - 1);
//proper naming end
j.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
//community support
//CrossRef_AniDB_TraktV2Repository repCrossRef = new CrossRef_AniDB_TraktV2Repository();
//List<CrossRef_AniDB_TraktV2> Trakt = repCrossRef.GetByAnimeID(anim.AnimeID);
//if (Trakt != null)
//{
// if (Trakt.Count > 0)
// {
// j.Trakt = Trakt[0].TraktID;
// }
//}
//CrossRef_AniDB_TvDBV2Repository repCrossRefV2 = new CrossRef_AniDB_TvDBV2Repository();
//List<CrossRef_AniDB_TvDBV2> TvDB = repCrossRefV2.GetByAnimeID(anim.AnimeID);
//if (TvDB != null)
//{
// if (TvDB.Count > 0)
// {
// j.TvDB = TvDB[0].TvDBID.ToString();
// }
//}
//community support END
joints2.Add(j);
retGroups.Remove(j);
break;
>>>>>>> |
<<<<<<<
using NutzCode.CloudFileSystem;
using CrossRef_File_Episode = JMMServer.Entities.CrossRef_File_Episode;
=======
using Path = Pri.LongPath.Path;
using File = Pri.LongPath.File;
using FileInfo = Pri.LongPath.FileInfo;
>>>>>>>
using Path = Pri.LongPath.Path;
using File = Pri.LongPath.File;
using FileInfo = Pri.LongPath.FileInfo;
using NutzCode.CloudFileSystem;
using CrossRef_File_Episode = JMMServer.Entities.CrossRef_File_Episode; |
<<<<<<<
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using NutzCode.CloudFileSystem;
=======
using FluentNHibernate.Utils;
using JMMContracts;
>>>>>>>
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using NutzCode.CloudFileSystem;
using FluentNHibernate.Utils;
using JMMContracts;
<<<<<<<
public static BitmapImage CreateIconImage(this ICloudPlugin plugin)
{
return Application.Current.Dispatcher.Invoke(() =>
{
if (plugin?.Icon == null)
return null;
MemoryStream ms = new MemoryStream(plugin.Icon);
ms.Seek(0, SeekOrigin.Begin);
BitmapImage icon = new BitmapImage();
icon.BeginInit();
icon.StreamSource = ms;
icon.EndInit();
return icon;
});
}
=======
public static Contract_AnimeGroup DeepCopy(this Contract_AnimeGroup c)
{
Contract_AnimeGroup contract = new Contract_AnimeGroup();
contract.AnimeGroupID = c.AnimeGroupID;
contract.AnimeGroupParentID = c.AnimeGroupParentID;
contract.DefaultAnimeSeriesID = c.DefaultAnimeSeriesID;
contract.GroupName = c.GroupName;
contract.Description = c.Description;
contract.IsFave = c.IsFave;
contract.IsManuallyNamed = c.IsManuallyNamed;
contract.UnwatchedEpisodeCount = c.UnwatchedEpisodeCount;
contract.DateTimeUpdated = c.DateTimeUpdated;
contract.WatchedEpisodeCount = c.WatchedEpisodeCount;
contract.SortName = c.SortName;
contract.WatchedDate = c.WatchedDate;
contract.EpisodeAddedDate = c.EpisodeAddedDate;
contract.LatestEpisodeAirDate = c.LatestEpisodeAirDate;
contract.PlayedCount = c.PlayedCount;
contract.WatchedCount = c.WatchedCount;
contract.StoppedCount = c.StoppedCount;
contract.OverrideDescription = c.OverrideDescription;
contract.MissingEpisodeCount = c.MissingEpisodeCount;
contract.MissingEpisodeCountGroups = c.MissingEpisodeCountGroups;
contract.Stat_AirDate_Min = c.Stat_AirDate_Min;
contract.Stat_AirDate_Max = c.Stat_AirDate_Max;
contract.Stat_EndDate = c.Stat_EndDate;
contract.Stat_SeriesCreatedDate = c.Stat_SeriesCreatedDate;
contract.Stat_UserVotePermanent = c.Stat_UserVotePermanent;
contract.Stat_UserVoteTemporary = c.Stat_UserVoteTemporary;
contract.Stat_UserVoteOverall = c.Stat_UserVoteOverall;
contract.Stat_IsComplete = c.Stat_IsComplete;
contract.Stat_HasFinishedAiring = c.Stat_HasFinishedAiring;
contract.Stat_IsCurrentlyAiring = c.Stat_IsCurrentlyAiring;
contract.Stat_HasTvDBLink = c.Stat_HasTvDBLink;
contract.Stat_HasMALLink = c.Stat_HasMALLink;
contract.Stat_HasMovieDBLink = c.Stat_HasMovieDBLink;
contract.Stat_HasMovieDBOrTvDBLink = c.Stat_HasMovieDBOrTvDBLink;
contract.Stat_SeriesCount = c.Stat_SeriesCount;
contract.Stat_EpisodeCount = c.Stat_EpisodeCount;
contract.Stat_AniDBRating = c.Stat_AniDBRating;
contract.ServerPosterPath = c.ServerPosterPath;
contract.SeriesForNameOverride = c.SeriesForNameOverride;
contract.Stat_AllCustomTags = new HashSet<string>(c.Stat_AllCustomTags);
contract.Stat_AllTags = new HashSet<string>(c.Stat_AllTags);
contract.Stat_AllTitles = new HashSet<string>(c.Stat_AllTitles);
contract.Stat_AnimeTypes = new HashSet<string>(c.Stat_AnimeTypes);
contract.Stat_AllVideoQuality = new HashSet<string>(c.Stat_AllVideoQuality);
contract.Stat_AllVideoQuality_Episodes = new HashSet<string>(c.Stat_AllVideoQuality_Episodes);
contract.Stat_AudioLanguages = new HashSet<string>(c.Stat_AudioLanguages);
contract.Stat_SubtitleLanguages = new HashSet<string>(c.Stat_SubtitleLanguages);
return contract;
}
>>>>>>>
public static Contract_AnimeGroup DeepCopy(this Contract_AnimeGroup c)
{
Contract_AnimeGroup contract = new Contract_AnimeGroup();
contract.AnimeGroupID = c.AnimeGroupID;
contract.AnimeGroupParentID = c.AnimeGroupParentID;
contract.DefaultAnimeSeriesID = c.DefaultAnimeSeriesID;
contract.GroupName = c.GroupName;
contract.Description = c.Description;
contract.IsFave = c.IsFave;
contract.IsManuallyNamed = c.IsManuallyNamed;
contract.UnwatchedEpisodeCount = c.UnwatchedEpisodeCount;
contract.DateTimeUpdated = c.DateTimeUpdated;
contract.WatchedEpisodeCount = c.WatchedEpisodeCount;
contract.SortName = c.SortName;
contract.WatchedDate = c.WatchedDate;
contract.EpisodeAddedDate = c.EpisodeAddedDate;
contract.LatestEpisodeAirDate = c.LatestEpisodeAirDate;
contract.PlayedCount = c.PlayedCount;
contract.WatchedCount = c.WatchedCount;
contract.StoppedCount = c.StoppedCount;
contract.OverrideDescription = c.OverrideDescription;
contract.MissingEpisodeCount = c.MissingEpisodeCount;
contract.MissingEpisodeCountGroups = c.MissingEpisodeCountGroups;
contract.Stat_AirDate_Min = c.Stat_AirDate_Min;
contract.Stat_AirDate_Max = c.Stat_AirDate_Max;
contract.Stat_EndDate = c.Stat_EndDate;
contract.Stat_SeriesCreatedDate = c.Stat_SeriesCreatedDate;
contract.Stat_UserVotePermanent = c.Stat_UserVotePermanent;
contract.Stat_UserVoteTemporary = c.Stat_UserVoteTemporary;
contract.Stat_UserVoteOverall = c.Stat_UserVoteOverall;
contract.Stat_IsComplete = c.Stat_IsComplete;
contract.Stat_HasFinishedAiring = c.Stat_HasFinishedAiring;
contract.Stat_IsCurrentlyAiring = c.Stat_IsCurrentlyAiring;
contract.Stat_HasTvDBLink = c.Stat_HasTvDBLink;
contract.Stat_HasMALLink = c.Stat_HasMALLink;
contract.Stat_HasMovieDBLink = c.Stat_HasMovieDBLink;
contract.Stat_HasMovieDBOrTvDBLink = c.Stat_HasMovieDBOrTvDBLink;
contract.Stat_SeriesCount = c.Stat_SeriesCount;
contract.Stat_EpisodeCount = c.Stat_EpisodeCount;
contract.Stat_AniDBRating = c.Stat_AniDBRating;
contract.ServerPosterPath = c.ServerPosterPath;
contract.SeriesForNameOverride = c.SeriesForNameOverride;
contract.Stat_AllCustomTags = new HashSet<string>(c.Stat_AllCustomTags);
contract.Stat_AllTags = new HashSet<string>(c.Stat_AllTags);
contract.Stat_AllTitles = new HashSet<string>(c.Stat_AllTitles);
contract.Stat_AnimeTypes = new HashSet<string>(c.Stat_AnimeTypes);
contract.Stat_AllVideoQuality = new HashSet<string>(c.Stat_AllVideoQuality);
contract.Stat_AllVideoQuality_Episodes = new HashSet<string>(c.Stat_AllVideoQuality_Episodes);
contract.Stat_AudioLanguages = new HashSet<string>(c.Stat_AudioLanguages);
contract.Stat_SubtitleLanguages = new HashSet<string>(c.Stat_SubtitleLanguages);
return contract;
}
public static BitmapImage CreateIconImage(this ICloudPlugin plugin)
{
return Application.Current.Dispatcher.Invoke(() =>
{
if (plugin?.Icon == null)
return null;
MemoryStream ms = new MemoryStream(plugin.Icon);
ms.Seek(0, SeekOrigin.Begin);
BitmapImage icon = new BitmapImage();
icon.BeginInit();
icon.StreamSource = ms;
icon.EndInit();
return icon;
});
} |
<<<<<<<
if (!string.IsNullOrEmpty(anim.AllTags))
{
v.Tags = new List<Tag> { new Tag { Value = anim.AllTags.Replace("|", ",") } };
}
v.Rating = (anim.Rating / 100F).ToString(CultureInfo.InvariantCulture);
v.Year = "" + anim.BeginYear;
=======
List<AnimeSeries> sers = grp.GetAllSeries();
AnimeSeries ser = sers[0];
v.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
>>>>>>>
List<AnimeSeries> sers = grp.GetAllSeries();
AnimeSeries ser = sers[0];
v.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
if (!string.IsNullOrEmpty(anim.AllTags))
{
v.Tags = new List<Tag> { new Tag { Value = anim.AllTags.Replace("|", ",") } };
}
v.Rating = (anim.Rating / 100F).ToString(CultureInfo.InvariantCulture);
v.Year = "" + anim.BeginYear;
<<<<<<<
if (!string.IsNullOrEmpty(anim.AllTags))
{
j.Tags = new List<Tag> { new Tag { Value = anim.AllTags.Replace("|", ",") } };
}
j.Rating = (anim.Rating / 100F).ToString(CultureInfo.InvariantCulture);
j.Year = "" + anim.BeginYear;
=======
j.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
>>>>>>>
j.totalLocal = ser.GetAnimeEpisodesCountWithVideoLocal();
if (!string.IsNullOrEmpty(anim.AllTags))
{
j.Tags = new List<Tag> { new Tag { Value = anim.AllTags.Replace("|", ",") } };
}
j.Rating = (anim.Rating / 100F).ToString(CultureInfo.InvariantCulture);
j.Year = "" + anim.BeginYear; |
<<<<<<<
private static void UpdateSchema_050(int currentVersionNumber)
{
int thisVersion = 50;
if (currentVersionNumber >= thisVersion) return;
if (currentVersionNumber >= thisVersion) return;
logger.Info("Updating schema to VERSION: {0}", thisVersion);
List<string> cmds = new List<string>();
cmds.Add("CREATE TABLE VideoLocal_Place ( VideoLocal_Place_ID int IDENTITY(1,1) NOT NULL, VideoLocalID int NOT NULL, FilePath nvarchar(MAX) NOT NULL, ImportFolderID int NOT NULL, ImportFolderType int NOT NULL, CONSTRAINT [PK_VideoLocal_Place] PRIMARY KEY CLUSTERED ( VideoLocal_Place_ID ASC ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY]");
cmds.Add("ALTER TABLE VideoLocal ADD FileName nvarchar(max) NOT NULL DEFAULT(''), VideoCodec varchar(max) NOT NULL DEFAULT(''), VideoBitrate varchar(max) NOT NULL DEFAULT(''), VideoBitDepth varchar(max) NOT NULL DEFAULT(''), VideoFrameRate varchar(max) NOT NULL DEFAULT(''), VideoResolution varchar(max) NOT NULL DEFAULT(''), AudioCodec varchar(max) NOT NULL DEFAULT(''), AudioBitrate varchar(max) NOT NULL DEFAULT(''),Duration bigint NOT NULL DEFAULT(0)");
cmds.Add("INSERT INTO VideoLocal_Place (VideoLocalID, FilePath, ImportFolderID, ImportFolderType) SELECT VideoLocalID, FilePath, ImportFolderID, 1 as ImportFolderType FROM VideoLocal");
cmds.Add("ALTER TABLE VideoLocal DROP COLUMN FilePath, ImportFolderID");
cmds.Add("UPDATE VideoLocal SET VideoLocal.FileName=VideoInfo.FileName, VideoLocal.VideoCodec=VideoInfo.VideoCodec, VideoLocal.VideoBitrate=VideoInfo.VideoBitrate, VideoLocal.VideoBitDepth=VideoInfo.VideoBitDepth, VideoLocal.VideoFrameRate=VideoInfo.VideoFrameRate,VideoLocal.VideoResolution=VideoInfo.VideoResolution,VideoLocal.AudioCodec=VideoInfo.AudioCodec,VideoLocal.AudioBitrate=VideoInfo.AudioBitrate, VideoLocal.Duration=VideoInfo.Duration FROM VideoLocal INNER JOIN VideoInfo ON VideoLocal.Hash=VideoInfo.Hash");
cmds.Add("CREATE TABLE CloudAccount ( CloudID int IDENTITY(1,1) NOT NULL, ConnectionString nvarchar(MAX) NOT NULL, Provider nvarchar(MAX) NOT NULL, Name nvarchar(MAX) NOT NULL, CONSTRAINT [PK_CloudAccount] PRIMARY KEY CLUSTERED ( CloudID ASC ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]) ON [PRIMARY]");
cmds.Add("ALTER TABLE ImportFolder ADD CloudID int NULL");
cmds.Add("ALTER TABLE VideoLocal_User ALTER COLUMN WatchedDate datetime NULL");
cmds.Add("ALTER TABLE VideoLocal_User ADD ResumePosition bigint NOT NULL DEFAULT (0)");
cmds.Add("DROP TABLE VideoInfo");
using (
SqlConnection tmpConn =
new SqlConnection(string.Format("Server={0};User ID={1};Password={2};database={3}",
ServerSettings.DatabaseServer,
ServerSettings.DatabaseUsername, ServerSettings.DatabasePassword, ServerSettings.DatabaseName)))
{
tmpConn.Open();
foreach (string cmdTable in cmds)
{
using (SqlCommand command = new SqlCommand(cmdTable, tmpConn))
{
try
{
command.ExecuteNonQuery();
}
catch (Exception e)
{
}
}
}
}
UpdateDatabaseVersion(thisVersion);
}
private static void UpdateSchema_051(int currentVersionNumber)
{
int thisVersion = 51;
if (currentVersionNumber >= thisVersion) return;
if (currentVersionNumber >= thisVersion) return;
logger.Info("Updating schema to VERSION: {0}", thisVersion);
List<string> cmds = new List<string>();
//Remove Videolocal Hash unique constraint. Since we use videolocal to store the non hashed files in cloud drop folders. Empty Hash.
cmds.Add("DROP INDEX UIX_VideoLocal_Hash ON Videolocal;");
cmds.Add("CREATE INDEX UIX_VideoLocal_Hash ON VideoLocal(Hash);");
using (
SqlConnection tmpConn =
new SqlConnection(string.Format("Server={0};User ID={1};Password={2};database={3}",
ServerSettings.DatabaseServer,
ServerSettings.DatabaseUsername, ServerSettings.DatabasePassword, ServerSettings.DatabaseName)))
{
tmpConn.Open();
foreach (string cmdTable in cmds)
{
using (SqlCommand command = new SqlCommand(cmdTable, tmpConn))
{
try
{
command.ExecuteNonQuery();
}
catch (Exception e)
{
}
}
}
}
UpdateDatabaseVersion(thisVersion);
}
private static void ExecuteSQLCommands(List<string> cmds)
=======
private void ExecuteSQLCommands(List<string> cmds)
>>>>>>>
private void UpdateSchema_050(int currentVersionNumber)
{
int thisVersion = 50;
if (currentVersionNumber >= thisVersion) return;
if (currentVersionNumber >= thisVersion) return;
logger.Info("Updating schema to VERSION: {0}", thisVersion);
List<string> cmds = new List<string>();
cmds.Add("CREATE TABLE VideoLocal_Place ( VideoLocal_Place_ID int IDENTITY(1,1) NOT NULL, VideoLocalID int NOT NULL, FilePath nvarchar(MAX) NOT NULL, ImportFolderID int NOT NULL, ImportFolderType int NOT NULL, CONSTRAINT [PK_VideoLocal_Place] PRIMARY KEY CLUSTERED ( VideoLocal_Place_ID ASC ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] ) ON [PRIMARY]");
cmds.Add("ALTER TABLE VideoLocal ADD FileName nvarchar(max) NOT NULL DEFAULT(''), VideoCodec varchar(max) NOT NULL DEFAULT(''), VideoBitrate varchar(max) NOT NULL DEFAULT(''), VideoBitDepth varchar(max) NOT NULL DEFAULT(''), VideoFrameRate varchar(max) NOT NULL DEFAULT(''), VideoResolution varchar(max) NOT NULL DEFAULT(''), AudioCodec varchar(max) NOT NULL DEFAULT(''), AudioBitrate varchar(max) NOT NULL DEFAULT(''),Duration bigint NOT NULL DEFAULT(0)");
cmds.Add("INSERT INTO VideoLocal_Place (VideoLocalID, FilePath, ImportFolderID, ImportFolderType) SELECT VideoLocalID, FilePath, ImportFolderID, 1 as ImportFolderType FROM VideoLocal");
cmds.Add("ALTER TABLE VideoLocal DROP COLUMN FilePath, ImportFolderID");
cmds.Add("UPDATE VideoLocal SET VideoLocal.FileName=VideoInfo.FileName, VideoLocal.VideoCodec=VideoInfo.VideoCodec, VideoLocal.VideoBitrate=VideoInfo.VideoBitrate, VideoLocal.VideoBitDepth=VideoInfo.VideoBitDepth, VideoLocal.VideoFrameRate=VideoInfo.VideoFrameRate,VideoLocal.VideoResolution=VideoInfo.VideoResolution,VideoLocal.AudioCodec=VideoInfo.AudioCodec,VideoLocal.AudioBitrate=VideoInfo.AudioBitrate, VideoLocal.Duration=VideoInfo.Duration FROM VideoLocal INNER JOIN VideoInfo ON VideoLocal.Hash=VideoInfo.Hash");
cmds.Add("CREATE TABLE CloudAccount ( CloudID int IDENTITY(1,1) NOT NULL, ConnectionString nvarchar(MAX) NOT NULL, Provider nvarchar(MAX) NOT NULL, Name nvarchar(MAX) NOT NULL, CONSTRAINT [PK_CloudAccount] PRIMARY KEY CLUSTERED ( CloudID ASC ) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]) ON [PRIMARY]");
cmds.Add("ALTER TABLE ImportFolder ADD CloudID int NULL");
cmds.Add("ALTER TABLE VideoLocal_User ALTER COLUMN WatchedDate datetime NULL");
cmds.Add("ALTER TABLE VideoLocal_User ADD ResumePosition bigint NOT NULL DEFAULT (0)");
cmds.Add("DROP TABLE VideoInfo");
using (
SqlConnection tmpConn =
new SqlConnection(string.Format("Server={0};User ID={1};Password={2};database={3}",
ServerSettings.DatabaseServer,
ServerSettings.DatabaseUsername, ServerSettings.DatabasePassword, ServerSettings.DatabaseName)))
{
tmpConn.Open();
foreach (string cmdTable in cmds)
{
using (SqlCommand command = new SqlCommand(cmdTable, tmpConn))
{
try
{
command.ExecuteNonQuery();
}
catch (Exception e)
{
}
}
}
}
UpdateDatabaseVersion(thisVersion);
}
private void UpdateSchema_051(int currentVersionNumber)
{
int thisVersion = 51;
if (currentVersionNumber >= thisVersion) return;
if (currentVersionNumber >= thisVersion) return;
logger.Info("Updating schema to VERSION: {0}", thisVersion);
List<string> cmds = new List<string>();
//Remove Videolocal Hash unique constraint. Since we use videolocal to store the non hashed files in cloud drop folders. Empty Hash.
cmds.Add("DROP INDEX UIX_VideoLocal_Hash ON Videolocal;");
cmds.Add("CREATE INDEX UIX_VideoLocal_Hash ON VideoLocal(Hash);");
using (
SqlConnection tmpConn =
new SqlConnection(string.Format("Server={0};User ID={1};Password={2};database={3}",
ServerSettings.DatabaseServer,
ServerSettings.DatabaseUsername, ServerSettings.DatabasePassword, ServerSettings.DatabaseName)))
{
tmpConn.Open();
foreach (string cmdTable in cmds)
{
using (SqlCommand command = new SqlCommand(cmdTable, tmpConn))
{
try
{
command.ExecuteNonQuery();
}
catch (Exception e)
{
}
}
}
}
UpdateDatabaseVersion(thisVersion);
}
private void ExecuteSQLCommands(List<string> cmds) |
<<<<<<<
$"React has not been loaded correctly: missing ({String.Join(result, ", ")})." +
"Please expose your version of React as global variables named " +
"'React', 'ReactDOM' and 'ReactDOMServer', or enable the 'LoadReact'" +
"configuration option to use the built-in version of React."
=======
"React has not been loaded correctly. Please expose your version of React as global " +
"variables named 'React', 'ReactDOM', and 'ReactDOMServer', or enable the " +
"'LoadReact' configuration option to use the built-in version of React."
>>>>>>>
$"React has not been loaded correctly: missing ({String.Join(result, ", ")})." +
"Please expose your version of React as global variables named " +
"'React', 'ReactDOM', and 'ReactDOMServer', or enable the 'LoadReact'" +
"configuration option to use the built-in version of React." |
<<<<<<<
using Autofac;
=======
using Microsoft.Practices.Unity;
using Newtonsoft.Json;
>>>>>>>
using Autofac;
using Newtonsoft.Json; |
<<<<<<<
var exporters = new List<NVPair>() {
new NVPair(ExporterType.BRSTM, "BRSTM"),
new NVPair(ExporterType.BCSTM, "BCSTM"),
new NVPair(ExporterType.BFSTM, "BFSTM"),
new NVPair(ExporterType.DSP, "DSP"),
new NVPair(ExporterType.IDSP, "IDSP"),
new NVPair(ExporterType.WAV, "WAV"),
new NVPair(ExporterType.FLAC, "FLAC"),
new NVPair(ExporterType.MP3, "MP3"),
new NVPair(ExporterType.OggVorbis, "Ogg Vorbis")
=======
var exporters = new List<NVPair<ExporterType>>() {
new NVPair<ExporterType>(ExporterType.BRSTM, "BRSTM (ADPCM)"),
new NVPair<ExporterType>(ExporterType.BRSTM_PCM16, "BRSTM (PCM16)"),
new NVPair<ExporterType>(ExporterType.BCSTM, "BCSTM (ADPCM)"),
new NVPair<ExporterType>(ExporterType.BFSTM, "BFSTM (ADPCM)"),
new NVPair<ExporterType>(ExporterType.WAV, "WAV"),
new NVPair<ExporterType>(ExporterType.FLAC, "FLAC"),
new NVPair<ExporterType>(ExporterType.MP3, "MP3"),
new NVPair<ExporterType>(ExporterType.AAC_M4A, "AAC (.m4a)"),
new NVPair<ExporterType>(ExporterType.AAC_ADTS, "AAC (ADTS .aac)"),
new NVPair<ExporterType>(ExporterType.OggVorbis, "Ogg Vorbis")
>>>>>>>
var exporters = new List<NVPair<ExporterType>>() {
new NVPair<ExporterType>(ExporterType.BRSTM, "BRSTM"),
new NVPair<ExporterType>(ExporterType.BCSTM, "BCSTM"),
new NVPair<ExporterType>(ExporterType.BFSTM, "BFSTM"),
new NVPair<ExporterType>(ExporterType.DSP, "DSP"),
new NVPair<ExporterType>(ExporterType.IDSP, "IDSP"),
new NVPair<ExporterType>(ExporterType.WAV, "WAV"),
new NVPair<ExporterType>(ExporterType.FLAC, "FLAC"),
new NVPair<ExporterType>(ExporterType.MP3, "MP3"),
new NVPair<ExporterType>(ExporterType.AAC_M4A, "AAC (.m4a)"),
new NVPair<ExporterType>(ExporterType.AAC_ADTS, "AAC (ADTS .aac)"),
new NVPair<ExporterType>(ExporterType.OggVorbis, "Ogg Vorbis")
<<<<<<<
ddlBxstmCodec.DataSource = new BxstmCodec[] {
BxstmCodec.Adpcm,
BxstmCodec.Pcm16Bit,
BxstmCodec.Pcm8Bit
};
var nonLoopingBehaviors = new List<NVPair>() {
new NVPair(NonLoopingBehavior.NoChange, "Keep as non-looping"),
new NVPair(NonLoopingBehavior.ForceLoop, "Force start-to-end loop"),
new NVPair(NonLoopingBehavior.AskAll, "Ask for all files")
=======
var nonLoopingBehaviors = new List<NVPair<NonLoopingBehavior>>() {
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.NoChange, "Keep as non-looping"),
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.ForceLoop, "Force start-to-end loop"),
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.AskAll, "Ask for all files")
>>>>>>>
ddlBxstmCodec.DataSource = new BxstmCodec[] {
BxstmCodec.Adpcm,
BxstmCodec.Pcm16Bit,
BxstmCodec.Pcm8Bit
};
var nonLoopingBehaviors = new List<NVPair<NonLoopingBehavior>>() {
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.NoChange, "Keep as non-looping"),
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.ForceLoop, "Force start-to-end loop"),
new NVPair<NonLoopingBehavior>(NonLoopingBehavior.AskAll, "Ask for all files")
<<<<<<<
ddlBxstmCodec.SelectedValue = o.BxstmCodec;
=======
encodingParameters[ExporterType.AAC_M4A] = o.AACEncodingParameters;
>>>>>>>
encodingParameters[ExporterType.AAC_M4A] = o.AACEncodingParameters;
ddlBxstmCodec.SelectedValue = o.BxstmCodec;
<<<<<<<
BxstmCodec = (BxstmCodec)ddlBxstmCodec.SelectedValue,
=======
AACEncodingParameters = encodingParameters[ExporterType.AAC_M4A],
>>>>>>>
AACEncodingParameters = encodingParameters[ExporterType.AAC_M4A],
BxstmCodec = (BxstmCodec)ddlBxstmCodec.SelectedValue, |
<<<<<<<
public static async Task RunAsync(Options o) {
=======
public static void Run(Options o, bool showEndDialog = true) {
>>>>>>>
public static async Task RunAsync(Options o, bool showEndDialog = true) {
<<<<<<<
new VGMImporter(ConfigurationManager.AppSettings["vgmplay_path"]),
=======
new VGMImporter(ConfigurationManager.AppSettings["vgmplay_path"] ?? ConfigurationManager.AppSettings["vgm2wav_path"]),
new MSU1(),
>>>>>>>
new VGMImporter(ConfigurationManager.AppSettings["vgmplay_path"]),
new MSU1(),
<<<<<<<
async Task Encode() {
var row = window.AddEncodingRow(toExport.Name);
try {
await exporter.WriteFileAsync(toExport.Audio, outputDir, toExport.Name);
exported.Enqueue(toExport.Name);
} finally {
for (int j = 0; j < claims; j++) {
sem.Release();
}
row.Remove();
=======
var row = window.AddEncodingRow(toExport.Name);
//if (o.NumSimulTasks == 1) {
// exporter.WriteFile(toExport.LWAV, outputDir, toExport.Name);
// lock (exported) {
// exported.Add(toExport.Name);
// }
// for (int j = 0; j < claims; j++) {
// sem.Release();
// }
// row.Remove();
//} else {
Task task = new Task(() => exporter.WriteFile(toExport.LWAV, outputDir, toExport.Name));
task.Start();
tasks.Add(task);
tasks.Add(task.ContinueWith(t => {
lock (exported) {
exported.Add(toExport.Name);
}
for (int j = 0; j < claims; j++) {
sem.Release();
>>>>>>>
async Task Encode() {
var row = window.AddEncodingRow(toExport.Name);
try {
await exporter.WriteFileAsync(toExport.Audio, outputDir, toExport.Name);
exported.Enqueue(toExport.Name);
} finally {
for (int j = 0; j < claims; j++) {
sem.Release();
}
row.Remove(); |
<<<<<<<
case "BxstmCodec":
o.BxstmCodec = (BxstmCodec)Enum.Parse(typeof(BxstmCodec), v, true);
break;
=======
case nameof(o.AACEncodingParameters):
o.AACEncodingParameters = v;
break;
>>>>>>>
case nameof(o.AACEncodingParameters):
o.AACEncodingParameters = v;
break;
case "BxstmCodec":
o.BxstmCodec = (BxstmCodec)Enum.Parse(typeof(BxstmCodec), v, true);
break;
<<<<<<<
if (o.BxstmCodec != null) sw.WriteLine("BxstmCodec=" + o.BxstmCodec);
=======
if (o.AACEncodingParameters != null) sw.WriteLine(nameof(o.AACEncodingParameters) + "=" + o.AACEncodingParameters);
>>>>>>>
if (o.AACEncodingParameters != null) sw.WriteLine(nameof(o.AACEncodingParameters) + "=" + o.AACEncodingParameters);
if (o.BxstmCodec != null) sw.WriteLine("BxstmCodec=" + o.BxstmCodec); |
<<<<<<<
internal override void CopyToUnchecked(VectorStorage<T> target, bool skipClearing = false)
=======
public override bool Equals(VectorStorage<T> other)
{
// Reject equality when the argument is null or has a different shape.
if (other == null || Length != other.Length)
{
return false;
}
// Accept if the argument is the same object as this.
if (ReferenceEquals(this, other))
{
return true;
}
var otherSparse = other as SparseVectorStorage<T>;
if (otherSparse == null)
{
return base.Equals(other);
}
int i = 0, j = 0;
while (i < ValueCount || j < otherSparse.ValueCount)
{
if (j >= otherSparse.ValueCount || i < ValueCount && Indices[i] < otherSparse.Indices[j])
{
if (!_zero.Equals(Values[i++]))
{
return false;
}
continue;
}
if (i >= ValueCount || j < otherSparse.ValueCount && otherSparse.Indices[j] < Indices[i])
{
if (!_zero.Equals(otherSparse.Values[j++]))
{
return false;
}
continue;
}
if (!Values[i].Equals(otherSparse.Values[j]))
{
return false;
}
i++;
j++;
}
return true;
}
/// <remarks>Parameters assumed to be validated already.</remarks>
public override void CopyTo(VectorStorage<T> target, bool skipClearing = false)
>>>>>>>
public override bool Equals(VectorStorage<T> other)
{
// Reject equality when the argument is null or has a different shape.
if (other == null || Length != other.Length)
{
return false;
}
// Accept if the argument is the same object as this.
if (ReferenceEquals(this, other))
{
return true;
}
var otherSparse = other as SparseVectorStorage<T>;
if (otherSparse == null)
{
return base.Equals(other);
}
int i = 0, j = 0;
while (i < ValueCount || j < otherSparse.ValueCount)
{
if (j >= otherSparse.ValueCount || i < ValueCount && Indices[i] < otherSparse.Indices[j])
{
if (!_zero.Equals(Values[i++]))
{
return false;
}
continue;
}
if (i >= ValueCount || j < otherSparse.ValueCount && otherSparse.Indices[j] < Indices[i])
{
if (!_zero.Equals(otherSparse.Values[j++]))
{
return false;
}
continue;
}
if (!Values[i].Equals(otherSparse.Values[j]))
{
return false;
}
i++;
j++;
}
return true;
}
internal override void CopyToUnchecked(VectorStorage<T> target, bool skipClearing = false) |
<<<<<<<
[SerializeField]
protected Vector2 m_localScaling = Vector2.one;
public Vector2 LocalScaling
{
get { return m_localScaling; }
set
{
m_localScaling = value;
if (collisionShapePtr != null)
{
((CylinderShape)collisionShapePtr).LocalScaling = new Vector3(value.x, value.y, value.x).ToBullet();
}
}
}
=======
>>>>>>>
<<<<<<<
UnityEngine.Vector3 scale = new Vector3(m_localScaling.x, m_localScaling.y, m_localScaling.x);
BUtility.DebugDrawCylinder(position, rotation, scale, halfExtent.x, HalfExtent.y, 1, Color.yellow);
=======
BUtility.DebugDrawCylinder(position, rotation, LocalScaling, halfExtent.x, halfExtent.y, 1, Color.yellow);
>>>>>>>
BUtility.DebugDrawCylinder(position, rotation, LocalScaling, halfExtent.x, halfExtent.y, 1, Color.yellow); |
<<<<<<<
_colorHelpBuilder = new ColorHelpBuilder(_console);
_output = output;
=======
_rawHelpBuilder = new ColorHelpBuilder(_console);
>>>>>>>
_colorHelpBuilder = new ColorHelpBuilder(_console);
<<<<<<<
_console.ResetColorCalls.Should().Be(2);
=======
_console.Output.Should().Contain("\t");
>>>>>>>
_console.ResetColorCalls.Should().Be(2);
<<<<<<<
_console.ResetColorCalls.Should().Be(3);
=======
>>>>>>>
_console.ResetColorCalls.Should().Be(3);
<<<<<<<
_console.ResetColorCalls.Should().Be(3);
=======
>>>>>>>
_console.ResetColorCalls.Should().Be(3);
<<<<<<<
_console.ResetColorCalls.Should().Be(3);
=======
>>>>>>>
_console.ResetColorCalls.Should().Be(3);
<<<<<<<
_console.ResetColorCalls.Should().Be(4);
=======
>>>>>>>
_console.ResetColorCalls.Should().Be(4); |
<<<<<<<
using static CommandLine.Create;
using Xunit.Abstractions;
=======
using static Microsoft.DotNet.Cli.CommandLine.Create;
>>>>>>>
using Xunit.Abstractions;
using static Microsoft.DotNet.Cli.CommandLine.Create; |
<<<<<<<
using System;
using System.Collections.Generic;
=======
using ChartJs.Blazor.Interop;
>>>>>>>
using System;
using System.Collections.Generic;
using ChartJs.Blazor.Interop;
<<<<<<<
/// <summary>
/// Gets or sets the animation-configuration for this chart.
/// </summary>
public Animation Animation { get; set; }
/// <summary>
/// Gets the plugin options. The key has to be the unique
/// identification of the plugin.
/// <para>
/// Reference for chart.js plugin options:
/// <a href="https://www.chartjs.org/docs/latest/developers/plugins.html#plugin-options"/>
/// </para>
/// </summary>
public Dictionary<string, object> Plugins { get; } = new Dictionary<string, object>();
public IClickHandler OnClick { get; set; }
=======
/// <summary>
/// Gets or sets the browser events that the chart should listen to for tooltips and hovering.
/// <para>
/// If <see langword="null"/>, this includes <see cref="BrowserEvent.MouseMove"/>, <see cref="BrowserEvent.MouseOut"/>,
/// <see cref="BrowserEvent.Click"/>, <see cref="BrowserEvent.TouchStart"/> and <see cref="BrowserEvent.TouchMove"/>.
/// </para>
/// </summary>
public BrowserEvent[] Events { get; set; }
/// <summary>
/// Gets or sets the callback to call when an event of type <see cref="BrowserEvent.MouseUp"/> or
/// <see cref="BrowserEvent.Click"/> fires on the chart.
/// Called in the context of the chart and passed the event and an array of active elements.
/// <para>See <see cref="JavaScriptHandler{T}"/> and <see cref="DelegateHandler{T}"/>.</para>
/// </summary>
public IMethodHandler<ChartMouseEvent> OnClick { get; set; }
>>>>>>>
/// <summary>
/// Gets or sets the animation-configuration for this chart.
/// </summary>
public Animation Animation { get; set; }
/// <summary>
/// Gets the plugin options. The key has to be the unique
/// identification of the plugin.
/// <para>
/// Reference for chart.js plugin options:
/// <a href="https://www.chartjs.org/docs/latest/developers/plugins.html#plugin-options"/>
/// </para>
/// </summary>
public Dictionary<string, object> Plugins { get; } = new Dictionary<string, object>();
/// Gets or sets the browser events that the chart should listen to for tooltips and hovering.
/// <para>
/// If <see langword="null"/>, this includes <see cref="BrowserEvent.MouseMove"/>, <see cref="BrowserEvent.MouseOut"/>,
/// <see cref="BrowserEvent.Click"/>, <see cref="BrowserEvent.TouchStart"/> and <see cref="BrowserEvent.TouchMove"/>.
/// </para>
/// </summary>
public BrowserEvent[] Events { get; set; }
/// <summary>
/// Gets or sets the callback to call when an event of type <see cref="BrowserEvent.MouseUp"/> or
/// <see cref="BrowserEvent.Click"/> fires on the chart.
/// Called in the context of the chart and passed the event and an array of active elements.
/// <para>See <see cref="JavaScriptHandler{T}"/> and <see cref="DelegateHandler{T}"/>.</para>
/// </summary>
public IMethodHandler<ChartMouseEvent> OnClick { get; set; } |
<<<<<<<
public async Task<IHttpActionResult> GetNewAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetAssociatedActiveOrganizationsAsync(_organizationRepository);
if (organizations.Count == 0)
=======
public async Task<IHttpActionResult> NewAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
>>>>>>>
public async Task<IHttpActionResult> GetNewAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
<<<<<<<
public async Task<IHttpActionResult> GetRecentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetAssociatedActiveOrganizationsAsync(_organizationRepository);
if (organizations.Count == 0)
=======
public async Task<IHttpActionResult> RecentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
>>>>>>>
public async Task<IHttpActionResult> GetRecentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
<<<<<<<
public async Task<IHttpActionResult> GetFrequentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetAssociatedActiveOrganizationsAsync(_organizationRepository);
if (organizations.Count == 0)
=======
public async Task<IHttpActionResult> FrequentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
>>>>>>>
public async Task<IHttpActionResult> GetFrequentAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
<<<<<<<
public async Task<IHttpActionResult> GetUsersAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetAssociatedActiveOrganizationsAsync(_organizationRepository);
if (organizations.Count == 0)
=======
public async Task<IHttpActionResult> UsersAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0)
>>>>>>>
public async Task<IHttpActionResult> GetUsersAsync(string filter = null, string time = null, string offset = null, string mode = null, int page = 1, int limit = 10) {
var organizations = await GetSelectedOrganizationsAsync(_organizationRepository, _projectRepository, _stackRepository, filter);
if (organizations.Count(o => !o.IsSuspended) == 0) |
<<<<<<<
pw.DebugDrawMode = (BulletSharp.DebugDrawModes) EditorGUILayout.EnumPopup("Debug Draw Mode", pw.DebugDrawMode);
EditorGUILayout.Separator();
pw.gravity = EditorGUILayout.Vector3Field("Gravity", pw.gravity);
EditorGUILayout.Separator();
pw.collisionType = (BDynamicsWorld.CollisionConfType)EditorGUILayout.EnumPopup("Collision Type", pw.collisionType);
pw.broadphaseType = (BDynamicsWorld.BroadphaseType) EditorGUILayout.EnumPopup("Broadphase Algorithm", pw.broadphaseType);
pw.axis3SweepBroadphaseMin = EditorGUILayout.Vector3Field("Broadphase Axis 3 Sweep Min", pw.axis3SweepBroadphaseMin);
pw.axis3SweepBroadphaseMax = EditorGUILayout.Vector3Field("Broadphase Axis 3 Sweep Max", pw.axis3SweepBroadphaseMax);
=======
pw.DebugDrawMode = (BulletSharp.DebugDrawModes)EditorGUILayout.EnumMaskField("Debug Draw Mode", pw.DebugDrawMode);
>>>>>>>
pw.DebugDrawMode = (BulletSharp.DebugDrawModes)EditorGUILayout.EnumMaskField("Debug Draw Mode", pw.DebugDrawMode);
EditorGUILayout.Separator();
pw.gravity = EditorGUILayout.Vector3Field("Gravity", pw.gravity);
EditorGUILayout.Separator();
pw.collisionType = (BDynamicsWorld.CollisionConfType)EditorGUILayout.EnumPopup("Collision Type", pw.collisionType);
pw.broadphaseType = (BDynamicsWorld.BroadphaseType) EditorGUILayout.EnumPopup("Broadphase Algorithm", pw.broadphaseType);
pw.axis3SweepBroadphaseMin = EditorGUILayout.Vector3Field("Broadphase Axis 3 Sweep Min", pw.axis3SweepBroadphaseMin);
pw.axis3SweepBroadphaseMax = EditorGUILayout.Vector3Field("Broadphase Axis 3 Sweep Max", pw.axis3SweepBroadphaseMax); |
<<<<<<<
if (!response.IsValid) {
Logger.Error().Message("Retrieving stats failed: {0}", response.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
=======
if (!res.IsValid) {
_logger.Error().Message("Retrieving term stats failed: {0}", res.ServerError.Error).Write();
throw new ApplicationException("Retrieving term stats failed.");
>>>>>>>
if (!response.IsValid) {
_logger.Error().Message("Retrieving stats failed: {0}", response.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
<<<<<<<
if (!response.IsValid) {
Logger.Error().Message("Retrieving stats failed: {0}", response.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
=======
if (!res.IsValid) {
_logger.Error().Message("Retrieving term stats failed: {0}", res.ServerError.Error).Write();
throw new ApplicationException("Retrieving term stats failed.");
>>>>>>>
if (!response.IsValid) {
_logger.Error().Message("Retrieving stats failed: {0}", response.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
<<<<<<<
private AggregationDescriptor<PersistentEvent> BuildAggregations(AggregationDescriptor<PersistentEvent> aggregation, IEnumerable<FieldAggregation> fields) {
foreach (var field in fields) {
string defaultValueScript = $"doc['{field.Field}'].empty ? 0 : doc['{field.Field}'].value";
switch (field.Type) {
case FieldAggregationType.Average:
aggregation.Average(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Distinct:
aggregation.Cardinality(field.Key, a => a.Script(defaultValueScript).PrecisionThreshold(100));
break;
case FieldAggregationType.Sum:
aggregation.Sum(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Min:
aggregation.Min(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Max:
aggregation.Max(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Last:
// TODO: Populate with the last value.
break;
case FieldAggregationType.Term:
var termField = field as TermFieldAggregation;
if (termField == null)
throw new InvalidOperationException("term aggregation must be of type TermFieldAggregation");
aggregation.Terms(field.Key, t => {
var tad = t.Field(field.Field);
if (!String.IsNullOrEmpty(termField.ExcludePattern))
tad.Exclude(termField.ExcludePattern);
if (!String.IsNullOrEmpty(termField.IncludePattern))
tad.Include(termField.IncludePattern);
return tad;
});
break;
default:
throw new InvalidOperationException($"Unknown FieldAggregation type: {field.Type}");
}
=======
public async Task<EventStatsResult> GetOccurrenceStatsAsync(DateTime utcStart, DateTime utcEnd, string systemFilter, string userFilter = null, TimeSpan? displayTimeOffset = null, int desiredDataPoints = 100) {
if (!displayTimeOffset.HasValue)
displayTimeOffset = TimeSpan.Zero;
var filter = new ElasticQuery()
.WithSystemFilter(systemFilter)
.WithFilter(userFilter)
.WithDateRange(utcStart, utcEnd, EventIndex.Fields.PersistentEvent.Date)
.WithIndices(utcStart, utcEnd, $"'{_eventIndex.VersionedName}-'yyyyMM");
// if no start date then figure out first event date
if (!filter.DateRanges.First().UseStartDate)
await UpdateFilterStartDateRangesAsync(filter, utcEnd).AnyContext();
utcStart = filter.DateRanges.First().GetStartDate();
utcEnd = filter.DateRanges.First().GetEndDate();
var interval = GetInterval(utcStart, utcEnd, desiredDataPoints);
var res = await _elasticClient.SearchAsync<PersistentEvent>(s => s
.SearchType(SearchType.Count)
.IgnoreUnavailable()
.Index(filter.Indices.Count > 0 ? String.Join(",", filter.Indices) : _eventIndex.AliasName)
.Query(_queryBuilder.BuildQuery<PersistentEvent>(filter))
.Aggregations(agg => agg
.DateHistogram("timelime", t => t
.Field(ev => ev.Date)
.MinimumDocumentCount(0)
.Interval(interval.Item1)
.TimeZone(HoursAndMinutes(displayTimeOffset.Value))
.Aggregations(agg2 => agg2
.Cardinality("tl_unique", u => u
.Field(ev => ev.StackId)
.PrecisionThreshold(100)
)
.Terms("tl_new", u => u
.Field(ev => ev.IsFirstOccurrence)
.Exclude("F")
)
)
)
.Cardinality("unique", u => u
.Field(ev => ev.StackId)
.PrecisionThreshold(100)
)
.Terms("new", u => u
.Field(ev => ev.IsFirstOccurrence)
.Exclude("F")
)
.Min("first_occurrence", t => t.Field(ev => ev.Date))
.Max("last_occurrence", t => t.Field(ev => ev.Date))
)
).AnyContext();
if (!res.IsValid) {
_logger.Error().Message("Retrieving stats failed: {0}", res.ServerError.Error).Write();
throw new ApplicationException("Retrieving stats failed.");
>>>>>>>
private AggregationDescriptor<PersistentEvent> BuildAggregations(AggregationDescriptor<PersistentEvent> aggregation, IEnumerable<FieldAggregation> fields) {
foreach (var field in fields) {
string defaultValueScript = $"doc['{field.Field}'].empty ? 0 : doc['{field.Field}'].value";
switch (field.Type) {
case FieldAggregationType.Average:
aggregation.Average(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Distinct:
aggregation.Cardinality(field.Key, a => a.Script(defaultValueScript).PrecisionThreshold(100));
break;
case FieldAggregationType.Sum:
aggregation.Sum(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Min:
aggregation.Min(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Max:
aggregation.Max(field.Key, a => a.Script(defaultValueScript));
break;
case FieldAggregationType.Last:
// TODO: Populate with the last value.
break;
case FieldAggregationType.Term:
var termField = field as TermFieldAggregation;
if (termField == null)
throw new InvalidOperationException("term aggregation must be of type TermFieldAggregation");
aggregation.Terms(field.Key, t => {
var tad = t.Field(field.Field);
if (!String.IsNullOrEmpty(termField.ExcludePattern))
tad.Exclude(termField.ExcludePattern);
if (!String.IsNullOrEmpty(termField.IncludePattern))
tad.Include(termField.IncludePattern);
return tad;
});
break;
default:
throw new InvalidOperationException($"Unknown FieldAggregation type: {field.Type}");
} |
<<<<<<<
Logger.Info().Message("Sending daily summary: users={0} project={1}", users.Count, project.Id).Write();
=======
_logger.Info().Message("Sending daily summary: users={0} project={1}", users.Count, project.Id).Write();
//var paging = new PagingOptions { Limit = 5 };
//List<Stack> newest = (await _stackRepository.GetNewAsync(project.Id, data.UtcStartTime, data.UtcEndTime, paging).AnyContext()).Documents.ToList();
var newest = new List<Stack>();
>>>>>>>
_logger.Info().Message("Sending daily summary: users={0} project={1}", users.Count, project.Id).Write(); |
<<<<<<<
_metricsClient.DisplayStats();
var fields = FieldAggregationProcessor.Process("distinct:stack_id,term:is_first_occurrence:-F", false);
Assert.True(fields.IsValid);
Assert.Equal(2, fields.Aggregations.Count);
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null, userFilter: "project:" + TestConstants.ProjectId);
=======
var result = await _stats.GetOccurrenceStatsAsync(startDate, DateTime.UtcNow, null, userFilter: "project:" + TestConstants.ProjectId);
>>>>>>>
var fields = FieldAggregationProcessor.Process("distinct:stack_id,term:is_first_occurrence:-F", false);
Assert.True(fields.IsValid);
Assert.Equal(2, fields.Aggregations.Count);
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null, userFilter: "project:" + TestConstants.ProjectId);
<<<<<<<
_metricsClient.DisplayStats();
var fields = FieldAggregationProcessor.Process("distinct:stack_id,term:is_first_occurrence:-F", false);
Assert.True(fields.IsValid);
Assert.Equal(2, fields.Aggregations.Count);
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, DateTime.MinValue, DateTime.MaxValue, null, userFilter: "project:" + TestConstants.ProjectId);
=======
var result = await _stats.GetOccurrenceStatsAsync(DateTime.MinValue, DateTime.MaxValue, null, userFilter: "project:" + TestConstants.ProjectId);
>>>>>>>
var fields = FieldAggregationProcessor.Process("distinct:stack_id,term:is_first_occurrence:-F", false);
Assert.True(fields.IsValid);
Assert.Equal(2, fields.Aggregations.Count);
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, DateTime.MinValue, DateTime.MaxValue, null, userFilter: "project:" + TestConstants.ProjectId);
<<<<<<<
_metricsClient.DisplayStats();
var fields = FieldAggregationProcessor.Process("distinct:stack_id", false);
Assert.True(fields.IsValid);
Assert.Equal(1, fields.Aggregations.Count);
var resultUtc = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null);
=======
var resultUtc = await _stats.GetOccurrenceStatsAsync(startDate, DateTime.UtcNow, null);
>>>>>>>
var fields = FieldAggregationProcessor.Process("distinct:stack_id", false);
Assert.True(fields.IsValid);
Assert.Equal(1, fields.Aggregations.Count);
var resultUtc = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null);
<<<<<<<
_metricsClient.DisplayStats();
=======
var result = await _stats.GetSessionTermsStatsAsync(startDate, DateTime.UtcNow, null);
Assert.Equal(3, result.Sessions);
Assert.Equal(3, result.Terms.Sum(t => t.Sessions));
Assert.Equal(3, result.Users);
Assert.Equal((decimal)(3600.0 / result.Sessions), result.AvgDuration);
Assert.Equal(3, result.Terms.Count);
foreach (var term in result.Terms)
Assert.Equal(term.Sessions, term.Timeline.Sum(t => t.Sessions));
}
>>>>>>>
<<<<<<<
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null, "type:session");
Assert.Equal(3, result.Total);
Assert.Equal(3, result.Timeline.Sum(t => t.Total));
Assert.Equal(3, result.Numbers[1]);
Assert.Equal(3, result.Timeline.Sum(t => t.Numbers[1]));
Assert.Equal(3600.0 / result.Total, result.Numbers[0]);
Assert.Equal(3600, result.Timeline.Sum(t => t.Numbers[0]));
=======
var startDate = DateTime.UtcNow.SubtractHours(1);
await CreateSessionEventsAsync();
var result = await _stats.GetSessionStatsAsync(startDate, DateTime.UtcNow, null);
Assert.Equal(3, result.Sessions);
Assert.Equal(3, result.Timeline.Sum(t => t.Sessions));
Assert.Equal(3, result.Users);
Assert.Equal(3, result.Timeline.Sum(t => t.Users));
Assert.Equal((decimal)(3600.0 / result.Sessions), result.AvgDuration);
Assert.Equal(3600, result.Timeline.Sum(t => t.AvgDuration));
>>>>>>>
var result = await _stats.GetNumbersTimelineStatsAsync(fields.Aggregations, startDate, DateTime.UtcNow, null, "type:session");
Assert.Equal(3, result.Total);
Assert.Equal(3, result.Timeline.Sum(t => t.Total));
Assert.Equal(3, result.Numbers[1]);
Assert.Equal(3, result.Timeline.Sum(t => t.Numbers[1]));
Assert.Equal(3600.0 / result.Total, result.Numbers[0]);
Assert.Equal(3600, result.Timeline.Sum(t => t.Numbers[0])); |
<<<<<<<
[assembly: Exceptionless("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw", ServerUrl = "http://localhost:50000")]
=======
[assembly: Exceptionless("e3d51ea621464280bbcb79c11fd6483e", EnableSSL = false, ServerUrl = "http://localhost:50000")]
>>>>>>>
[assembly: Exceptionless("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw", EnableSSL = false, ServerUrl = "http://localhost:50000")] |
<<<<<<<
using Exceptionless.Plugins.Default;
=======
using Exceptionless.Insulation.Redis;
>>>>>>>
using Exceptionless.Plugins.Default;
using Exceptionless.Insulation.Redis; |
<<<<<<<
if (settings.EnableMetricsReporting && String.Equals(settings.MetricsReportingStrategy, "AppMetrics", StringComparison.OrdinalIgnoreCase)) {
builder = builder.UseMetrics();
}
return builder;
=======
if (!String.IsNullOrEmpty(Settings.Current.ApplicationInsightsKey))
builder.UseApplicationInsights(Settings.Current.ApplicationInsightsKey);
return builder;
>>>>>>>
if (!String.IsNullOrEmpty(Settings.Current.ApplicationInsightsKey))
builder.UseApplicationInsights(Settings.Current.ApplicationInsightsKey);
if (settings.EnableMetricsReporting && String.Equals(settings.MetricsReportingStrategy, "AppMetrics", StringComparison.OrdinalIgnoreCase))
builder = builder.UseMetrics();
return builder; |
<<<<<<<
var filter = Query<PersistentEvent>.DateRange(r => r.Field(e => e.Date).LessThan(utcCutoffDate));
return RemoveAllAsync(new ExceptionlessQuery().WithOrganizationId(organizationId).WithElasticFilter(filter), false);
=======
var filter = Filter<PersistentEvent>.Range(r => r.OnField(e => e.Date).Lower(utcCutoffDate));
return RemoveAllAsync(new ExceptionlessQuery().WithOrganizationId(organizationId).WithElasticFilter(filter).IncludeDeleted(), false);
}
public override Task<long> RemoveAllByOrganizationIdAsync(string organizationId) {
if (String.IsNullOrEmpty(organizationId))
throw new ArgumentNullException(nameof(organizationId));
var query = new ExceptionlessQuery().WithOrganizationId(organizationId);
return PatchAllAsync(query, new { is_deleted = true, updated_utc = SystemClock.UtcNow });
}
public override Task<long> RemoveAllByProjectIdAsync(string organizationId, string projectId) {
if (String.IsNullOrEmpty(organizationId))
throw new ArgumentNullException(nameof(organizationId));
if (String.IsNullOrEmpty(projectId))
throw new ArgumentNullException(nameof(projectId));
var query = new ExceptionlessQuery().WithOrganizationId(organizationId).WithProjectId(projectId);
return PatchAllAsync(query, new { is_deleted = true, updated_utc = SystemClock.UtcNow });
>>>>>>>
var filter = Query<PersistentEvent>.DateRange(r => r.Field(e => e.Date).LessThan(utcCutoffDate));
return RemoveAllAsync(new ExceptionlessQuery().WithOrganizationId(organizationId).WithElasticFilter(filter).IncludeDeleted(), false);
}
public override Task<long> RemoveAllByOrganizationIdAsync(string organizationId) {
if (String.IsNullOrEmpty(organizationId))
throw new ArgumentNullException(nameof(organizationId));
var query = new ExceptionlessQuery().WithOrganizationId(organizationId);
return PatchAllAsync(query, new { is_deleted = true, updated_utc = SystemClock.UtcNow });
}
public override Task<long> RemoveAllByProjectIdAsync(string organizationId, string projectId) {
if (String.IsNullOrEmpty(organizationId))
throw new ArgumentNullException(nameof(organizationId));
if (String.IsNullOrEmpty(projectId))
throw new ArgumentNullException(nameof(projectId));
var query = new ExceptionlessQuery().WithOrganizationId(organizationId).WithProjectId(projectId);
return PatchAllAsync(query, new { is_deleted = true, updated_utc = SystemClock.UtcNow });
<<<<<<<
public Task<FindResults<PersistentEvent>> GetByFilterAsync(IExceptionlessSystemFilterQuery systemFilter, string userFilter, string sort, string field, DateTime utcStart, DateTime utcEnd, PagingOptions paging) {
=======
public Task<FindResults<PersistentEvent>> GetByFilterAsync(IExceptionlessSystemFilterQuery systemFilter, string userFilter, SortingOptions sorting, string field, DateTime utcStart, DateTime utcEnd, PagingOptions paging) {
if (sorting.Fields.Count == 0)
sorting.Fields.Add(new FieldSort { Field = EventIndexType.Fields.Date, Order = SortOrder.Descending });
>>>>>>>
public Task<FindResults<PersistentEvent>> GetByFilterAsync(IExceptionlessSystemFilterQuery systemFilter, string userFilter, string sort, string field, DateTime utcStart, DateTime utcEnd, PagingOptions paging) { |
<<<<<<<
using Exceptionless.Insulation.Metrics;
=======
using Exceptionless.Web.Utility;
using Microsoft.ApplicationInsights.Extensibility;
>>>>>>>
using Exceptionless.Web.Utility;
using Microsoft.ApplicationInsights.Extensibility;
using Exceptionless.Insulation.Metrics; |
<<<<<<<
// SharpZipLibrary samples
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
=======
// SharpZipLib samples
// Copyright (c) 2007, AlphaSierraPapa
>>>>>>>
// SharpZipLib samples
// Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team |
<<<<<<<
if (hit != null) touch.Target = hit.Transform;
if (touchBeganInvoker != null)
touchBeganInvoker.InvokeHandleExceptions(this, new TouchLayerEventArgs(touch));
=======
if (hit.Transform != null) touch.Target = hit.Transform;
touchBeganInvoker.InvokeHandleExceptions(this, new TouchLayerEventArgs(touch));
>>>>>>>
if (hit.Transform != null) touch.Target = hit.Transform;
if (touchBeganInvoker != null)
touchBeganInvoker.InvokeHandleExceptions(this, new TouchLayerEventArgs(touch));
<<<<<<<
=======
>>>>>>> |
<<<<<<<
private ITouchHit hit;
private bool isDirty = false;
=======
private Dictionary<string, System.Object> properties;
>>>>>>>
private ITouchHit hit;
private bool isDirty = false;
private Dictionary<string, System.Object> properties; |
<<<<<<<
ITouch BeginTouch(Vector2 position, Tags tags);
=======
/// <summary>
/// Registers a touch with global Touch Manager.
/// <seealso cref="ITouch"/>
/// </summary>
/// <param name="position">Screen position of the touch.</param>
/// <param name="tags">Initial tags.</param>
/// <returns>Internal id of the new touch.</returns>
int BeginTouch(Vector2 position, Tags tags);
/// <summary>
/// Registers a touch with global Touch Manager.
/// <seealso cref="ITouch"/>
/// </summary>
/// <param name="position">Screen position of the touch.</param>
/// <param name="tags">Initial tags.</param>
/// <param name="properties">Initial properties.</param>
/// <returns>Internal id of the new touch.</returns>
int BeginTouch(Vector2 position, Tags tags, IDictionary<string, System.Object> properties);
>>>>>>>
/// <summary>
/// Registers a touch with global Touch Manager.
/// <seealso cref="ITouch"/>
/// </summary>
/// <param name="position">Screen position of the touch.</param>
/// <param name="tags">Initial tags.</param>
/// <returns>Internal id of the new touch.</returns>
ITouch BeginTouch(Vector2 position, Tags tags); |
<<<<<<<
protected override ITouch beginTouch(Vector2 position)
=======
/// <inheritdoc />
protected override int beginTouch(Vector2 position)
>>>>>>>
/// <inheritdoc />
protected override ITouch beginTouch(Vector2 position) |
<<<<<<<
/// <inheritdoc />
public TouchLayer Layer { get; internal set; }
/// <inheritdoc />
=======
>>>>>>>
/// <inheritdoc />
public TouchLayer Layer { get; internal set; }
/// <inheritdoc />
<<<<<<<
private ITouchHit hit;
private bool isDirty;
=======
private ProjectionParams projection;
>>>>>>>
private ITouchHit hit;
private bool isDirty;
private ProjectionParams projection;
<<<<<<<
internal void INTERNAL_ResetPosition()
=======
internal void NewFrame()
>>>>>>>
internal void INTERNAL_ResetPosition() |
<<<<<<<
private ColumnHeader columnHeader1;
private ColumnHeader columnHeader3;
private ColumnHeader columnHeader2;
private ColumnHeader columnHeader4;
private Label passwordPreview;
private global::Sequencer.Forms.SubstitutionListControl substitutionList1;
private StrengthBar strengthBar;
=======
private ProgressBar strengthBar;
private SubstitutionListControl substitutionList1;
>>>>>>>
private SubstitutionListControl substitutionList1;
private StrengthBar strengthBar;
<<<<<<<
passwordPreview.Text = string.Format(sequencer.GenerateSequence(Configuration, randomizer));
=======
listPreviews.Items.Clear();
for (int i = 0; i < 50; i++)
{
listPreviews.Items.Add(sequencer.GenerateSequence(Configuration, randomizer));
}
>>>>>>>
listPreviews.Items.Clear();
for (int i = 0; i < 50; i++)
{
listPreviews.Items.Add(sequencer.GenerateSequence(Configuration, randomizer));
}
<<<<<<<
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.passwordPreview = new System.Windows.Forms.Label();
=======
this.lblCharacters = new System.Windows.Forms.Label();
this.lblWords = new System.Windows.Forms.Label();
this.listPreviews = new System.Windows.Forms.ListView();
this.strengthBar = new System.Windows.Forms.ProgressBar();
>>>>>>>
this.lblCharacters = new System.Windows.Forms.Label();
this.lblWords = new System.Windows.Forms.Label();
this.listPreviews = new System.Windows.Forms.ListView();
<<<<<<<
=======
this.splitContainer1.Panel2.Controls.Add(this.listPreviews);
this.splitContainer1.Panel2.Controls.Add(label5);
>>>>>>>
this.splitContainer1.Panel2.Controls.Add(this.listPreviews);
<<<<<<<
this.splitContainer1.Panel2.Controls.Add(label5);
this.splitContainer1.Panel2.Controls.Add(this.passwordPreview);
this.splitContainer1.Panel2.Controls.Add(label4);
=======
>>>>>>>
this.splitContainer1.Panel2.Controls.Add(label5);
<<<<<<<
// passwordPreview
//
this.passwordPreview.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.passwordPreview.AutoSize = true;
this.passwordPreview.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.passwordPreview.Location = new System.Drawing.Point(82, 268);
this.passwordPreview.Name = "passwordPreview";
this.passwordPreview.Size = new System.Drawing.Size(255, 16);
this.passwordPreview.TabIndex = 3;
this.passwordPreview.Text = "Password Preview Goes Here At Runtime";
//
=======
// strengthBar
//
this.strengthBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.strengthBar.Location = new System.Drawing.Point(194, 150);
this.strengthBar.MarqueeAnimationSpeed = 500;
this.strengthBar.Maximum = 128;
this.strengthBar.Name = "strengthBar";
this.strengthBar.Size = new System.Drawing.Size(312, 20);
this.strengthBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.strengthBar.TabIndex = 4;
this.strengthBar.Value = 46;
//
>>>>>>> |
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")]
=======
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "tvOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.tvOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "watchOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.watchOS")]
>>>>>>>
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "tvOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.tvOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "watchOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.watchOS")]
<<<<<<<
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1008:Opening parenthesis should be spaced correctly", Justification = "Clashed with rule 1003", Scope = "member", Target = "~M:Xamarin.Essentials.SmsMessage.#ctor(System.String,System.String)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")]
=======
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "tvOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.tvOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "watchOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.watchOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1008:Opening parenthesis should be spaced correctly", Justification = "Clashed with rule 1003", Scope = "member", Target = "~M:Xamarin.Essentials.SmsMessage.#ctor(System.String,System.String)")]
>>>>>>>
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "tvOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.tvOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "watchOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.watchOS")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.SpacingRules", "SA1008:Opening parenthesis should be spaced correctly", Justification = "Clashed with rule 1003", Scope = "member", Target = "~M:Xamarin.Essentials.SmsMessage.#ctor(System.String,System.String)")]
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "macOS is what we want.", Scope = "member", Target = "~P:Xamarin.Essentials.DevicePlatform.macOS")] |
<<<<<<<
RTHandles.Release(m_AmbientOcclusionBuffer);
RTHandles.Release(m_VelocityBuffer);
RTHandles.Release(m_DistortionBuffer);
RTHandles.Release(m_DeferredShadowBuffer);
RTHandles.Release(m_DebugColorPickerBuffer);
RTHandles.Release(m_DebugFullScreenTempBuffer);
=======
RTHandles.Release(m_AmbientOcclusionBuffer);
RTHandles.Release(m_VelocityBuffer);
RTHandles.Release(m_DistortionBuffer);
RTHandles.Release(m_DeferredShadowBuffer);
>>>>>>>
RTHandles.Release(m_AmbientOcclusionBuffer);
RTHandles.Release(m_VelocityBuffer);
RTHandles.Release(m_DistortionBuffer);
RTHandles.Release(m_DeferredShadowBuffer);
<<<<<<<
HDCamera.ClearAll();
=======
HDCamera.CleanUnused();
>>>>>>>
HDCamera.ClearAll();
<<<<<<<
ssRefraction.PushShaderParameters(cmd);
var ssReflection = VolumeManager.instance.stack.GetComponent<ScreenSpaceReflection>()
?? ScreenSpaceReflection.@default;
ssReflection.PushShaderParameters(cmd);
=======
ssRefraction.PushShaderParameters(cmd);
>>>>>>>
ssRefraction.PushShaderParameters(cmd);
var ssReflection = VolumeManager.instance.stack.GetComponent<ScreenSpaceReflection>()
?? ScreenSpaceReflection.@default;
ssReflection.PushShaderParameters(cmd);
<<<<<<<
cmd.SetGlobalInt(HDShaderIDs._SSReflectionEnabled, m_FrameSettings.enableSSR ? 1 : 0);
var previousDepthPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.DepthPyramid);
if (previousDepthPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._DepthPyramidTexture, previousDepthPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidSize, new Vector4(
previousDepthPyramidRT.referenceSize.x,
previousDepthPyramidRT.referenceSize.y,
1f / previousDepthPyramidRT.referenceSize.x,
1f / previousDepthPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidScale, new Vector4(
previousDepthPyramidRT.referenceSize.x / (float)previousDepthPyramidRT.rt.width,
previousDepthPyramidRT.referenceSize.y / (float)previousDepthPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousDepthPyramidRT.rt.width, previousDepthPyramidRT.rt.height), 2),
0.0f
));
}
var previousColorPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.ColorPyramid);
if (previousColorPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._ColorPyramidTexture, previousColorPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidSize, new Vector4(
previousColorPyramidRT.referenceSize.x,
previousColorPyramidRT.referenceSize.y,
1f / previousColorPyramidRT.referenceSize.x,
1f / previousColorPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidScale, new Vector4(
previousColorPyramidRT.referenceSize.x / (float)previousColorPyramidRT.rt.width,
previousColorPyramidRT.referenceSize.y / (float)previousColorPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousColorPyramidRT.rt.width, previousColorPyramidRT.rt.height), 2),
0.0f
));
}
=======
var previousDepthPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.DepthPyramid);
if (previousDepthPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._DepthPyramidTexture, previousDepthPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidSize, new Vector4(
previousDepthPyramidRT.referenceSize.x,
previousDepthPyramidRT.referenceSize.y,
1f / previousDepthPyramidRT.referenceSize.x,
1f / previousDepthPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidScale, new Vector4(
previousDepthPyramidRT.referenceSize.x / (float)previousDepthPyramidRT.rt.width,
previousDepthPyramidRT.referenceSize.y / (float)previousDepthPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousDepthPyramidRT.rt.width, previousDepthPyramidRT.rt.height), 2),
0.0f
));
}
var previousColorPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.ColorPyramid);
if (previousColorPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._ColorPyramidTexture, previousColorPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidSize, new Vector4(
previousColorPyramidRT.referenceSize.x,
previousColorPyramidRT.referenceSize.y,
1f / previousColorPyramidRT.referenceSize.x,
1f / previousColorPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidScale, new Vector4(
previousColorPyramidRT.referenceSize.x / (float)previousColorPyramidRT.rt.width,
previousColorPyramidRT.referenceSize.y / (float)previousColorPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousColorPyramidRT.rt.width, previousColorPyramidRT.rt.height), 2),
0.0f
));
}
>>>>>>>
cmd.SetGlobalInt(HDShaderIDs._SSReflectionEnabled, m_FrameSettings.enableSSR ? 1 : 0);
var previousDepthPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.DepthPyramid);
if (previousDepthPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._DepthPyramidTexture, previousDepthPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidSize, new Vector4(
previousDepthPyramidRT.referenceSize.x,
previousDepthPyramidRT.referenceSize.y,
1f / previousDepthPyramidRT.referenceSize.x,
1f / previousDepthPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._DepthPyramidScale, new Vector4(
previousDepthPyramidRT.referenceSize.x / (float)previousDepthPyramidRT.rt.width,
previousDepthPyramidRT.referenceSize.y / (float)previousDepthPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousDepthPyramidRT.rt.width, previousDepthPyramidRT.rt.height), 2),
0.0f
));
}
var previousColorPyramidRT = hdCamera.GetPreviousFrameRT((int)HDCameraFrameHistoryType.ColorPyramid);
if (previousColorPyramidRT != null)
{
cmd.SetGlobalTexture(HDShaderIDs._ColorPyramidTexture, previousColorPyramidRT);
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidSize, new Vector4(
previousColorPyramidRT.referenceSize.x,
previousColorPyramidRT.referenceSize.y,
1f / previousColorPyramidRT.referenceSize.x,
1f / previousColorPyramidRT.referenceSize.y
));
cmd.SetGlobalVector(HDShaderIDs._ColorPyramidScale, new Vector4(
previousColorPyramidRT.referenceSize.x / (float)previousColorPyramidRT.rt.width,
previousColorPyramidRT.referenceSize.y / (float)previousColorPyramidRT.rt.height,
Mathf.Log(Mathf.Min(previousColorPyramidRT.rt.width, previousColorPyramidRT.rt.height), 2),
0.0f
));
}
<<<<<<<
=======
RenderDepthPyramid(hdCamera, cmd, renderContext, FullScreenDebugMode.DepthPyramid);
>>>>>>>
RenderDepthPyramid(hdCamera, cmd, renderContext, FullScreenDebugMode.DepthPyramid);
<<<<<<<
// Assign -1 in tracing model to notifiy we took the data.
// When debugging in forward, we want only the first time the pixel is drawn
data.tracingModel = (Lit.ProjectionModel)(-1);
m_DebugScreenSpaceTracingDataArray[0] = data;
m_DebugScreenSpaceTracingData.SetData(m_DebugScreenSpaceTracingDataArray);
=======
// Assign -1 in tracing model to notifiy we took the data.
// When debugging in forward, we want only the first time the pixel is drawn
data.tracingModel = (Lit.RefractionSSRayModel)(-1);
m_DebugScreenSpaceTracingDataArray[0] = data;
m_DebugScreenSpaceTracingData.SetData(m_DebugScreenSpaceTracingDataArray);
>>>>>>>
// Assign -1 in tracing model to notifiy we took the data.
// When debugging in forward, we want only the first time the pixel is drawn
data.tracingModel = (Lit.ProjectionModel)(-1);
m_DebugScreenSpaceTracingDataArray[0] = data;
m_DebugScreenSpaceTracingData.SetData(m_DebugScreenSpaceTracingDataArray);
<<<<<<<
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingReflection);
if (debugSSTThisPass)
{
cmd.SetGlobalBuffer(HDShaderIDs._DebugScreenSpaceTracingData, m_DebugScreenSpaceTracingData);
cmd.SetRandomWriteTarget(7, m_DebugScreenSpaceTracingData);
}
=======
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingReflection);
if (debugSSTThisPass)
{
cmd.SetGlobalBuffer(HDShaderIDs._DebugScreenSpaceTracingData, m_DebugScreenSpaceTracingData);
cmd.SetRandomWriteTarget(7, m_DebugScreenSpaceTracingData);
}
>>>>>>>
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingReflection);
if (debugSSTThisPass)
{
cmd.SetGlobalBuffer(HDShaderIDs._DebugScreenSpaceTracingData, m_DebugScreenSpaceTracingData);
cmd.SetRandomWriteTarget(7, m_DebugScreenSpaceTracingData);
}
<<<<<<<
if (debugSSTThisPass)
cmd.ClearRandomWriteTargets();
break;
=======
if (debugSSTThisPass)
cmd.ClearRandomWriteTargets();
>>>>>>>
if (debugSSTThisPass)
cmd.ClearRandomWriteTargets();
break;
<<<<<<<
HDUtils.SetRenderTarget(cmd, hdCamera, m_CameraColorBuffer, m_CameraDepthStencilBuffer);
if (m_FrameSettings.enableDBuffer && (DecalSystem.m_DecalsVisibleThisFrame > 0)) // enable d-buffer flag value is being interpreted more like enable decals in general now that we have clustered
DecalSystem.instance.SetAtlas(cmd); // for clustered decals
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingRefraction);
if (debugSSTThisPass)
=======
HDUtils.SetRenderTarget(cmd, hdCamera, m_CameraColorBuffer, m_CameraDepthStencilBuffer);
if ((m_FrameSettings.enableDBuffer) && (DecalSystem.m_DecalsVisibleThisFrame > 0)) // enable d-buffer flag value is being interpreted more like enable decals in general now that we have clustered
>>>>>>>
HDUtils.SetRenderTarget(cmd, hdCamera, m_CameraColorBuffer, m_CameraDepthStencilBuffer);
if (m_FrameSettings.enableDBuffer && (DecalSystem.m_DecalsVisibleThisFrame > 0)) // enable d-buffer flag value is being interpreted more like enable decals in general now that we have clustered
DecalSystem.instance.SetAtlas(cmd); // for clustered decals
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingRefraction);
if (debugSSTThisPass)
}
var debugSSTThisPass = debugScreenSpaceTracing && (m_CurrentDebugDisplaySettings.lightingDebugSettings.debugLightingMode == DebugLightingMode.ScreenSpaceTracingRefraction);
if (debugSSTThisPass)
<<<<<<<
Vector2 pyramidScale = m_BufferPyramid.GetPyramidToScreenScale(hdCamera, cameraRT);
PushFullScreenDebugTextureMip(cmd, cameraRT, m_BufferPyramid.GetPyramidLodCount(hdCamera), new Vector4(pyramidScale.x, pyramidScale.y, 0.0f, 0.0f), hdCamera, debugMode);
=======
Vector2 pyramidScale = m_BufferPyramid.GetPyramidToScreenScale(hdCamera, cameraRT);
PushFullScreenDebugTextureMip(cmd, cameraRT, m_BufferPyramid.GetPyramidLodCount(new Vector2Int(hdCamera.actualWidth, hdCamera.actualHeight)), new Vector4(pyramidScale.x, pyramidScale.y, 0.0f, 0.0f), hdCamera, debugMode);
>>>>>>>
Vector2 pyramidScale = m_BufferPyramid.GetPyramidToScreenScale(hdCamera, cameraRT);
PushFullScreenDebugTextureMip(cmd, cameraRT, m_BufferPyramid.GetPyramidLodCount(new Vector2Int(hdCamera.actualWidth, hdCamera.actualHeight)), new Vector4(pyramidScale.x, pyramidScale.y, 0.0f, 0.0f), hdCamera, debugMode); |
<<<<<<<
}
}
// Pass global parameters to compute shader
// TODO: get rid of this by making global parameters visible to compute shaders
PushGlobalParams(camera, cmd, deferredComputeShader, kernel);
hdCamera.SetupComputeShader(deferredComputeShader, cmd);
// TODO: Update value like in ApplyDebugDisplaySettings() call. Sadly it is high likely that this will not be keep in sync. we really need to get rid of this by making global parameters visible to compute shaders
cmd.SetComputeIntParam(deferredComputeShader, HDShaderIDs._DebugViewMaterial, debugViewMaterial);
cmd.SetComputeIntParam(deferredComputeShader, HDShaderIDs._DebugLightingMode, debugLightingMode);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._DebugLightingAlbedo, debugLightingAlbedo);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._DebugLightingSmoothness, debugLightingSmoothness);
cmd.SetComputeBufferParam(deferredComputeShader, kernel, HDShaderIDs.g_vLightListGlobal, bUseClusteredForDeferred ? s_PerVoxelLightLists : s_LightList);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._DeferredShadowTexture, deferredShadowTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._MainDepthTexture, depthTexture);
// TODO: Don't know why but If we use Shader.GetGlobalTexture(HDShaderIDs._GBufferTexture0) instead of HDShaderIDs._GBufferTexture0 the screen start to flicker in SceneView...
// Need to investigate what is happening. But this may be unnecessary as development of SetGlobalTexture for compute shader have begin
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._GBufferTexture0, HDShaderIDs._GBufferTexture0);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._GBufferTexture1, HDShaderIDs._GBufferTexture1);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._GBufferTexture2, HDShaderIDs._GBufferTexture2);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._GBufferTexture3, HDShaderIDs._GBufferTexture3);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._AmbientOcclusionTexture, HDShaderIDs._AmbientOcclusionTexture);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._LtcData, ltcData);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._PreIntegratedFGD, preIntegratedFGD);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._LtcGGXMatrix, ltcGGXMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._LtcDisneyDiffuseMatrix, ltcDisneyDiffuseMatrix);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._LtcMultiGGXFresnelDisneyDiffuse, ltcMultiGGXFresnelDisneyDiffuse);
cmd.SetComputeMatrixParam(deferredComputeShader, HDShaderIDs.g_mInvScrProjection, invScrProjection);
cmd.SetComputeIntParam(deferredComputeShader, HDShaderIDs._UseTileLightList, useTileLightList);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._Time, time);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._SinTime, sinTime);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._CosTime, cosTime);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs.unity_DeltaTime, unity_DeltaTime);
cmd.SetComputeIntParam(deferredComputeShader, HDShaderIDs._EnvLightSkyEnabled, envLightSkyEnabled);
cmd.SetComputeVectorParam(deferredComputeShader, HDShaderIDs._AmbientOcclusionParam, ambientOcclusionParam);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs._SkyTexture, skyTexture ? skyTexture : m_DefaultTexture2DArray);
cmd.SetComputeFloatParam(deferredComputeShader, HDShaderIDs._SkyTextureMipCount, skyTextureMipCount);
// Set SSS parameters.
cmd.SetComputeIntParam( deferredComputeShader, HDShaderIDs._EnableSSSAndTransmission, enableSSSAndTransmission);
cmd.SetComputeIntParam( deferredComputeShader, HDShaderIDs._TexturingModeFlags, texturingModeFlags);
cmd.SetComputeIntParam( deferredComputeShader, HDShaderIDs._TransmissionFlags, transmissionFlags);
cmd.SetComputeIntParam( deferredComputeShader, HDShaderIDs._UseDisneySSS, useDisneySSS);
cmd.SetComputeVectorArrayParam(deferredComputeShader, HDShaderIDs._ThicknessRemaps, thicknessRemaps);
cmd.SetComputeVectorArrayParam(deferredComputeShader, HDShaderIDs._ShapeParams, shapeParams);
cmd.SetComputeVectorArrayParam(deferredComputeShader, HDShaderIDs._TransmissionTints, transmissionTints);
cmd.SetComputeVectorArrayParam(deferredComputeShader, HDShaderIDs._HalfRcpVariancesAndWeights, halfRcpVariancesAndWeights);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs.specularLightingUAV, colorBuffers[0]);
cmd.SetComputeTextureParam(deferredComputeShader, kernel, HDShaderIDs.diffuseLightingUAV, colorBuffers[1]);
if (options.volumetricLightingEnabled)
{
// TODO: enable keyword VOLUMETRIC_LIGHTING_ENABLED.
// TODO: do not use globals, call HDRenderPipeline.SetVolumetricLightingData() instead.
HDRenderPipeline.SetVolumetricLightingDataFromGlobals(cmd, deferredComputeShader, kernel);
}
else
{
// TODO: disable keyword VOLUMETRIC_LIGHTING_ENABLED.
// We should not access any volumetric lighting data in our shaders.
}
if (enableFeatureVariants)
{
cmd.SetComputeIntParam(deferredComputeShader, HDShaderIDs.g_TileListOffset, variant * numTiles);
cmd.SetComputeBufferParam(deferredComputeShader, kernel, HDShaderIDs.g_TileList, s_TileList);
cmd.DispatchCompute(deferredComputeShader, kernel, s_DispatchIndirectBuffer, (uint)variant * 3 * sizeof(uint));
=======
>>>>>>> |
<<<<<<<
if (m_PerformBC6HCompression)
{
cmd.BC6HEncodeFastCubemap(
result, m_ProbeSize, m_TextureCache.GetTexCache(),
0, int.MaxValue, sliceIndex);
m_TextureCache.SetSliceHash(sliceIndex, m_TextureCache.GetTextureUpdateCount(texture));
}
else
{
m_TextureCache.UpdateSlice(cmd, sliceIndex, result, m_TextureCache.GetTextureUpdateCount(texture)); // Be careful to provide the update count from the input texture, not the temporary one used for convolving.
}
=======
m_TextureCache.UpdateSlice(cmd, sliceIndex, result, m_TextureCache.GetTextureHash(texture)); // Be careful to provide the update count from the input texture, not the temporary one used for convolving.
>>>>>>>
if (m_PerformBC6HCompression)
{
cmd.BC6HEncodeFastCubemap(
result, m_ProbeSize, m_TextureCache.GetTexCache(),
0, int.MaxValue, sliceIndex);
m_TextureCache.SetSliceHash(sliceIndex, m_TextureCache.GetTextureHash(texture));
}
else
{
m_TextureCache.UpdateSlice(cmd, sliceIndex, result, m_TextureCache.GetTextureHash(texture)); // Be careful to provide the update count from the input texture, not the temporary one used for convolving.
} |
<<<<<<<
void OnSubsurfaceInspectorGUI()
{
EditorGUILayout.LabelField(styles.sssCategory);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(m_SssProfileStdDev1, styles.sssProfileStdDev1);
EditorGUILayout.PropertyField(m_SssProfileStdDev2, styles.sssProfileStdDev2);
EditorGUILayout.PropertyField(m_SssProfileLerpWeight, styles.sssProfileLerpWeight);
EditorGUILayout.PropertyField(m_SssBilateralScale, styles.sssBilateralScale);
EditorGUI.indentLevel--;
}
public override void OnInspectorGUI()
=======
/* public override void OnInspectorGUI()
>>>>>>>
void OnSubsurfaceInspectorGUI()
{
EditorGUILayout.LabelField(styles.sssCategory);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(m_SssProfileStdDev1, styles.sssProfileStdDev1);
EditorGUILayout.PropertyField(m_SssProfileStdDev2, styles.sssProfileStdDev2);
EditorGUILayout.PropertyField(m_SssProfileLerpWeight, styles.sssProfileLerpWeight);
EditorGUILayout.PropertyField(m_SssBilateralScale, styles.sssBilateralScale);
EditorGUI.indentLevel--;
}
/*
public override void OnInspectorGUI() |
<<<<<<<
private Socket CreateRawSocket(uint localAddress, uint remoteAddress)
=======
private static Socket CreateRawSocket(uint localAddress, uint remoteAddress)
>>>>>>>
private static Socket CreateRawSocket(uint localAddress, uint remoteAddress)
<<<<<<<
socket.ReceiveBufferSize = 1024 * 5000; // this is the size of the internal network card buffer
if (remoteAddress > 0)
socket.Connect(new IPEndPoint(remoteAddress, 0));
=======
socket.ReceiveBufferSize = 1024 * 50000; // this is the size of the internal network card buffer. It must be large due to thread pre-emption.
if (remoteAddress != 0)
socket.Connect(new IPEndPoint(remoteAddress, 0));
>>>>>>>
if (remoteAddress > 0)
socket.Connect(new IPEndPoint(remoteAddress, 0)); |
<<<<<<<
using ExtraRoles.Medic;
=======
using ExtraRoles.Officer;
>>>>>>>
using ExtraRoles.Medic;
using ExtraRoles.Officer; |
<<<<<<<
public const string Wox = "Wox";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Wox + ".exe");
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
public const string PortableFolderName = "UserData";
public static string PortableDataPath = Path.Combine(ProgramDirectory, PortableFolderName);
public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Wox);
=======
public const string Wox = "Wox";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Wox + ".exe");
public static bool IsPortableMode;
public const string PortableFolderName = "UserData";
public static string PortableDataPath = Path.Combine(ProgramDirectory, PortableFolderName);
>>>>>>>
public const string Wox = "Wox";
public const string Plugins = "Plugins";
private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location.NonNull()).ToString();
public static readonly string ExecutablePath = Path.Combine(ProgramDirectory, Wox + ".exe");
public static readonly string ApplicationDirectory = Directory.GetParent(ProgramDirectory).ToString();
public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
public static bool IsPortableMode;
public const string PortableFolderName = "UserData";
public static string PortableDataPath = Path.Combine(ProgramDirectory, PortableFolderName);
public static string RoamingDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Wox);
<<<<<<<
return PortableDataPath;
=======
IsPortableMode = true;
return PortableDataPath;
>>>>>>>
IsPortableMode = true;
return PortableDataPath; |
<<<<<<<
UpdateInfo newUpdateInfo;
if (!silentUpdate)
api.ShowMsg("Please wait...", "Checking for new update");
using var updateManager = await GitHubUpdateManager(GitHubRepository);
=======
updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
}
catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
{
Log.Exception($"|Updater.UpdateApp|Please check your connection and proxy settings to api.github.com.", e);
return;
}
>>>>>>>
UpdateInfo newUpdateInfo;
if (!silentUpdate)
api.ShowMsg("Please wait...", "Checking for new update");
using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
<<<<<<<
newUpdateInfo = await updateManager.CheckForUpdate().NonNull();
=======
newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
}
catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
{
Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to api.github.com.", e);
updateManager.Dispose();
return;
}
>>>>>>>
newUpdateInfo = await updateManager.CheckForUpdate().NonNull().ConfigureAwait(false);
<<<<<<<
=======
await updateManager.ApplyReleases(newUpdateInfo).ConfigureAwait(false);
if (DataLocation.PortableDataLocationInUse())
{
var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{DataLocation.PortableFolderName}";
FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination);
if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination))
MessageBox.Show("Flow Launcher was not able to move your user profile data to the new update version. Please manually " +
$"move your profile data folder from {DataLocation.PortableDataPath} to {targetDestination}");
}
else
{
await updateManager.CreateUninstallerRegistryEntry().ConfigureAwait(false);
}
var newVersionTips = NewVersinoTips(newReleaseVersion.ToString());
Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
// always dispose UpdateManager
updateManager.Dispose();
if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
{
UpdateManager.RestartApp(Constant.ApplicationFileName);
}
>>>>>>> |
<<<<<<<
using System.Reflection;
=======
using System.Runtime.Serialization.Formatters;
>>>>>>>
using System.Reflection;
using System.Runtime.Serialization.Formatters; |
<<<<<<<
private static bool IsDriveOrSharedFolder(string search)
{
if (search.StartsWith(@"\\"))
{ // share folder
return true;
}
if (_driverNames != null && _driverNames.Any(search.StartsWith))
{ // normal drive letter
return true;
}
if (_driverNames == null && search.Length > 2 && char.IsLetter(search[0]) && search[1] == ':')
{ // when we don't have the drive letters we can try...
return true; // we don't know so let's give it the possibility
}
return false;
}
private Result CreateFolderResult(string title, string path, string queryActionKeyword)
=======
private Result CreateFolderResult(string title, string path, Query query)
>>>>>>>
private static bool IsDriveOrSharedFolder(string search)
{
if (search.StartsWith(@"\\"))
{ // share folder
return true;
}
if (_driverNames != null && _driverNames.Any(search.StartsWith))
{ // normal drive letter
return true;
}
if (_driverNames == null && search.Length > 2 && char.IsLetter(search[0]) && search[1] == ':')
{ // when we don't have the drive letters we can try...
return true; // we don't know so let's give it the possibility
}
return false;
}
private Result CreateFolderResult(string title, string path, Query query) |
<<<<<<<
string search = query.Search.ToLower();
List<FolderLink> userFolderLinks = _settings.FolderLinks.Where(
x => x.Nickname.StartsWith(search, StringComparison.OrdinalIgnoreCase)).ToList();
List<Result> results =
userFolderLinks.Select(
item => new Result()
{
Title = item.Nickname,
IcoPath = item.Path,
SubTitle = "Ctrl + Enter to open the directory",
TitleHighlightData = StringMatcher.FuzzySearch(item.Nickname, search).MatchData,
Action = c =>
{
if (c.SpecialKeyState.CtrlPressed)
{
try
{
Process.Start(item.Path);
return true;
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Could not start " + item.Path);
return false;
}
}
_context.API.ChangeQuery($"{query.ActionKeyword} {item.Path}{(item.Path.EndsWith("\\") ? "" : "\\")}");
return false;
},
ContextData = item,
}).ToList();
=======
var results = GetUserFolderResults(query);
>>>>>>>
var results = GetUserFolderResults(query);
<<<<<<<
string searchNickname = new FolderLink { Path = query.Search }.Nickname;
//Add children directories
DirectoryInfo[] dirs = new DirectoryInfo(search).GetDirectories();
foreach (DirectoryInfo dir in dirs)
=======
try
>>>>>>>
string searchNickname = new FolderLink { Path = query.Search }.Nickname;
try
<<<<<<<
Title = dir.Name,
IcoPath = dir.FullName,
SubTitle = "Ctrl + Enter to open the directory",
TitleHighlightData = StringMatcher.FuzzySearch(dir.Name, searchNickname).MatchData,
Action = c =>
{
if (c.SpecialKeyState.CtrlPressed)
{
try
{
Process.Start(dirCopy.FullName);
return true;
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Could not start " + dirCopy.FullName);
return false;
}
}
_context.API.ChangeQuery($"{query.ActionKeyword} {dirCopy.FullName}\\");
return false;
}
};
=======
if ((fileSystemInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) continue;
>>>>>>>
if ((fileSystemInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) continue;
<<<<<<<
Title = Path.GetFileName(filePath),
IcoPath = filePath,
TitleHighlightData = StringMatcher.FuzzySearch(file.Name, searchNickname).MatchData,
Action = c =>
{
try
{
Process.Start(filePath);
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Could not start " + filePath);
}
=======
results.Add(new Result { Title = e.Message, Score = 501 });
>>>>>>>
results.Add(new Result { Title = e.Message, Score = 501 }); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Visible;
=======
MainVM.IsProgressBarVisible = true;
>>>>>>>
MainVM.ProgressBarVisibility = Visibility.Visible;
<<<<<<<
this.MainVM.ProgressBarVisibility = Visibility.Collapsed;
=======
MainVM.IsProgressBarVisible = false;
>>>>>>>
MainVM.ProgressBarVisibility = Visibility.Collapsed;
<<<<<<<
this.MainVM.ShowContextMenu(results, plugin.ID);
=======
MainVM.ShowContextMenu(results, plugin.ID);
>>>>>>>
MainVM.ShowContextMenu(results, plugin.ID);
<<<<<<<
UserSettingStorage.Instance.WindowLeft = this.MainVM.Left;
UserSettingStorage.Instance.WindowTop = this.MainVM.Top;
this.MainVM.WindowVisibility = Visibility.Collapsed;
=======
UserSettingStorage.Instance.WindowLeft = MainVM.Left;
UserSettingStorage.Instance.WindowTop = MainVM.Top;
MainVM.IsVisible = false;
>>>>>>>
UserSettingStorage.Instance.WindowLeft = MainVM.Left;
UserSettingStorage.Instance.WindowTop = MainVM.Top;
MainVM.WindowVisibility = Visibility.Collapsed;
<<<<<<<
this.MainVM.WindowVisibility = Visibility.Visible;
this.MainVM.SelectAllText = true;
=======
MainVM.IsVisible = true;
MainVM.SelectAllText = true;
>>>>>>>
MainVM.WindowVisibility = Visibility.Visible;
MainVM.SelectAllText = true; |
<<<<<<<
cbStartWithWindows.IsChecked = CheckApplicationIsStartupWithWindow();
=======
comboMaxResultsToShow.SelectionChanged += (o, e) =>
{
UserSettingStorage.Instance.MaxResultsToShow = (int)comboMaxResultsToShow.SelectedItem;
UserSettingStorage.Instance.Save();
MainWindow.pnlResult.lbResults.GetBindingExpression(MaxHeightProperty).UpdateTarget();
};
cbStartWithWindows.IsChecked = File.Exists(woxLinkPath);
>>>>>>>
cbStartWithWindows.IsChecked = CheckApplicationIsStartupWithWindow();
comboMaxResultsToShow.SelectionChanged += (o, e) =>
{
UserSettingStorage.Instance.MaxResultsToShow = (int)comboMaxResultsToShow.SelectedItem;
UserSettingStorage.Instance.Save();
MainWindow.pnlResult.lbResults.GetBindingExpression(MaxHeightProperty).UpdateTarget();
};
<<<<<<<
LoadLanguages();
=======
comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);
var maxResults = UserSettingStorage.Instance.MaxResultsToShow;
comboMaxResultsToShow.SelectedItem = maxResults == 0 ? 6 : maxResults;
#endregion
#region Theme
if (!string.IsNullOrEmpty(UserSettingStorage.Instance.QueryBoxFont) &&
Fonts.SystemFontFamilies.Count(o => o.FamilyNames.Values.Contains(UserSettingStorage.Instance.QueryBoxFont)) > 0)
{
cbQueryBoxFont.Text = UserSettingStorage.Instance.QueryBoxFont;
cbQueryBoxFontFaces.SelectedItem = SyntaxSugars.CallOrRescueDefault(() => ((FontFamily)cbQueryBoxFont.SelectedItem).ConvertFromInvariantStringsOrNormal(
UserSettingStorage.Instance.QueryBoxFontStyle,
UserSettingStorage.Instance.QueryBoxFontWeight,
UserSettingStorage.Instance.QueryBoxFontStretch
));
}
if (!string.IsNullOrEmpty(UserSettingStorage.Instance.ResultItemFont) &&
Fonts.SystemFontFamilies.Count(o => o.FamilyNames.Values.Contains(UserSettingStorage.Instance.ResultItemFont)) > 0)
{
cbResultItemFont.Text = UserSettingStorage.Instance.ResultItemFont;
cbResultItemFontFaces.SelectedItem = SyntaxSugars.CallOrRescueDefault(() => ((FontFamily)cbResultItemFont.SelectedItem).ConvertFromInvariantStringsOrNormal(
UserSettingStorage.Instance.ResultItemFontStyle,
UserSettingStorage.Instance.ResultItemFontWeight,
UserSettingStorage.Instance.ResultItemFontStretch
));
}
resultPanelPreview.AddResults(new List<Result>()
{
new Result()
{
Title = "Wox is an effective launcher for windows",
SubTitle = "Wox provide bundles of features let you access infomations quickly.",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath)
},
new Result()
{
Title = "Search applications",
SubTitle = "Search applications, files (via everything plugin) and browser bookmarks",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath)
},
new Result()
{
Title = "Search web contents with shortcuts",
SubTitle = "e.g. search google with g keyword or youtube keyword)",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(Application.ExecutablePath)
},
new Result()
{
Title = "clipboard history ",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(Application.ExecutablePath)
},
new Result()
{
Title = "Themes support",
SubTitle = "get more themes from http://www.getwox.com/theme",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(Application.ExecutablePath)
},
new Result()
{
Title = "Plugins support",
SubTitle = "get more plugins from http://www.getwox.com/plugin",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(Application.ExecutablePath)
},
new Result()
{
Title = "Wox is an open-source software",
SubTitle = "Wox benefits from the open-source community a lot",
IcoPath = "Images/work.png",
PluginDirectory = Path.GetDirectoryName(Application.ExecutablePath)
}
});
foreach (string theme in LoadAvailableThemes())
{
string themeName = System.IO.Path.GetFileNameWithoutExtension(theme);
themeComboBox.Items.Add(themeName);
}
themeComboBox.SelectedItem = UserSettingStorage.Instance.Theme;
slOpacity.Value = UserSettingStorage.Instance.Opacity;
CbOpacityMode.SelectedItem = UserSettingStorage.Instance.OpacityMode;
var wallpaper = WallpaperPathRetrieval.GetWallpaperPath();
if (wallpaper != null && File.Exists(wallpaper))
{
var brush = new ImageBrush(new BitmapImage(new Uri(wallpaper)));
brush.Stretch = Stretch.UniformToFill;
PreviewPanel.Background = brush;
}
else
{
var wallpaperColor = WallpaperPathRetrieval.GetWallpaperColor();
PreviewPanel.Background = new SolidColorBrush(wallpaperColor);
}
//PreviewPanel
App.Window.SetTheme(UserSettingStorage.Instance.Theme);
#endregion
#region Plugin
ctlHotkey.OnHotkeyChanged += ctlHotkey_OnHotkeyChanged;
ctlHotkey.SetHotkey(UserSettingStorage.Instance.Hotkey, false);
lvCustomHotkey.ItemsSource = UserSettingStorage.Instance.CustomPluginHotkeys;
var plugins = new CompositeCollection
{
new CollectionContainer
{
Collection =
PluginLoader.Plugins.AllPlugins.Where(o => o.Metadata.PluginType == PluginType.System)
.Select(o => o.Plugin)
.Cast<ISystemPlugin>()
},
FindResource("FeatureBoxSeperator"),
new CollectionContainer
{
Collection =
PluginLoader.Plugins.AllPlugins.Where(o => o.Metadata.PluginType == PluginType.ThirdParty)
}
};
lbPlugins.ItemsSource = plugins;
lbPlugins.SelectedIndex = 0;
>>>>>>>
LoadLanguages();
comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);
var maxResults = UserSettingStorage.Instance.MaxResultsToShow;
comboMaxResultsToShow.SelectedItem = maxResults == 0 ? 6 : maxResults; |
<<<<<<<
=======
Task.Delay(200, currentCancellationToken).ContinueWith(_ =>
{
// start the progress bar if query takes more than 200 ms and this is the current running query and it didn't finish yet
if (currentUpdateSource == _updateSource && _isQueryRunning)
{
ProgressBarVisibility = Visibility.Visible;
}
}, currentCancellationToken);
>>>>>>>
<<<<<<<
if (!plugin.Metadata.Disabled)
{
try
{
var results = PluginManager.QueryForPlugin(plugin, query);
UpdateResultView(results, plugin.Metadata, query);
}
catch (Exception e)
{
Log.Exception("MainViewModel", $"Exception when querying the plugin {plugin.Metadata.Name}", e, "QueryResults");
}
}
});
=======
if (!plugins[i].Metadata.Disabled)
tasks[i] = QueryTask(plugins[i], query, currentCancellationToken);
else tasks[i] = Task.CompletedTask; // Avoid Null
}
// Check the code, WhenAll will translate all type of IEnumerable or Collection to Array, so make an array at first
await Task.WhenAll(tasks);
>>>>>>>
if (!plugins[i].Metadata.Disabled)
tasks[i] = QueryTask(plugins[i], query, currentCancellationToken);
else tasks[i] = Task.CompletedTask; // Avoid Null
}
// Check the code, WhenAll will translate all type of IEnumerable or Collection to Array, so make an array at first
await Task.WhenAll(tasks);
<<<<<<<
if (currentCancellationToken.IsCancellationRequested)
return;
=======
>>>>>>>
if (currentCancellationToken.IsCancellationRequested)
return;
<<<<<<<
if (!currentCancellationToken.IsCancellationRequested)
{ // update to hidden if this is still the current query
=======
if (!currentCancellationToken.IsCancellationRequested)
{
// update to hidden if this is still the current query
>>>>>>>
if (!currentCancellationToken.IsCancellationRequested)
{
// update to hidden if this is still the current query |
<<<<<<<
[InlineData("DA250-ConditionalWithRichXPath.docx", "DA250-Address.xml", false)]
=======
[InlineData("DA251-EnhancedTables.docx", "DA-Data.xml", false)]
>>>>>>>
[InlineData("DA250-ConditionalWithRichXPath.docx", "DA250-Address.xml", false)]
[InlineData("DA251-EnhancedTables.docx", "DA-Data.xml", false)] |
<<<<<<<
private readonly Stream _output;
private Thread _thread;
=======
private readonly TextWriter _output;
private readonly Thread _thread;
>>>>>>>
private readonly Stream _output;
private readonly Thread _thread;
<<<<<<<
var headerBytes = System.Text.Encoding.UTF8.GetBytes(sb.ToString());
// only one write to _output
using (var ms = new MemoryStream(headerBytes.Length + contentBytes.Length))
{
ms.Write(headerBytes, 0, headerBytes.Length);
ms.Write(contentBytes, 0, contentBytes.Length);
_output.Write(ms.ToArray(), 0, (int)ms.Position);
}
=======
sb.Append(content);
_output.Write(sb.ToString());
>>>>>>>
var headerBytes = System.Text.Encoding.UTF8.GetBytes(sb.ToString());
// only one write to _output
using (var ms = new MemoryStream(headerBytes.Length + contentBytes.Length))
{
ms.Write(headerBytes, 0, headerBytes.Length);
ms.Write(contentBytes, 0, contentBytes.Length);
_output.Write(ms.ToArray(), 0, (int)ms.Position);
} |
<<<<<<<
Task Initialize();
event ShutdownEventHandler Shutdown;
event ExitEventHandler Exit;
Task WasShutDown { get; }
Task WaitForExit { get; }
=======
Task Initialize();
IObservable<bool> Shutdown { get; }
IObservable<int> Exit { get; }
Task WasShutDown { get; }
Task WaitForExit { get; }
>>>>>>>
IObservable<bool> Shutdown { get; }
IObservable<int> Exit { get; }
Task WasShutDown { get; }
Task WaitForExit { get; } |
<<<<<<<
[Fact]
public async Task ShouldHandle_Request_WithNullParameters()
{
bool wasShutDown = false;
ShutdownHandler shutdownHandler = new ShutdownHandler();
shutdownHandler.Shutdown += shutdownRequested =>
{
wasShutDown = true;
};
var collection = new HandlerCollection { shutdownHandler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
JToken @params = JValue.CreateNull(); // If the "params" property present but null, this will be JTokenType.Null.
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, @params);
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
Assert.True(wasShutDown, "WasShutDown");
}
[Fact]
public async Task ShouldHandle_Request_WithMissingParameters()
{
bool wasShutDown = false;
ShutdownHandler shutdownHandler = new ShutdownHandler();
shutdownHandler.Shutdown += shutdownRequested =>
{
wasShutDown = true;
};
var collection = new HandlerCollection { shutdownHandler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
JToken @params = null; // If the "params" property was missing entirely, this will be null.
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, @params);
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
Assert.True(wasShutDown, "WasShutDown");
}
=======
[Fact]
public async Task ShouldRouteTo_CorrectRequestWhenGivenNullParams()
{
var handler = Substitute.For<IShutdownHandler>();
handler
.Handle(Arg.Any<object>(), Arg.Any<CancellationToken>())
.Returns(Task.CompletedTask);
var collection = new HandlerCollection { handler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, new JObject());
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
await handler.Received(1).Handle(Arg.Any<object>(), Arg.Any<CancellationToken>());
}
>>>>>>>
[Fact]
public async Task ShouldRouteTo_CorrectRequestWhenGivenNullParams()
{
var handler = Substitute.For<IShutdownHandler>();
handler
.Handle(Arg.Any<object>(), Arg.Any<CancellationToken>())
.Returns(Task.CompletedTask);
var collection = new HandlerCollection { handler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, new JObject());
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
await handler.Received(1).Handle(Arg.Any<object>(), Arg.Any<CancellationToken>());
}
[Fact]
public async Task ShouldHandle_Request_WithNullParameters()
{
bool wasShutDown = false;
ShutdownHandler shutdownHandler = new ShutdownHandler();
shutdownHandler.Shutdown += shutdownRequested =>
{
wasShutDown = true;
};
var collection = new HandlerCollection { shutdownHandler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
JToken @params = JValue.CreateNull(); // If the "params" property present but null, this will be JTokenType.Null.
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, @params);
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
Assert.True(wasShutDown, "WasShutDown");
}
[Fact]
public async Task ShouldHandle_Request_WithMissingParameters()
{
bool wasShutDown = false;
ShutdownHandler shutdownHandler = new ShutdownHandler();
shutdownHandler.Shutdown += shutdownRequested =>
{
wasShutDown = true;
};
var collection = new HandlerCollection { shutdownHandler };
var mediator = new LspRequestRouter(collection, _testLoggerFactory, _handlerMatcherCollection, new Serializer());
JToken @params = null; // If the "params" property was missing entirely, this will be null.
var id = Guid.NewGuid().ToString();
var request = new Request(id, GeneralNames.Shutdown, @params);
await mediator.RouteRequest(mediator.GetDescriptor(request), request);
Assert.True(wasShutDown, "WasShutDown");
} |
<<<<<<<
if (e.PropertyName == AnimationView.IsPlayingProperty.PropertyName &&
!string.IsNullOrEmpty(Element.Animation))
{
if (Element.IsPlaying)
_animationView.PlayAnimation();
else
_animationView.PauseAnimation();
}
=======
if(e.PropertyName == AnimationView.HardwareAccelerationProperty.PropertyName)
_animationView.UseHardwareAcceleration(Element.HardwareAcceleration);
>>>>>>>
if (e.PropertyName == AnimationView.IsPlayingProperty.PropertyName &&
!string.IsNullOrEmpty(Element.Animation))
{
if (Element.IsPlaying)
_animationView.PlayAnimation();
else
_animationView.PauseAnimation();
}
if(e.PropertyName == AnimationView.HardwareAccelerationProperty.PropertyName)
_animationView.UseHardwareAcceleration(Element.HardwareAcceleration); |
<<<<<<<
public virtual void RenderDeferredLighting(HDRenderPipeline.HDCamera hdCamera, ScriptableRenderContext renderContext,
RenderTargetIdentifier[] colorBuffers, RenderTargetIdentifier stencilBuffer,
bool outputSplitLighting) {}
=======
public virtual void RenderDeferredLighting(HDCamera hdCamera, ScriptableRenderContext renderContext, RenderTargetIdentifier cameraColorBufferRT) {}
>>>>>>>
public virtual void RenderDeferredLighting(HDCamera hdCamera, ScriptableRenderContext renderContext,
RenderTargetIdentifier[] colorBuffers, RenderTargetIdentifier stencilBuffer,
bool outputSplitLighting) {} |
<<<<<<<
#region Lighting
bool bPlayerVision = false;
ILight playerVision;
QuadRenderer quadRenderer;
ShadowMapResolver shadowMapResolver;
LightArea lightArea128;
LightArea lightArea256;
LightArea lightArea512;
LightArea lightArea1024;
RenderImage screenShadows;
RenderImage shadowIntermediate;
private RenderImage shadowBlendIntermediate;
private RenderImage playerOcclusionTarget;
private FXShader lightBlendShader;
private RenderImage _sceneTarget;
#endregion
=======
>>>>>>>
#region Lighting
bool bPlayerVision = false;
ILight playerVision;
QuadRenderer quadRenderer;
ShadowMapResolver shadowMapResolver;
LightArea lightArea128;
LightArea lightArea256;
LightArea lightArea512;
LightArea lightArea1024;
RenderImage screenShadows;
RenderImage shadowIntermediate;
private RenderImage shadowBlendIntermediate;
private RenderImage playerOcclusionTarget;
private FXShader lightBlendShader;
private RenderImage _sceneTarget;
#endregion
<<<<<<<
#region Lighting
quadRenderer = new QuadRenderer();
quadRenderer.LoadContent();
shadowMapResolver = new ShadowMapResolver(quadRenderer, ShadowmapSize.Size1024, ShadowmapSize.Size1024, ResourceManager);
shadowMapResolver.LoadContent();
lightArea128 = new LightArea(ShadowmapSize.Size128);
lightArea256 = new LightArea(ShadowmapSize.Size256);
lightArea512 = new LightArea(ShadowmapSize.Size512);
lightArea1024 = new LightArea(ShadowmapSize.Size1024);
screenShadows = new RenderImage("screenShadows", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
screenShadows.UseDepthBuffer = false;
shadowIntermediate = new RenderImage("shadowIntermediate", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
shadowIntermediate.UseDepthBuffer = false;
shadowBlendIntermediate = new RenderImage("shadowBlendIntermediate", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
shadowBlendIntermediate.UseDepthBuffer = false;
playerOcclusionTarget = new RenderImage("playerOcclusionTarget", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
playerOcclusionTarget.UseDepthBuffer = false;
lightBlendShader = IoCManager.Resolve<IResourceManager>().GetShader("lightblend");
playerVision = IoCManager.Resolve<ILightManager>().CreateLight();
playerVision.SetColor(Color.Transparent);
playerVision.SetRadius(1024);
playerVision.Move(Vector2D.Zero);
#endregion
=======
_handsGui = new HandsGui();
_handsGui.Position = new Point(hotbar.Position.X + 5, hotbar.Position.Y + 7);
UserInterfaceManager.AddComponent(_handsGui);
var combo = new HumanComboGui(PlayerManager, NetworkManager, ResourceManager, UserInterfaceManager);
combo.Update();
combo.Position = new Point(hotbar.ClientArea.Right - combo.ClientArea.Width + 5, hotbar.Position.Y - combo.ClientArea.Height - 5);
UserInterfaceManager.AddComponent(combo);
var healthPanel = new HealthPanel();
healthPanel.Position = new Point(hotbar.ClientArea.Right - 1, hotbar.Position.Y + 11);
healthPanel.Update();
UserInterfaceManager.AddComponent(healthPanel);
var targetingUi = new TargetingGui();
targetingUi.Update();
targetingUi.Position = new Point(healthPanel.ClientArea.Right - 1, healthPanel.ClientArea.Bottom - targetingUi.ClientArea.Height);
UserInterfaceManager.AddComponent(targetingUi);
var inventoryButton = new SimpleImageButton("button_inv", ResourceManager);
inventoryButton.Position = new Point(hotbar.Position.X + 172, hotbar.Position.Y + 2);
inventoryButton.Update();
inventoryButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(inventoryButton_Clicked);
UserInterfaceManager.AddComponent(inventoryButton);
var statusButton = new SimpleImageButton("button_status", ResourceManager);
statusButton.Position = new Point(inventoryButton.ClientArea.Right , inventoryButton.Position.Y);
statusButton.Update();
statusButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(statusButton_Clicked);
UserInterfaceManager.AddComponent(statusButton);
var craftButton = new SimpleImageButton("button_craft", ResourceManager);
craftButton.Position = new Point(statusButton.ClientArea.Right , statusButton.Position.Y);
craftButton.Update();
craftButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(craftButton_Clicked);
UserInterfaceManager.AddComponent(craftButton);
var menuButton = new SimpleImageButton("button_menu", ResourceManager);
menuButton.Position = new Point(craftButton.ClientArea.Right , craftButton.Position.Y);
menuButton.Update();
menuButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(menuButton_Clicked);
UserInterfaceManager.AddComponent(menuButton);
}
void menuButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.DisposeAllComponents<MenuWindow>(); //Remove old ones.
UserInterfaceManager.AddComponent(new MenuWindow()); //Create a new one.
}
void craftButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 3);
}
void statusButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 2);
}
void inventoryButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 1);
>>>>>>>
#region Lighting
quadRenderer = new QuadRenderer();
quadRenderer.LoadContent();
shadowMapResolver = new ShadowMapResolver(quadRenderer, ShadowmapSize.Size1024, ShadowmapSize.Size1024, ResourceManager);
shadowMapResolver.LoadContent();
lightArea128 = new LightArea(ShadowmapSize.Size128);
lightArea256 = new LightArea(ShadowmapSize.Size256);
lightArea512 = new LightArea(ShadowmapSize.Size512);
lightArea1024 = new LightArea(ShadowmapSize.Size1024);
screenShadows = new RenderImage("screenShadows", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
screenShadows.UseDepthBuffer = false;
shadowIntermediate = new RenderImage("shadowIntermediate", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
shadowIntermediate.UseDepthBuffer = false;
shadowBlendIntermediate = new RenderImage("shadowBlendIntermediate", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
shadowBlendIntermediate.UseDepthBuffer = false;
playerOcclusionTarget = new RenderImage("playerOcclusionTarget", Gorgon.CurrentClippingViewport.Width, Gorgon.CurrentClippingViewport.Height, ImageBufferFormats.BufferRGB888A8);
playerOcclusionTarget.UseDepthBuffer = false;
lightBlendShader = IoCManager.Resolve<IResourceManager>().GetShader("lightblend");
playerVision = IoCManager.Resolve<ILightManager>().CreateLight();
playerVision.SetColor(Color.Transparent);
playerVision.SetRadius(1024);
playerVision.Move(Vector2D.Zero);
#endregion
_handsGui = new HandsGui();
_handsGui.Position = new Point(hotbar.Position.X + 5, hotbar.Position.Y + 7);
UserInterfaceManager.AddComponent(_handsGui);
var combo = new HumanComboGui(PlayerManager, NetworkManager, ResourceManager, UserInterfaceManager);
combo.Update();
combo.Position = new Point(hotbar.ClientArea.Right - combo.ClientArea.Width + 5, hotbar.Position.Y - combo.ClientArea.Height - 5);
UserInterfaceManager.AddComponent(combo);
var healthPanel = new HealthPanel();
healthPanel.Position = new Point(hotbar.ClientArea.Right - 1, hotbar.Position.Y + 11);
healthPanel.Update();
UserInterfaceManager.AddComponent(healthPanel);
var targetingUi = new TargetingGui();
targetingUi.Update();
targetingUi.Position = new Point(healthPanel.ClientArea.Right - 1, healthPanel.ClientArea.Bottom - targetingUi.ClientArea.Height);
UserInterfaceManager.AddComponent(targetingUi);
var inventoryButton = new SimpleImageButton("button_inv", ResourceManager);
inventoryButton.Position = new Point(hotbar.Position.X + 172, hotbar.Position.Y + 2);
inventoryButton.Update();
inventoryButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(inventoryButton_Clicked);
UserInterfaceManager.AddComponent(inventoryButton);
var statusButton = new SimpleImageButton("button_status", ResourceManager);
statusButton.Position = new Point(inventoryButton.ClientArea.Right , inventoryButton.Position.Y);
statusButton.Update();
statusButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(statusButton_Clicked);
UserInterfaceManager.AddComponent(statusButton);
var craftButton = new SimpleImageButton("button_craft", ResourceManager);
craftButton.Position = new Point(statusButton.ClientArea.Right , statusButton.Position.Y);
craftButton.Update();
craftButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(craftButton_Clicked);
UserInterfaceManager.AddComponent(craftButton);
var menuButton = new SimpleImageButton("button_menu", ResourceManager);
menuButton.Position = new Point(craftButton.ClientArea.Right , craftButton.Position.Y);
menuButton.Update();
menuButton.Clicked += new SimpleImageButton.SimpleImageButtonPressHandler(menuButton_Clicked);
UserInterfaceManager.AddComponent(menuButton);
}
void menuButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.DisposeAllComponents<MenuWindow>(); //Remove old ones.
UserInterfaceManager.AddComponent(new MenuWindow()); //Create a new one.
}
void craftButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 3);
}
void statusButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 2);
}
void inventoryButton_Clicked(SimpleImageButton sender)
{
UserInterfaceManager.ComponentUpdate(GuiComponentType.ComboGui, ComboGuiMessage.ToggleShowPage, 1);
<<<<<<<
=======
/* What are we doing here exactly? Well:
* First we get the tile we are stood on, and try and make this the centre of the view. However if we're too close to one edge
* we allow us to be drawn nearer that edge, and not in the middle of the screen.
* We then find how far "into" the map we are (xTopLeft, yTopLeft), the position of the top left of the screen in WORLD
* co-ordinates so we can work out what we need to draw, and what we dont need to (what's off screen).
* Then we see if we've moved a tile recently or a flag has been set on the map that we need to update the visibility (a door
* opened for example).
* We then loop through all the tiles, and draw the floor and the sides of the walls, as they will always be under us
* and the entities. Next we find all the entities in view and draw them. Lastly we draw the top section of walls as they will
* always be on top of us and entities.
* */
>>>>>>>
<<<<<<<
_baseTarget.Clear(System.Drawing.Color.Black);
Gorgon.Screen.Clear(System.Drawing.Color.Black);
=======
_baseTarget.Clear(Color.Black);
_lightTarget.Clear(Color.Black);
_lightTargetIntermediate.Clear(Color.FromArgb(0, Color.Black));
Gorgon.Screen.Clear(Color.Black);
>>>>>>>
_baseTarget.Clear(System.Drawing.Color.Black);
Gorgon.Screen.Clear(System.Drawing.Color.Black); |
<<<<<<<
// JB: TODO - why is this needed? Don't we have a unique key for an opponent? RF1 has vehicleName
// which is of the form classname: driver name #number (e.g. "F309: Jim Britton #14") - can't we just
// rely on this for our opponent keys?
=======
>>>>>>>
// JB: TODO - why is this needed? Don't we have a unique key for an opponent? RF1 has vehicleName
// which is of the form classname: driver name #number (e.g. "F309: Jim Britton #14") - can't we just
// rely on this for our opponent keys? |
<<<<<<<
public bool IsAsyncEnabled()
{
return m_LightLoopSettings.enableAsyncCompute;
}
public void BuildGPULightListsCommon(Camera camera, CommandBuffer cmd, RenderTargetIdentifier cameraDepthBufferRT, RenderTargetIdentifier stencilTextureRT, bool skyEnabled)
=======
public void BuildGPULightListsCommon(Camera camera, CommandBuffer cmd, RenderTargetIdentifier cameraDepthBufferRT, RenderTargetIdentifier stencilTextureRT)
>>>>>>>
public void BuildGPULightListsCommon(Camera camera, CommandBuffer cmd, RenderTargetIdentifier cameraDepthBufferRT, RenderTargetIdentifier stencilTextureRT, bool skyEnabled)
<<<<<<<
string sLabel = m_LightLoopSettings.enableTileAndCluster ?
=======
// TODO: Check if we can remove this, when I test I can't
Texture skyTexture = Shader.GetGlobalTexture(HDShaderIDs._SkyTexture);
float skyTextureMipCount = Shader.GetGlobalFloat(HDShaderIDs._SkyTextureMipCount);
string sLabel = m_FrameSettings.lightLoopSettings.enableTileAndCluster ?
>>>>>>>
string sLabel = m_FrameSettings.lightLoopSettings.enableTileAndCluster ? |
<<<<<<<
this.isOfflineSession = true;
this.distanceOffTrack = 0;
this.isApproachingTrack = false;
this.playerLapsWhenFCYPosAssigned = -1;
this.detectedTrackNoDRSZones = false;
=======
>>>>>>>
this.isOfflineSession = true;
this.distanceOffTrack = 0;
this.isApproachingTrack = false;
this.playerLapsWhenFCYPosAssigned = -1;
this.detectedTrackNoDRSZones = false; |
<<<<<<<
// just entered the pit lane with no limiter active
audioPlayer.playMessageImmediately(new QueuedMessage(folderEngageLimiter, 0, this));
timeOfLastLimiterWarning = currentGameState.Now;
=======
// just passed the limiter line. Nasty hack - if we're playing Raceroom, confirm the pit actions using the macro if it exists:
if (CrewChief.gameDefinition.gameEnum == GameEnum.RACE_ROOM && CrewChiefV4.commands.MacroManager.macros.ContainsKey("confirm pit")
&& CrewChiefV4.commands.MacroManager.macros["confirm pit"].allowAutomaticTriggering)
{
CrewChiefV4.commands.MacroManager.macros["confirm pit"].execute(true);
}
if (currentGameState.PitData.limiterStatus == 0)
{
// just entered the pit lane with no limiter active
audioPlayer.playMessage(new QueuedMessage(folderEngageLimiter, 0, this));
timeOfLastLimiterWarning = currentGameState.Now;
}
>>>>>>>
// just passed the limiter line. Nasty hack - if we're playing Raceroom, confirm the pit actions using the macro if it exists:
if (CrewChief.gameDefinition.gameEnum == GameEnum.RACE_ROOM && CrewChiefV4.commands.MacroManager.macros.ContainsKey("confirm pit")
&& CrewChiefV4.commands.MacroManager.macros["confirm pit"].allowAutomaticTriggering)
{
CrewChiefV4.commands.MacroManager.macros["confirm pit"].execute(true);
}
if (currentGameState.PitData.limiterStatus == 0)
{
// just entered the pit lane with no limiter active
audioPlayer.playMessageImmediately(new QueuedMessage(folderEngageLimiter, 0, this));
timeOfLastLimiterWarning = currentGameState.Now;
} |
<<<<<<<
// Player lap times with sector information
public List<LapData> PlayerLapData = new List<LapData>();
public void playerStartNewLap(int lapNumber, int position, Boolean inPits, float gameTimeAtStart, Boolean isRaining, float trackTemp, float airTemp)
{
LapData thisLapData = new LapData();
thisLapData.Conditions.Add(new LapConditions(isRaining, trackTemp, airTemp));
thisLapData.GameTimeAtLapStart = gameTimeAtStart;
thisLapData.OutLap = inPits;
thisLapData.PositionAtStart = position;
thisLapData.LapNumber = lapNumber;
PlayerLapData.Add(thisLapData);
}
public void playerCompleteLapWithProvidedLapTime(int position, float gameTimeAtLapEnd, float providedLapTime,
Boolean lapIsValid, Boolean isRaining, float trackTemp, float airTemp, Boolean sessionLengthIsTime, float sessionTimeRemaining)
{
if (PlayerLapData.Count > 0)
{
LapData lapData = PlayerLapData[PlayerLapData.Count - 1];
playerAddCumulativeSectorData(position, providedLapTime, gameTimeAtLapEnd, lapIsValid, isRaining, trackTemp, airTemp);
lapData.LapTime = providedLapTime;
// Verify: LapTimePreviousm, PlayerLapTimeSessionBest, PlayerBestLapSector1Time
LapTimePrevious = providedLapTime;
if (lapData.IsValid && (PlayerLapTimeSessionBest == -1 || PlayerLapTimeSessionBest > lapData.LapTime))
{
PlayerLapTimeSessionBestPrevious = PlayerLapTimeSessionBest;
PlayerLapTimeSessionBest = lapData.LapTime;
PlayerBestLapSector1Time = lapData.SectorTimes[0];
PlayerBestLapSector2Time = lapData.SectorTimes[1];
PlayerBestLapSector3Time = lapData.SectorTimes[2];
}
PreviousLapWasValid = lapData.IsValid;
}
// Not sure we need this for player.
/*if (sessionLengthIsTime && sessionTimeRemaining > 0 && CurrentBestLapTime > 0 && sessionTimeRemaining < CurrentBestLapTime - 5)
{
isProbablyLastLap = true;
}*/
}
public void playerAddCumulativeSectorData(int position, float cumulativeSectorTime, float gameTimeAtSectorEnd, Boolean lapIsValid, Boolean isRaining, float trackTemp, float airTemp)
{
if (PlayerLapData.Count > 0)
{
LapData lapData = PlayerLapData[PlayerLapData.Count - 1];
if (cumulativeSectorTime <= 0)
{
cumulativeSectorTime = gameTimeAtSectorEnd - lapData.GameTimeAtLapStart;
}
float thisSectorTime = cumulativeSectorTime;
int sectorNumber = 1;
foreach (float sectorTime in lapData.SectorTimes)
{
sectorNumber++;
thisSectorTime = thisSectorTime - sectorTime;
}
lapData.SectorTimes.Add(thisSectorTime);
if (lapIsValid && thisSectorTime > 0)
{
// Possibly track Best sector times here.
if (sectorNumber == 1 && (PlayerBestSector1Time == -1 || thisSectorTime < PlayerBestSector1Time))
{
PlayerBestSector1Time = thisSectorTime;
}
if (sectorNumber == 2 && (PlayerBestSector2Time == -1 || thisSectorTime < PlayerBestSector2Time))
{
PlayerBestSector2Time = thisSectorTime;
}
if (sectorNumber == 3 && (PlayerBestSector3Time == -1 || thisSectorTime < PlayerBestSector3Time))
{
PlayerBestSector3Time = thisSectorTime;
}
}
lapData.SectorPositions.Add(position);
lapData.GameTimeAtSectorEnd.Add(gameTimeAtSectorEnd);
if (lapData.IsValid && !lapIsValid)
{
lapData.IsValid = false;
}
lapData.Conditions.Add(new LapConditions(isRaining, trackTemp, airTemp));
}
}
=======
public TrackLandmarksTiming trackLandmarksTiming = new TrackLandmarksTiming();
>>>>>>>
public TrackLandmarksTiming trackLandmarksTiming = new TrackLandmarksTiming();
// Player lap times with sector information
public List<LapData> PlayerLapData = new List<LapData>();
public void playerStartNewLap(int lapNumber, int position, Boolean inPits, float gameTimeAtStart, Boolean isRaining, float trackTemp, float airTemp)
{
LapData thisLapData = new LapData();
thisLapData.Conditions.Add(new LapConditions(isRaining, trackTemp, airTemp));
thisLapData.GameTimeAtLapStart = gameTimeAtStart;
thisLapData.OutLap = inPits;
thisLapData.PositionAtStart = position;
thisLapData.LapNumber = lapNumber;
PlayerLapData.Add(thisLapData);
}
public void playerCompleteLapWithProvidedLapTime(int position, float gameTimeAtLapEnd, float providedLapTime,
Boolean lapIsValid, Boolean isRaining, float trackTemp, float airTemp, Boolean sessionLengthIsTime, float sessionTimeRemaining)
{
if (PlayerLapData.Count > 0)
{
LapData lapData = PlayerLapData[PlayerLapData.Count - 1];
playerAddCumulativeSectorData(position, providedLapTime, gameTimeAtLapEnd, lapIsValid, isRaining, trackTemp, airTemp);
lapData.LapTime = providedLapTime;
// Verify: LapTimePreviousm, PlayerLapTimeSessionBest, PlayerBestLapSector1Time
LapTimePrevious = providedLapTime;
if (lapData.IsValid && (PlayerLapTimeSessionBest == -1 || PlayerLapTimeSessionBest > lapData.LapTime))
{
PlayerLapTimeSessionBestPrevious = PlayerLapTimeSessionBest;
PlayerLapTimeSessionBest = lapData.LapTime;
PlayerBestLapSector1Time = lapData.SectorTimes[0];
PlayerBestLapSector2Time = lapData.SectorTimes[1];
PlayerBestLapSector3Time = lapData.SectorTimes[2];
}
PreviousLapWasValid = lapData.IsValid;
}
// Not sure we need this for player.
/*if (sessionLengthIsTime && sessionTimeRemaining > 0 && CurrentBestLapTime > 0 && sessionTimeRemaining < CurrentBestLapTime - 5)
{
isProbablyLastLap = true;
}*/
}
public void playerAddCumulativeSectorData(int position, float cumulativeSectorTime, float gameTimeAtSectorEnd, Boolean lapIsValid, Boolean isRaining, float trackTemp, float airTemp)
{
if (PlayerLapData.Count > 0)
{
LapData lapData = PlayerLapData[PlayerLapData.Count - 1];
if (cumulativeSectorTime <= 0)
{
cumulativeSectorTime = gameTimeAtSectorEnd - lapData.GameTimeAtLapStart;
}
float thisSectorTime = cumulativeSectorTime;
int sectorNumber = 1;
foreach (float sectorTime in lapData.SectorTimes)
{
sectorNumber++;
thisSectorTime = thisSectorTime - sectorTime;
}
lapData.SectorTimes.Add(thisSectorTime);
if (lapIsValid && thisSectorTime > 0)
{
// Possibly track Best sector times here.
if (sectorNumber == 1 && (PlayerBestSector1Time == -1 || thisSectorTime < PlayerBestSector1Time))
{
PlayerBestSector1Time = thisSectorTime;
}
if (sectorNumber == 2 && (PlayerBestSector2Time == -1 || thisSectorTime < PlayerBestSector2Time))
{
PlayerBestSector2Time = thisSectorTime;
}
if (sectorNumber == 3 && (PlayerBestSector3Time == -1 || thisSectorTime < PlayerBestSector3Time))
{
PlayerBestSector3Time = thisSectorTime;
}
}
lapData.SectorPositions.Add(position);
lapData.GameTimeAtSectorEnd.Add(gameTimeAtSectorEnd);
if (lapData.IsValid && !lapIsValid)
{
lapData.IsValid = false;
}
lapData.Conditions.Add(new LapConditions(isRaining, trackTemp, airTemp));
}
} |
<<<<<<<
m_IsCameraRendering = false;
Lightmapping.SetDelegate(lightsDelegate);
=======
>>>>>>>
Lightmapping.SetDelegate(lightsDelegate); |
<<<<<<<
=======
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
>>>>>>>
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
<<<<<<<
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
=======
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.coreutils.ThreadUtils;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image;
>>>>>>>
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image; |
<<<<<<<
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterModel;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterModel;
import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
=======
>>>>>>>
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.DetailViewEvent;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterModel;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterModel;
import org.sleuthkit.autopsy.timeline.utils.IntervalUtils;
import org.sleuthkit.autopsy.timeline.zooming.ZoomParams;
<<<<<<<
import org.sleuthkit.datamodel.DescriptionLoD;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.EventType;
import org.sleuthkit.datamodel.timeline.EventTypeZoomLevel;
import org.sleuthkit.datamodel.timeline.TimeUnits;
import org.sleuthkit.datamodel.timeline.filters.DescriptionFilter;
import org.sleuthkit.datamodel.timeline.filters.TypeFilter;
=======
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.DescriptionLoD;
import org.sleuthkit.datamodel.timeline.EventType;
import org.sleuthkit.datamodel.timeline.EventTypeZoomLevel;
import org.sleuthkit.datamodel.timeline.IntervalUtils;
import org.sleuthkit.datamodel.timeline.TimeLineEvent;
import org.sleuthkit.datamodel.timeline.TimeUnits;
import org.sleuthkit.datamodel.timeline.ZoomParams;
import org.sleuthkit.datamodel.timeline.filters.DescriptionFilter;
import org.sleuthkit.datamodel.timeline.filters.RootFilter;
import org.sleuthkit.datamodel.timeline.filters.TypeFilter;
>>>>>>>
import org.sleuthkit.datamodel.DescriptionLoD;
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.EventType;
import org.sleuthkit.datamodel.timeline.EventTypeZoomLevel;
import org.sleuthkit.datamodel.timeline.TimeUnits;
import org.sleuthkit.datamodel.timeline.filters.DescriptionFilter;
import org.sleuthkit.datamodel.timeline.filters.TypeFilter;
<<<<<<<
filteredEvents.syncTagsFilter(historyManagerParams.getFilterModel());
=======
filteredEvents.syncTagsFilter(historyManagerParams.getFilter().getTagsFilter());
>>>>>>>
filteredEvents.syncTagsFilter(historyManagerParams.getFilterModel()); |
<<<<<<<
=======
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.ExecUtil;
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
>>>>>>>
<<<<<<<
import java.util.Optional;
import java.util.Scanner;
import java.util.Set;
=======
>>>>>>>
import java.util.Optional;
import java.util.Scanner;
import java.util.Set;
<<<<<<<
}
private Optional<URLVisit> parseLine(AbstractFile origFile, String line) {
=======
while (fileScanner.hasNext()) {
String line = fileScanner.nextLine();
if (!line.startsWith("URL")) { //NON-NLS
continue;
}
String[] lineBuff = line.split("\\t"); //NON-NLS
>>>>>>>
}
private Optional<URLVisit> parseLine(AbstractFile origFile, String line) { |
<<<<<<<
Map<Integer, CommonAttributeValueList> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCount(Case.getCurrentCase(), correlationCase);
Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn();
return new CommonAttributeCountSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType, mimeTypesToFilterOn);
=======
Set<String> mimeTypesToFilterOn = new HashSet<>();
if (isFilterByMedia()) {
mimeTypesToFilterOn.addAll(MEDIA_PICS_VIDEO_MIME_TYPES);
}
if (isFilterByDoc()) {
mimeTypesToFilterOn.addAll(TEXT_FILES_MIME_TYPES);
}
Map<Integer, CommonAttributeValueList> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCount(Case.getCurrentCase(), mimeTypesToFilterOn, correlationCase);
return new CommonAttributeCountSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType);
>>>>>>>
Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn();
Map<Integer, CommonAttributeValueList> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCount(Case.getCurrentCase(), mimeTypesToFilterOn, correlationCase);
return new CommonAttributeCountSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType);
<<<<<<<
Map<String, Map<String, CommonAttributeValueList>> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCase(Case.getCurrentCase(), correlationCase);
Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn();
return new CommonAttributeCaseSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType, mimeTypesToFilterOn);
=======
Set<String> mimeTypesToFilterOn = new HashSet<>();
if (isFilterByMedia()) {
mimeTypesToFilterOn.addAll(MEDIA_PICS_VIDEO_MIME_TYPES);
}
if (isFilterByDoc()) {
mimeTypesToFilterOn.addAll(TEXT_FILES_MIME_TYPES);
}
Map<String, Map<String, CommonAttributeValueList>> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCase(Case.getCurrentCase(), mimeTypesToFilterOn, correlationCase);
return new CommonAttributeCaseSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType);
>>>>>>>
Set<String> mimeTypesToFilterOn = getMimeTypesToFilterOn();
Map<String, Map<String, CommonAttributeValueList>> interCaseCommonFiles = eamDbAttrInst.findSingleInterCaseValuesByCase(Case.getCurrentCase(), mimeTypesToFilterOn, correlationCase);
return new CommonAttributeCaseSearchResults(interCaseCommonFiles, this.frequencyPercentageThreshold, this.corAttrType); |
<<<<<<<
private final static IngestServices ingestServices = IngestServices.getInstance();
private final static Logger logger = ingestServices.getLogger(SQLiteReader.class.getName());
=======
private final static IngestServices services = IngestServices.getInstance();
private final static Logger logger = services.getLogger(SQLiteReader.class.getName());
>>>>>>>
private final static IngestServices ingestServices = IngestServices.getInstance();
private final static Logger logger = ingestServices.getLogger(SQLiteReader.class.getName());
<<<<<<<
connection = getDatabaseConnection(localDiskPath);
} catch (ClassNotFoundException | SQLException |IOException |
NoCurrentCaseException | TskCoreException | FileReaderException ex) {
=======
connection = getDatabaseConnection(super.getLocalDiskPath());
} catch (ClassNotFoundException | SQLException | IOException
| NoCurrentCaseException | TskCoreException ex) {
>>>>>>>
connection = getDatabaseConnection(localDiskPath);
} catch (ClassNotFoundException | SQLException |IOException |
NoCurrentCaseException | TskCoreException | FileReaderException ex) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
sqliteFile.getDataSource(), metaFileName,
sqliteFile.getParent().getName());
=======
sqliteFile.getDataSource(), metaFileName,
sqliteFile.getParent().getName());
>>>>>>>
sqliteFile.getDataSource(), metaFileName,
sqliteFile.getParent().getName());
<<<<<<<
String tmpMetafilePathName = openCase.getTempDirectory() +
File.separator + metaFile.getId() + metaFile.getName();
=======
String tmpMetafilePathName = openCase.getTempDirectory()
+ File.separator + metaFile.getId() + metaFile.getName();
>>>>>>>
String tmpMetafilePathName = openCase.getTempDirectory()
+ File.separator + metaFile.getId() + metaFile.getName(); |
<<<<<<<
=======
>>>>>>>
<<<<<<<
@Override
protected synchronized void setFileHelper(Long newFileID) {
=======
@Override
synchronized protected void setFileHelper(Long newFileID) {
>>>>>>>
@Override
protected synchronized void setFileHelper(Long newFileID) {
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.MultiEvent;
import org.sleuthkit.datamodel.DescriptionLoD;
=======
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.DescriptionLoD;
import org.sleuthkit.datamodel.timeline.MultiEvent;
>>>>>>>
import org.sleuthkit.autopsy.timeline.ui.detailview.datamodel.MultiEvent;
import org.sleuthkit.datamodel.DescriptionLoD;
import org.sleuthkit.datamodel.TskCoreException;
<<<<<<<
@Override
=======
@SuppressWarnings("unchecked")
@Override
>>>>>>>
@Override |
<<<<<<<
this.knownStatus = knownStatus;
=======
this.knownStatusDenoted = notable;
>>>>>>>
this.knownStatusDenoted = knownStatus; |
<<<<<<<
=======
/**
* Configure the listener to create correlation properties
*
* @param value True to create properties; otherwise false.
*/
public synchronized static void setCreateCrProperties(boolean value) {
createCrProperties = value;
}
>>>>>>>
/**
* Configure the listener to create correlation properties
*
* @param value True to create properties; otherwise false.
*/
public synchronized static void setCreateCrProperties(boolean value) {
createCrProperties = value;
}
<<<<<<<
Collection<BlackboardAttribute> attributes = Arrays.asList(
new BlackboardAttribute(
TSK_SET_NAME, MODULE_NAME,
Bundle.IngestEventsListener_prevTaggedSet_text()),
new BlackboardAttribute(
TSK_COMMENT, MODULE_NAME,
Bundle.IngestEventsListener_prevCaseComment_text() + caseDisplayNames.stream().distinct().collect(Collectors.joining(","))),
new BlackboardAttribute(
TSK_ASSOCIATED_ARTIFACT, MODULE_NAME,
bbArtifact.getArtifactID()));
postArtifactToBlackboard(bbArtifact, attributes);
=======
try {
String MODULE_NAME = Bundle.IngestEventsListener_ingestmodule_name();
Collection<BlackboardAttribute> attributes = new ArrayList<>();
attributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME,
Bundle.IngestEventsListener_prevTaggedSet_text()));
attributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT, MODULE_NAME,
Bundle.IngestEventsListener_prevCaseComment_text() + caseDisplayNames.stream().distinct().collect(Collectors.joining(",", "", ""))));
attributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, bbArtifact.getArtifactID()));
SleuthkitCase tskCase = bbArtifact.getSleuthkitCase();
AbstractFile abstractFile = tskCase.getAbstractFileById(bbArtifact.getObjectID());
org.sleuthkit.datamodel.Blackboard tskBlackboard = tskCase.getBlackboard();
// Create artifact if it doesn't already exist.
if (!tskBlackboard.artifactExists(abstractFile, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT, attributes)) {
BlackboardArtifact tifArtifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT);
tifArtifact.addAttributes(attributes);
try {
// index the artifact for keyword search
Blackboard blackboard = Case.getCurrentCaseThrows().getServices().getBlackboard();
blackboard.indexArtifact(tifArtifact);
} catch (Blackboard.BlackboardException | NoCurrentCaseException ex) {
LOGGER.log(Level.SEVERE, "Unable to index blackboard artifact " + tifArtifact.getArtifactID(), ex); //NON-NLS
}
// fire event to notify UI of this new artifact
IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent(MODULE_NAME, BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT));
}
} catch (TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Failed to create BlackboardArtifact.", ex); // NON-NLS
} catch (IllegalStateException ex) {
LOGGER.log(Level.SEVERE, "Failed to create BlackboardAttribute.", ex); // NON-NLS
}
>>>>>>>
Collection<BlackboardAttribute> attributes = Arrays.asList(
new BlackboardAttribute(
TSK_SET_NAME, MODULE_NAME,
Bundle.IngestEventsListener_prevTaggedSet_text()),
new BlackboardAttribute(
TSK_COMMENT, MODULE_NAME,
Bundle.IngestEventsListener_prevCaseComment_text() + caseDisplayNames.stream().distinct().collect(Collectors.joining(","))),
new BlackboardAttribute(
TSK_ASSOCIATED_ARTIFACT, MODULE_NAME,
bbArtifact.getArtifactID()));
postArtifactToBlackboard(bbArtifact, attributes);
<<<<<<<
=======
String MODULE_NAME = Bundle.IngestEventsListener_ingestmodule_name();
Collection<BlackboardAttribute> attributes = new ArrayList<>();
BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME,
Bundle.IngestEventsListener_prevExists_text());
attributes.add(att);
attributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, bbArtifact.getArtifactID()));
>>>>>>>
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import org.sleuthkit.autopsy.datamodel.ContentUtils;
=======
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
>>>>>>>
import org.sleuthkit.autopsy.coreutils.NetworkUtils;
import org.sleuthkit.autopsy.datamodel.ContentUtils;
<<<<<<<
Collection<BlackboardAttribute> bbattributes = Arrays.asList(
new BlackboardAttribute(
TSK_URL, PARENT_MODULE_NAME,
Objects.toString(result.get("url"), "")), //NON-NLS
new BlackboardAttribute(
TSK_DATETIME_ACCESSED, PARENT_MODULE_NAME,
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - SECONDS_SINCE_JAN_1_1601),
new BlackboardAttribute(
TSK_REFERRER, PARENT_MODULE_NAME,
Objects.toString(result.get("from_visit"), "")), //NON-NLS
new BlackboardAttribute(
TSK_TITLE, PARENT_MODULE_NAME,
Objects.toString(result.get("title"), "")), //NON-NLS
new BlackboardAttribute(
TSK_PROG_NAME, PARENT_MODULE_NAME,
getModuleName()),
new BlackboardAttribute(
TSK_DOMAIN, PARENT_MODULE_NAME,
Util.extractDomain(Objects.toString(result.get("url"), "")))); //NON-NLS
try {
BlackboardArtifact bbart = historyFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
bbart.addAttributes(bbattributes);
=======
Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - Long.valueOf("11644473600"))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
(NetworkUtils.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
BlackboardArtifact bbart = this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, historyFile, bbattributes);
if (bbart != null) {
>>>>>>>
Collection<BlackboardAttribute> bbattributes = Arrays.asList(
new BlackboardAttribute(
TSK_URL, PARENT_MODULE_NAME,
Objects.toString(result.get("url"), "")), //NON-NLS
new BlackboardAttribute(
TSK_DATETIME_ACCESSED, PARENT_MODULE_NAME,
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - SECONDS_SINCE_JAN_1_1601),
new BlackboardAttribute(
TSK_REFERRER, PARENT_MODULE_NAME,
Objects.toString(result.get("from_visit"), "")), //NON-NLS
new BlackboardAttribute(
TSK_TITLE, PARENT_MODULE_NAME,
Objects.toString(result.get("title"), "")), //NON-NLS
new BlackboardAttribute(
TSK_PROG_NAME, PARENT_MODULE_NAME,
getModuleName()),
new BlackboardAttribute(
TSK_DOMAIN, PARENT_MODULE_NAME,
Util.extractDomain(Objects.toString(result.get("url"), "")))); //NON-NLS
try {
BlackboardArtifact bbart = historyFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
bbart.addAttributes(bbattributes);
<<<<<<<
try {
BlackboardArtifact bbart = downloadFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD);
bbart.addAttributes(bbattributes);
=======
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
//bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "Recent Activity", ((result.get("url").toString() != null) ? EscapeUtil.decodeURL(result.get("url").toString()) : "")));
Long time = (Long.valueOf(result.get("start_time").toString()) / 1000000) - Long.valueOf("11644473600"); //NON-NLS
//TODO Revisit usage of deprecated constructor as per TSK-583
//bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "Recent Activity", "Last Visited", time));
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), time));
String domain = NetworkUtils.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), domain));
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
BlackboardArtifact bbart = this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadFile, bbattributes);
if (bbart != null) {
>>>>>>>
try {
BlackboardArtifact bbart = downloadFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD);
bbart.addAttributes(bbattributes);
<<<<<<<
Collection<BlackboardAttribute> bbattributes = Arrays.asList(
new BlackboardAttribute(
TSK_URL, PARENT_MODULE_NAME,
Objects.toString(result.get("origin_url"), "")), //NON-NLS
new BlackboardAttribute(
TSK_DATETIME_ACCESSED, PARENT_MODULE_NAME,
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - SECONDS_SINCE_JAN_1_1601), //NON-NLS
new BlackboardAttribute(
TSK_REFERRER, PARENT_MODULE_NAME,
Objects.toString(result.get("from_visit"), "")), //NON-NLS
new BlackboardAttribute(
TSK_NAME, PARENT_MODULE_NAME,
Objects.toString(result.get("title").toString(), "")), //NON-NLS
new BlackboardAttribute(
TSK_PROG_NAME, PARENT_MODULE_NAME,
getModuleName()),
new BlackboardAttribute(
TSK_URL_DECODED, PARENT_MODULE_NAME,
Util.extractDomain(Objects.toString(result.get("origin_url"), ""))), //NON-NLS
new BlackboardAttribute(
TSK_USER_NAME, PARENT_MODULE_NAME,
Objects.toString(result.get("username_value"), "").replaceAll("'", "''")), //NON-NLS
new BlackboardAttribute(
TSK_DOMAIN, PARENT_MODULE_NAME,
Objects.toString(result.get("signon_realm"), ""))); //NON-NLS
try {
BlackboardArtifact bbart = signonFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
bbart.addAttributes(bbattributes);
=======
Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("origin_url").toString() != null) ? result.get("origin_url").toString() : ""))); //NON-NLS
//bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "Recent Activity", ((result.get("origin_url").toString() != null) ? EscapeUtil.decodeURL(result.get("origin_url").toString()) : "")));
//TODO Revisit usage of deprecated constructor as per TSK-583
//bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "Recent Activity", "Last Visited", ((Long.valueOf(result.get("last_visit_time").toString())) / 1000000)));
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - Long.valueOf("11644473600"))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
(NetworkUtils.extractDomain((result.get("origin_url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
((result.get("username_value").toString() != null) ? result.get("username_value").toString().replaceAll("'", "''") : ""))); //NON-NLS
bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN,
NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
result.get("signon_realm").toString())); //NON-NLS
BlackboardArtifact bbart = this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, signonFile, bbattributes);
if (bbart != null) {
>>>>>>>
Collection<BlackboardAttribute> bbattributes = Arrays.asList(
new BlackboardAttribute(
TSK_URL, PARENT_MODULE_NAME,
Objects.toString(result.get("origin_url"), "")), //NON-NLS
new BlackboardAttribute(
TSK_DATETIME_ACCESSED, PARENT_MODULE_NAME,
(Long.valueOf(result.get("last_visit_time").toString()) / 1000000) - SECONDS_SINCE_JAN_1_1601), //NON-NLS
new BlackboardAttribute(
TSK_REFERRER, PARENT_MODULE_NAME,
Objects.toString(result.get("from_visit"), "")), //NON-NLS
new BlackboardAttribute(
TSK_NAME, PARENT_MODULE_NAME,
Objects.toString(result.get("title").toString(), "")), //NON-NLS
new BlackboardAttribute(
TSK_PROG_NAME, PARENT_MODULE_NAME,
getModuleName()),
new BlackboardAttribute(
TSK_URL_DECODED, PARENT_MODULE_NAME,
Util.extractDomain(Objects.toString(result.get("origin_url"), ""))), //NON-NLS
new BlackboardAttribute(
TSK_USER_NAME, PARENT_MODULE_NAME,
Objects.toString(result.get("username_value"), "").replaceAll("'", "''")), //NON-NLS
new BlackboardAttribute(
TSK_DOMAIN, PARENT_MODULE_NAME,
Objects.toString(result.get("signon_realm"), ""))); //NON-NLS
try {
BlackboardArtifact bbart = signonFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
bbart.addAttributes(bbattributes); |
<<<<<<<
private static class ShortNameVisitor extends ContentVisitor.Default<String> {
ShortNameVisitor() {
}
@Override
protected String defaultVisit(Content cntnt) {
return cntnt.getName();
}
}
private static class GetPathVisitor implements ContentVisitor<List<String>> {
ContentVisitor<String> toString;
GetPathVisitor(ContentVisitor<String> toString) {
this.toString = toString;
}
@Override
public List<String> visit(LayoutFile lay) {
Content parent = null;
try {
parent = lay.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + LayoutFile.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(lay));
}
return path;
}
@Override
public List<String> visit(VirtualDirectory ld) {
Content parent = null;
try {
parent = ld.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + VirtualDirectory.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(ld));
}
return path;
}
@Override
public List<String> visit(Directory dir) {
Content parent = null;
try {
parent = dir.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + Directory.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(dir));
}
return path;
}
@Override
public List<String> visit(File file) {
Content parent = null;
try {
parent = file.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + File.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(file));
}
return path;
}
@Override
public List<String> visit(FileSystem fs) {
Content parent = null;
try {
parent = fs.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + FileSystem.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(fs));
}
return path;
}
@Override
public List<String> visit(Image image) {
List<String> path = new LinkedList<String>();
path.add(toString.visit(image));
return path;
}
@Override
public List<String> visit(Volume volume) {
Content parent = null;
try {
parent = volume.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + Volume.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(volume));
}
return path;
}
@Override
public List<String> visit(VolumeSystem vs) {
Content parent = null;
try {
parent = vs.getParent();
} catch (TskCoreException ex) {
throw new RuntimeException("Problem getting parent from " + VolumeSystem.class.getName(), ex);
}
List<String> path = Collections.<String>emptyList();
if (parent != null) {
path = parent.accept(this);
path.add(toString.visit(vs));
}
return path;
}
}
=======
>>>>>>> |
<<<<<<<
=======
import java.beans.FeatureDescriptor;
import java.beans.PropertyChangeEvent;
>>>>>>>
<<<<<<<
=======
import java.util.Comparator;
import java.util.LinkedHashSet;
>>>>>>>
import java.util.Comparator;
import java.util.LinkedHashSet;
<<<<<<<
import java.util.prefs.Preferences;
=======
import java.util.TreeSet;
import java.util.prefs.Preferences;
>>>>>>>
import java.util.TreeSet;
import java.util.prefs.Preferences;
<<<<<<<
import org.netbeans.swing.etable.ETableColumn;
=======
import javax.swing.table.TableColumnModel;
import org.netbeans.swing.etable.ETableColumn;
>>>>>>>
import javax.swing.table.TableColumnModel;
import org.netbeans.swing.etable.ETableColumn;
<<<<<<<
private OutlineView outlineView;
/**
* Convenience reference to internal Outline
*/
private Outline outline;
=======
private OutlineView ov;
>>>>>>>
/**
* Convenience reference to internal Outline
*/
private Outline outline;
<<<<<<<
outlineView = ((OutlineView) this.tableScrollPanel);
outlineView.setAllowedDragActions(DnDConstants.ACTION_NONE);
outline = outlineView.getOutline();
=======
ov = ((OutlineView) this.tableScrollPanel);
ov.setAllowedDragActions(DnDConstants.ACTION_NONE);
>>>>>>>
outlineView.setAllowedDragActions(DnDConstants.ACTION_NONE);
outline = outlineView.getOutline();
<<<<<<<
=======
/**
* Gets regular Bean property set properties from all children and,
* recursively, subchildren, of a Node.
*
* Note: won't work out the box for lazy load - you need to set all children
* properties for the parent by hand.
*
* @param parent Node (with at least one child) from which toget
* properties.
* @param rows Maximum number of rows to retrieve properties for
* (can be used for memory optimization).
* @param propertiesAcc Set in which to accumulate the properties.
*/
private void getAllChildPropertyHeadersRec(Node parent, int rows, Set<Property<?>> propertiesAcc) {
Children children = parent.getChildren();
int childCount = 0;
for (Node child : children.getNodes()) {
if (++childCount > rows) {
return;
}
for (PropertySet ps : child.getPropertySets()) {
final Property<?>[] props = ps.getProperties();
final int propsNum = props.length;
for (int j = 0; j < propsNum; ++j) {
propertiesAcc.add(props[j]);
}
}
getAllChildPropertyHeadersRec(child, rows, propertiesAcc);
}
}
>>>>>>>
/**
* Gets regular Bean property set properties from all children and,
* recursively, subchildren, of a Node.
*
* Note: won't work out the box for lazy load - you need to set all children
* properties for the parent by hand.
*
* @param parent Node (with at least one child) from which toget
* properties.
* @param rows Maximum number of rows to retrieve properties for
* (can be used for memory optimization).
* @param propertiesAcc Set in which to accumulate the properties.
*/
private void getAllChildPropertyHeadersRec(Node parent, int rows, Set<Property<?>> propertiesAcc) {
Children children = parent.getChildren();
int childCount = 0;
for (Node child : children.getNodes()) {
if (++childCount > rows) {
return;
}
for (PropertySet ps : child.getPropertySets()) {
final Property<?>[] props = ps.getProperties();
final int propsNum = props.length;
for (int j = 0; j < propsNum; ++j) {
propertiesAcc.add(props[j]);
}
}
getAllChildPropertyHeadersRec(child, rows, propertiesAcc);
}
}
<<<<<<<
/*
* The quick filter must be reset because when determining column width,
=======
final OutlineView ov = ((OutlineView) this.tableScrollPanel);
/*
* The quick filter must be reset because when determining column width,
>>>>>>>
/*
* The quick filter must be reset because when determining column width,
<<<<<<<
List<Node.Property<?>> props = loadColumnOrder(currentRoot, propertiesMap);
=======
List<Node.Property<?>> props = loadColumnOrder();
>>>>>>>
List<Node.Property<?>> props = loadColumnOrder();
<<<<<<<
private synchronized List<Node.Property<?>> loadColumnOrder(Node Node, Map<Integer, Property<?>> propMap) {
List<Property<?>> props = ResultViewerPersistence.getAllChildProperties(Node);
=======
private synchronized List<Node.Property<?>> loadColumnOrder() {
// This is a set because we add properties of up to 100 child nodes, and we want unique properties
Set<Property<?>> propertiesAcc = new LinkedHashSet<>();
this.getAllChildPropertyHeadersRec(currentRoot, 100, propertiesAcc);
List<Node.Property<?>> props = new ArrayList<>(propertiesAcc);
>>>>>>>
private synchronized List<Node.Property<?>> loadColumnOrder() {
// This is a set because we add properties of up to 100 child nodes, and we want unique properties
Set<Property<?>> propertiesAcc = new LinkedHashSet<>();
this.getAllChildPropertyHeadersRec(currentRoot, 100, propertiesAcc);
List<Node.Property<?>> props = new ArrayList<>(propertiesAcc); |
<<<<<<<
//try {
file.setKnown(TskData.FileKnown.BAD);
// skCase.setKnown(file, TskData.FileKnown.BAD);
//} catch (TskException ex) {
// logger.log(Level.WARNING, "Couldn't set notable state for file " + name + " - see sleuthkit log for details", ex); //NON-NLS
// services.postMessage(IngestMessage.createErrorMessage(
// HashLookupModuleFactory.getModuleName(),
// NbBundle.getMessage(this.getClass(),
// "HashDbIngestModule.hashLookupErrorMsg",
// name),
// NbBundle.getMessage(this.getClass(),
// "HashDbIngestModule.settingKnownBadStateErr",
// name)));
// ret = ProcessResult.ERROR;
//}
String hashSetName = db.getHashSetName();
=======
try {
skCase.setKnown(file, TskData.FileKnown.BAD);
} catch (TskException ex) {
logger.log(Level.WARNING, "Couldn't set notable state for file " + name + " - see sleuthkit log for details", ex); //NON-NLS
services.postMessage(IngestMessage.createErrorMessage(
HashLookupModuleFactory.getModuleName(),
NbBundle.getMessage(this.getClass(),
"HashDbIngestModule.hashLookupErrorMsg",
name),
NbBundle.getMessage(this.getClass(),
"HashDbIngestModule.settingKnownBadStateErr",
name)));
ret = ProcessResult.ERROR;
}
String hashSetName = db.getDisplayName();
>>>>>>>
//try {
file.setKnown(TskData.FileKnown.BAD);
// skCase.setKnown(file, TskData.FileKnown.BAD);
//} catch (TskException ex) {
// logger.log(Level.WARNING, "Couldn't set notable state for file " + name + " - see sleuthkit log for details", ex); //NON-NLS
// services.postMessage(IngestMessage.createErrorMessage(
// HashLookupModuleFactory.getModuleName(),
// NbBundle.getMessage(this.getClass(),
// "HashDbIngestModule.hashLookupErrorMsg",
// name),
// NbBundle.getMessage(this.getClass(),
// "HashDbIngestModule.settingKnownBadStateErr",
// name)));
// ret = ProcessResult.ERROR;
//}
String hashSetName = db.getDisplayName(); |
<<<<<<<
//If there is not Text Translator implementation, then hide these buttons
//from the user.
TextTranslationService tts = TextTranslationService.getInstance();
translateNamesRadioButton.setEnabled(tts.hasProvider());
=======
this.timeZoneList.setListData(TimeZoneUtils.createTimeZoneList().stream().toArray(String[]::new));
>>>>>>>
//If there is not Text Translator implementation, then hide these buttons
//from the user.
TextTranslationService tts = TextTranslationService.getInstance();
translateNamesRadioButton.setEnabled(tts.hasProvider());
this.timeZoneList.setListData(TimeZoneUtils.createTimeZoneList().stream().toArray(String[]::new));
<<<<<<<
translateNamesRadioButton = new javax.swing.JRadioButton();
translateTextLabel = new javax.swing.JLabel();
=======
jScrollPane1 = new javax.swing.JScrollPane();
timeZoneList = new javax.swing.JList<>();
>>>>>>>
translateNamesRadioButton = new javax.swing.JRadioButton();
translateTextLabel = new javax.swing.JLabel();
jScrollPane1 = new javax.swing.JScrollPane();
timeZoneList = new javax.swing.JList<>();
<<<<<<<
org.openide.awt.Mnemonics.setLocalizedText(translateNamesRadioButton, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.translateNamesRadioButton.text")); // NOI18N
translateNamesRadioButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
translateNamesRadioButtonActionPerformed(evt);
}
});
org.openide.awt.Mnemonics.setLocalizedText(translateTextLabel, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.translateTextLabel.text")); // NOI18N
=======
timeZoneList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
timeZoneListValueChanged(evt);
}
});
jScrollPane1.setViewportView(timeZoneList);
>>>>>>>
org.openide.awt.Mnemonics.setLocalizedText(translateNamesRadioButton, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.translateNamesRadioButton.text")); // NOI18N
translateNamesRadioButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
translateNamesRadioButtonActionPerformed(evt);
}
});
org.openide.awt.Mnemonics.setLocalizedText(translateTextLabel, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.translateTextLabel.text")); // NOI18N
timeZoneList.addListSelectionListener(new javax.swing.event.ListSelectionListener() {
public void valueChanged(javax.swing.event.ListSelectionEvent evt) {
timeZoneListValueChanged(evt);
}
});
jScrollPane1.setViewportView(timeZoneList);
<<<<<<<
.addComponent(dataSourcesHideSlackCheckbox)
.addComponent(viewsHideSlackCheckbox)))
.addComponent(hideSlackFilesLabel))
.addGroup(globalSettingsPanelLayout.createSequentialGroup()
.addGap(10, 10, 10)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(dataSourcesHideKnownCheckbox)
.addComponent(viewsHideKnownCheckbox))))
.addComponent(hideOtherUsersTagsLabel))
.addGap(18, 18, 18)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(translateTextLabel)
.addComponent(displayTimeLabel)
.addGroup(globalSettingsPanelLayout.createSequentialGroup()
.addGap(10, 10, 10)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(keepCurrentViewerRadioButton)
.addComponent(useBestViewerRadioButton)
.addComponent(useGMTTimeRadioButton)
.addComponent(useLocalTimeRadioButton)
.addComponent(translateNamesRadioButton)))
.addComponent(selectFileLabel))))
.addGap(0, 10, Short.MAX_VALUE)))
.addContainerGap())
=======
.addComponent(keepCurrentViewerRadioButton)
.addComponent(useBestViewerRadioButton)
.addComponent(useLocalTimeRadioButton)
.addComponent(useAnotherTimeRadioButton)))
.addComponent(selectFileLabel)))
.addComponent(hideOtherUsersTagsLabel)
.addComponent(deletedFilesLimitLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())))
>>>>>>>
.addComponent(dataSourcesHideSlackCheckbox)
.addComponent(viewsHideSlackCheckbox)))
.addComponent(hideSlackFilesLabel))
.addGroup(globalSettingsPanelLayout.createSequentialGroup()
.addGap(10, 10, 10)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(dataSourcesHideKnownCheckbox)
.addComponent(viewsHideKnownCheckbox))))
.addComponent(hideOtherUsersTagsLabel))
.addGap(18, 18, 18)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(translateTextLabel)
.addComponent(displayTimeLabel)
.addGroup(globalSettingsPanelLayout.createSequentialGroup()
.addGap(10, 10, 10)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(keepCurrentViewerRadioButton)
.addComponent(useBestViewerRadioButton)
.addComponent(useGMTTimeRadioButton)
.addComponent(useLocalTimeRadioButton)
.addComponent(translateNamesRadioButton)))
.addComponent(selectFileLabel))))
.addGap(0, 10, Short.MAX_VALUE)))
.addContainerGap())
.addComponent(keepCurrentViewerRadioButton)
.addComponent(useBestViewerRadioButton)
.addComponent(useLocalTimeRadioButton)
.addComponent(useAnotherTimeRadioButton)))
.addComponent(selectFileLabel)))
.addComponent(hideOtherUsersTagsLabel)
.addComponent(deletedFilesLimitLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())))
<<<<<<<
.addComponent(useGMTTimeRadioButton)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(translateTextLabel)
.addComponent(hideOtherUsersTagsLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(hideOtherUsersTagsCheckbox)
.addComponent(translateNamesRadioButton))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(centralRepoLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(commentsOccurencesColumnsCheckbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(deletedFilesLimitLabel)
=======
.addComponent(useAnotherTimeRadioButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)))
>>>>>>>
.addComponent(useGMTTimeRadioButton)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(translateTextLabel)
.addComponent(hideOtherUsersTagsLabel))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(hideOtherUsersTagsCheckbox)
.addComponent(translateNamesRadioButton))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(centralRepoLabel)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(commentsOccurencesColumnsCheckbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(deletedFilesLimitLabel)
.addComponent(useAnotherTimeRadioButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)))
<<<<<<<
private void translateNamesRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translateNamesRadioButtonActionPerformed
if (immediateUpdates) {
UserPreferences.setDisplayTranslatedFileNames(translateNamesRadioButton.isSelected());
} else {
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}
}//GEN-LAST:event_translateNamesRadioButtonActionPerformed
=======
private void timeZoneListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_timeZoneListValueChanged
if (immediateUpdates && useAnotherTimeRadioButton.isSelected()) {
UserPreferences.setTimeZoneForDisplays(timeZoneList.getSelectedValue().substring(11).trim());
} else {
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}
}//GEN-LAST:event_timeZoneListValueChanged
>>>>>>>
private void translateNamesRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_translateNamesRadioButtonActionPerformed
if (immediateUpdates) {
UserPreferences.setDisplayTranslatedFileNames(translateNamesRadioButton.isSelected());
} else {
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}
}//GEN-LAST:event_translateNamesRadioButtonActionPerformed
private void timeZoneListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_timeZoneListValueChanged
if (immediateUpdates && useAnotherTimeRadioButton.isSelected()) {
UserPreferences.setTimeZoneForDisplays(timeZoneList.getSelectedValue().substring(11).trim());
} else {
firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
}
}//GEN-LAST:event_timeZoneListValueChanged
<<<<<<<
private javax.swing.JRadioButton translateNamesRadioButton;
private javax.swing.JLabel translateTextLabel;
=======
private javax.swing.JList<String> timeZoneList;
private javax.swing.JRadioButton useAnotherTimeRadioButton;
>>>>>>>
private javax.swing.JRadioButton translateNamesRadioButton;
private javax.swing.JLabel translateTextLabel;
private javax.swing.JList<String> timeZoneList;
private javax.swing.JRadioButton useAnotherTimeRadioButton; |
<<<<<<<
=======
import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.TYPE;
>>>>>>>
import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
<<<<<<<
actionsList.add(AddContentTagAction.getInstance());
=======
actionsList.add(TagAbstractFileAction.getInstance());
actionsList.addAll(ContextMenuExtensionPoint.getActions());
>>>>>>>
actionsList.add(AddContentTagAction.getInstance());
actionsList.addAll(ContextMenuExtensionPoint.getActions()); |
<<<<<<<
=======
import java.nio.file.Path;
import static java.util.TimeZone.getTimeZone;
import org.openide.util.Lookup;
import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
import org.sleuthkit.autopsy.ingest.IngestModule.IngestModuleException;
import org.sleuthkit.autopsy.ingest.IngestServices;
import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService;
import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamException;
>>>>>>>
import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
<<<<<<<
String parentModuleName = NbBundle.getMessage(this.getClass(), "ExtractRegistry.parentModuleName.noSpace");
=======
String parentModuleName = RecentActivityExtracterModuleFactory.getModuleName();
String winver = "";
>>>>>>>
String parentModuleName = RecentActivityExtracterModuleFactory.getModuleName(); |
<<<<<<<
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new UserActivityPanel()),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_recentFileTab_title(), new RecentFilesPanel()),
=======
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new DataSourceSummaryUserActivityPanel()),
>>>>>>>
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_userActivityTab_title(), new UserActivityPanel()),
<<<<<<<
// do nothing on closing
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_ingestHistoryTab_title(), ingestHistoryPanel, ingestHistoryPanel::setDataSource, () -> {
}),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_detailsTab_title(), new ContainerPanel())
=======
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_recentFileTab_title(), new RecentFilesPanel()),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_pastCasesTab_title(), new PastCasesPanel()),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_ingestHistoryTab_title(), ingestHistoryPanel, ingestHistoryPanel::setDataSource),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_detailsTab_title(), new DataSourceSummaryDetailsPanel())
>>>>>>>
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_recentFileTab_title(), new RecentFilesPanel()),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_pastCasesTab_title(), new PastCasesPanel()),
// do nothing on closing
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_ingestHistoryTab_title(), ingestHistoryPanel, ingestHistoryPanel::setDataSource, () -> {
}),
new DataSourceTab(Bundle.DataSourceSummaryTabbedPane_detailsTab_title(), new ContainerPanel()) |
<<<<<<<
=======
import java.util.Collections;
import java.util.Comparator;
>>>>>>>
<<<<<<<
return new TimelineEvent(
resultSet.getLong("event_id"), // NON-NLS
resultSet.getLong("data_source_obj_id"), // NON-NLS
resultSet.getLong("file_obj_id"), // NON-NLS
resultSet.getLong("artifact_id"), // NON-NLS
resultSet.getLong("time"), // NON-NLS
eventType,
eventType.getDescription(
resultSet.getString("full_description"), // NON-NLS
resultSet.getString("med_description"), // NON-NLS
resultSet.getString("short_description")), // NON-NLS
resultSet.getInt("hash_hit") != 0, //NON-NLS
resultSet.getInt("tagged") != 0);
=======
List<Long> hashHits = unGroupConcat(resultSet.getString("hash_hits"), Long::valueOf); //NON-NLS
List<Long> tagged = unGroupConcat(resultSet.getString("taggeds"), Long::valueOf); //NON-NLS
//TODO: address singleton type, instead of potential multiple types
return new EventCluster(interval, Collections.singleton(eventType), eventIDs, hashHits, tagged, description, descriptionLOD);
>>>>>>>
return new TimelineEvent(
resultSet.getLong("event_id"), // NON-NLS
resultSet.getLong("data_source_obj_id"), // NON-NLS
resultSet.getLong("file_obj_id"), // NON-NLS
resultSet.getLong("artifact_id"), // NON-NLS
resultSet.getLong("time"), // NON-NLS
eventType,
resultSet.getString("full_description"), // NON-NLS
resultSet.getString("med_description"), // NON-NLS
resultSet.getString("short_description"), // NON-NLS
resultSet.getInt("hash_hit") != 0, //NON-NLS
resultSet.getInt("tagged") != 0);
<<<<<<<
=======
for (EventCluster aggregateEvent : preMergedEvents) {
typeMap.computeIfAbsent(EventType.getCommonSuperType(aggregateEvent.getEventTypes()), eventType -> HashMultimap.create())
.put(aggregateEvent.getDescription(), aggregateEvent);
}
>>>>>>>
<<<<<<<
for (EventCluster eventCluster : mergedClusters) {
stripeDescMap.merge(ImmutablePair.of(eventCluster.getEventType(), eventCluster.getDescription()),
=======
for (EventCluster eventCluster : aggEvents) {
stripeDescMap.merge(ImmutablePair.of(EventType.getCommonSuperType(eventCluster.getEventTypes()), eventCluster.getDescription()),
>>>>>>>
for (EventCluster eventCluster : mergedClusters) {
stripeDescMap.merge(ImmutablePair.of(eventCluster.getEventType(), eventCluster.getDescription()), |
<<<<<<<
=======
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
>>>>>>>
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
<<<<<<<
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
=======
import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
import org.sleuthkit.autopsy.coreutils.ThreadUtils;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image;
>>>>>>>
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT;
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME;
import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisCompletedEvent;
import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image; |
<<<<<<<
String workdir();
String socket();
=======
List<String> generatekeys();
>>>>>>>
List<String> generatekeys();
String workdir();
String socket(); |
<<<<<<<
class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
private IngestJobSettingsPanel ingestJobSettingsPanel;
=======
class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDescriptor> {
@Messages("AddImageWizardIngestConfigPanel.name.text=Configure Ingest Modules")
private final IngestJobSettingsPanel ingestJobSettingsPanel;
>>>>>>>
class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel {
@Messages("AddImageWizardIngestConfigPanel.name.text=Configure Ingest Modules")
private IngestJobSettingsPanel ingestJobSettingsPanel; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.