Fix docs and use recovery time for show command.

stalkerg · stalkerg · commit c0b9b027522d · 2016-10-31T18:57:15.000+03:00
diff --git a/doc/pg_arman.md b/doc/pg_arman.md
@@ -10,14 +10,12 @@ pg_arman [ OPTIONS ]
     { init |
       backup |
       restore |
-      show [ DATE | timeline ] |
-      validate [ DATE ] |
-      delete DATE }
+	  show [ ID] |
+	  validate [ ID ] |
+	  delete ID }
 ```
 
-DATE is the start time of the target backup in ISO-format:
-(YYYY-MM-DD HH:MI:SS). Prefix match is used to compare DATE and backup
-files.
+ID is the base36 id from start time of the target backup.
 
 ## DESCRIPTION 
 
@@ -139,12 +137,12 @@ $ pg_ctl start
 ### SHOW A BACKUP 
 ```
 $ pg_arman show
-===================================================================================
-Start                Mode  Current TLI  Parent TLI  Time    Data   Backup   Status 
-===================================================================================
-2013-12-25 03:02:31  PAGE            1           0    0m   203kB     67MB   DONE
-2013-12-25 03:02:31  PAGE            1           0    0m      0B       0B   ERROR
-2013-12-25 03:02:25  FULL            1           0    0m    33MB    364MB   OK
+==========================================================================================
+ID       Recovery time        Mode  Current TLI  Parent TLI  Time    Data   Backup   Status
+==========================================================================================
+OFX1LH   2013-12-25 03:02:31  PAGE            1           0    0m   203kB     67MB   DONE
+OFX1KL   2013-12-25 03:02:31  PAGE            1           0    0m      0B       0B   ERROR
+OFX1KA   2013-12-25 03:02:25  FULL            1           0    0m    33MB    364MB   OK
 ```
 The fields are:
 
@@ -165,10 +163,10 @@ The fields are:
 	* ERROR : backup is unavailable because some errors occur during backup.
 	* CORRUPT : backup is unavailable because it is broken.
 
-When a date is specified, more details about a backup is retrieved:
+When a ID is specified, more details about a backup is retrieved:
 
 ```
-$ pg_arman show '2011-11-27 19:15:45'
+$ pg_arman show OFX1LH
 # configuration
 BACKUP_MODE=FULL
 # result
@@ -189,7 +187,7 @@ You can check the "RECOVERY_XID" and "RECOVERY_TIME" which are used for
 restore option "--recovery-target-xid", "--recovery-target-time".
 
 The delete command deletes backup files not required by recovery after
-the specified date. This command also cleans up in the WAL archive the
+the specified ID. This command also cleans up in the WAL archive the
 WAL segments that are no longer needed to restore from the remaining
 backups.
 
diff --git a/expected/option.out b/expected/option.out
@@ -7,9 +7,9 @@ Usage:
   pg_arman OPTION init
   pg_arman OPTION backup
   pg_arman OPTION restore
-  pg_arman OPTION show [DATE] [DATE]
-  pg_arman OPTION validate [DATE] [DATE]
-  pg_arman OPTION delete DATE
+  pg_arman OPTION show [ID]
+  pg_arman OPTION validate [ID]
+  pg_arman OPTION delete ID
 
 Common Options:
   -D, --pgdata=PATH         location of the database storage area
diff --git a/pg_arman.c b/pg_arman.c
@@ -211,9 +211,9 @@ pgut_help(bool details)
 	printf(_("  %s OPTION init\n"), PROGRAM_NAME);
 	printf(_("  %s OPTION backup\n"), PROGRAM_NAME);
 	printf(_("  %s OPTION restore\n"), PROGRAM_NAME);
-	printf(_("  %s OPTION show [DATE] [DATE]\n"), PROGRAM_NAME);
-	printf(_("  %s OPTION validate [DATE] [DATE]\n"), PROGRAM_NAME);
-	printf(_("  %s OPTION delete DATE\n"), PROGRAM_NAME);
+	printf(_("  %s OPTION show [ID]\n"), PROGRAM_NAME);
+	printf(_("  %s OPTION validate [ID]\n"), PROGRAM_NAME);
+	printf(_("  %s OPTION delete ID\n"), PROGRAM_NAME);
 
 	if (!details)
 		return;
diff --git a/show.c b/show.c
@@ -166,7 +166,7 @@ show_backup_list(FILE *out, parray *backup_list, bool show_all)
 
 	/* show header */
 	fputs("===================================================================================\n", out);
-	fputs("ID       Stop                 Mode    Current TLI  Parent TLI  Time    Data  Status  \n", out);
+	fputs("ID       Recovery time        Mode    Current TLI  Parent TLI  Time    Data  Status  \n", out);
 	fputs("===================================================================================\n", out);
 
 	for (i = 0; i < parray_num(backup_list); i++)
@@ -184,7 +184,7 @@ show_backup_list(FILE *out, parray *backup_list, bool show_all)
 		if (backup->status == BACKUP_STATUS_DELETED && !show_all)
 			continue;
 
-		time2iso(timestamp, lengthof(timestamp), backup->end_time);
+		time2iso(timestamp, lengthof(timestamp), backup->recovery_time);
 		if (backup->end_time != (time_t) 0)
 			snprintf(duration, lengthof(duration), "%lum",
 				(backup->end_time - backup->start_time) / 60);
