Remove ImageExtension

yavdr · Jan 31, 2015 · e26b6f0 · e26b6f0
1 parent b360669
commit e26b6f0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/channels.cpp b/channels.cpp
@@ -126,13 +126,13 @@ void ChannelsResponder::replyImage(ostream& out, cxxtools::http::Request& reques
   string absolute_path = imageFolder + imageName;
 
   if (request.hasHeader("If-Modified-Since")) {
-      timediff = difftime(ImageExtension::get()->getModifiedTime(absolute_path), ImageExtension::get()->getModifiedSinceTime(request));
+      timediff = difftime(FileExtension::get()->getModifiedTime(absolute_path), FileExtension::get()->getModifiedSinceTime(request));
   }
 
   if (timediff > 0.0 || timediff < 0.0) {
       string contenttype = (string)"image/" + imageName.substr( imageName.find_last_of('.') + 1 );
       if ( se.writeBinary(absolute_path) ) {
-	 ImageExtension::get()->addModifiedHeader(absolute_path, reply);
+	  FileExtension::get()->addModifiedHeader(absolute_path, reply);
          reply.addHeader("Content-Type", contenttype.c_str());
       } else {
         reply.httpReturn(502, "Binary Output failed");

diff --git a/events.cpp b/events.cpp
@@ -162,13 +162,13 @@ void EventsResponder::replyImage(ostream& out, cxxtools::http::Request& request,
   string path = Settings::get()->EpgImageDirectory() + (string)"/" + image;
 
   if (request.hasHeader("If-Modified-Since")) {
-      timediff = difftime(ImageExtension::get()->getModifiedTime(path), ImageExtension::get()->getModifiedSinceTime(request));
+      timediff = difftime(FileExtension::get()->getModifiedTime(path), FileExtension::get()->getModifiedSinceTime(request));
   }
 
   if (timediff > 0.0 || timediff < 0.0) {
     if ( se.writeBinary(path) ) {
        reply.addHeader("Content-Type", contenttype.c_str());
-       ImageExtension::get()->addModifiedHeader(path, reply);
+       FileExtension::get()->addModifiedHeader(path, reply);
     } else {
        reply.httpReturn(404, "Could not find image!");
     }

diff --git a/scraper2vdr.cpp b/scraper2vdr.cpp
@@ -510,22 +510,22 @@ void ScraperImageResponder::reply(ostream& out, cxxtools::http::Request& request
       string image = url.replace(0, base.length(), "");
       string path = epgImagesPath + (string)"/" + image;
 
-      if (!ImageExtension::get()->exists(path)) {
+      if (!FileExtension::get()->exists(path)) {
 	  isyslog("restfulapi Scraper: image does not exist");
 	  reply.httpReturn(404, "File not found");
 	  return;
       }
 
       if (request.hasHeader("If-Modified-Since")) {
-	  timediff = difftime(ImageExtension::get()->getModifiedTime(path), ImageExtension::get()->getModifiedSinceTime(request));
+	  timediff = difftime(FileExtension::get()->getModifiedTime(path), FileExtension::get()->getModifiedSinceTime(request));
       }
       if (timediff > 0.0 || timediff < 0.0) {
 	  string type = image.substr(image.find_last_of(".")+1);
 	  string contenttype = (string)"image/" + type;
 	  StreamExtension se(&out);
 	  if ( se.writeBinary(path) ) {
 	      isyslog("restfulapi Scraper: successfully piped image");
-	      ImageExtension::get()->addModifiedHeader(path, reply);
+	      FileExtension::get()->addModifiedHeader(path, reply);
 	      reply.addHeader("Content-Type", contenttype.c_str());
 	  } else {
 	      isyslog("restfulapi Scraper: error piping image");

diff --git a/tools.cpp b/tools.cpp
@@ -491,10 +491,6 @@ bool FileExtension::exists(string path) {
   return false;
 };
 
-
-
-// --- ImageExtension -----------------------------------------------------------
-
 // --- VdrExtension -----------------------------------------------------------
 
 cChannel* VdrExtension::getChannel(int number)

diff --git a/tools.h b/tools.h
@@ -173,8 +173,6 @@ class FileExtension {
     bool exists(std::string path);
 };
 
-class ImageExtension : public FileExtension {};
-
 class VdrExtension
 {
   private: