Ticket #3842: 3842-head-dbg-2.patch

libs/libmythtv/datadirect.cpp

@@ -1099 +1099 @@
 
         if (ok)
         {
-            if (copy(out, in))
+            ok = copy(out, in);
+            in.close();
+            pclose(fp);
+
+            if (ok)
             {
-                pclose(fp);
                 fp = fopen(cache_dd_data.ascii(), "r");
+                VERBOSE(VB_IMPORTANT, "fp("<<cache_dd_data.ascii()<<"): "<<fp);
             }
             else
             {
@@ -1110 +1114 @@
                         LOC_ERR + "Failed to save DD cache! "
                         "redownloading data...");
                 cachedata = false;
-                pclose(fp);
                 fp = DDPost(ddurl, GetPostFilename(), inputfile,
                             GetUserID(), GetPassword(),
                             pstartDate, pendDate, err);
@@ -1118 +1121 @@
         }
     }
 
+    if (!fp)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to get data 2 " +
+                QString("(%1) -- ").arg(err) + ENO);
+        return false;
+    }
+
+    bool ok = true;
     QFile f;
     if (f.open(IO_ReadOnly, fp)) 
     {
@@ -1131 +1142 @@
     else
     {
         VERBOSE(VB_GENERAL, LOC_ERR + "Error opening DataDirect file");
-        pclose(fp);
-        fp = NULL;
+        ok = false;
     }
 
-    return fp;
+    if (!cachedata && inputfile.isEmpty())
+        pclose(fp);
+    else
+        fclose(fp);
+
+    return ok;
 }
 
 bool DataDirectProcessor::GrabLineupsOnly(void)

libs/libmyth/util.cpp

@@ -605 +605 @@
     return false;
 }
 
-/** \fn  Copy(QFile&,QFile&,uint)
+/** \fn copy(QFile&,QFile&,uint)
  *  \brief Copies src file to dst file.
  *
  *   If the dst file is open, it must be open for writing.
@@ -636 +636 @@
         return -1LL;
 
     if (!dst.isWritable() && !dst.isOpen())
+    {
         odst = dst.open(IO_Raw|IO_WriteOnly|IO_Truncate);
+        VERBOSE(VB_IMPORTANT, "copy: opening dst ("<<odst<<")");
+    }
 
     if (!src.isReadable() && !src.isOpen())
+    {
         osrc = src.open(IO_Raw|IO_ReadOnly);
+        VERBOSE(VB_IMPORTANT, "copy: opened src ("<<osrc<<")");
+    }
 
     bool ok = dst.isWritable() && src.isReadable();
     long long total_bytes = 0LL;
@@ -649 +655 @@
         rlen = src.readBlock(buf, buflen);
         if (rlen<0)
         {
+            VERBOSE(VB_IMPORTANT, "copy: read error");
             ok = false;
             break;
         }
@@ -663 +670 @@
             if (wlen>=0)
                 off+= wlen;
             if (wlen<0)
+            {
+                VERBOSE(VB_IMPORTANT, "copy: write error");
                 ok = false;
+            }
         }
     }
     delete[] buf;
 
+    VERBOSE(VB_IMPORTANT, "copy: "<<((ok)?"ok":"error"));
+
     if (odst)
+    {
+        VERBOSE(VB_IMPORTANT, "copy: closing dst");
         dst.close();
+    }
 
     if (osrc)
+    {
+        VERBOSE(VB_IMPORTANT, "copy: closing src");
         src.close();
+    }
 
     return (ok) ? total_bytes : -1LL;
 }

libs/libmyth/util.h

@@ -75 +75 @@
 MPUBLIC bool telnet(const QString &host, int port);
 
 MPUBLIC long long copy(QFile &dst, QFile &src, uint block_size = 0);
-MPUBLIC QString createTempFile(QString name_template = "/tmp/mythtv_XXXXX",
+MPUBLIC QString createTempFile(QString name_template = "/tmp/mythtv_XXXXXX",
                                bool dir = false);
 
 #endif // UTIL_H_