Add Converter::possibleOutputFormats()

Author: attah

lib/converter.h

@@ -164,6 +164,24 @@ class Converter
     }
     return inputFormats;
   }
+
+  List<std::string> possibleOutputFormats(const List<std::string>& supportedFormats, const std::string& inputFormat)
+  {
+    List<std::string> possibleTransferFormats;
+    for(const auto& [convertKey, convertFun] : Pipelines)
+    {
+      if(convertKey.first == inputFormat && supportedFormats.contains(convertKey.second))
+      {
+        possibleTransferFormats.push_back(convertKey.second);
+      }
+    }
+    if(!possibleTransferFormats.contains(inputFormat) && supportedFormats.contains(inputFormat))
+    {
+        possibleTransferFormats.push_back(inputFormat);
+    }
+    return possibleTransferFormats;
+  }
+
 };
 
 #endif // CONVERTER_H

lib/ippprinter.cpp

@@ -388,10 +388,20 @@ List<std::string> IppPrinter::additionalDocumentFormats() const
   return additionalFormats;
 }
 
+List<std::string> IppPrinter::allDocumentFormats() const
+{
+  return documentFormats() += additionalDocumentFormats();
+}
+
+
 List<std::string> IppPrinter::possibleInputFormats() const
 {
-  return Converter::instance().possibleInputFormats(documentFormats()
-         += additionalDocumentFormats());
+  return Converter::instance().possibleInputFormats(allDocumentFormats());
+}
+
+List<std::string> IppPrinter::possibleTransferFormats(const std::string& inputFormat) const
+{
+  return Converter::instance().possibleOutputFormats(allDocumentFormats(), inputFormat);
 }
 
 bool IppPrinter::supportsPrinterRaster() const

lib/ippprinter.h

@@ -85,7 +85,9 @@ class IppPrinter
   std::string strings() const;
   List<std::string> documentFormats() const;
   List<std::string> additionalDocumentFormats() const;
+  List<std::string> allDocumentFormats() const;
   List<std::string> possibleInputFormats() const;
+  List<std::string> possibleTransferFormats(const std::string& inputFormat) const;
   bool supportsPrinterRaster() const;
 
   bool isWarningState() const;

tests/test.cpp

@@ -2374,6 +2374,8 @@ TEST(converter)
 {
   List<std::string> supportedFormats;
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats) == List<std::string> {});
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == List<std::string> {});
 
   // PDF to PDF
   supportedFormats = {"application/pdf"};
@@ -2388,46 +2390,62 @@ TEST(converter)
          == (List<std::string> {"application/pdf", "image/pwg-raster"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "image/pwg-raster");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"image/pwg-raster"}));
 
   // ...and URF
   supportedFormats = {"image/urf"};
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats)
          == (List<std::string> {"application/pdf", "image/urf"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "image/urf");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"image/urf"}));
 
   // PDF has higher prio than raster
   supportedFormats = {"image/pwg-raster", "application/pdf"};
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats)
          == (List<std::string> {"application/pdf", "image/pwg-raster"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "application/pdf");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"application/pdf", "image/pwg-raster"}));
 
   // Octet Stream, because why not
   supportedFormats = {"application/octet-stream", "image/pwg-raster", "application/pdf"};
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats)
          == (List<std::string> {"application/pdf", "application/octet-stream", "image/pwg-raster"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "application/pdf");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"application/pdf", "image/pwg-raster"}));
 
   // PDF has higher prio than Postscript too
   supportedFormats = {"application/postscript", "application/pdf"};
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats)
          == (List<std::string> {"application/pdf", "application/postscript"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "application/pdf");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"application/pdf", "application/postscript"}));
 
   // Postscript has higher prio than raster
   supportedFormats = {"image/pwg-raster", "application/postscript"};
   ASSERT(Converter::instance().possibleInputFormats(supportedFormats)
          == (List<std::string> {"application/pdf", "image/pwg-raster", "application/postscript"}));
   ASSERT(Converter::instance().getTargetFormat("application/pdf", supportedFormats)
          == "application/postscript");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "application/pdf")
+         == (List<std::string> {"application/postscript", "image/pwg-raster"}));
 
   // JPEG needs JPEG support
   ASSERT_FALSE(Converter::instance().getTargetFormat("image/jpeg", supportedFormats));
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "image/jpeg")
+         == List<std::string> {});
   supportedFormats = {"application/octet-stream", "image/pwg-raster", "application/pdf", "image/jpeg"};
   ASSERT(Converter::instance().getTargetFormat("image/jpeg", supportedFormats) == "image/jpeg");
+  ASSERT(Converter::instance().possibleOutputFormats(supportedFormats, "image/jpeg")
+         == (List<std::string> {"image/jpeg"}));
 
   // Functions exist. TODO: Check that they are the correct ones.
   ASSERT(Converter::instance().getConvertFun("application/pdf", "application/pdf"));