1 files changed, 63 insertions, 53 deletions

diff --git a/src/base/UCatCovers.pas b/src/base/UCatCovers.pas
index 6ef81b68..6e004b22 100644
--- a/src/base/UCatCovers.pas
+++ b/src/base/UCatCovers.pas
@@ -38,20 +38,21 @@ interface
 {$I switches.inc}
 
 uses
-  UIni;
+  UIni,
+  UPath;
 
 type
   TCatCovers = class
     protected
-      cNames:    array [0..high(ISorting)] of array of string;
-      cFiles:    array [0..high(ISorting)] of array of string;
+      cNames:    array [0..high(ISorting)] of array of UTF8String;
+      cFiles:    array [0..high(ISorting)] of array of IPath;
     public
       constructor Create;
       procedure Load; //Load Cover aus Cover.ini and Cover Folder
-      procedure LoadPath(const CoversPath: string);
-      procedure Add(Sorting: integer; Name, Filename: string); //Add a Cover
-      function  CoverExists(Sorting: integer; Name: string): boolean; //Returns True when a cover with the given Name exists
-      function  GetCover(Sorting: integer; Name: string): string; //Returns the Filename of a Cover
+      procedure LoadPath(const CoversPath: IPath);
+      procedure Add(Sorting: integer; const Name: UTF8String; const Filename: IPath); //Add a Cover
+      function  CoverExists(Sorting: integer; const Name: UTF8String): boolean; //Returns True when a cover with the given Name exists
+      function  GetCover(Sorting: integer; const Name: UTF8String): IPath; //Returns the Filename of a Cover
   end;
 
 var
@@ -63,10 +64,11 @@ uses
   IniFiles,
   SysUtils,
   Classes,
-  // UFiles,
+  UFilesystem,
   ULog,
   UMain,
-  UPath;
+  UUnicodeUtils,
+  UPathUtils;
 
 constructor TCatCovers.Create;
 begin
@@ -79,25 +81,28 @@ var
   I: integer;
 begin
   for I := 0 to CoverPaths.Count-1 do
-    LoadPath(CoverPaths[I]);
+    LoadPath(CoverPaths[I] as IPath);
 end;
 
 (**
  * Load Cover from Cover.ini and Cover Folder
  *)
-procedure TCatCovers.LoadPath(const CoversPath: string);
+procedure TCatCovers.LoadPath(const CoversPath: IPath);
 var
   Ini: TMemIniFile;
-  SR:  TSearchRec;
   List: TStringlist;
   I, J: Integer;
-  Name, Filename, Temp: string;
+  Filename: IPath;
+  Name, TmpName: UTF8String;
+  CatCover: IPath;
+  Iter: IFileIterator;
+  FileInfo: TFileInfo;
 begin
   Ini := nil;
   List := nil;
 
   try
-    Ini  := TMemIniFile.Create(CoversPath + 'covers.ini');
+    Ini  := TMemIniFile.Create(CoversPath.Append('covers.ini').ToNative);
     List := TStringlist.Create;
 
     //Add every Cover in Covers Ini for Every Sorting option
@@ -106,63 +111,65 @@ begin
       Ini.ReadSection(ISorting[I], List);
 
       for J := 0 to List.Count - 1 do
-        Add(I, List.Strings[J], CoversPath + Ini.ReadString(ISorting[I], List.Strings[J], 'NoCover.jpg'));
+      begin
+        CatCover := Path(Ini.ReadString(ISorting[I], List.Strings[J], 'NoCover.jpg'));
+        Add(I, List.Strings[J], CoversPath.Append(CatCover));
+      end;
     end;
   finally
     Ini.Free;
     List.Free;
   end;
 
