Complete Video Support + Major Refactoring + Security Fixes

.gitignore

@@ -19,6 +19,7 @@ piwigoPublish.lrplugin/PiwigoHelper.lua
 # Other files
 *.bak
 .claude/
+claude.md
 __pycache__/
 cat layout.odt
 deploy.sh

piwigoPublish.lrplugin/CustomMetadata.lua

@@ -23,7 +23,7 @@
 
 
 return {
-    schemaVersion = 5,
+    schemaVersion = 6,
     metadataFieldsForPhotos = {
 
         {
@@ -32,7 +32,7 @@ return {
             searchable = true,
             browsable = true,
             id = 'pwHostURL',
-            title = 'Piwigo Host',
+            title = "Piwigo Host",
             version = 3
         },
         {
@@ -41,7 +41,7 @@ return {
             searchable = true,
             browsable = true,
             id = 'pwAlbumName',
-            title = 'Album Name',
+            title = "Album Name",
             version = 2
         },
         {
@@ -50,7 +50,7 @@ return {
             searchable = false,
             browsable = false,
             id = 'pwAlbumURL',
-            title = 'Album URL',
+            title = "Album URL",
             version = 4
         },
         {
@@ -59,7 +59,7 @@ return {
             searchable = false,
             browsable = false,
             id = 'pwImageURL',
-            title = 'Photo URL',
+            title = "Photo URL",
             version = 4
         },
         {
@@ -68,7 +68,7 @@ return {
             searchable = true,
             browsable = true,
             id = 'pwUploadDate',
-            title = 'Upload Date',
+            title = "Upload Date",
             version = 2
         },
         {
@@ -77,7 +77,7 @@ return {
             searchable = true,
             browsable = true,
             id = 'pwUploadTime',
-            title = 'Upload Time',
+            title = "Upload Time",
             version = 2
         },
         {
@@ -86,8 +86,17 @@ return {
             searchable = false,
             browsable = false,
             id = 'pwCommentSync',
-            title = 'pwCommentSync',
+            title = "pwCommentSync",
             version = 1
         },
+        {
+            dataType = 'string',
+            readOnly = true,
+            searchable = false,
+            browsable = false,
+            id = 'pwVideoPreset',
+            title = "Video Preset",
+            version = 6
+        },
     }
 }

piwigoPublish.lrplugin/Info.lua

@@ -37,8 +37,8 @@ return {
 -- define custom metadata data for this plugin
     PublishSettings = {
         publishMetadata = {
-            { id = 'myCustomStatus', title = 'Status', type = 'string' },
-            { id = 'syncToken', title = 'Token', type = 'string' },
+            { id = 'myCustomStatus', title = "Status", type = 'string' },
+            { id = 'syncToken', title = "Token", type = 'string' },
         },
     },
 

piwigoPublish.lrplugin/Init.lua

@@ -51,23 +51,27 @@ _G.utils = require "utils"
 _G.PiwigoAPI = require "PiwigoAPI"
 _G.PWImportService = require "PWImportService"
 _G.PWStatusManager = require "PWStatusManager"
+_G.vtk_core = require "vtk_core"
+_G.vtk_ui   = require "vtk_ui"
 
--- Global initializations 
+-- Global initializations
+-- Detect macOS vs Windows based on path separator in Lightroom's standard paths
+local testPath = LrPathUtils.getStandardFilePath("documents")
+_G.MAC_ENV = testPath:find("/") and not testPath:find("\\") or false
 _G.prefs = _G.LrPrefs.prefsForPlugin()
 -- logger setup
 _G.log = import 'LrLogger' ('PiwigoPublishPlugin')
 if prefs.debugEnabled == nil then
     prefs.debugEnabled = false
 end
-if prefs.debugToFile == nil then 
-    prefs.debugToFile = false
+if prefs.clearLogOnReload == nil then
+    prefs.clearLogOnReload = false
 end
 if prefs.debugEnabled then
-    if prefs.debugToFile then
-        log:enable("logfile")
-    else
-        log:enable("print")
+    if prefs.clearLogOnReload then
+        utils.clearLogFiles()  -- truncate log at each reload (dev mode)
     end
+    log:enable("logfile")
 else
     log:disable()
 end

piwigoPublish.lrplugin/PWCollToSet.lua

@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+---@diagnostic disable: undefined-global
+
 --*******************************************
 local function CollToSet()
     log:info("CollToSet")

piwigoPublish.lrplugin/PWExtraOptions.lua

@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+---@diagnostic disable: undefined-global
+
 require "UIHelpers"
 
 -- *************************************************
@@ -96,7 +98,7 @@ local function main()
             f:spacer { height = 1 },
             f:row {
                 f:push_button {
-                    title = 'Set Piwigo Album Cover',
+                    title = "Set Piwigo Album Cover",
                     tooltip = "Sets selected image as Piwigo album cover ",
                     action = function(button)
                         LrTasks.startAsyncTask(function()

piwigoPublish.lrplugin/PWImportService.lua

@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+---@diagnostic disable: undefined-global
+
 local PWIMportService = {}
 
 local SPECIAL_PREFIX = "※" -- U+203B Reference Mark used by another plugin to identify super collections
@@ -394,11 +396,7 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
             if pwDetails.isPiwigo then
                 local collectionSettings = newCollorSet:getCollectionSetInfoSummary().collectionSettings or {}
                 -- album settings set to correspond to service being cloned
-                if propertyTable.syncAlbumDescriptions then
-                    collectionSettings.albumDescription = comment
-                else
-                    collectionSettings.albumDescription = ""
-                end
+                collectionSettings.albumDescription = comment
                 if status == "private" then
                     collectionSettings.albumPrivate = true
                 else
@@ -409,13 +407,7 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
                     local thisCat = PiwigoAPI.pwCategoriesGetThis(propertyTable, remoteAlbumId)
                     if thisCat then
                         -- use settings directly from Piwigo, overriding local settings
-                        if propertyTable.syncAlbumDescriptions then
-                            if thisCat.description then
-                                collectionSettings.albumDescription = thisCat.description
-                            else
-                                collectionSettings.albumDescription = ""
-                            end
-                        end
+                        collectionSettings.albumDescription = thisCat.description or ""
                         if thisCat.status == "public" then
                             collectionSettings.albumPrivate = false
                         else
@@ -476,11 +468,7 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
             if pwDetails.isPiwigo and pwDetails.isSameHost then
                 -- this is the same Piwigo host then we can copy remote ids etc
                 local collectionSettings = newCollorSet:getCollectionInfoSummary().collectionSettings or {}
-                if propertyTable.syncAlbumDescriptions then
-                    collectionSettings.albumDescription = comment
-                else
-                    collectionSettings.albumDescription = ""
-                end
+                collectionSettings.albumDescription = comment
                 if status == "private" then
                     collectionSettings.albumPrivate = true
                 else
@@ -490,13 +478,7 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
                     -- check if remoote album exists and add to collection if so
                     local thisCat = PiwigoAPI.pwCategoriesGetThis(propertyTable, remoteAlbumId)
                     if thisCat then
-                        if propertyTable.syncAlbumDescriptions then
-                            if thisCat.description then
-                                collectionSettings.albumDescription = thisCat.description
-                            else
-                                collectionSettings.albumDescription = ""
-                            end
-                        end
+                        collectionSettings.albumDescription = thisCat.description or ""
                         if thisCat.status == "public" then
                             collectionSettings.albumPrivate = false
                         else

piwigoPublish.lrplugin/PWSendMetadata.lua

@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+---@diagnostic disable: undefined-global
+
 --*******************************************
 local function SendMetadata()
     log:info("SendMetadata")
@@ -65,6 +67,11 @@ local function SendMetadata()
         return false
     end
 
+    if not useSource then
+        LrDialogs.message("SendMetadata - Can't find publish collection source", "", "warning")
+        return false
+    end
+
     local result = LrDialogs.confirm("Send Metadata to Piwigo",
         "Send metadata to Piwigo for " .. #selPhotos .. " photo(s) in album " .. useSource:getName() .. "?", "Ok",
         "Cancel")