Service Schnittstellenerweiterung der Scraper Plugins

From e588e67ddb4600274b0b41a4961a2fa4ee86a01e Mon Sep 17 00:00:00 2001
From: hannemann <hannemann666@gmx.net>
Date: Thu, 19 Feb 2015 23:05:23 +0100
Subject: [PATCH] add service call to retrieve basedir

---
config.c | 8 ++++++++
config.h | 5 ++++-
services.h | 12 ++++++++++++
tvscraper.c | 5 +++++
4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/config.c b/config.c
index 4110bd3..3ce0bc8 100644
--- a/config.c
+++ b/config.c
@@ -55,3 +55,11 @@ void cTVScraperConfig::PrintChannels(void) {
esyslog("tvscraper: channel to be scrapped: %s", channels[i].c_str());
}
}
+
+bool cTVScraperConfig::GetImageDir(ScraperGetImageDir* call) {
+ if ( baseDir.length() > 0 ) {
+ call->imageDir = baseDir;
+ return true;
+ }
+ return false;
+}
diff --git a/config.h b/config.h
index 83901b4..5565db3 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,8 @@
#ifndef __TVSCRAPER_CONFIG_H
#define __TVSCRAPER_CONFIG_H

+#include "services.h"
+
using namespace std;

enum scrapType {
@@ -19,6 +21,7 @@ class cTVScraperConfig {
int enableDebug;
void SetBaseDir(string dir) { baseDir = dir; };
string GetBaseDir(void) { return baseDir; };
+ bool GetImageDir(ScraperGetImageDir* call);
void ClearChannels(void);
void AddChannel(string channelID);
bool ChannelActive(int channelNum);
@@ -27,4 +30,4 @@ class cTVScraperConfig {
void PrintChannels(void);
};

-#endif //__TVSCRAPER_CONFIG_H
\ No newline at end of file
+#endif //__TVSCRAPER_CONFIG_H
diff --git a/services.h b/services.h
index 0e72056..6b396bb 100644
--- a/services.h
+++ b/services.h
@@ -1,3 +1,6 @@
+#ifndef __TVSCRAPERSERVICES_H
+#define __TVSCRAPERSERVICES_H
+
enum tvType {
tSeries,
tMovie,
@@ -185,3 +188,12 @@ public:
//out
cTvMedia poster;
};
+
+// Data structure for service "GetImageDir"
+class ScraperGetImageDir {
+public:
+ //out
+ std::string imageDir;
+};
+
+#endif //__TVSCRAPERSERVICES_H
diff --git a/tvscraper.c b/tvscraper.c
index 1480f63..a20dadf 100644
--- a/tvscraper.c
+++ b/tvscraper.c
@@ -298,6 +298,11 @@ bool cPluginTvscraper::Service(const char *Id, void *Data) {
}
return false;
}
+
+ if (strcmp(Id, "GetImageDir") == 0) {
+ ScraperGetImageDir* call = (ScraperGetImageDir*) Data;
+ return config.GetImageDir(call);
+ }
return false;
}

--
1.9.1

From 4acd7f3811cb2936b72791c7744ec9522cffe29f Mon Sep 17 00:00:00 2001
From: hannemann <hannemann666@gmx.net>
Date: Thu, 19 Feb 2015 23:28:27 +0100
Subject: [PATCH] add service call getImageDir

---
config.c | 8 ++++++++
config.h | 3 +++
scraper2vdr.c | 5 +++++
scraper2vdr.h | 2 +-
services.h | 8 +++++++-
5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/config.c b/config.c
index 1fe1016..7e6bbef 100644
--- a/config.c
+++ b/config.c
@@ -31,6 +31,14 @@ void cScraper2VdrConfig::SetImageDir(cString dir) {
imgDirSet = true;
}

+bool cScraper2VdrConfig::GetImageDir(ScraperGetImageDir* call) {
+ if (imgDirSet) {
+ call->imageDir = imageDir;
+ return true;
+ }
+ return false;
+}
+
void cScraper2VdrConfig::SetDefaultImageDir(void) {
if (!imgDirSet) {
imageDir = cPlugin::CacheDirectory(PLUGIN_NAME_I18N);
diff --git a/config.h b/config.h
index fb08748..489c546 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,8 @@
#include <string>
#include <vdr/plugin.h>

+#include "services.h"
+
using namespace std;

class cScraper2VdrConfig {
@@ -14,6 +16,7 @@ class cScraper2VdrConfig {
bool SetupParse(const char *Name, const char *Value);
void SetUuid(cPlugin *plug);
void SetImageDir(cString dir);
+ bool GetImageDir(ScraperGetImageDir* call);
void SetDefaultImageDir(void);
void SetMode(string mode);
int mainMenuEntry;
diff --git a/scraper2vdr.c b/scraper2vdr.c
index e21d234..6529185 100644
--- a/scraper2vdr.c
+++ b/scraper2vdr.c
@@ -217,6 +217,11 @@ bool cPluginScraper2vdr::Service(const char *Id, void *Data) {
return scrapManager->GetPosterThumb(call);
}

+ if (strcmp(Id, "GetImageDir") == 0) {
+ ScraperGetImageDir* call = (ScraperGetImageDir*) Data;
+ return config.GetImageDir(call);
+ }
+
return false;
}

diff --git a/scraper2vdr.h b/scraper2vdr.h
index 7d5acbc..30c63cd 100644
--- a/scraper2vdr.h
+++ b/scraper2vdr.h
@@ -13,7 +13,7 @@
//***************************************************************************
// Constants
//***************************************************************************
-static const char *VERSION = "0.1.6";
+static const char *VERSION = "0.1.5";
static const char *DESCRIPTION = "'scraper2vdr' plugin";
static const char *MAINMENUENTRY = "Scraper2Vdr";

diff --git a/services.h b/services.h
index 5812837..652fd25 100644
--- a/services.h
+++ b/services.h
@@ -209,4 +209,10 @@ public:
cTvMedia poster;
};

-#endif //__SCRAPER2VDRSERVICES_H
\ No newline at end of file
+// Data structure for service "GetImageDir"
+class ScraperGetImageDir {
+public:
+ //out
+ std::string imageDir;
+};
+#endif //__SCRAPER2VDRSERVICES_H
--
1.9.1