Ticket #13447: 20190411-scan-lcn-required.patch

mythtv/libs/libmythtv/channelscan/channelimporter.cpp

@@ -6 +6 @@
  *
  */
 
-#include <QTextStream>
+// C++ includes
 #include <iostream>
 #include <utility>
 
+// Qt includes
+#include <QTextStream>
+
 using namespace std;
 
 // MythTV headers
@@ -79 +82 @@
 
     FilterServices(transports);
 
+    if (m_lcn_only)
+        FilterChannelNumber(transports);
+
     // Pull in DB info
     sourceid = transports[0].m_channels[0].m_source_id;
     ScanDTVTransportList db_trans = GetDBTransports(sourceid, transports);
@@ -824 +830 @@
     }
 }
 
+// Remove the channels that do not have a logical channel number
+void ChannelImporter::FilterChannelNumber(ScanDTVTransportList &transports) const
+{
+    for (size_t i = 0; i < transports.size(); ++i)
+    {
+        ChannelInsertInfoList filtered;
+        for (size_t k = 0; k < transports[i].m_channels.size(); ++k)
+        {
+            if (transports[i].m_channels[k].m_chan_num.isEmpty())
+            {
+                QString msg = FormatChannel(transports[i], transports[i].m_channels[k]);
+                LOG(VB_GENERAL, LOG_DEBUG, QString("No LCN: %1").arg(msg));
+                continue;
+            }
+            filtered.push_back(transports[i].m_channels[k]);
+        }
+        transports[i].m_channels = filtered;
+    }
+}
+
 /** \fn ChannelImporter::GetDBTransports(uint,ScanDTVTransportList&) const
  *  \brief Adds found channel info to transports list,
  *         returns channels in DB which were not found in scan

mythtv/libs/libmythtv/channelscan/channelimporter.h

@@ -76 +76 @@
   public:
     ChannelImporter(bool gui, bool interactive,
                     bool _delete, bool insert, bool save,
-                    bool fta_only, ServiceRequirements service_requirements,
+                    bool fta_only, bool lcn_only,
+                    ServiceRequirements service_requirements,
                     bool success = false) :
-        m_use_gui(gui), m_is_interactive(interactive),
+        m_use_gui(gui),
+        m_is_interactive(interactive),
         m_do_delete(_delete),
-        m_do_insert(insert), m_do_save(save), m_fta_only(fta_only),
+        m_do_insert(insert),
+        m_do_save(save),
+        m_fta_only(fta_only),
+        m_lcn_only(lcn_only),
         m_success(success),
         m_service_requirements(service_requirements) { }
 
@@ -133 +138 @@
 
     void CleanupDuplicates(ScanDTVTransportList &transports) const;
     void FilterServices(ScanDTVTransportList &transports) const;
+    void FilterChannelNumber(ScanDTVTransportList &transports) const;
     ScanDTVTransportList GetDBTransports(
         uint sourceid, ScanDTVTransportList&) const;
 
@@ -228 +234 @@
     bool                m_do_save;
     /// Only FreeToAir (non-encrypted) channels desired post scan?
     bool                m_fta_only;
+    /// Only services with logical channel numbers desired post scan?
+    bool                m_lcn_only;
     /// To pass information IPTV channel scan succeeded
     bool                m_success {false};
     /// Services desired post scan

mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h

@@ -120 +120 @@
     };
 };
 
+class ChannelNumbersOnly : public TransMythUICheckBoxSetting
+{
+  public:
+    ChannelNumbersOnly()
+    {
+        setValue(false);
+        setLabel(QObject::tr("Logical Channel Numbers required"));
+        setHelpText(
+            QObject::tr(
+                "If set, only services with a Logical Channel Number will "
+                "be added during the scan. This will filter out services "
+                "for set-top-box firmware download and video-on-demand "
+                "that can be present on DVB-C networks."));
+    };
+};
+
 class AddFullTS : public TransMythUICheckBoxSetting
 {
   public:

mythtv/libs/libmythtv/channelscan/channelscanner.cpp

@@ -115 +115 @@
     bool           do_follow_nit,
     bool           do_test_decryption,
     bool           do_fta_only,
+    bool           do_lcn_only,
     bool           do_add_full_ts,
     ServiceRequirements service_requirements,
     // stuff needed for particular scans
@@ -127 +128 @@
     const QString &tbl_end   /* FullScan optional */)
 {
     m_freeToAirOnly = do_fta_only;
+    m_channelNumbersOnly = do_lcn_only;
     m_addFullTS = do_add_full_ts;
     m_serviceRequirements = service_requirements;
     m_sourceid = sourceid;

mythtv/libs/libmythtv/channelscan/channelscanner.h

@@ -76 +76 @@
               bool           do_follow_nit,
               bool           do_test_decryption,
               bool           do_fta_only,
+              bool           do_lcn_only,
               bool           do_add_full_ts,
               ServiceRequirements service_requirements,
               // stuff needed for particular scans
@@ -135 +136 @@
     /// Only fta channels desired post scan?
     bool                     m_freeToAirOnly       {false};
 
+    /// Only channels with logical channel numbers desired post scan?
+    bool                     m_channelNumbersOnly  {false};
+
     /// Add MPTS "full transport stream" channels
     bool                     m_addFullTS           {false};
 

mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp

@@ -136 +136 @@
 void ChannelScannerCLI::Process(const ScanDTVTransportList &_transports)
 {
     ChannelImporter ci(false, m_interactive, !m_onlysavescan, !m_onlysavescan, true,
-                       m_freeToAirOnly, m_serviceRequirements);
+                       m_freeToAirOnly, m_channelNumbersOnly, m_serviceRequirements);
     ci.Process(_transports, m_sourceid);
 }
 

