delete mangalist.ini and move the rest to base.ini #1020

Author: riderkick

baseunits/FMDOptions.pas

@@ -84,7 +84,6 @@   TIniFileRun = class(IniFiles.TMemIniFile)
   CONFIG_ADVANCED,
   REVISION_FILE,
   UPDATE_FILE,
-  MANGALIST_FILE,
   BASE_FILE,
   ACCOUNTS_FILE,
   WEBSITE_CONFIG_FILE,
@@ -98,7 +97,6 @@   TIniFileRun = class(IniFiles.TMemIniFile)
   MANGAFOXTEMPLATE_FOLDER,
   LUA_WEBSITEMODULE_FOLDER,
   LUA_WEBSITEMODULE_REPOS: String;
-  DEFAULT_SELECTED_WEBSITES: String = 'MangaFox,MangaHere,MangaInn,MangaReader';
 
   // ini files
   revisionfile,
@@ -107,6 +105,7 @@   TIniFileRun = class(IniFiles.TMemIniFile)
   advancedfile: TIniFileRun;
 
   // base url, should be in base.ini
+  DEFAULT_SELECTED_WEBSITES: String = 'MangaFox,MangaHere,MangaInn,MangaReader';
   DB_URL: String = 'https://sourceforge.net/projects/newfmd/files/data/<website>.7z/download';
   UPDATE_URL: String = 'https://raw.githubusercontent.com/riderkick/FMD/master/update';
   CHANGELOG_URL: String = 'https://raw.githubusercontent.com/riderkick/FMD/master/changelog.txt';
@@ -272,6 +271,7 @@ procedure ReadBaseFile;
   if not FileExistsUTF8(BASE_FILE) then Exit;
   with TIniFile.Create(BASE_FILE) do
     try
+      DEFAULT_SELECTED_WEBSITES:=ReadString('base','DEFAULT_SELECTED_WEBSITES',DEFAULT_SELECTED_WEBSITES);
       DB_URL:=ReadString('base','DB_URL',DB_URL);
       UPDATE_URL:=ReadString('base','UPDATE_URL',UPDATE_URL);
       CHANGELOG_URL:=ReadString('base','CHANGELOG_URL',CHANGELOG_URL);
@@ -291,7 +291,6 @@ procedure SetFMDdirectory(const ADir: String);
   CONFIG_FOLDER := FMD_DIRECTORY + 'config' + PathDelim;
   REVISION_FILE := CONFIG_FOLDER + 'revision.ini';
   UPDATE_FILE := CONFIG_FOLDER + 'updates.ini';
-  MANGALIST_FILE := CONFIG_FOLDER + 'mangalist.ini';
   BASE_FILE := CONFIG_FOLDER + 'base.ini';
 
   IMAGE_FOLDER := FMD_DIRECTORY + 'images' + PathDelim;

config/base.ini

@@ -1,4 +1,5 @@
 [base]
+DEFAULT_SELECTED_WEBSITES=MangaFox,MangaHere,MangaInn,MangaReader
 DB_URL=https://sourceforge.net/projects/newfmd/files/data/<website>.7z/download
 UPDATE_URL=https://raw.githubusercontent.com/riderkick/FMD/master/update
 CHANGELOG_URL=https://raw.githubusercontent.com/riderkick/FMD/master/changelog.txt

config/mangalist.ini

@@ -5255,28 +5255,9 @@ procedure TMainForm.LoadMangaOptions;
   data: PSingleItem;
 begin
   categories := TStringList.Create;
-  categories.OwnsObjects := True;
-  categories.Sorted := False;
   try
-    // read mangalist.ini
-    with TIniFile.Create(MANGALIST_FILE) do
-    try
-      // read available websites
-      ReadSection('available', categories);
-      for i := 0 to categories.Count - 1 do
-      begin
-        categoriesitem := TStringList.Create;
-        categories.Objects[i] := categoriesitem;
-        categoriesitem.Sorted := False;
-        s := Trim(ReadString('available', categories[i], ''));
-        if s <> '' then
-          categoriesitem.CommaText := s;
-      end;
-    finally
-      Free;
-    end;
-
     // sort all
+    categories.OwnsObjects := True;
     categories.Duplicates := dupIgnore;
     categories.Sorted := True;
     for i := 0 to categories.Count - 1 do