Ticket #2292: xmltv_ru.patch

themes/default/categories.xml

@@ -290 +290 @@
   <catcolor category="Wissenschaft" color="#33ff99"></catcolor>
   <catcolor category="Zeichentrick" color="MediumSlateBlue"></catcolor>
 
+  <!-- Categories introduced by tv_grab_ru -->
+  <!-- (unofficial xmltv grabber for Russia) -->
+  <catcolor category="ХуЎПжествеММый фОльЌ" color="Blue"></catcolor>
+  <catcolor category="МультОплОкацОПММый серОал" color="#3333aa"></catcolor>
+  <catcolor category="МультфОльЌ" color="#3333aa"></catcolor>
+  <catcolor category="ДПкуЌеМтальМый серОал" color="goldenrod"></catcolor>
+  <catcolor category="ДПкуЌеМтальМый фОльЌ" color="goldenrod"></catcolor>
+  <catcolor category="Спектакль" color="MediumTurquoise"></catcolor>
+  <catcolor category="КПМцерт" color="turquoise3"></catcolor>
+  <catcolor category="КПЌеЎОя" color="#8800aa"></catcolor>
+  <catcolor category="МелПЎраЌа" color="rosybrown3"></catcolor>
+  <catcolor category="ТрОллер" color="firebrick3"></catcolor>
+  <catcolor category="БПевОк" color="MediumVioletRed"></catcolor>
+  <catcolor category="ЀОльЌ ужасПв" color="firebrick3"></catcolor>
+
 </categorycolors>
 

libs/libmythtv/videosource.cpp

@@ -303 +303 @@
         grabber == "tv_grab_ee" || grabber == "tv_grab_be_tvb" ||
         grabber == "tv_grab_be_tlm" || grabber == "tv_grab_is" ||
         grabber == "tv_grab_br" || grabber == "tv_grab_cz" ||
-        grabber == "tv_grab_il")
+        grabber == "tv_grab_il" || grabber == "tv_grab_ru")
     {
         VERBOSE(VB_IMPORTANT, "\n" << err_msg);
         MythPopupBox::showOkPopup(
@@ -437 +437 @@
     addTarget("tv_grab_il", new XMLTV_generic_config(parent, "tv_grab_il"));
     grabber->addSelection("Israel", "tv_grab_il");
 
+    addTarget("tv_grab_ru", new XMLTV_generic_config(parent, "tv_grab_ru"));
+    grabber->addSelection("Russia", "tv_grab_ru");
+
     addTarget("/bin/true", new NoGrabber_config(parent));
     grabber->addSelection("No grabber", "/bin/true");
 }

programs/mythfilldatabase/filldata.cpp

@@ -1205 +1205 @@
 {
     // we signal an error by setting it invalid (> 840min = 14hr)
     int result = 841;
+    
+    if (timezone.upper() == "UTC" || timezone.upper() == "GMT")
+        return 0;
 
     if (timezone.length() == 5)
     {
@@ -2629 +2632 @@
         command.sprintf("nice %s --config-file '%s' --output %s",
                         xmltv_grabber.ascii(), configfile.ascii(),
                         filename.ascii());
+    else if (xmltv_grabber == "tv_grab_ru")
+        // Russian grabber returns all known data by default
+        command.sprintf("nice %s --config-file '%s' --output %s",
+                        xmltv_grabber.ascii(), configfile.ascii(),
+                        filename.ascii());
     else
     {
         isNorthAmerica = true;
@@ -2655 +2663 @@
          xmltv_grabber == "tv_grab_pt" ||
          xmltv_grabber == "tv_grab_be_tvb" ||
          xmltv_grabber == "tv_grab_be_tlm" ||
-         xmltv_grabber == "tv_grab_ee"))
+         xmltv_grabber == "tv_grab_ee" ||
+         xmltv_grabber == "tv_grab_ru"))
          command += " --quiet";
 
 
@@ -2899 +2908 @@
                  xmltv_grabber == "tv_grab_be_tlm" ||
                  xmltv_grabber == "tv_grab_is" ||
                  xmltv_grabber == "tv_grab_br" ||
-                 xmltv_grabber == "tv_grab_cz")
+                 xmltv_grabber == "tv_grab_cz" ||
+                 xmltv_grabber == "tv_grab_ru")
         {
             // Grabbers supporting the --offset option