mythtv/libs/libmythtv/channelscan/channelscanner_gui.cpp

@@ -135 +135 @@
                                 bool success)
 {
     ChannelImporter ci(true, true, true, true, true,
-                       m_freeToAirOnly, m_serviceRequirements, success);
+                       m_freeToAirOnly, m_channelNumbersOnly, m_serviceRequirements, success);
     ci.Process(_transports, m_sourceid);
 }
 

mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp

@@ -31 +31 @@
     m_scanConfig = new ScanOptionalConfig(m_scanType);
     m_services = new DesiredServices();
     m_ftaOnly = new FreeToAirOnly();
+    m_lcnOnly = new ChannelNumbersOnly();
     m_addFullTS = new AddFullTS();
     m_trustEncSI = new TrustEncSISetting();
 
     addChild(m_services);
     addChild(m_ftaOnly);
+    addChild(m_lcnOnly);
     addChild(m_addFullTS);
     addChild(m_trustEncSI);
 
@@ -72 +74 @@
     return m_ftaOnly->boolValue();
 }
 
+bool ScanWizard::DoChannelNumbersOnly(void) const
+{
+    return m_lcnOnly->boolValue();
+}
+
 bool ScanWizard::DoAddFullTS(void) const
 {
     return m_addFullTS->boolValue();

mythtv/libs/libmythtv/channelscan/scanwizardconfig.h

@@ -43 +43 @@
 class IgnoreSignalTimeout;
 class DesiredServices;
 class FreeToAirOnly;
+class ChannelNumbersOnly;
 class AddFullTS;
 class TrustEncSISetting;
 

mythtv/libs/libmythtv/scanwizard.cpp

@@ -137 +137 @@
         ScanDTVTransportList transports = LoadScan(scanid);
         ChannelImporter ci(true, true, true, true, false,
                            DoFreeToAirOnly(),
+                           DoChannelNumbersOnly(),
                            GetServiceRequirements());
         ci.Process(transports, sourceid);
     }
@@ -179 +180 @@
             GetInputName(),           GetSourceID(),
             DoIgnoreSignalTimeout(),  DoFollowNIT(),
             DoTestDecryption(),       DoFreeToAirOnly(),
+            DoChannelNumbersOnly(),
             DoAddFullTS(),            GetServiceRequirements(),
             // stuff needed for particular scans
             GetMultiplex(),         start_chan,

mythtv/libs/libmythtv/scanwizard.h

@@ -87 +87 @@
         { return m_scanConfig->DoIgnoreSignalTimeout(); }
     bool    DoFollowNIT(void) const
         { return m_scanConfig->DoFollowNIT(); }
-    bool    DoFreeToAirOnly(void)  const;
-    bool    DoAddFullTS(void)      const;
-    bool    DoTestDecryption(void) const;
+    bool    DoFreeToAirOnly(void)       const;
+    bool    DoChannelNumbersOnly(void)  const;
+    bool    DoAddFullTS(void)           const;
+    bool    DoTestDecryption(void)      const;
 
   protected:
     VideoSourceSelector *m_videoSource {nullptr};
@@ -98 +99 @@
     ScanOptionalConfig  *m_scanConfig  {nullptr};
     DesiredServices     *m_services    {nullptr};
     FreeToAirOnly       *m_ftaOnly     {nullptr};
+    ChannelNumbersOnly  *m_lcnOnly     {nullptr};
     AddFullTS           *m_addFullTS   {nullptr};
     TrustEncSISetting   *m_trustEncSI  {nullptr};
 // End of members moved from ScanWizardConfig

mythtv/programs/mythtv-setup/main.cpp

@@ -274 +274 @@
     bool    expertMode = false;
     uint    scanImport = 0;
     bool    scanFTAOnly = false;
+    bool    scanLCNOnly = false;
     bool    addFullTS = false;
     ServiceRequirements scanServiceRequirements = kRequireAV;
     uint    scanCardId = 0;
@@ -363 +364 @@
         scanImport = cmdline.toUInt("importscan");
     if (cmdline.toBool("ftaonly"))
         scanFTAOnly = true;
+    if (cmdline.toBool("lcnonly"))
+        scanLCNOnly = true;
     if (cmdline.toBool("addfullts"))
         addFullTS = true;
     if (cmdline.toBool("servicetype"))
@@ -518 +521 @@
                          /* follow_nit */            true,
                          /* test decryption */       true,
                          scanFTAOnly,
+                         scanLCNOnly,
                          addFullTS,
                          scanServiceRequirements,
                          // stuff needed for particular scans
@@ -552 +556 @@
         {
             ScanDTVTransportList list = LoadScan(scanImport);
             ChannelImporter ci(false, true, true, true, false,
-                               scanFTAOnly, scanServiceRequirements);
+                               scanFTAOnly, scanLCNOnly, scanServiceRequirements);
             ci.Process(list);
         }
         cout<<"*** SCAN IMPORT END ***"<<endl;