Skip to content

Commit

Permalink
Merge pull request #3308 from CommandPost/issue/3279-csv2notion-neo
Browse files Browse the repository at this point in the history
Replaced csv2notion with CSV2Notion Neo
  • Loading branch information
latenitefilms committed Jan 18, 2024
2 parents 1d6c074 + 012464a commit 2ee2f49
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions scripts/build_commandpost_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ echo " * Building CommandPost-App Docs..."
./scripts/build.sh docs

echo " * Signing csv2notion..."
xattr -cr "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion"
codesign --verbose --force --deep --options=runtime --timestamp --entitlements "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/entitlements.plist" --sign "Developer ID Application: LateNite Films Pty Ltd" "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion"
codesign -dv --verbose=4 "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion"
xattr -cr "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion_neo"
codesign --verbose --force --deep --options=runtime --timestamp --entitlements "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/entitlements.plist" --sign "Developer ID Application: LateNite Films Pty Ltd" "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion_neo"
codesign -dv --verbose=4 "${COMMANDPOST_HOME}/src/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion_neo"

echo " * Building CommandPost-App..."
./scripts/build.sh build -s Release -c Release -d -u
Expand Down
5 changes: 3 additions & 2 deletions src/extensions/languages/English_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,8 @@
"notificationTestFailedMessage": "The test failed with the following errors:",
"notion": "Notion",
"notionDatabaseURL": "Notion Database URL",
"notionDescription": "This tool allows you to get metadata from Final Cut Pro and upload it straight to Notion. Powered by Vladilen Zhdanov's csv2notion.",
"notionDescription": "This tool allows you to get metadata from Final Cut Pro and upload it straight to Notion.",
"notionDescriptionTwo": "Powered by CSV2Notion Neo (which is a fork of Vladilen Zhdanov's csv2notion).",
"notionToken": "Notion Token",
"noTitleShortcut": "There is no Title assigned to this shortcut.\n\nYou can assign Shortcuts via the CommandPost menu bar.",
"notValidKeysAndError": "The supplied API keys are not valid.\n\nThe following error(s) occurred:\n",
Expand Down Expand Up @@ -2288,7 +2289,7 @@
"shotDataDescriptionFive": "The images will be renamed based on the Scene and Shot number in the connected Shot Data Title.",
"shotDataDescriptionFour": "on the timeline (but not in a secondary storyline), these images will be consolidated into the same folder as the CSV.",
"shotDataDescriptionOne": "This utility allows you to import a FCPXML which contains one or more Shot Data Titles in a timeline, and converts",
"shotDataDescriptionSix": "This utility was commissioned by Vigneswaran Rajkumar for a feature film project, and is built using Vladilen Zhdanov's csv2notion.",
"shotDataDescriptionSix": "This utility was commissioned by Vigneswaran Rajkumar, and is powered by CSV2Notion Neo (a fork of Vladilen Zhdanov's csv2notion).",
"shotDataDescriptionThree": "If you have a Shot Data Title on the Primary Storyline, and have a single still image connected directly to it",
"shotDataDescriptionTwo": "the data from these Motion Templates into a single CSV file for use in other applications.",
"shotDataDropZone": "You can drag and drop projects from the Final Cut Pro Browser to here for processing...",
Expand Down
1 change: 1 addition & 0 deletions src/plugins/finalcutpro/toolbox/notion/html/panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
</script>
<h3 class="uiItem">{{ i18n("notion") }}</h3>
<p class="uiItem">{{ i18n("notionDescription") }}</p>
<p class="uiItem">{{ i18n("notionDescriptionTwo") }}</p>

<br />

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/finalcutpro/toolbox/notion/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ local function uploadToNotion(csvPath)
--------------------------------------------------------------------------------
-- Define path to csv2notion:
--------------------------------------------------------------------------------
local binPath = config.basePath .. "/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion"
local binPath = config.basePath .. "/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion_neo"

--------------------------------------------------------------------------------
-- Setup Arguments for csv2notion:
Expand Down Expand Up @@ -562,7 +562,7 @@ function plugin.init(deps, env)
label = i18n("notion"),
image = icon,
tooltip = i18n("notion"),
height = 490,
height = 510,
})
:addContent(1, generateContent, false)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 vzhd1701
Copyright (c) 2023 The Acharya

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.8
v1.2.0
Binary file not shown.
Empty file.
2 changes: 1 addition & 1 deletion src/plugins/finalcutpro/toolbox/shotdata/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ local function uploadToNotion(csvPath)
--------------------------------------------------------------------------------
-- Define path to csv2notion:
--------------------------------------------------------------------------------
local binPath = config.basePath .. "/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion"
local binPath = config.basePath .. "/plugins/finalcutpro/toolbox/shotdata/csv2notion/csv2notion_neo"

--------------------------------------------------------------------------------
-- Setup Arguments for csv2notion:
Expand Down

0 comments on commit 2ee2f49

Please sign in to comment.