Menu
▾
▴
[gtpd-cvs] gtkpod/src clientserver.c, 1.11, 1.12 display_itdb.c, 1.58, 1.59 display_itdb.h, 1.35, 1.36 file.c, 1.189, 1.190 file_export.c, 1.65, 1.66 file_itunesdb.c, 1.100, 1.101 md5.c, 1.44, 1.45 md5.h, 1.22, 1.23 misc_playlist.c, 1.38, 1.39 misc_track.c, 1.52, 1.53 misc_track.h, 1.15, 1.16 prefs_window.c, 1.185, 1.186
|
From: <jc...@us...> - 2006-11-17 07:40:50
|
Update of /cvsroot/gtkpod/gtkpod/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32694/src Modified Files: clientserver.c display_itdb.c display_itdb.h file.c file_export.c file_itunesdb.c md5.c md5.h misc_playlist.c misc_track.c misc_track.h prefs_window.c Log Message: * src/*.[ch]: realized that we are using sha1 hash and not md5 hash, therefore renamed all relevant occurences of md5 (function names only so far). Index: clientserver.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/clientserver.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- clientserver.c 17 Jun 2005 13:30:02 -0000 1.11 +++ clientserver.c 17 Nov 2006 07:40:47 -0000 1.12 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-06-17 22:25:30 jcs> +/* Time-stamp: <2006-11-17 16:33:14 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -135,7 +135,7 @@ { if (flock (fd, LOCK_EX) == 0) { - gchar *md5 = md5_hash_on_filename (file, TRUE); + gchar *md5 = sha1_hash_on_filename (file, TRUE); write (fd, SOCKET_PLYC, strlen (SOCKET_PLYC)); if (md5) write (fd, md5, strlen (md5)); write (fd, " ", 1); Index: display_itdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- display_itdb.c 21 Sep 2006 15:03:13 -0000 1.58 +++ display_itdb.c 17 Nov 2006 07:40:47 -0000 1.59 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-09-21 23:56:52 jcs> +/* Time-stamp: <2006-11-17 16:33:13 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -63,7 +63,7 @@ { if (eitdb) { - md5_free_eitdb (eitdb); + sha1_free_eitdb (eitdb); g_free (eitdb); } } @@ -106,7 +106,7 @@ g_free (etrack->year_str); g_free (etrack->pc_path_utf8); g_free (etrack->hostname); - g_free (etrack->md5_hash); + g_free (etrack->sha1_hash); g_free (etrack->charset); g_free (etrack); } @@ -127,7 +127,7 @@ etr_dup->thumb_path_locale = g_strdup (etr->thumb_path_locale); etr_dup->thumb_path_utf8 = g_strdup (etr->thumb_path_utf8); etr_dup->hostname = g_strdup (etr->hostname); - etr_dup->md5_hash = g_strdup (etr->md5_hash); + etr_dup->sha1_hash = g_strdup (etr->sha1_hash); etr_dup->charset = g_strdup (etr->charset); } return etr_dup; @@ -262,7 +262,7 @@ Track *gp_track_add (iTunesDB *itdb, Track *track) { Track *result=NULL; - Track *oldtrack = md5_track_exists_insert (itdb, track); + Track *oldtrack = sha1_track_exists_insert (itdb, track); if(oldtrack) { @@ -274,7 +274,7 @@ { /* Make sure all strings are initialised -- that way we don't have to worry about it when we are handling the strings */ - /* exception: md5_hash, hostname, charset: these may be NULL. */ + /* exception: sha1_hash, hostname, charset: these may be NULL. */ gp_track_validate_entries (track); itdb_track_add (itdb, track, -1); result = track; @@ -685,7 +685,7 @@ if (remove_track) { - md5_track_remove (track); + sha1_track_remove (track); if (itdb->usertype & GP_ITDB_TYPE_IPOD) { switch (deleteaction) @@ -766,7 +766,7 @@ /* Make sure all strings are initialised -- that way we don't have to worry about it when we are handling the strings. - exception: md5_hash, hostname and charset: these may be NULL. */ + exception: sha1_hash, hostname and charset: these may be NULL. */ void gp_track_validate_entries (Track *track) { ExtraTrackData *etr; @@ -1037,8 +1037,8 @@ iTunesDB *itdb = gl->data; g_return_val_if_fail (itdb, FALSE); - if (md5) track = md5_md5_exists (itdb, md5); - else track = md5_file_exists (itdb, file, TRUE); + if (md5) track = sha1_sha1_exists (itdb, md5); + else track = sha1_file_exists (itdb, file, TRUE); if (!track) track = gp_track_by_filename (itdb, file); if (track) { Index: display_itdb.h =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- display_itdb.h 18 Sep 2006 07:10:44 -0000 1.35 +++ display_itdb.h 17 Nov 2006 07:40:47 -0000 1.36 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-09-18 15:27:12 jcs> +/* Time-stamp: <2006-11-17 16:33:11 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -71,7 +71,7 @@ gchar *thumb_path_locale; /* same for thumbnail */ gchar *thumb_path_utf8; /* same for thumbnail */ gchar *hostname; /* name of host this file has been imported on*/ - gchar *md5_hash; /* md5 hash of file (or NULL) */ + gchar *sha1_hash; /* sha1 hash of file (or NULL) */ gchar *charset; /* charset used for ID3 tags */ gint32 sortindex; /* used for stable sorting (current order) */ gboolean tchanged; /* temporary use, e.g. in detail.c */ Index: file.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v retrieving revision 1.189 retrieving revision 1.190 diff -u -d -r1.189 -r1.190 --- file.c 9 Nov 2006 07:49:24 -0000 1.189 +++ file.c 17 Nov 2006 07:40:47 -0000 1.190 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-09-24 15:25:28 jcs> +/* Time-stamp: <2006-11-17 16:36:11 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -1600,17 +1600,17 @@ /* remove track from md5 hash and reinsert it (hash value may have changed!) */ gchar *name_on_ipod; - gchar *oldhash = etr->md5_hash; + gchar *oldhash = etr->sha1_hash; - md5_track_remove (track); + sha1_track_remove (track); /* need to remove the old value manually! */ - etr->md5_hash = NULL; - oldtrack = md5_track_exists_insert (itdb, track); + etr->sha1_hash = NULL; + oldtrack = sha1_track_exists_insert (itdb, track); if (oldtrack) { /* track exists, remove old track and register the new version */ - md5_track_remove (oldtrack); + sha1_track_remove (oldtrack); gp_duplicate_remove (track, oldtrack); - md5_track_exists_insert (itdb, track); + sha1_track_exists_insert (itdb, track); } /* track may have to be copied to iPod on next export */ /* since it will copied under the same name as before, we @@ -1618,9 +1618,9 @@ name_on_ipod = get_file_name_from_source (track, SOURCE_IPOD); if (name_on_ipod && (strcmp (name_on_ipod, trackpath) != 0)) { /* trackpath is not on the iPod */ - if (oldhash && etr->md5_hash) + if (oldhash && etr->sha1_hash) { /* do we really have to copy the track again? */ - if (strcmp (oldhash, etr->md5_hash) != 0) + if (strcmp (oldhash, etr->sha1_hash) != 0) { track->transferred = FALSE; data_changed (itdb); @@ -1982,13 +1982,13 @@ g_free (ipod_fullpath); } /* remove track from md5 hash and reinsert it (hash value has changed!) */ - md5_track_remove (track); - C_FREE (etr->md5_hash); /* need to remove the old value manually! */ - oldtrack = md5_track_exists_insert (itdb, track); + sha1_track_remove (track); + C_FREE (etr->sha1_hash); /* need to remove the old value manually! */ + oldtrack = sha1_track_exists_insert (itdb, track); if (oldtrack) { /* track exists, remove and register the new version */ - md5_track_remove (oldtrack); + sha1_track_remove (oldtrack); gp_duplicate_remove (track, oldtrack); - md5_track_exists_insert (itdb, track); + sha1_track_exists_insert (itdb, track); } if (!prefs_get_int("write_charset") && track_charset_set) Index: file_export.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- file_export.c 3 Oct 2006 14:12:00 -0000 1.65 +++ file_export.c 17 Nov 2006 07:40:47 -0000 1.66 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-06-25 00:22:56 jcs> +/* Time-stamp: <2006-11-17 16:33:13 jcs> | | Copyright (C) 2002 Corey Donohoe <atmos at atmos.org> | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> @@ -747,7 +747,7 @@ Track *tr = gl->data; g_return_val_if_fail (tr, NULL); - otr = md5_track_exists (itdb_d, tr); + otr = sha1_track_exists (itdb_d, tr); if (otr) { Index: file_itunesdb.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- file_itunesdb.c 9 Nov 2006 07:49:24 -0000 1.100 +++ file_itunesdb.c 17 Nov 2006 07:40:47 -0000 1.101 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-06-25 15:57:03 jcs> +/* Time-stamp: <2006-11-17 16:36:11 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -62,7 +62,7 @@ time_t mtime; gchar *thumb_path_locale; gchar *thumb_path_utf8; - gchar *md5_hash; + gchar *sha1_hash; gchar *charset; gchar *hostname; gchar *ipod_path; @@ -117,15 +117,15 @@ while (widgets_blocked && gtk_events_pending ()) gtk_main_iteration (); - if (!etr->md5_hash) + if (!etr->sha1_hash) { gchar *filename = get_file_name_from_source (track, SOURCE_IPOD); - etr->md5_hash = md5_hash_on_filename (filename, FALSE); + etr->sha1_hash = sha1_hash_on_filename (filename, FALSE); g_free (filename); } - if (etr->md5_hash) + if (etr->sha1_hash) { - sei = g_hash_table_lookup (extendedinfohash_md5, etr->md5_hash); + sei = g_hash_table_lookup (extendedinfohash_md5, etr->sha1_hash); } } if (sei) /* found info for this id! */ @@ -141,8 +141,8 @@ etr->thumb_path_locale = g_strdup (sei->thumb_path_locale); if (sei->thumb_path_utf8 && !etr->thumb_path_utf8) etr->thumb_path_utf8 = g_strdup (sei->thumb_path_utf8); - if (sei->md5_hash && !etr->md5_hash) - etr->md5_hash = g_strdup (sei->md5_hash); + if (sei->sha1_hash && !etr->sha1_hash) + etr->sha1_hash = g_strdup (sei->sha1_hash); if (sei->charset && !etr->charset) etr->charset = g_strdup (sei->charset); if (sei->hostname && !etr->hostname) @@ -172,7 +172,7 @@ g_free (sei->pc_path_utf8); g_free (sei->thumb_path_locale); g_free (sei->thumb_path_utf8); - g_free (sei->md5_hash); + g_free (sei->sha1_hash); g_free (sei->charset); g_free (sei->hostname); g_free (sei->ipod_path); @@ -224,7 +224,7 @@ name); return FALSE; } - md5 = md5_hash_on_filename (itunes, FALSE); + md5 = sha1_hash_on_filename (itunes, FALSE); if (!md5) { gtkpod_warning (_("Could not create hash value from itunesdb\n")); @@ -292,7 +292,7 @@ g_hash_table_insert (extendedinfohash, &sei->ipod_id, sei); } - else if (sei->md5_hash) + else if (sei->sha1_hash) { if (!extendedinfohash_md5) { @@ -300,7 +300,7 @@ g_str_hash,g_str_equal, NULL,hash_delete); } g_hash_table_insert (extendedinfohash_md5, - sei->md5_hash, sei); + sei->sha1_hash, sei); } else { @@ -344,14 +344,15 @@ sei->thumb_path_locale = g_strdup (arg); else if (g_ascii_strcasecmp (line, "thumbnail_utf8") == 0) sei->thumb_path_utf8 = g_strdup (arg); - else if (g_ascii_strcasecmp (line, "md5_hash") == 0) + else if ((g_ascii_strcasecmp (line, "md5_hash") == 0) || + (g_ascii_strcasecmp (line, "sha1_hash") == 0)) { /* only accept hash value if version is >= 0.53 or PATH_MAX is 4096 -- in 0.53 I changed the MD5 hash routine to using blocks of 4096 Bytes in length. Before it was PATH_MAX, which might be different on different architectures. */ if ((extendedinfoversion >= 0.53) || (PATH_MAX == 4096)) - sei->md5_hash = g_strdup (arg); + sei->sha1_hash = g_strdup (arg); } else if (g_ascii_strcasecmp (line, "charset") == 0) sei->charset = g_strdup (arg); @@ -618,7 +619,7 @@ /* delete hash information (if present) */ destroy_extendedinfohash (); /* find duplicates */ - gp_md5_hash_tracks_itdb (itdb); + gp_sha1_hash_tracks_itdb (itdb); /* mark the data as unchanged */ data_unchanged (itdb); @@ -1075,7 +1076,7 @@ } g_free (name); name = NULL; - md5 = md5_hash_on_filename (itdb->filename, FALSE); + md5 = sha1_hash_on_filename (itdb->filename, FALSE); if (md5) { fprintf(fp, "itunesdb_hash=%s\n", md5); @@ -1110,8 +1111,8 @@ on the ipod away from gktpod/itunes etc. */ if (strlen (track->ipod_path) != 0) fprintf (fp, "filename_ipod=%s\n", track->ipod_path); - if (etr->md5_hash && *etr->md5_hash) - fprintf (fp, "md5_hash=%s\n", etr->md5_hash); + if (etr->sha1_hash && *etr->sha1_hash) + fprintf (fp, "sha1_hash=%s\n", etr->sha1_hash); if (etr->charset && *etr->charset) fprintf (fp, "charset=%s\n", etr->charset); if (!track->transferred && etr->oldsize) Index: md5.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/md5.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- md5.c 25 Jun 2006 23:29:08 -0000 1.44 +++ md5.c 17 Nov 2006 07:40:47 -0000 1.45 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-05-17 22:10:35 jcs> +/* Time-stamp: <2006-11-17 16:36:47 jcs> | | Copyright (C) 2002 Corey Donohoe <atmos at atmos.org> | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> @@ -93,7 +93,7 @@ #define PATH_MAX_MD5 4096 /* Set up or destory the md5 hash table */ -void setup_md5() +void setup_sha1() { struct itdbs_head *itdbs_head; @@ -106,13 +106,13 @@ { if (prefs_get_int("md5")) /* MD5 hashing turned on */ { - gp_md5_hash_tracks(); + gp_sha1_hash_tracks(); /* Display duplicates */ gp_duplicate_remove(NULL, NULL); } else - gp_md5_free_hash(); + gp_sha1_free_hash(); } } @@ -135,13 +135,13 @@ } /** - * md5_hash_on_file - read PATH_MAX_MD5 * NR_PATH_MAX_BLOCKS bytes + * sha1_hash_on_file - read PATH_MAX_MD5 * NR_PATH_MAX_BLOCKS bytes * from the file and ask sha1 for a hash of it, convert this hash to a * string of hex output @fp - an open file descriptor to read from * Returns - A Hash String - you handle memory returned */ static gchar * -md5_hash_on_file(FILE * fp) +sha1_hash_on_file(FILE * fp) { gchar *result = NULL; @@ -196,7 +196,7 @@ * Returns - an SHA1 hash in string format, is the hex output from the hash */ static gchar * -md5_hash_track(Track * s) +sha1_hash_track(Track * s) { ExtraTrackData *etr; gchar *result = NULL; @@ -206,16 +206,16 @@ etr = s->userdata; g_return_val_if_fail (etr, NULL); - if (etr->md5_hash != NULL) + if (etr->sha1_hash != NULL) { - result = g_strdup(etr->md5_hash); + result = g_strdup(etr->sha1_hash); } else { filename = get_file_name_from_source (s, SOURCE_PREFER_LOCAL); if (filename) { - result = md5_hash_on_filename (filename, FALSE); + result = sha1_hash_on_filename (filename, FALSE); g_free(filename); } } @@ -224,7 +224,7 @@ /* @silent: don't print any warning */ -gchar *md5_hash_on_filename (gchar *name, gboolean silent) +gchar *sha1_hash_on_filename (gchar *name, gboolean silent) { gchar *result = NULL; @@ -244,7 +244,7 @@ } else { - result = md5_hash_on_file (fpit); + result = sha1_hash_on_file (fpit); fclose (fpit); } } @@ -255,7 +255,7 @@ /** * Free up the dynamically allocated memory in @itdb's hash table */ -void md5_free_eitdb (ExtraiTunesDBData *eitdb) +void sha1_free_eitdb (ExtraiTunesDBData *eitdb) { g_return_if_fail (eitdb); @@ -269,12 +269,12 @@ /** * Free up the dynamically allocated memory in @itdb's hash table */ -void md5_free (iTunesDB *itdb) +void sha1_free (iTunesDB *itdb) { g_return_if_fail (itdb); g_return_if_fail (itdb->userdata); - md5_free_eitdb (itdb->userdata); + sha1_free_eitdb (itdb->userdata); } /** @@ -283,7 +283,7 @@ * is inserted into the hash. * Returns a pointer to the duplicate track. */ -Track *md5_track_exists_insert (iTunesDB *itdb, Track * s) +Track *sha1_track_exists_insert (iTunesDB *itdb, Track * s) { ExtraiTunesDBData *eitdb; ExtraTrackData *etr; @@ -306,7 +306,7 @@ g_str_equal, g_free, NULL); } - val = md5_hash_track (s); + val = sha1_hash_track (s); if (val != NULL) { track = g_hash_table_lookup (eitdb->md5hash, val); @@ -316,8 +316,8 @@ } else { /* if it doesn't exist we register it in the hash */ - g_free (etr->md5_hash); - etr->md5_hash = g_strdup (val); + g_free (etr->sha1_hash); + etr->sha1_hash = g_strdup (val); /* val is used in the next line -- we don't have to * g_free() it */ g_hash_table_insert (eitdb->md5hash, val, s); @@ -332,7 +332,7 @@ * @s - the Track we want to know about. * Returns a pointer to the duplicate track. */ -Track *md5_track_exists (iTunesDB *itdb, Track *s) +Track *sha1_track_exists (iTunesDB *itdb, Track *s) { ExtraiTunesDBData *eitdb; Track *track = NULL; @@ -343,7 +343,7 @@ if (prefs_get_int("md5") && eitdb->md5hash) { - gchar *val = md5_hash_track (s); + gchar *val = sha1_hash_track (s); if (val) { track = g_hash_table_lookup (eitdb->md5hash, val); @@ -359,7 +359,7 @@ * Returns a pointer to the duplicate track using md5 for * identification. If md5 checksums are off, NULL is returned. */ -Track *md5_file_exists (iTunesDB *itdb, gchar *file, gboolean silent) +Track *sha1_file_exists (iTunesDB *itdb, gchar *file, gboolean silent) { ExtraiTunesDBData *eitdb; Track *track = NULL; @@ -371,7 +371,7 @@ if (prefs_get_int("md5") && eitdb->md5hash) { - gchar *val = md5_hash_on_filename (file, silent); + gchar *val = sha1_hash_on_filename (file, silent); if (val) { track = g_hash_table_lookup (eitdb->md5hash, val); @@ -388,7 +388,7 @@ * Returns a pointer to the duplicate track using md5 for * identification. If md5 checksums are off, NULL is returned. */ -Track *md5_md5_exists (iTunesDB *itdb, gchar *md5) +Track *sha1_sha1_exists (iTunesDB *itdb, gchar *md5) { ExtraiTunesDBData *eitdb; Track *track = NULL; @@ -409,7 +409,7 @@ * Free the specified track from the ipod's unique file hash * @s - The Track that's being freed from the ipod */ -void md5_track_remove (Track *s) +void sha1_track_remove (Track *s) { ExtraiTunesDBData *eitdb; @@ -420,7 +420,7 @@ if (prefs_get_int("md5") && eitdb->md5hash) { - gchar *val = md5_hash_track (s); + gchar *val = sha1_hash_track (s); if (val) { Track *track = g_hash_table_lookup (eitdb->md5hash, val); Index: md5.h =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/md5.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- md5.h 25 Jun 2006 23:29:08 -0000 1.22 +++ md5.h 17 Nov 2006 07:40:47 -0000 1.23 @@ -1,4 +1,4 @@ -/* Time-stamp: <2005-06-17 22:12:15 jcs> +/* Time-stamp: <2006-11-17 16:28:43 jcs> | | Copyright (C) 2002 Corey Donohoe <atmos at atmos.org> | Copyright (C) 2004-2005 Jorg Schuler <jcsjcs at users.sourceforge.net> @@ -33,16 +33,16 @@ #include "display_itdb.h" -void setup_md5(); -gchar *md5_hash_on_filename (gchar *name, gboolean silent); -/* Any calls to the following functions immediately return if md5sums +void setup_sha1(); +gchar *sha1_hash_on_filename (gchar *name, gboolean silent); +/* Any calls to the following functions immediately return if sha1sums * is not on */ -Track *md5_file_exists (iTunesDB *itdb, gchar *file, gboolean silent); -Track *md5_md5_exists (iTunesDB *itdb, gchar *md5); -Track *md5_track_exists (iTunesDB *itdb, Track *s); -Track *md5_track_exists_insert (iTunesDB *itdb, Track *s); -void md5_track_remove (Track *s); -void md5_free (iTunesDB *itdb); -void md5_free_eitdb (ExtraiTunesDBData *eitdb); +Track *sha1_file_exists (iTunesDB *itdb, gchar *file, gboolean silent); +Track *sha1_sha1_exists (iTunesDB *itdb, gchar *sha1); +Track *sha1_track_exists (iTunesDB *itdb, Track *s); +Track *sha1_track_exists_insert (iTunesDB *itdb, Track *s); +void sha1_track_remove (Track *s); +void sha1_free (iTunesDB *itdb); +void sha1_free_eitdb (ExtraiTunesDBData *eitdb); #endif Index: misc_playlist.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- misc_playlist.c 23 Jun 2006 16:59:23 -0000 1.38 +++ misc_playlist.c 17 Nov 2006 07:40:47 -0000 1.39 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-06-24 01:53:45 jcs> +/* Time-stamp: <2006-11-17 16:33:12 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -925,15 +925,15 @@ /* Update MD5 information */ /* remove track from md5 hash and reinsert it (hash value may have changed!) */ - md5_track_remove (track); + sha1_track_remove (track); /* need to remove the old value manually! */ - etr->md5_hash = NULL; - oldtrack = md5_track_exists_insert (itdb, track); + etr->sha1_hash = NULL; + oldtrack = sha1_track_exists_insert (itdb, track); if (oldtrack) { /* track exists, remove old track and register the new version */ - md5_track_remove (oldtrack); + sha1_track_remove (oldtrack); gp_duplicate_remove (track, oldtrack); - md5_track_exists_insert (itdb, track); + sha1_track_exists_insert (itdb, track); } } g_list_free(l_dangling); @@ -1124,7 +1124,7 @@ norphaned++; if (localdebug) fprintf(stdout,"to orphaned "); - if ((dupl_track = md5_file_exists (itdb, fn_orphaned, + if ((dupl_track = sha1_file_exists (itdb, fn_orphaned, TRUE))) { /* This orphan has already been added again. It will be removed with the next sync */ Index: misc_track.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- misc_track.c 24 Sep 2006 06:42:52 -0000 1.52 +++ misc_track.c 17 Nov 2006 07:40:47 -0000 1.53 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-09-24 15:25:29 jcs> +/* Time-stamp: <2006-11-17 16:35:28 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -53,7 +53,7 @@ * Register all tracks in the md5 hash and remove duplicates (while * preserving playlists) */ -void gp_md5_hash_tracks_itdb (iTunesDB *itdb) +void gp_sha1_hash_tracks_itdb (iTunesDB *itdb) { gint ns, count; GList *gl; @@ -66,14 +66,14 @@ block_widgets (); /* block widgets -- this might take a while, so we'll do refreshs */ - md5_free (itdb); /* release md5 hash */ + sha1_free (itdb); /* release md5 hash */ count = 0; /* populate the hash table */ gl=itdb->tracks; while (gl) { Track *track=gl->data; - Track *oldtrack = md5_track_exists_insert (itdb, track); + Track *oldtrack = sha1_track_exists_insert (itdb, track); /* need to get next track now because it might be a duplicate and thus be removed when we call gp_duplicate_remove() */ @@ -103,7 +103,7 @@ * Call gp_hash_tracks_itdb() for each itdb. * */ -void gp_md5_hash_tracks (void) +void gp_sha1_hash_tracks (void) { GList *gl; struct itdbs_head *itdbs_head; @@ -116,17 +116,17 @@ block_widgets (); for (gl=itdbs_head->itdbs; gl; gl=gl->next) { - gp_md5_hash_tracks_itdb (gl->data); + gp_sha1_hash_tracks_itdb (gl->data); } release_widgets (); } /** - * Call md5_free() for each itdb and delete md5 checksums in all tracks. + * Call sha1_free() for each itdb and delete md5 checksums in all tracks. * */ -void gp_md5_free_hash (void) +void gp_sha1_free_hash (void) { void rm_md5 (gpointer track, gpointer user_data) { @@ -134,7 +134,7 @@ g_return_if_fail (track); etr = ((Track *)track)->userdata; g_return_if_fail (etr); - C_FREE (etr->md5_hash); + C_FREE (etr->sha1_hash); } GList *gl; struct itdbs_head *itdbs_head; @@ -148,7 +148,7 @@ { iTunesDB *itdb = gl->data; g_return_if_fail (itdb); - md5_free (itdb); + sha1_free (itdb); g_list_foreach (itdb->tracks, rm_md5, NULL); } } @@ -349,13 +349,13 @@ block_widgets (); /* block widgets -- this might take a while, so we'll do refreshs */ - md5_free (itdb); /* release md5 hash */ + sha1_free (itdb); /* release md5 hash */ count = 0; track_nr = 0; /* populate the hash table */ while ((track = g_list_nth_data (itdb->tracks, track_nr))) { - oldtrack = md5_track_exists_insert (itdb, track); + oldtrack = sha1_track_exists_insert (itdb, track); ++count; /* printf("%d:%d:%p:%p\n", count, track_nr, track, oldtrack); */ if (!prefs_get_int("block_display") && Index: misc_track.h =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- misc_track.h 13 May 2006 16:41:06 -0000 1.15 +++ misc_track.h 17 Nov 2006 07:40:47 -0000 1.16 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-05-14 00:54:51 jcs> +/* Time-stamp: <2006-11-17 16:36:11 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -37,9 +37,9 @@ #include "display.h" void gp_duplicate_remove (Track *oldtrack, Track *track); -void gp_md5_hash_tracks_itdb (iTunesDB *itdb); -void gp_md5_hash_tracks (void); -void gp_md5_free_hash (void); +void gp_sha1_hash_tracks_itdb (iTunesDB *itdb); +void gp_sha1_hash_tracks (void); +void gp_sha1_free_hash (void); Track *gp_track_by_filename (iTunesDB *itdb, gchar *filename); gchar **track_get_item_pointer (Track *track, T_item t_item); const gchar *track_get_item (Track *track, T_item t_item); Index: prefs_window.c =================================================================== RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v retrieving revision 1.185 retrieving revision 1.186 diff -u -d -r1.185 -r1.186 --- prefs_window.c 24 Sep 2006 12:16:26 -0000 1.185 +++ prefs_window.c 17 Nov 2006 07:40:47 -0000 1.186 @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-09-24 20:49:38 jcs> +/* Time-stamp: <2006-11-17 16:36:10 jcs> | | Copyright (C) 2002 Corey Donohoe <atmos at atmos.org> | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> @@ -695,7 +695,7 @@ /* Set up/free md5 hash table if changed */ if (temp_prefs_get_int_value(temp_prefs, "md5", NULL)) - setup_md5(); + setup_sha1(); } /* Need this in case user reordered column order (we don't |