Changeset 71137 in vbox

Timestamp:

Feb 27, 2018 2:47:38 PM (7 years ago)

Author:

vboxsync

Message:

VideoRec: Added timestamping output files if an output file already exists (never overwrite).

File:

• trunk/src/VBox/Main/src-client/VideoRec.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/VideoRec.cpp

@@ -961 +961 @@
 
     int rc;
-    if (pStream->uScreenID > 1)
+    if (pCfg->aScreens.size() > 1)
         rc = RTStrAPrintf(&pszFile, "%s-%u%s", pszAbsPath, pStream->uScreenID + 1, pszSuff);
     else
@@ -969 +969 @@
     {
         uint64_t fOpen = RTFILE_O_WRITE | RTFILE_O_DENY_WRITE;
-#ifdef DEBUG
-        fOpen |= RTFILE_O_CREATE_REPLACE;
-#else
+
         /* Play safe: the file must not exist, overwriting is potentially
          * hazardous as nothing prevents the user from picking a file name of some
          * other important file, causing unintentional data loss. */
         fOpen |= RTFILE_O_CREATE;
-#endif
+
         RTFILE hFile;
         rc = RTFileOpen(&hFile, pszFile, fOpen);
+        if (rc == VERR_ALREADY_EXISTS)
+        {
+            RTStrFree(pszFile);
+            pszFile = NULL;
+
+            RTTIMESPEC ts;
+            RTTimeNow(&ts);
+            RTTIME time;
+            RTTimeExplode(&time, &ts);
+
+            if (pCfg->aScreens.size() > 1)
+                rc = RTStrAPrintf(&pszFile, "%s-%04d-%02u-%02uT%02u-%02u-%02u-%09uZ-%u%s",
+                                  pszAbsPath, time.i32Year, time.u8Month, time.u8MonthDay,
+                                  time.u8Hour, time.u8Minute, time.u8Second, time.u32Nanosecond,
+                                  pStream->uScreenID + 1, pszSuff);
+            else
+                rc = RTStrAPrintf(&pszFile, "%s-%04d-%02u-%02uT%02u-%02u-%02u-%09uZ%s",
+                                  pszAbsPath, time.i32Year, time.u8Month, time.u8MonthDay,
+                                  time.u8Hour, time.u8Minute, time.u8Second, time.u32Nanosecond,
+                                  pszSuff);
+
+            if (RT_SUCCESS(rc))
+                rc = RTFileOpen(&hFile, pszFile, fOpen);
+        }
+
         if (RT_SUCCESS(rc))
         {
@@ -985 +1008 @@
             pStream->File.pszFile = pszFile; /* Assign allocated string to our stream's config. */
         }
-        else
-            RTStrFree(pszFile);
     }
 
@@ -993 +1014 @@
 
     if (RT_FAILURE(rc))
-        LogRel(("VideoRec: Failed to open file for screen %RU32, rc=%Rrc\n", pStream->uScreenID, rc));
+    {
+        LogRel(("VideoRec: Failed to open file '%s' for screen %RU32, rc=%Rrc\n",
+                pszFile ? pszFile : "<Unnamed>", pStream->uScreenID, rc));
+        RTStrFree(pszFile);
+    }
 
     return rc;