[Pmplib-commits] SF.net SVN: pmplib: [304] trunk/pmplib/frontend/easypmp

[<ny...@us...>]

Revision: 304
          http://svn.sourceforge.net/pmplib/?rev=304&view=rev
Author:   nyaochi
Date:     2007-02-06 10:12:00 -0800 (Tue, 06 Feb 2007)

Log Message:
-----------
Show file names from which EasyPMP failed to obtain the media information.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/common/database.c
    trunk/pmplib/frontend/easypmp/common/easypmp.h
    trunk/pmplib/frontend/easypmp/cui/main.c

Modified: trunk/pmplib/frontend/easypmp/common/database.c
===================================================================
--- trunk/pmplib/frontend/easypmp/common/database.c	2007-02-06 17:55:20 UTC (rev 303)
+++ trunk/pmplib/frontend/easypmp/common/database.c	2007-02-06 18:12:00 UTC (rev 304)
@@ -207,6 +207,12 @@
 				opt->num_strip_words
 				) == 0) {
 				++num_obtained;
+			} else {
+				// Report the error.
+				if (progress(instance, EASYPMPP_MUSIC_GMI | EASYPMPSP_WARN_GMI, i, 0, filename) != 0) {
+					result = EASYPMPE_CANCEL;
+					goto error_exit;
+				}
 			}
 			record->ts_update = timestamp;
 			record->ts_import = ts_import;

Modified: trunk/pmplib/frontend/easypmp/common/easypmp.h
===================================================================
--- trunk/pmplib/frontend/easypmp/common/easypmp.h	2007-02-06 17:55:20 UTC (rev 303)
+++ trunk/pmplib/frontend/easypmp/common/easypmp.h	2007-02-06 18:12:00 UTC (rev 304)
@@ -47,14 +47,15 @@
 	EASYPMPSP_START				= 0x00000001,
 	EASYPMPSP_PROGRESS			= 0x00000002,
 	EASYPMPSP_SKIPPED			= 0x00000003,
-	EASYPMPSP_WARN_PLAYLIST		= 0x00000004,
-	EASYPMPSP_SKIP_PLAYLIST		= 0x00000005,
-	EASYPMPSP_MISSING_MEDIA		= 0x00000006,
-	EASYPMPSP_JSPL_ERROR		= 0x00000007,
-	EASYPMPSP_JSPL_ERROR_POS	= 0x00000008,
-	EASYPMPSP_JSPL_ERROR_LINE	= 0x00000009,
-	EASYPMPSP_JSPL_OUTPUT		= 0x0000000A,
-	EASYPMPSP_END				= 0x0000000B,
+	EASYPMPSP_WARN_GMI			= 0x00000004,
+	EASYPMPSP_WARN_PLAYLIST		= 0x00000005,
+	EASYPMPSP_SKIP_PLAYLIST		= 0x00000006,
+	EASYPMPSP_MISSING_MEDIA		= 0x00000007,
+	EASYPMPSP_JSPL_ERROR		= 0x00000008,
+	EASYPMPSP_JSPL_ERROR_POS	= 0x00000009,
+	EASYPMPSP_JSPL_ERROR_LINE	= 0x0000000A,
+	EASYPMPSP_JSPL_OUTPUT		= 0x0000000B,
+	EASYPMPSP_END				= 0x0000000C,
 };
 
 enum {

Modified: trunk/pmplib/frontend/easypmp/cui/main.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/main.c	2007-02-06 17:55:20 UTC (rev 303)
+++ trunk/pmplib/frontend/easypmp/cui/main.c	2007-02-06 18:12:00 UTC (rev 304)
@@ -114,6 +114,11 @@
 	case EASYPMPP_MUSIC_GMI|EASYPMPSP_PROGRESS:
 		easypmp_progress_num_str(fpo, param_int+1, filepath_skippath(param_str));
 		break;
+	case EASYPMPP_MUSIC_GMI|EASYPMPSP_WARN_GMI:
+		console_clearln(fpo);
+		fprintf(fpe, "  WARNING: Could not obtain the media information\n");
+		fprints(fpe, "    %s\n", param_str);
+		break;
 	case EASYPMPP_MUSIC_GMI|EASYPMPSP_END:
 		console_clearln(fpo);
 		fprintf(fpo, "  %d files were imported\n", param_int);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.