shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Load definitions from multiple directories

Browse Source
This commit is contained in:
kaso17
2016-10-30 19:34:48 +01:00
committed by kaso17
parent 2f140fd2c0
commit 0f5e18492c
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Jackett/Services/ConfigurationService.cs
View File

@@ -25,7 +25,7 @@ namespace Jackett.Services
T GetConfig<T>();
void SaveConfig<T>(T config);
string ApplicationFolder();
string GetCardigannDefinitionsFolder();
List<string> GetCardigannDefinitionsFolders();
void CreateOrMigrateSettings();
void PerformMigration();
}
@@ -198,8 +198,21 @@ namespace Jackett.Services
return dir;
}
public string GetCardigannDefinitionsFolder()
public List<string> GetCardigannDefinitionsFolders()
{
List<string> dirs = new List<string>();
if (System.Environment.OSVersion.Platform == PlatformID.Unix)
{
dirs.Add(Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".config/cardigann/definitions/"));
dirs.Add("/etc/xdg/cardigan/definitions/");
}
else
{
dirs.Add(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "cardigann\\definitions\\"));
dirs.Add(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "cardigann\\definitions\\"));
}
// If we are debugging we can use the non copied definitions.
string dir = Path.Combine(ApplicationFolder(), "Definitions"); ;
@@ -211,7 +224,8 @@ namespace Jackett.Services
dir = sourcePath;
}
#endif
return dir;
dirs.Add(dir);
return dirs;
}
public string GetVersion()

4
src/Jackett/Services/IndexerManagerService.cs
View File

@@ -76,10 +76,14 @@ namespace Jackett.Services
try
{
if (!Directory.Exists(path))
return;
DirectoryInfo d = new DirectoryInfo(path);
foreach (var file in d.GetFiles("*.yml"))
{
logger.Info("Loading Cardigann definition " + file.FullName);
string DefinitionString = File.ReadAllText(file.FullName);
CardigannIndexer idx = new CardigannIndexer(this, container.Resolve<IWebClient>(), logger, container.Resolve<IProtectionService>(), DefinitionString);
if (indexers.ContainsKey(idx.ID))

5
src/Jackett/Services/ServerService.cs
View File

@@ -150,7 +150,10 @@ namespace Jackett.Services
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
// Load indexers
indexerService.InitIndexers();
indexerService.InitCardigannIndexers(configService.GetCardigannDefinitionsFolder());
foreach(string dir in configService.GetCardigannDefinitionsFolders())
{
indexerService.InitCardigannIndexers(dir);
}
client.Init();
}