Changeset 20975

Timestamp:

04/13/13 08:22:03 (11 years ago)

Author:

nit

Message:

[titan] extend epg scan log

File:

• titan/titan/epgscan.h (modified) (9 diffs)

titan/titan/epgscan.h

@@ -135 +135 @@
         struct dvbdev* fenode = NULL;
         struct channel* chnode = NULL;
-        char* tmpstr = NULL;
+        char* tmpstr = NULL, *chname = NULL;
         FILE* fd = NULL;
         
-        debug(400, "epgscan thread start");
+        debug(400, "epgscan thread start, wait for right time");
         
         fd = fopen(EPGSCANLOG, "w");
@@ -146 +146 @@
         }
         else
-        { 
-                tmpstr = ostrcat("epgscan thread start ", gettime(NULL, "%d-%m-%Y %H:%M"), 0, 1);
-                if(tmpstr != NULL) fprintf(fd, "%s\n", tmpstr);
-                free(tmpstr); tmpstr = NULL;
-        }
+                fprintf(fd, "epgscan thread start, wait for right time\n");
 
         if(status.standby != 0) startmode = 1;
@@ -171 +167 @@
         while(self->aktion != STOP && time(NULL) < 1072224000) // 01.01.2004
                 usleep(1 * 1000000);
-                
+
         debug(400, "epgscan time ok");
-        if(fd != NULL) fprintf(fd, "epgscan time ok\n");
+        if(fd != NULL)
+        {
+                tmpstr = ostrcat("epgscan time ok ", gettime(NULL, "%d-%m-%Y %H:%M"), 0, 1);
+                if(tmpstr != NULL) fprintf(fd, "%s\n", tmpstr);
+                free(tmpstr); tmpstr = NULL;
+        }
 
         if(getconfigint("delepgbeforescan", NULL) == 1)
         {
+                debug(400, "del epg before scan");
+                if(fd != NULL) fprintf(fd, "del epg before scan\n");
                 resetepg(1);
                 epgdelete = 1;
@@ -192 +195 @@
                 }
 
+                if(node->name != NULL)
+                        chname = node->name;
+                else
+                        chname = "unknown";
+
                 if(epgdelete == 0 && chnode == status.aktservice->channel)
                 {
-                        debug(400, "epgscan channel same as aktchannel sid=%d, tid=%llu", node->serviceid, node->transponderid);
-                        if(fd != NULL) fprintf(fd, "epgscan channel same as aktchannel sid=%d, tid=%llu\n", node->serviceid, node->transponderid);
+                        debug(400, "epgscan channel same as aktchannel channel=%s sid=%d, tid=%llu", chname, node->serviceid, node->transponderid);
+                        if(fd != NULL) fprintf(fd, "epgscan channel same as aktchannel channel=%s sid=%d, tid=%llu\n", chname, node->serviceid, node->transponderid);
                         node = node->next;
                         continue;
@@ -203 +211 @@
                 if(tmpepgscannode != NULL && tmpepgscannode->scantime != 0)
                 {
-                        debug(400, "epgscan transponer already scanned tid=%llu", node->transponderid);
-                        if(fd != NULL) fprintf(fd, "epgscan transponer already scanned tid=%llu\n", node->transponderid);
+                        debug(400, "epgscan transponer already scanned channel=%s tid=%llu", chname, node->transponderid);
+                        if(fd != NULL) fprintf(fd, "epgscan transponer already scanned channel=%s tid=%llu\n", chname, node->transponderid);
                         node = node->next;
                         continue;
@@ -215 +223 @@
                 if(fenode == NULL || (status.standby == 0 && fenode == status.aktservice->fedev))
                 {
-                        debug(400, "epgscan no free frontend found");
-                        if(fd != NULL) fprintf(fd, "epgscan no free frontend found\n");
+                        debug(400, "epgscan no free frontend found channel=%s", chname);
+                        if(fd != NULL) fprintf(fd, "epgscan no free frontend found channel=%s\n", chname);
                         node = node->next;
                         continue;
@@ -235 +243 @@
                         else
                         {
-                                debug(400, "epgscan unknown frontend");
-                                if(fd != NULL) fprintf(fd, "epgscan unknown frontend\n");
+                                debug(400, "epgscan unknown frontend channel=%s", chname);
+                                if(fd != NULL) fprintf(fd, "epgscan unknown frontend channel=%s\n", chname);
                                 node = node->next;
                                 continue;
@@ -244 +252 @@
                         if(festatus != 0)
                         {
-                                debug(400, "epgscan frontend tune failed");
-                                if(fd != NULL) fprintf(fd, "epgscan frontend tune failed\n");
+                                debug(400, "epgscan frontend tune failed channel=%s", chname);
+                                if(fd != NULL) fprintf(fd, "epgscan frontend tune failed channel=%s\n", chname);
                                 node = node->next;
                                 continue;
                         }
 
-                        if(chnode->name != NULL)
-                        {
-                                debug(400, "epgscan scanning channel=%s, sid=%d, tid=%llu, frontend=%s", chnode->name, chnode->serviceid, chnode->transponderid, fenode->feshortname);
-                                if(fd != NULL) fprintf(fd, "epgscan scanning channel=%s, sid=%d, tid=%llu, frontend=%s\n", chnode->name, chnode->serviceid, chnode->transponderid, fenode->feshortname);
-                        }
+                        debug(400, "epgscan scanning channel=%s, sid=%d, tid=%llu, frontend=%s", chname, chnode->serviceid, chnode->transponderid, fenode->feshortname);
+                        if(fd != NULL) fprintf(fd, "epgscan scanning channel=%s, sid=%d, tid=%llu, frontend=%s\n", chname, chnode->serviceid, chnode->transponderid, fenode->feshortname);
+
                         if(chnode->transponder != NULL) chnode->transponder->lastepg = 0;
                         readeit(self, chnode, fenode, 1);
@@ -267 +273 @@
                 else
                 {
-                        debug(400, "epgscan frontend locked frontend=%s", fenode->feshortname);
-                        if(fd != NULL) fprintf(fd, "epgscan frontend locked frontend=%s\n", fenode->feshortname);
+                        debug(400, "epgscan frontend locked channel=%s frontend=%s", chname, fenode->feshortname);
+                        if(fd != NULL) fprintf(fd, "epgscan frontend locked channel=%s frontend=%s\n", chname, fenode->feshortname);
                 }