Changeset 13520 for extensions/PiwigoLib/PiwigoUpload/Service

Timestamp:

Mar 8, 2012, 11:19:12 PM (12 years ago)

Author:

bayral

Message:

new project for windows live publish plugin
Well advance single uploader

Location:

extensions/PiwigoLib/PiwigoUpload/Service

Files:

• LoadFromDirectory.cs (modified) (3 diffs)
• UploadToPiwigo.cs (modified) (1 diff)

extensions/PiwigoLib/PiwigoUpload/Service/LoadFromDirectory.cs

@@ -5 +5 @@
 using System.IO;
 using Com.Piwigo.Uploader.DTO;
+using Com.Piwigo.Lib.DTO;
 
 namespace Com.Piwigo.Uploader.Service
 {
+
     public class LoadFromDirectory : IService 
     {
-        string[] extensions = { ".jpeg", ".jpg" };
+        string[] extensions = { ".jpeg", ".jpg", ".JPEG", ".JPG" };
+
+        private LocalImage loadFile(String fileName)
+        {
+            LocalImage img = new LocalImage();
+            // loading image data in album
+            if (extensions.Contains<String>(Path.GetExtension(fileName)))
+            {
+                FileInfo fi = new FileInfo(fileName);
+                img.LocalFile = fi.FullName;
+                img.Name = fi.Name;
+                img.ConfidentialLevel = ModelManager.Instance.UploadOption.ConfidentialLevel;
+                img.Author = ModelManager.Instance.UploadOption.Author;
+                img.AuthorComment = "";
+           }
+            return img;
+        }
 
         private LocalAlbum loadDirectory(String dirName, Int32? rootAlbumId)
         {
-            DirectoryInfo dir = new DirectoryInfo(dirName); 
-            LocalAlbum album = new LocalAlbum (){ LocalDir=dir.FullName, Name=dir.Name};
+            DirectoryInfo dir = new DirectoryInfo(dirName);
+            LocalAlbum album = new LocalAlbum() { LocalDir = dir.FullName, Name = dir.Name };
+
+            Int32 parentAlbumId =  (rootAlbumId.HasValue ? rootAlbumId.Value : PwgAlbum.RootAlbumId);
+
             album.MessageInfo = "";
-            album.UpperCatId = rootAlbumId;
+            album.UpperCatId = parentAlbumId;
             
             // loading image data in album
@@ -24 +45 @@
                 .Where(s => extensions.Any(ext => ext == Path.GetExtension(s))))
             {
-                FileInfo fi = new  FileInfo(strfile);
-                LocalImage img = new LocalImage();
-                img.LocalFile = fi.FullName;
-                img.Name = fi.Name;
-                img.Author = "";
-                img.AuthorComment = "";
-                album.LocalImages.Add(img);
+                album.LocalImages.Add(loadFile(strfile));
             }
 
@@ -44 +59 @@
         public void runService()
         {
-            ModelManager.Instance.lstAlbumLocaux.Add(
-                loadDirectory(ModelManager.Instance.directoryName,
-                null)
-                );
+            if (File.Exists(ModelManager.Instance.directoryName))
+            {
+                if (extensions.Contains<String>(Path.GetExtension(ModelManager.Instance.directoryName)))
+                {
+                    FileInfo file = new FileInfo(ModelManager.Instance.directoryName);
+                    LocalAlbum album;
+                    album = ModelManager.Instance.lstAlbumLocaux.SingleOrDefault(a => a.Name == file.Directory.Name);
+
+                    if (album == null)
+                    {
+                        album = new LocalAlbum() { LocalDir = file.Directory.FullName, Name = file.Directory.Name };
+                        album.MessageInfo = "auto created for photo input.";
+                        album.UpperCatId = 0;
+                        album.LocalImages = new LocalImageList();
+                        album.SubAlbums = new LocalAlbumList();
+
+                        ModelManager.Instance.lstAlbumLocaux.Add(album);
+                    }
+
+                    if (album.LocalImages.Count(a => a.Name == file.Name) < 1)
+                    {
+                        album.LocalImages.Add(loadFile(file.FullName));
+                    }
+                }
+            }
+            else if (Directory.Exists(ModelManager.Instance.directoryName))
+            {
+                Int32 RootAlbumId = PwgAlbum.RootAlbumId;
+                LocalAlbum rootAlbum = null;
+
+                if (ModelManager.Instance.SelectedNode != null)
+                {
+                    if (ModelManager.Instance.SelectedNode.Tag != null)
+                    {
+                        if (ModelManager.Instance.SelectedNode.Tag is LocalAlbum)
+                        {
+                            rootAlbum = (LocalAlbum)ModelManager.Instance.SelectedNode.Tag;
+                            RootAlbumId = (rootAlbum.Id.HasValue ? rootAlbum.Id.Value : PwgAlbum.RootAlbumId);
+                        }
+                        else if (ModelManager.Instance.SelectedNode.Tag is PwgImage)
+                        {
+                            rootAlbum = (LocalAlbum)ModelManager.Instance.SelectedNode.Parent.Tag;
+                            RootAlbumId = (rootAlbum.Id.HasValue ? rootAlbum.Id.Value : PwgAlbum.RootAlbumId);
+                        }
+                    }
+                }
+
+                if (rootAlbum != null)
+                {
+                    rootAlbum.SubAlbums.Add(
+                        loadDirectory(ModelManager.Instance.directoryName,
+                        RootAlbumId)
+                        );
+                }
+                else
+                {
+                    ModelManager.Instance.lstAlbumLocaux.Add(
+                        loadDirectory(ModelManager.Instance.directoryName,
+                        PwgAlbum.RootAlbumId)
+                        );
+                }
+            }
         }
     }

extensions/PiwigoLib/PiwigoUpload/Service/UploadToPiwigo.cs

@@ -55 +55 @@
             FileInfo fi = new FileInfo(aImg.LocalFile);
 
-            List<PwgTag> lstTag = new List<PwgTag>(aImg.LstTags);
+            List<PwgTag> lstTag = new List<PwgTag>();
+            if (aImg.LstTags != null)
+            {
+                lstTag.AddRange(aImg.LstTags);
+            }
 
             PwgServiceProvider.Instance.PwgImagesService.addImageByMultiPartForm(fi, null, aImg.UpperCatId, aImg.Name, aImg.Author, aImg.AuthorComment, aImg.ConfidentialLevel, lstTag);