Index repair now done by markad instead of genindex - and for TS too!

4 files changed, 88 insertions, 90 deletions

diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
index f736bd8..588170d 100644
--- a/command/markad-standalone.cpp
+++ b/command/markad-standalone.cpp
@@ -710,6 +710,7 @@ bool cMarkAdStandalone::ProcessFile(const char *Directory, int Number)
     int dataread;
     dsyslog("processing file %05i",Number);
 
+    uint64_t base=0;
     while ((dataread=read(f,data,datalen))>0)
     {
         if (abort) break;
@@ -737,15 +738,19 @@ bool cMarkAdStandalone::ProcessFile(const char *Directory, int Number)
                         bool dRes=false;
                         if (streaminfo->FindVideoInfos(&macontext,pkt,pktlen))
                         {
+                            uint64_t offset=base+(dataread-tslen);
                             if (!framecnt)
                             {
                                 isyslog("%s %i%c",(macontext.Video.Info.Height>576) ? "HDTV" : "SDTV",
                                         macontext.Video.Info.Height,
                                         macontext.Video.Info.Interlaced ? 'i' : 'p');
                                 AddStartMark();
+                                offset=0;
                             }
-                            //printf("%05i( %c )\n",framecnt,frametypes[macontext.Video.Info.Pict_Type]);
+                            if (bGenIndex) marks.WriteIndex(Directory,isTS,offset,
+                                             macontext.Video.Info.Pict_Type,Number);
                             framecnt++;
+
                             if (macontext.Video.Info.Pict_Type==MA_I_TYPE)
                             {
                                 lastiframe=iframe;
@@ -863,6 +868,7 @@ bool cMarkAdStandalone::ProcessFile(const char *Directory, int Number)
             if (f!=-1) close(f);
             return false;
         }
+        base+=dataread;
     }
     close(f);
     return true;
@@ -960,6 +966,7 @@ void cMarkAdStandalone::Process(const char *Directory)
         }
         if (marks.Save(Directory,macontext.Video.Info.FramesPerSecond,isTS))
         {
+            marks.CloseIndex(Directory,isTS);
             bool bIndexError=false;
             if (marks.CheckIndex(Directory,isTS,&bIndexError))
             {
@@ -971,9 +978,9 @@ void cMarkAdStandalone::Process(const char *Directory)
                     }
                     else
                     {
-                        if ((!isTS) && (bGenIndex))
+                        if (bGenIndex)
                         {
-                            if (RegenerateVDRIndex(Directory))
+                            if (RegenerateIndex())
                             {
                                 isyslog("recreated index");
                             }
@@ -985,7 +992,8 @@ void cMarkAdStandalone::Process(const char *Directory)
                         else
                         {
                             esyslog("index doesn't match marks%s",
-                                    isTS ? ", please recreate it" : ", please run genindex");
+                                    isTS ? ", sorry you're lost" :
+                                    ", please run genindex");
                         }
                     }
                 }
@@ -1526,101 +1534,31 @@ bool cMarkAdStandalone::CheckPATPMT(const char *Directory)
     return true;
 }
 
-bool cMarkAdStandalone::RegenerateVDRIndex(const char *Directory)
+bool cMarkAdStandalone::RegenerateIndex()
 {
-    if (!Directory) return false;
-    pid_t pid;
-
-    char *oldfile;
-    if (asprintf(&oldfile,"%s/index.vdr.generated",Directory)==-1) return false;
-    if (unlink(oldfile)==-1)
+    if (!directory) return false;
+    // rename index[.vdr].generated -> index[.vdr]
+    char *oldpath,*newpath;
+    if (asprintf(&oldpath,"%s/index%s.generated",directory,
+                 isTS ? "" : ".vdr")==-1) return false;
+    if (asprintf(&newpath,"%s/index%s",directory,isTS ? "" : ".vdr")==-1)
     {
-        if (errno!=ENOENT)
-        {
-            free(oldfile);
-            return false;
-        }
+        free(oldpath);
+        return false;
     }
-    free(oldfile);
 
-    if ((pid = fork()) < 0) return false;
-    if (pid > 0)   // parent process
+    if (rename(oldpath,newpath)!=0)
     {
-        int status = 0;
-        if (waitpid(pid, &status, 0) < 0) return false;
-
-        if (!status)
-        {
-            // check stdout/stderr-file for messages
-            char tmp[256];
-            snprintf(tmp,sizeof(tmp),"/tmp/%i",pid);
-            tmp[255]=0;
-            struct stat statbuf;
-            if (stat(tmp,&statbuf)!=0) return false;
-            unlink(tmp);
-            if (statbuf.st_size!=0)
-            {
-                if (asprintf(&oldfile,"%s/index.vdr.generated",Directory)==-1) return false;
-                unlink(oldfile);
-                free(oldfile);
-                return false;
-            }
-        }
-
-        // rename index.vdr.generated -> index.vdr
-        char *oldpath,*newpath;
-        if (asprintf(&oldpath,"%s/index.vdr.generated",Directory)==-1) return false;
-
-        if (asprintf(&newpath,"%s/index.vdr",Directory)==-1)
+        if (errno!=ENOENT)
         {
             free(oldpath);
+            free(newpath);
             return false;
         }
-
-        if (rename(oldpath,newpath)!=0)
-        {
-            if (errno!=ENOENT)
-            {
-                free(oldpath);
-                free(newpath);
-                return false;
-            }
-        }
-        free(oldpath);
-
-        if (getuid()==0 || geteuid()!=0)
-        {
-            // if we are root, set fileowner to owner of 001.vdr/00001.ts file
-            char *spath=NULL;
-            if (asprintf(&spath,"%s/%s",Directory,isTS ? "00001.ts" : "001.vdr")!=-1)
-            {
-                struct stat statbuf;
-                if (!stat(spath,&statbuf))
-                {
-                    if (chown(newpath,statbuf.st_uid, statbuf.st_gid)) {};
-                }
-                free(spath);
-            }
-        }
-        free(newpath);
-
-        return (status==0);
-    }
-    else   // child process
-    {
-        int MaxPossibleFileDescriptors = getdtablesize();
-        for (int i = STDERR_FILENO + 1; i < MaxPossibleFileDescriptors; i++)
-            close(i); //close all dup'ed filedescriptors
-
-        if (chdir(Directory)!=0) return 2;
-
-        char *cmd;
-        if (asprintf(&cmd,"genindex -q >& /tmp/%i",(int) getpid())==-1) return 2;
-        int ret=execl("/bin/sh", "sh", "-c", cmd, NULL);
-        free(cmd);
-        if (ret) ret=2;
-        _exit(ret);
     }
+    free(oldpath);
+    free(newpath);
+    return true;
 }
 
 bool cMarkAdStandalone::CreatePidfile(const char *Directory)
