Skip to content

Commit

Permalink
🔩 Merge pull request #4 from CarterGames/pre-release
Browse files Browse the repository at this point in the history
🔧 Fixes for some parsing issues
  • Loading branch information
JonathanMCarter authored Sep 11, 2024
2 parents 06305ec + 889321b commit 41149db
Show file tree
Hide file tree
Showing 12 changed files with 265 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
using UnityEditor;
/*
* Copyright (c) 2024 Carter Games
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

using UnityEditor;
using UnityEngine;

namespace CarterGames.Standalone.NotionData.Editor.Custom_Editors.Drawer
namespace CarterGames.Standalone.NotionData.Editor
{
[CustomPropertyDrawer(typeof(NotionSortProperty))]
public class PropertyDrawerNotionSortProperty : PropertyDrawer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
using UnityEngine;
/*
* Copyright (c) 2024 Carter Games
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

using UnityEngine;

namespace CarterGames.Standalone.NotionData.Editor
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* THE SOFTWARE.
*/

using System;
using System.Collections.Generic;
using CarterGames.Standalone.NotionData.Common;
using CarterGames.Standalone.NotionData.ThirdParty;
Expand Down Expand Up @@ -130,7 +131,17 @@ private static NotionDatabaseRow GetRowData(JSONNode element)
/// <returns>The value found.</returns>
private static string GetValueForType(string type, JSONNode element)
{
return DatabasePropertyParserLookup[type].GetJsonValue(element);
// Avoids issues where the type is not supported but the notion property type is (like a rollup showing a page etc).
try
{
return DatabasePropertyParserLookup[type].GetJsonValue(element);
}
#pragma warning disable
catch (Exception e)
#pragma warning restore
{
return string.Empty;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
* THE SOFTWARE.
*/

using System;
using System.Collections.Generic;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* THE SOFTWARE.
*/

using System;
using CarterGames.Standalone.NotionData.ThirdParty;

namespace CarterGames.Standalone.NotionData.Editor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static class AssetInfo
/// <summary>
/// The version number of the asset.
/// </summary>
public static string VersionNumber => "0.2.2";
public static string VersionNumber => "0.2.3";


/// <summary>
Expand All @@ -40,6 +40,6 @@ public static class AssetInfo
/// <remarks>
/// Format is Y/M/D.
/// </remarks>
public static string ReleaseDate => "2024/09/08";
public static string ReleaseDate => "2024/09/11";
}
}
Loading

0 comments on commit 41149db

Please sign in to comment.