Changeset 12336 for extensions/PiwigoLib/PiwigoWpf/Services/ImageCacheManager.cs

Timestamp:

Oct 3, 2011, 5:09:51 PM (13 years ago)

Author:

bayral

Message:

rename category to Albums

File:

• extensions/PiwigoLib/PiwigoWpf/Services/ImageCacheManager.cs (modified) (10 diffs)

extensions/PiwigoLib/PiwigoWpf/Services/ImageCacheManager.cs

@@ -64 +64 @@
             #region DTO
             // local DTO
-            internal class CategoryDictionnaryItem
+            internal class AlbumDictionnaryItem
             {
                 internal DirectoryInfo BasePath;
-                internal String CategorieId;
+                internal String AlbumId;
             };
 
-            internal class CategoryDictionnary : SortedDictionary<String, CategoryDictionnaryItem> { };
+            internal class AlbumDictionnary : SortedDictionary<String, AlbumDictionnaryItem> { };
 
             internal class ServerDictionnaryItem
             {
                 internal DirectoryInfo BasePath;
-                internal CategoryDictionnary Categories;
+                internal AlbumDictionnary Albums;
                 internal Uri ServeurUrl;
             };
@@ -86 +86 @@
             internal ServerDictionnary _aServerDictionnary;
             internal ServerDictionnaryItem _currentServer;
-            internal CategoryDictionnaryItem _currentCategory;
+            internal AlbumDictionnaryItem _currentAlbum;
 
             #endregion DTO
@@ -100 +100 @@
             }
             
-            static private String BuildCategoryDirCache(ServerDictionnaryItem server, String CatgeoryId)
-            {
-                String CategoryDirCache = String.Empty;
+            static private String BuildAlbumDirCache(ServerDictionnaryItem server, String CatgeoryId)
+            {
+                String AlbumDirCache = String.Empty;
                 if (server != null)
                 {
-                    CategoryDirCache = Path.Combine(server.BasePath.FullName, CatgeoryId.Replace("/", "_")); 
+                    AlbumDirCache = Path.Combine(server.BasePath.FullName, CatgeoryId.Replace("/", "_")); 
                 }
                 else
                 {
-                    throw new ApplicationException ("Current server not set before using category");
-                }
-
-                return CategoryDirCache;
+                    throw new ApplicationException ("Current server not set before using Album");
+                }
+
+                return AlbumDirCache;
             }
 
@@ -147 +147 @@
             public void UnsetCurrentServer()
             { 
-                _currentCategory = null;
+                _currentAlbum = null;
                 _currentServer = null;
             }
@@ -171 +171 @@
                         server.ServeurUrl = new Uri(serveurUri);
                         server.BasePath = new DirectoryInfo(currentserverDir);
-                        server.Categories = new CategoryDictionnary();
+                        server.Albums = new AlbumDictionnary();
                         _aServerDictionnary.Add(serveurUri, server);
                         _currentServer = server;
@@ -180 +180 @@
                         //Create it
                         Directory.CreateDirectory(currentserverDir);
-                        _currentServer.Categories.Clear();
-                    }
-                }
-            }
-
-            public void SetCurrentCategory(String CategorieId)
+                        _currentServer.Albums.Clear();
+                    }
+                }
+            }
+
+            public void SetCurrentAlbum(String AlbumId)
             {
                 if (_currentServer != null)
@@ -191 +191 @@
                     lock (_lock)
                     {
-                        String currentsCategoryDir = BuildCategoryDirCache(_currentServer, CategorieId);
-                        if (_currentServer.Categories.ContainsKey(CategorieId))
-                        {
-                            _currentCategory = _currentServer.Categories[CategorieId];
+                        String currentsAlbumDir = BuildAlbumDirCache(_currentServer, AlbumId);
+                        if (_currentServer.Albums.ContainsKey(AlbumId))
+                        {
+                            _currentAlbum = _currentServer.Albums[AlbumId];
                         }
                         else
                         {
-                            CategoryDictionnaryItem category = new CategoryDictionnaryItem();
-                            category.BasePath = new DirectoryInfo(currentsCategoryDir);
-                            category.CategorieId = CategorieId;
-                            _currentServer.Categories.Add(CategorieId, category);
-                            _currentCategory = category;
-                        }
-
-                        if (!Directory.Exists(currentsCategoryDir))
+                            AlbumDictionnaryItem Album = new AlbumDictionnaryItem();
+                            Album.BasePath = new DirectoryInfo(currentsAlbumDir);
+                            Album.AlbumId = AlbumId;
+                            _currentServer.Albums.Add(AlbumId, Album);
+                            _currentAlbum = Album;
+                        }
+
+                        if (!Directory.Exists(currentsAlbumDir))
                         {
                             //Create it
-                            Directory.CreateDirectory(currentsCategoryDir);
+                            Directory.CreateDirectory(currentsAlbumDir);
                         }
                     }
@@ -214 +214 @@
                 else
                 {
-                    throw new ApplicationException("Current server not set before using category");
+                    throw new ApplicationException("Current server not set before using Album");
                 }
             }
@@ -226 +226 @@
                     }
 
-                    if (_currentCategory != null)
-                    {
-                        String localDir = Path.Combine(_currentCategory.BasePath.FullName, strImageType);
+                    if (_currentAlbum != null)
+                    {
+                        String localDir = Path.Combine(_currentAlbum.BasePath.FullName, strImageType);
                         if (!Directory.Exists(localDir))
                         {
@@ -277 +277 @@
                     else
                     {
-                        throw new ApplicationException("Current category not set before using image cache.");
+                        throw new ApplicationException("Current Album not set before using image cache.");
                     }
                 }