-  try
-    //Add Covers from Folder
-    if (FindFirst (CoversPath + '*.jpg', faAnyFile, SR) = 0) then
-      repeat
-        //Add Cover if it doesn't exist for every Section
-        Name := SR.Name;
-        Filename := CoversPath + Name;
-        Delete (Name, length(Name) - 3, 4);
-
-        for I := 0 to high(ISorting) do
-        begin
-          Temp := Name;
-          if ((I = sTitle) or (I = sTitle2)) and (Pos ('Title', Temp) <> 0) then
-            Delete (Temp, Pos ('Title', Temp), 5)
-          else if (I = sArtist) or (I = sArtist2) and (Pos ('Artist', Temp) <> 0) then
-            Delete (Temp, Pos ('Artist', Temp), 6);
-
-          if not CoverExists(I, Temp) then
-            Add (I, Temp, Filename);
-        end;
-      until FindNext (SR) <> 0;
-  finally
-    FindClose (SR);
+  //Add Covers from Folder
+  Iter := FileSystem.FileFind(CoversPath.Append('*.jpg'), 0);
+  while Iter.HasNext do
+  begin
+    FileInfo := Iter.Next;
+
+    //Add Cover if it doesn't exist for every Section
+    Filename := CoversPath.Append(FileInfo.Name);
+    Name := FileInfo.Name.SetExtension('').ToUTF8;
+
+    for I := 0 to high(ISorting) do
+    begin
+      TmpName := Name;
+      if ((I = sTitle) or (I = sTitle2)) and (UTF8Pos('Title', TmpName) <> 0) then
+        UTF8Delete(TmpName, UTF8Pos('Title', TmpName), 5)
+      else if (I = sArtist) or (I = sArtist2) and (UTF8Pos('Artist', TmpName) <> 0) then
+        UTF8Delete(TmpName, UTF8Pos('Artist', TmpName), 6);
+
+      if not CoverExists(I, TmpName) then
+        Add(I, TmpName, Filename);
+    end;
   end;
 end;
 
   //Add a Cover
-procedure TCatCovers.Add(Sorting: integer; Name, Filename: string);
+procedure TCatCovers.Add(Sorting: integer; const Name: UTF8String; const Filename: IPath);
 begin
-  if FileExists (Filename) then //If Exists -> Add
+  if Filename.IsFile then //If Exists -> Add
   begin
-    SetLength (CNames[Sorting], Length(CNames[Sorting]) + 1);
-    SetLength (CFiles[Sorting], Length(CNames[Sorting]) + 1);
+    SetLength(CNames[Sorting], Length(CNames[Sorting]) + 1);
+    SetLength(CFiles[Sorting], Length(CNames[Sorting]) + 1);
 
-    CNames[Sorting][high(cNames[Sorting])] := Uppercase(Name);
+    CNames[Sorting][high(cNames[Sorting])] := UTF8Uppercase(Name);
     CFiles[Sorting][high(cNames[Sorting])] := FileName;
   end;
 end;
 
   //Returns True when a cover with the given Name exists
-function TCatCovers.CoverExists(Sorting: integer; Name: string): boolean;
+function TCatCovers.CoverExists(Sorting: integer; const Name: UTF8String): boolean;
 var
   I: Integer;
+  UpperName: UTF8String;
 begin
   Result := False;
-  Name := Uppercase(Name); //Case Insensitiv
+  UpperName := UTF8Uppercase(Name); //Case Insensitiv
 
   for I := 0 to high(cNames[Sorting]) do
   begin
-    if (cNames[Sorting][I] = Name) then //Found Name
+    if (cNames[Sorting][I] = UpperName) then //Found Name
     begin
       Result := true;
       break; //Break For Loop
@@ -171,16 +178,18 @@ begin
 end;
 
   //Returns the Filename of a Cover
-function TCatCovers.GetCover(Sorting: integer; Name: string): string;
+function TCatCovers.GetCover(Sorting: integer; const Name: UTF8String): IPath;
 var
   I: Integer;
+  UpperName: UTF8String;
+  NoCoverPath: IPath; 
 begin
-  Result := '';
-  Name := Uppercase(Name);
+  Result := PATH_NONE;
+  UpperName := UTF8Uppercase(Name);
 
   for I := 0 to high(cNames[Sorting]) do
   begin
-    if cNames[Sorting][I] = Name then
+    if cNames[Sorting][I] = UpperName then
     begin
       Result := cFiles[Sorting][I];
       Break;
@@ -188,13 +197,14 @@ begin
   end;
 
   //No Cover
-  if (Result = '') then
+  if (Result.IsUnset) then
   begin
     for I := 0 to CoverPaths.Count-1 do
     begin
-      if (FileExists(CoverPaths[I] + 'NoCover.jpg')) then
+      NoCoverPath := (CoverPaths[I] as IPath).Append('NoCover.jpg');
+      if (NoCoverPath.IsFile) then
       begin
-        Result := CoverPaths[I] + 'NoCover.jpg';
+        Result := NoCoverPath;
         Break;
       end;
     end;