diff --git a/command/markad-standalone.h b/command/markad-standalone.h
index 910ff8c..dcf4769 100644
--- a/command/markad-standalone.h
+++ b/command/markad-standalone.h
@@ -226,7 +226,7 @@ unsigned Descriptor_Length:
     bool CheckTS(const char *Directory);
     bool LoadInfo(const char *Directory);
     bool SaveInfo(const char *Directory);
-    bool RegenerateVDRIndex(const char *Directory);
+    bool RegenerateIndex();
     bool ProcessFile(const char *Directory, int Number);
 public:
     void SetAbort()
diff --git a/command/marks.cpp b/command/marks.cpp
index 5cf8530..4afae07 100644
--- a/command/marks.cpp
+++ b/command/marks.cpp
@@ -44,6 +44,7 @@ clMark::~clMark()
 clMarks::~clMarks()
 {
     DelAll();
+    if (indexfd!=-1) close(indexfd);
 }
 
 int clMarks::Count(int Type)
@@ -307,6 +308,60 @@ char *clMarks::IndexToHMSF(int Index, double FramesPerSecond)
     return buf;
 }
 
+void clMarks::WriteIndex(const char *Directory, bool isTS, uint64_t Offset,
+                         int FrameType, int Number)
+{
+    if (indexfd==-1)
+    {
+        char *ipath=NULL;
+        if (asprintf(&ipath,"%s/index%s.generated",Directory,isTS ? "" : ".vdr")==-1) return;
+        indexfd=open(ipath,O_WRONLY|O_CREAT|O_TRUNC,0644);
+        free(ipath);
+        if (indexfd==-1) return;
+    }
+    if (isTS)
+    {
+        struct tIndexTS IndexTS;
+        IndexTS.offset=Offset;
+        IndexTS.reserved=0;
+        IndexTS.independent=(FrameType==1);
+        IndexTS.number=(uint16_t) Number;
+        write(indexfd,&IndexTS,sizeof(IndexTS));
+    }
+    else
+    {
+        struct tIndexVDR IndexVDR;
+        IndexVDR.offset=(int) Offset;
+        IndexVDR.type=(unsigned char) FrameType;
+        IndexVDR.number=(unsigned char) Number;
+        IndexVDR.reserved=0;
+        write(indexfd,&IndexVDR,sizeof(IndexVDR));
+    }
+}
+
+void clMarks::CloseIndex(const char *Directory, bool isTS)
+{
+    if (indexfd!=-1)
+    {
+        if (getuid()==0 || geteuid()!=0)
+        {
+            // if we are root, set fileowner to owner of 001.vdr/00001.ts file
+            char *spath=NULL;
+            if (asprintf(&spath,"%s/%s",Directory,isTS ? "00001.ts" : "001.vdr")!=-1)
+            {
+                struct stat statbuf;
+                if (!stat(spath,&statbuf))
+                {
+                    if (fchown(indexfd,statbuf.st_uid, statbuf.st_gid)) {};
+                }
+                free(spath);
+            }
+        }
+        close(indexfd);
+    }
+    indexfd=-1;
+}
+
 bool clMarks::CheckIndex(const char *Directory, bool isTS, bool *IndexError)
 {
     if (!IndexError) return false;
diff --git a/command/marks.h b/command/marks.h
index 06c1235..6ffedad 100644
--- a/command/marks.h
+++ b/command/marks.h
@@ -70,6 +70,7 @@ uint16_t number:
     char *IndexToHMSF(int Index, double FramesPerSecond);
     int count;
     int savedcount;
+    int indexfd;
 public:
     clMarks()
     {
@@ -77,6 +78,7 @@ public:
         first=last=NULL;
         savedcount=0;
         count=0;
+        indexfd=-1;
     }
     ~clMarks();
     int Count(int Type=0xFF);
@@ -107,6 +109,9 @@ public:
     bool Backup(const char *Directory, bool isTS);
     bool Save(const char *Directory, double FrameRate, bool isTS);
     bool CheckIndex(const char *Directory, bool isTS, bool *IndexError);
+    void WriteIndex(const char *Directory, bool isTS, uint64_t Offset,
+                    int FrameType, int Number);
+    void CloseIndex(const char *Directory, bool isTS);
 };
 
 #endif