[easytag/wip/et_core-refactor] Split ET_Core list handling code off to new file
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/et_core-refactor] Split ET_Core list handling code off to new file
- Date: Tue, 30 Dec 2014 23:53:06 +0000 (UTC)
commit c5abfa4bb11ef3c00a41637310052254d74708b6
Author: David King <amigadave amigadave com>
Date: Tue Dec 30 21:04:44 2014 +0000
Split ET_Core list handling code off to new file
Makefile.am | 2 +
po/POTFILES.in | 1 +
src/application.c | 1 +
src/application_window.c | 1 +
src/browser.c | 5 +-
src/easytag.c | 1 +
src/et_core.c | 1 +
src/file.c | 1460 +---------------------------------------------
src/file.h | 53 +--
src/file_area.c | 1 +
src/file_list.c | 1445 +++++++++++++++++++++++++++++++++++++++++++++
src/file_list.h | 65 ++
src/scan_dialog.h | 5 +-
src/tag_area.c | 2 +-
14 files changed, 1549 insertions(+), 1494 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5d0f723..7f4e0f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ easytag_SOURCES = \
src/file.c \
src/file_area.c \
src/file_description.c \
+ src/file_list.c \
src/file_tag.c \
src/load_files_dialog.c \
src/log.c \
@@ -110,6 +111,7 @@ easytag_headers = \
src/file.h \
src/file_area.h \
src/file_description.h \
+ src/file_list.h \
src/file_tag.h \
src/genres.h \
src/load_files_dialog.h \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3088fca..0bcb991 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,7 @@ src/charset.c
src/easytag.c
src/et_core.c
src/file_area.c
+src/file_list.c
src/file.c
src/load_files_dialog.c
src/log.c
diff --git a/src/application.c b/src/application.c
index 89bd624..72a8212 100644
--- a/src/application.c
+++ b/src/application.c
@@ -28,6 +28,7 @@
#include "easytag.h"
#include "log.h"
#include "misc.h"
+#include "setting.h"
/* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
G_DEFINE_TYPE (EtApplication, et_application, GTK_TYPE_APPLICATION)
diff --git a/src/application_window.c b/src/application_window.c
index 022da68..e400b0c 100644
--- a/src/application_window.c
+++ b/src/application_window.c
@@ -26,6 +26,7 @@
#include "cddb_dialog.h"
#include "easytag.h"
#include "file_area.h"
+#include "file_list.h"
#include "load_files_dialog.h"
#include "log.h"
#include "misc.h"
diff --git a/src/browser.c b/src/browser.c
index 27268a4..e359395 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -37,14 +37,15 @@
#include <errno.h>
#include "application_window.h"
+#include "charset.h"
+#include "dlm.h"
#include "easytag.h"
#include "et_core.h"
+#include "file_list.h"
#include "scan_dialog.h"
#include "log.h"
#include "misc.h"
#include "setting.h"
-#include "charset.h"
-#include "dlm.h"
#include "win32/win32dep.h"
diff --git a/src/easytag.c b/src/easytag.c
index 154cbe4..13b91d9 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -30,6 +30,7 @@
#include "application_window.h"
#include "browser.h"
#include "file_description.h"
+#include "file_list.h"
#include "log.h"
#include "misc.h"
#include "cddb_dialog.h"
diff --git a/src/et_core.c b/src/et_core.c
index ab4a285..e08bc46 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -21,6 +21,7 @@
#include "application_window.h"
#include "file.h"
+#include "file_list.h"
ET_Core *ETCore = NULL;
diff --git a/src/file.c b/src/file.c
index 9888aee..57f19ca 100644
--- a/src/file.c
+++ b/src/file.c
@@ -31,6 +31,7 @@
#include "application_window.h"
#include "easytag.h"
#include "file_tag.h"
+#include "file_list.h"
#include "mpeg_header.h"
#include "monkeyaudio_header.h"
#include "musepack_header.h"
@@ -74,17 +75,11 @@ static gboolean ET_Free_File_Info_Item (ET_File_Info *ETFileInfo);
static void ET_Initialize_File_Name_Item (File_Name *FileName);
-static guint ET_File_Key_New (void);
-
-static gboolean ET_Remove_File_From_Artist_Album_List (ET_File *ETFile);
-
static void ET_Display_Filename_To_UI (const ET_File *ETFile);
static EtFileHeaderFields * ET_Display_File_Info_To_UI (const ET_File *ETFile);
static gboolean ET_Save_File_Name_From_UI (const ET_File *ETFile,
File_Name *FileName);
-static gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
-static gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
static void ET_Mark_File_Tag_As_Saved (ET_File *ETFile);
@@ -93,121 +88,8 @@ static gboolean ET_Detect_Changes_Of_File_Name (const File_Name *FileName1,
static gboolean ET_Add_File_Name_To_List (ET_File *ETFile,
File_Name *FileName);
static gboolean ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag *FileTag);
-static gboolean ET_Add_File_To_History_List (ET_File *ETFile);
-static gboolean ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile);
-
-static guint ET_Displayed_File_List_Get_Length (void);
-static void ET_Displayed_File_List_Number (void);
-
-static gboolean et_core_read_file_info (GFile *file,
- ET_File_Info *ETFileInfo,
- GError **error);
-
-static gint ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
- const GList *AlbumList2);
-static gint ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
- const GList *etfilelist2);
-static gint ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
- const ET_File *ETFile2);
-static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
-
-static void set_sort_order_for_column_id (gint column_id,
- GtkTreeViewColumn *column,
- EtSortMode sort_type);
-
-/*
- * Frees the full main list of files: GList *ETFileList and reinitialize it.
- */
-gboolean
-ET_Free_File_List (void)
-{
- g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
-
- g_list_free_full (ETCore->ETFileList,
- (GDestroyNotify)ET_Free_File_List_Item);
- ETCore->ETFileList = NULL;
-
- return TRUE;
-}
-
-static void
-et_history_file_free (ET_History_File *file)
-{
- g_slice_free (ET_History_File, file);
-}
-
-/*
- * History list contains only pointers, so no data to free except the history structure.
- */
-gboolean
-ET_Free_History_File_List (void)
-{
- g_return_val_if_fail (ETCore != NULL && ETCore->ETHistoryFileList != NULL,
- FALSE);
-
- ETCore->ETHistoryFileList = g_list_first (ETCore->ETHistoryFileList);
-
- g_list_free_full (ETCore->ETHistoryFileList,
- (GDestroyNotify)et_history_file_free);
-
- ETCore->ETHistoryFileList = NULL;
-
- return TRUE;
-}
-
-/*
- * "Display" list contains only pointers, so NOTHING to free
- */
-gboolean
-ET_Free_Displayed_File_List (void)
-{
- g_return_val_if_fail (ETCore != NULL
- && ETCore->ETFileDisplayedList != NULL, FALSE);
-
- ETCore->ETFileDisplayedList = NULL;
-
- return TRUE;
-}
-
-/*
- * ArtistAlbum list contains 3 levels of lists
- */
-gboolean
-ET_Free_Artist_Album_File_List (void)
-{
- GList *l;
-
- g_return_val_if_fail (ETCore != NULL
- && ETCore->ETArtistAlbumFileList != NULL, FALSE);
-
- /* Pointers are stored inside the artist/album list-stores, so free them
- * first. */
- et_application_window_browser_clear_artist_model (ET_APPLICATION_WINDOW (MainWindow));
- et_application_window_browser_clear_album_model (ET_APPLICATION_WINDOW (MainWindow));
-
- for (l = ETCore->ETArtistAlbumFileList; l != NULL; l = g_list_next (l))
- {
- GList *m;
-
- for (m = (GList *)l->data; m != NULL; m = g_list_next (m))
- {
- GList *n = (GList *)m->data;
- if (n)
- g_list_free (n);
- }
-
- if (l->data) /* Free AlbumList list. */
- g_list_free ((GList *)l->data);
- }
-
- if (ETCore->ETArtistAlbumFileList)
- g_list_free(ETCore->ETArtistAlbumFileList);
-
- ETCore->ETArtistAlbumFileList = NULL;
-
- return TRUE;
-}
+static gchar *ET_File_Name_Format_Extension (const ET_File *ETFile);
/*
* Create a new File_Name structure
@@ -225,7 +107,7 @@ File_Name *ET_File_Name_Item_New (void)
/*
* Create a new File_Info structure
*/
-static ET_File_Info *
+ET_File_Info *
ET_File_Info_Item_New (void)
{
ET_File_Info *ETFileInfo;
@@ -235,11 +117,11 @@ ET_File_Info_Item_New (void)
return ETFileInfo;
}
-
/*
* Create a new ET_File structure
*/
-ET_File *ET_File_Item_New (void)
+ET_File *
+ET_File_Item_New (void)
{
ET_File *ETFile;
@@ -262,15 +144,6 @@ ET_Initialize_File_Name_Item (File_Name *FileName)
}
}
-
-/* Key for each item of ETFileList */
-static guint
-ET_File_Key_New (void)
-{
- static guint ETFileKey = 0;
- return ++ETFileKey;
-}
-
/* Key for Undo */
guint
ET_Undo_Key_New (void)
@@ -279,766 +152,6 @@ ET_Undo_Key_New (void)
return ++ETUndoKey;
}
-
-
-
-/**********************************
- * File adding/removing functions *
- **********************************/
-
-/*
- * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
- * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
- */
-GList *ET_Add_File_To_File_List (gchar *filename)
-{
- const ET_File_Description *ETFileDescription;
- ET_File *ETFile;
- File_Name *FileName;
- File_Tag *FileTag;
- ET_File_Info *ETFileInfo;
- gchar *ETFileExtension;
- guint ETFileKey;
- guint undo_key;
- GFile *file;
- GFileInfo *fileinfo;
- gchar *filename_utf8 = filename_to_display(filename);
- const gchar *locale_lc_ctype = getenv("LC_CTYPE");
- GError *error = NULL;
- gboolean success;
-
- if (!filename)
- return ETCore->ETFileList;
-
- file = g_file_new_for_path (filename);
-
- /* Primary Key for this file */
- ETFileKey = ET_File_Key_New();
-
- /* Get description of the file */
- ETFileDescription = ET_Get_File_Description(filename);
-
- /* Get real extension of the file (keeping the case) */
- ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
-
- /* Fill the File_Name structure for FileNameList */
- FileName = ET_File_Name_Item_New();
- FileName->saved = TRUE; /* The file hasn't been changed, so it's saved */
- FileName->value = filename;
- FileName->value_utf8 = filename_utf8;
- FileName->value_ck = g_utf8_collate_key_for_filename(filename_utf8, -1);
-
- /* Fill the File_Tag structure for FileTagList */
- FileTag = ET_File_Tag_Item_New();
- FileTag->saved = TRUE; /* The file hasn't been changed, so it's saved */
-
- /* Patch from Doruk Fisek and Onur Kucuk: avoid upper/lower conversion bugs
- * (like I->i conversion in some locales) in tag parsing. The problem occurs
- * for example with Turkish language where it can't read 'TITLE=' field if
- * it is written as 'Title=' in the file */
- setlocale(LC_CTYPE, "C");
-
- switch (ETFileDescription->TagType)
- {
-#ifdef ENABLE_MP3
- case ID3_TAG:
- if (!id3tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- "Error reading ID3 tag from file ‘%s’: %s",
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
-#ifdef ENABLE_OGG
- case OGG_TAG:
- if (!ogg_tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading tag from Ogg file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
-#ifdef ENABLE_FLAC
- case FLAC_TAG:
- if (!flac_tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading tag from FLAC file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
- case APE_TAG:
- if (!ape_tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading APE tag from file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#ifdef ENABLE_MP4
- case MP4_TAG:
- if (!mp4tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading tag from MP4 file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
-#ifdef ENABLE_WAVPACK
- case WAVPACK_TAG:
- if (!wavpack_tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading tag from WavPack file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
-#ifdef ENABLE_OPUS
- case OPUS_TAG:
- if (!et_opus_tag_read_file_tag (file, FileTag, &error))
- {
- Log_Print (LOG_ERROR,
- _("Error reading tag from Opus file ‘%s’: %s"),
- filename_utf8, error->message);
- g_clear_error (&error);
- }
- break;
-#endif
- case UNKNOWN_TAG:
- default:
- /* FIXME: Translatable string. */
- Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file
%s",ETFileDescription->TagType,filename_utf8);
- break;
- }
-
- if (FileTag->year && g_utf8_strlen (FileTag->year, -1) > 4)
- {
- Log_Print (LOG_WARNING,
- _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost
when saving"),
- FileTag->year, filename_utf8);
- }
-
- /* Fill the ET_File_Info structure */
- ETFileInfo = ET_File_Info_Item_New ();
-
- switch (ETFileDescription->FileType)
- {
-#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
- case MP3_FILE:
- case MP2_FILE:
- success = et_mpeg_header_read_file_info (file, ETFileInfo, &error);
- break;
-#endif
-#ifdef ENABLE_OGG
- case OGG_FILE:
- success = et_ogg_header_read_file_info (file, ETFileInfo, &error);
- break;
-#endif
-#ifdef ENABLE_SPEEX
- case SPEEX_FILE:
- success = et_speex_header_read_file_info (file, ETFileInfo,
- &error);
- break;
-#endif
-#ifdef ENABLE_FLAC
- case FLAC_FILE:
- success = et_flac_header_read_file_info (file, ETFileInfo, &error);
- break;
-#endif
- case MPC_FILE:
- success = et_mpc_header_read_file_info (file, ETFileInfo, &error);
- break;
- case MAC_FILE:
- success = et_mac_header_read_file_info (file, ETFileInfo, &error);
- break;
-#ifdef ENABLE_WAVPACK
- case WAVPACK_FILE:
- success = et_wavpack_header_read_file_info (file, ETFileInfo,
- &error);
- break;
-#endif
-#ifdef ENABLE_MP4
- case MP4_FILE:
- success = et_mp4_header_read_file_info (file, ETFileInfo, &error);
- break;
-#endif
-#ifdef ENABLE_OPUS
- case OPUS_FILE:
- success = et_opus_read_file_info (file, ETFileInfo, &error);
- break;
-#endif
- case UNKNOWN_FILE:
- default:
- /* FIXME: Translatable string. */
- Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file
%s",ETFileDescription->FileType,filename_utf8);
- /* To get at least the file size. */
- success = et_core_read_file_info (file, ETFileInfo, &error);
- break;
- }
-
- if (!success)
- {
- Log_Print (LOG_ERROR,
- _("Error while querying information for file ‘%s’: %s"),
- filename_utf8, error->message);
- g_error_free (error);
- }
-
- /* Restore previous value */
- setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
-
- /* Store the modification time of the file to check if the file was changed
- * before saving */
- fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
- G_FILE_QUERY_INFO_NONE, NULL, NULL);
- g_object_unref (file);
-
- /* Attach all data defined above to this ETFile item */
- ETFile = ET_File_Item_New();
-
- if (fileinfo)
- {
- ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
- G_FILE_ATTRIBUTE_TIME_MODIFIED);
- g_object_unref (fileinfo);
- }
- else
- {
- ETFile->FileModificationTime = 0;
- }
-
- ETFile->IndexKey = 0; // Will be renumered after...
- ETFile->ETFileKey = ETFileKey;
- ETFile->ETFileDescription = ETFileDescription;
- ETFile->ETFileExtension = ETFileExtension;
- ETFile->FileNameList = g_list_append(NULL,FileName);
- ETFile->FileNameCur = ETFile->FileNameList;
- ETFile->FileNameNew = ETFile->FileNameList;
- ETFile->FileTagList = g_list_append(NULL,FileTag);
- ETFile->FileTag = ETFile->FileTagList;
- ETFile->ETFileInfo = ETFileInfo;
-
- /* Add the item to the "main list" */
- ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
-
-
- /*
- * Process the filename and tag to generate undo if needed...
- * The undo key must be the same for FileName and FileTag => changed in the same time
- */
- undo_key = ET_Undo_Key_New();
-
- FileName = ET_File_Name_Item_New();
- FileName->key = undo_key;
- ET_Save_File_Name_Internal(ETFile,FileName);
-
- FileTag = ET_File_Tag_Item_New();
- FileTag->key = undo_key;
- ET_Save_File_Tag_Internal(ETFile,FileTag);
-
- /*
- * Generate undo for the file and the main undo list.
- * If no changes detected, FileName and FileTag item are deleted.
- */
- ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
-
- /*
- * Display a message if the file was changed at start
- */
- FileTag = (File_Tag *)ETFile->FileTag->data;
- FileName = (File_Name *)ETFile->FileNameNew->data;
- if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
- {
- Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
- filename_utf8);
- }
-
- /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
- //ET_Add_File_To_Artist_Album_File_List(ETFile);
-
- //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
- return ETCore->ETFileList;
-}
-
-gboolean ET_Create_Artist_Album_File_List (void)
-{
- GList *l;
-
- if (ETCore->ETArtistAlbumFileList)
- ET_Free_Artist_Album_File_List();
-
- for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
- {
- ET_File *ETFile = (ET_File *)l->data;
- ET_Add_File_To_Artist_Album_File_List(ETFile);
- }
- //ET_Debug_Print_Artist_Album_List(__FILE__,__LINE__,__FUNCTION__);
- return TRUE;
-}
-/*
- * The ETArtistAlbumFileList contains 3 levels of lists to sort the ETFile by artist then by album :
- * - "ETArtistAlbumFileList" list is a list of "ArtistList" items,
- * - "ArtistList" list is a list of "AlbumList" items,
- * - "AlbumList" list is a list of ETFile items.
- * Note : use the function ET_Debug_Print_Artist_Album_List(...) to understand how it works, it needed...
- */
-static gboolean
-ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
-{
- const gchar *ETFile_Artist;
- const gchar *ETFile_Album;
- const gchar *etfile_artist;
- const gchar *etfile_album;
- GList *ArtistList;
- GList *AlbumList = NULL;
- GList *etfilelist = NULL;
- ET_File *etfile = NULL;
-
- g_return_val_if_fail (ETFile != NULL, FALSE);
-
- /* Album value of the ETFile passed in parameter. */
- ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
- /* Artist value of the ETFile passed in parameter. */
- ETFile_Artist = ((File_Tag *)ETFile->FileTag->data)->artist;
-
- for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
- ArtistList = g_list_next (ArtistList))
- {
- AlbumList = (GList *)ArtistList->data; /* Take the first item */
- /* Take the first item, and the first etfile item. */
- if (AlbumList && (etfilelist = (GList *)AlbumList->data)
- && (etfile = (ET_File *)etfilelist->data)
- && ((File_Tag *)etfile->FileTag->data) != NULL)
- {
- etfile_artist = ((File_Tag *)etfile->FileTag->data)->artist;
- }
- else
- {
- etfile_artist = NULL;
- }
-
- if ((etfile_artist && ETFile_Artist && strcmp (etfile_artist,
- ETFile_Artist) == 0)
- || (!etfile_artist && !ETFile_Artist)) /* The "artist" values correspond? */
- {
- /* The "ArtistList" item was found! */
- while (AlbumList)
- {
- if ((etfilelist = (GList *)AlbumList->data)
- && (etfile = (ET_File *)etfilelist->data)
- && ((File_Tag *)etfile->FileTag->data) != NULL)
- {
- etfile_album = ((File_Tag *)etfile->FileTag->data)->album;
- }
- else
- {
- etfile_album = NULL;
- }
-
- if ((etfile_album && ETFile_Album && strcmp (etfile_album,
- ETFile_Album) == 0)
- || (!etfile_album && !ETFile_Album))
- /* The "album" values correspond? */
- {
- /* The "AlbumList" item was found!
- * Add the ETFile to this AlbumList item */
- AlbumList->data = g_list_append ((GList *)AlbumList->data,
- ETFile);
- AlbumList->data = g_list_sort ((GList *)AlbumList->data,
-
(GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
- return TRUE;
- }
-
- AlbumList = g_list_next (AlbumList);
- }
-
- /* The "AlbumList" item was NOT found! => Add a new "AlbumList"
- * item (+...) item to the "ArtistList" list. */
- etfilelist = g_list_append (NULL, ETFile);
- ArtistList->data = g_list_append ((GList *)ArtistList->data,
- etfilelist);
- ArtistList->data = g_list_sort ((GList *)ArtistList->data,
- (GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
- return TRUE;
- }
- }
-
- /* The "ArtistList" item was NOT found! => Add a new "ArtistList" to the
- * main list (=ETArtistAlbumFileList). */
- etfilelist = g_list_append (NULL, ETFile);
- AlbumList = g_list_append (NULL, etfilelist);
- ETCore->ETArtistAlbumFileList = g_list_append (ETCore->ETArtistAlbumFileList,
- AlbumList);
-
- /* Sort the list by ascending Artist. */
- ETCore->ETArtistAlbumFileList = g_list_sort (ETCore->ETArtistAlbumFileList,
-
(GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
-
- return TRUE;
-}
-
-
-
-/*
- * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
- */
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile)
-{
- GList *ETFileList = NULL; // Item containing the ETFile to delete... (in ETCore->ETFileList)
- GList *ETFileDisplayedList = NULL; // Item containing the ETFile to delete... (in
ETCore->ETFileDisplayedList)
-
- // Remove infos of the file
- ETCore->ETFileDisplayedList_TotalSize -= ((ET_File_Info *)ETFile->ETFileInfo)->size;
- ETCore->ETFileDisplayedList_TotalDuration -= ((ET_File_Info *)ETFile->ETFileInfo)->duration;
-
- // Find the ETFileList containing the ETFile item
- ETFileDisplayedList = g_list_find(g_list_first(ETCore->ETFileDisplayedList),ETFile);
- ETFileList = g_list_find(g_list_first(ETCore->ETFileList),ETFile);
-
- // Note : this ETFileList must be used only for ETCore->ETFileDisplayedList, and not
ETCore->ETFileDisplayed
- if (ETCore->ETFileDisplayedList == ETFileDisplayedList)
- {
- if (ETFileList->next)
- ETCore->ETFileDisplayedList = ETFileDisplayedList->next;
- else if (ETFileList->prev)
- ETCore->ETFileDisplayedList = ETFileDisplayedList->prev;
- else
- ETCore->ETFileDisplayedList = NULL;
- }
- // If the current displayed file is just removing, it will be unable to display it again!
- if (ETCore->ETFileDisplayed == ETFile)
- {
- if (ETCore->ETFileDisplayedList)
- ETCore->ETFileDisplayed = (ET_File *)ETCore->ETFileDisplayedList->data;
- else
- ETCore->ETFileDisplayed = (ET_File *)NULL;
- }
-
- /* Remove the file from the ETFileList list. */
- ETCore->ETFileList = g_list_remove (g_list_first (ETCore->ETFileList),
- ETFileList);
-
- // Remove the file from the ETArtistAlbumList list
- ET_Remove_File_From_Artist_Album_List(ETFile);
-
- /* Remove the file from the ETFileDisplayedList list (if not already). */
- ETCore->ETFileDisplayedList = g_list_remove (g_list_first (ETCore->ETFileDisplayedList),
- ETFileDisplayedList);
-
- // Free data of the file
- ET_Free_File_List_Item(ETFile);
- if (ETFileList)
- g_list_free(ETFileList);
- if (ETFileDisplayedList)
- g_list_free(ETFileDisplayedList);
-
- // Recalculate length of ETFileDisplayedList list
- ET_Displayed_File_List_Get_Length();
-
- // To number the ETFile in the list
- ET_Displayed_File_List_Number();
-
- // Displaying...
- if (ETCore->ETFileDisplayedList)
- {
- if (ETCore->ETFileDisplayed)
- {
- ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);
- }else if (ETCore->ETFileDisplayedList->data)
- {
- // Select the new file (synchronize index,...)
- ET_Displayed_File_List_By_Etfile((ET_File *)ETCore->ETFileDisplayedList->data);
- }
- }else
- {
- // Reinit the tag and file area
- et_application_window_file_area_clear (ET_APPLICATION_WINDOW (MainWindow));
- et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
- et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
- }
-
- return TRUE;
-}
-
-
-/*
- * Delete the corresponding file (allocated data was previously freed!). Return TRUE if deleted.
- */
-static gboolean
-ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
-{
- GList *ArtistList;
- GList *AlbumList;
- GList *etfilelist;
-
- g_return_val_if_fail (ETFile != NULL, FALSE);
-
- /* Search for the ETFile in the list. */
- for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
- ArtistList = g_list_next (ArtistList))
- {
- for (AlbumList = g_list_first ((GList *)ArtistList->data);
- AlbumList != NULL; AlbumList = g_list_next (AlbumList))
- {
- for (etfilelist = g_list_first ((GList *)AlbumList->data);
- etfilelist != NULL; etfilelist = g_list_next (etfilelist))
- {
- ET_File *etfile = (ET_File *)etfilelist->data;
-
- if (ETFile == etfile) /* The ETFile to delete was found! */
- {
- etfilelist = g_list_remove (etfilelist, ETFile);
-
- if (etfilelist) /* Delete from AlbumList. */
- {
- AlbumList->data = (gpointer) g_list_first (etfilelist);
- }
- else
- {
- AlbumList = g_list_remove (AlbumList, AlbumList->data);
-
- if (AlbumList) /* Delete from ArtistList. */
- {
- ArtistList->data = AlbumList;
- }
- else
- {
- /* Delete from the main list. */
- ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
-
- return TRUE;
- }
-
- return TRUE;
- }
-
- return TRUE;
- }
- }
- }
- }
-
- return FALSE; /* ETFile is NUL, or not found in the list. */
-}
-
-/**************************
- * File sorting functions *
- **************************/
-
-/*
- * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
- * Note : Add also new sorting in 'Browser_List_Sort_Func'
- */
-static void
-ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
-{
- ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
-}
-
-/*
- * Sort an 'ETFileList'
- */
-GList *
-ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type)
-{
- EtApplicationWindow *window;
- GtkTreeViewColumn *column;
- GList *etfilelist;
- gint column_id = Sorting_Type / 2;
-
- window = ET_APPLICATION_WINDOW (MainWindow);
- column = et_application_window_browser_get_column_for_column_id (window,
- column_id);
-
- /* Important to rewind before. */
- etfilelist = g_list_first (ETFileList);
-
- /* FIXME: Port to sort-mode? */
- set_sort_order_for_column_id (column_id, column, Sorting_Type);
-
- /* Sort... */
- switch (Sorting_Type)
- {
- case ET_SORT_MODE_ASCENDING_FILENAME:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Filename);
- break;
- case ET_SORT_MODE_DESCENDING_FILENAME:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Filename);
- break;
- case ET_SORT_MODE_ASCENDING_TITLE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Title);
- break;
- case ET_SORT_MODE_DESCENDING_TITLE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Title);
- break;
- case ET_SORT_MODE_ASCENDING_ARTIST:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Artist);
- break;
- case ET_SORT_MODE_DESCENDING_ARTIST:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Artist);
- break;
- case ET_SORT_MODE_ASCENDING_ALBUM_ARTIST:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album_Artist);
- break;
- case ET_SORT_MODE_DESCENDING_ALBUM_ARTIST:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album_Artist);
- break;
- case ET_SORT_MODE_ASCENDING_ALBUM:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album);
- break;
- case ET_SORT_MODE_DESCENDING_ALBUM:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album);
- break;
- case ET_SORT_MODE_ASCENDING_YEAR:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Year);
- break;
- case ET_SORT_MODE_DESCENDING_YEAR:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Year);
- break;
- case ET_SORT_MODE_ASCENDING_DISC_NUMBER:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)et_comp_func_sort_file_by_ascending_disc_number);
- break;
- case ET_SORT_MODE_DESCENDING_DISC_NUMBER:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)et_comp_func_sort_file_by_descending_disc_number);
- break;
- case ET_SORT_MODE_ASCENDING_TRACK_NUMBER:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Track_Number);
- break;
- case ET_SORT_MODE_DESCENDING_TRACK_NUMBER:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Track_Number);
- break;
- case ET_SORT_MODE_ASCENDING_GENRE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Genre);
- break;
- case ET_SORT_MODE_DESCENDING_GENRE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Genre);
- break;
- case ET_SORT_MODE_ASCENDING_COMMENT:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Comment);
- break;
- case ET_SORT_MODE_DESCENDING_COMMENT:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Comment);
- break;
- case ET_SORT_MODE_ASCENDING_COMPOSER:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Composer);
- break;
- case ET_SORT_MODE_DESCENDING_COMPOSER:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Composer);
- break;
- case ET_SORT_MODE_ASCENDING_ORIG_ARTIST:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist);
- break;
- case ET_SORT_MODE_DESCENDING_ORIG_ARTIST:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Orig_Artist);
- break;
- case ET_SORT_MODE_ASCENDING_COPYRIGHT:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Copyright);
- break;
- case ET_SORT_MODE_DESCENDING_COPYRIGHT:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Copyright);
- break;
- case ET_SORT_MODE_ASCENDING_URL:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Url);
- break;
- case ET_SORT_MODE_DESCENDING_URL:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Url);
- break;
- case ET_SORT_MODE_ASCENDING_ENCODED_BY:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Encoded_By);
- break;
- case ET_SORT_MODE_DESCENDING_ENCODED_BY:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Encoded_By);
- break;
- case ET_SORT_MODE_ASCENDING_CREATION_DATE:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Creation_Date);
- break;
- case ET_SORT_MODE_DESCENDING_CREATION_DATE:
- etfilelist = g_list_sort (etfilelist,
- (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Creation_Date);
- break;
- case ET_SORT_MODE_ASCENDING_FILE_TYPE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Type);
- break;
- case ET_SORT_MODE_DESCENDING_FILE_TYPE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Type);
- break;
- case ET_SORT_MODE_ASCENDING_FILE_SIZE:
- etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Size);
- break;
- case ET_SORT_MODE_DESCENDING_FILE_SIZE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Size);
- break;
- case ET_SORT_MODE_ASCENDING_FILE_DURATION:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Duration);
- break;
- case ET_SORT_MODE_DESCENDING_FILE_DURATION:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Duration);
- break;
- case ET_SORT_MODE_ASCENDING_FILE_BITRATE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate);
- break;
- case ET_SORT_MODE_DESCENDING_FILE_BITRATE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Bitrate);
- break;
- case ET_SORT_MODE_ASCENDING_FILE_SAMPLERATE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate);
- break;
- case ET_SORT_MODE_DESCENDING_FILE_SAMPLERATE:
- etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Samplerate);
- break;
- }
- /* Save sorting mode (note: needed when called from UI). */
- g_settings_set_enum (MainSettings, "sort-mode", Sorting_Type);
-
- //ETFileList = g_list_first(etfilelist);
- return etfilelist;
-}
-
-
-/*
- * Sort the list of files following the 'Sorting_Type' value. The new sorting is displayed in the UI.
- */
-void
-ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type)
-{
- g_return_if_fail (ETCore->ETFileList != NULL);
-
- ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
-
- /* Sort the list */
- ET_Sort_Displayed_File_List(Sorting_Type);
-
- /* To number the ETFile in the list */
- ET_Displayed_File_List_Number();
-
- /* Reload files in browser list */
- ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed); // Just to update 'ETFileDisplayedList'
- et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
- ETCore->ETFileDisplayed,
- TRUE);
- ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
-
- et_application_window_browser_refresh_sort (ET_APPLICATION_WINDOW (MainWindow));
- et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
-}
-
-
/*
* Comparison function for sorting by ascending filename.
*/
@@ -1909,226 +1022,6 @@ ET_Comp_Func_Sort_File_By_Descending_File_Samplerate (const ET_File *ETFile1,
return ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate(ETFile2,ETFile1);
}
-
-/*
- * Comparison function for sorting by ascending artist in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
- const GList *AlbumList2)
-{
- const GList *etfilelist1 = NULL;
- const GList *etfilelist2 = NULL;
- const ET_File *etfile1 = NULL;
- const ET_File *etfile2 = NULL;
- const gchar *etfile1_artist;
- const gchar *etfile2_artist;
-
- if (!AlbumList1
- || !(etfilelist1 = (GList *)AlbumList1->data)
- || !(etfile1 = (ET_File *)etfilelist1->data)
- || !(etfile1_artist = ((File_Tag *)etfile1->FileTag->data)->artist) )
- return -1;
-
- if (!AlbumList2
- || !(etfilelist2 = (GList *)AlbumList2->data)
- || !(etfile2 = (ET_File *)etfilelist2->data)
- || !(etfile2_artist = ((File_Tag *)etfile2->FileTag->data)->artist) )
- return 1;
-
- /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
- * return strcmp(etfile1_artist,etfile2_artist); */
- //else
- return strcasecmp(etfile1_artist,etfile2_artist);
-}
-
-/*
- * Comparison function for sorting by ascending album in the ArtistAlbumList.
- */
-static gint
-ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
- const GList *etfilelist2)
-{
- const ET_File *etfile1;
- const ET_File *etfile2;
- const gchar *etfile1_album;
- const gchar *etfile2_album;
-
- if (!etfilelist1
- || !(etfile1 = (ET_File *)etfilelist1->data)
- || !(etfile1_album = ((File_Tag *)etfile1->FileTag->data)->album) )
- return -1;
-
- if (!etfilelist2
- || !(etfile2 = (ET_File *)etfilelist2->data)
- || !(etfile2_album = ((File_Tag *)etfile2->FileTag->data)->album) )
- return 1;
-
- /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
- * return strcmp(etfile1_album,etfile2_album); */
- //else
- return strcasecmp(etfile1_album,etfile2_album);
-}
-
-/*
- * Comparison function for sorting etfile in the ArtistAlbumList.
- * FIX ME : should use the default sorting!
- */
-static gint
-ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
- const ET_File *ETFile2)
-{
-
- if (!ETFile1) return -1;
- if (!ETFile2) return 1;
-
- return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
-}
-
-
-
-
-/***************************
- * List handling functions *
- ***************************/
-
-/*
- * Returns the first item of the "displayed list"
- */
-GList *ET_Displayed_File_List_First (void)
-{
- ETCore->ETFileDisplayedList = g_list_first(ETCore->ETFileDisplayedList);
- return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the previous item of the "displayed list". When no more item, it returns NULL.
- */
-GList *ET_Displayed_File_List_Previous (void)
-{
- if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->prev)
- return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->prev;
- else
- return NULL;
-}
-
-/*
- * Returns the next item of the "displayed list".
- * When no more item, it returns NULL to don't "overwrite" the list.
- */
-GList *ET_Displayed_File_List_Next (void)
-{
- if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->next)
- return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->next;
- else
- return NULL;
-}
-
-/*
- * Returns the last item of the "displayed list"
- */
-GList *ET_Displayed_File_List_Last (void)
-{
- ETCore->ETFileDisplayedList = g_list_last(ETCore->ETFileDisplayedList);
- return ETCore->ETFileDisplayedList;
-}
-
-/*
- * Returns the item of the "displayed list" which correspond to the given 'ETFile' (used into browser list).
- */
-GList *
-ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
-{
- GList *etfilelist;
-
- for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
- etfilelist = ET_Displayed_File_List_Next ())
- {
- if (ETFile == (ET_File *)etfilelist->data)
- break;
- }
-
- if (etfilelist)
- {
- /* To "save" the position like in ET_File_List_Next... (not very good -
- * FIXME) */
- ETCore->ETFileDisplayedList = etfilelist;
- }
- return etfilelist;
-}
-
-/*
- * Just returns the current item of the "main list"
- */
-/*GList *ET_Displayed_File_List_Current (void)
-{
- return ETCore->ETFileDisplayedList;
- //return ETCore->ETFileDisplayedListPtr;
-}*/
-
-/*
- * Renumber the list of displayed files (IndexKey) from 1 to n
- */
-static void
-ET_Displayed_File_List_Number (void)
-{
- GList *l = NULL;
- guint i = 1;
-
- for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
- l = g_list_next (l))
- {
- ((ET_File *)l->data)->IndexKey = i++;
- }
-}
-
-/*
- * Returns the length of the list of displayed files
- */
-static guint
-ET_Displayed_File_List_Get_Length (void)
-{
- GList *list = NULL;
-
- list = g_list_first(ETCore->ETFileDisplayedList);
- ETCore->ETFileDisplayedList_Length = g_list_length(list);
- return ETCore->ETFileDisplayedList_Length;
-}
-
-/*
- * Load the list of displayed files (calculate length, size, ...)
- * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
- */
-gboolean ET_Set_Displayed_File_List (GList *ETFileList)
-{
- GList *l = NULL;
-
- ETCore->ETFileDisplayedList = g_list_first(ETFileList);
-
- //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
- ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
- ETCore->ETFileDisplayedList_TotalSize = 0;
- ETCore->ETFileDisplayedList_TotalDuration = 0;
-
- // Get size and duration of files in the list
- for (l = ETCore->ETFileDisplayedList; l != NULL; l = g_list_next (l))
- {
- ETCore->ETFileDisplayedList_TotalSize += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->size;
- ETCore->ETFileDisplayedList_TotalDuration += ((ET_File_Info *)((ET_File
*)l->data)->ETFileInfo)->duration;
- }
-
- /* Sort the file list. */
- ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
- "sort-mode"));
-
- // Should renums ETCore->ETFileDisplayedList only!
- ET_Displayed_File_List_Number();
-
- return TRUE;
-}
-
-
-
/*********************
* Freeing functions *
*********************/
@@ -2660,7 +1553,7 @@ ET_Save_File_Name_From_UI (const ET_File *ETFile, File_Name *FileName)
* Do the same thing of ET_Save_File_Name_From_UI, but without getting the
* data from the UI.
*/
-static gboolean
+gboolean
ET_Save_File_Name_Internal (const ET_File *ETFile,
File_Name *FileName)
{
@@ -2724,7 +1617,7 @@ ET_Save_File_Name_Internal (const ET_File *ETFile,
/*
* Do the same thing of et_tag_area_create_file_tag without getting the data from the UI.
*/
-static gboolean
+gboolean
ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
{
File_Tag *FileTagCur;
@@ -3051,80 +1944,13 @@ ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
}
/*
- * Function used to update path of filenames into list after renaming a parent directory
- * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
- */
-void
-ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
- const gchar *new_path)
-{
- GList *filelist;
- ET_File *file;
- GList *filenamelist;
- gchar *filename;
- gchar *last_path_tmp;
-
- if (!ETCore->ETFileList || !last_path || !new_path ||
- strlen(last_path) < 1 || strlen(new_path) < 1 )
- return;
-
- // Add '/' to end of path to avoid ambiguity between a directory and a filename...
- if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
- last_path_tmp = g_strdup(last_path);
- else
- last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
-
- for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
- filelist = g_list_next (filelist))
- {
- if ((file = filelist->data))
- {
- for (filenamelist = file->FileNameList; filenamelist != NULL;
- filenamelist = g_list_next (filenamelist))
- {
- File_Name *FileName = (File_Name *)filenamelist->data;
-
- if ( FileName && (filename=FileName->value) )
- {
- // Replace path of filename
- if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
- {
- gchar *filename_tmp;
-
- // Create the new filename
- filename_tmp = g_strconcat(new_path,
- (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" :
G_DIR_SEPARATOR_S,
- &filename[strlen(last_path_tmp)],NULL);
-
- /* Replace the filename (in file system encoding). */
- g_free(FileName->value);
- FileName->value = filename_tmp;
- /* Replace the filename (in file system encoding). */
- g_free(FileName->value_utf8);
- FileName->value_utf8 = filename_to_display(FileName->value);
- // Recalculate the collate key
- g_free(FileName->value_ck);
- FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
- }
- }
- }
- }
- }
-
- g_free(last_path_tmp);
-}
-
-
-
-/***********************
- * Undo/Redo functions *
- ***********************/
-
-/*
* Check if 'FileName' and 'FileTag' differ with those of 'ETFile'.
* Manage undo feature for the ETFile and the main undo list.
*/
-gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag)
+gboolean
+ET_Manage_Changes_Of_File_Data (ET_File *ETFile,
+ File_Name *FileName,
+ File_Tag *FileTag)
{
gboolean undo_added = FALSE;
@@ -3170,7 +1996,6 @@ gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, F
return undo_added;
}
-
/*
* Compares two File_Name items :
* - returns TRUE if there aren't the same
@@ -3269,34 +2094,6 @@ ET_Add_File_Tag_To_List (ET_File *ETFile, File_Tag *FileTag)
}
/*
- * Add a ETFile item to the main undo list of files
- */
-static gboolean
-ET_Add_File_To_History_List (ET_File *ETFile)
-{
- ET_History_File *ETHistoryFile;
-
- g_return_val_if_fail (ETFile != NULL, FALSE);
-
- ETHistoryFile = g_slice_new0 (ET_History_File);
- ETHistoryFile->ETFile = ETFile;
-
- /* The undo list must contains one item before the 'first undo' data */
- if (!ETCore->ETHistoryFileList)
- {
- ETCore->ETHistoryFileList = g_list_append (ETCore->ETHistoryFileList,
- g_slice_new0 (ET_History_File));
- }
-
- /* Add the item to the list (cut end of list from the current element) */
- ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
- ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
-
- return TRUE;
-}
-
-
-/*
* Applies one undo to the ETFile data (to reload the previous data).
* Returns TRUE if an undo had been applied.
*/
@@ -3418,82 +2215,6 @@ ET_File_Data_Has_Redo_Data (const ET_File *ETFile)
return has_filename_redo_data | has_filetag_redo_data;
}
-
-/*
- * Execute one 'undo' in the main undo list (it selects the last ETFile changed,
- * before to apply an undo action)
- */
-ET_File *ET_Undo_History_File_Data (void)
-{
- ET_File *ETFile;
- const ET_History_File *ETHistoryFile;
-
- g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
- ET_History_File_List_Has_Undo_Data (), NULL);
-
- ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
- ETFile = (ET_File *)ETHistoryFile->ETFile;
- ET_Displayed_File_List_By_Etfile(ETFile);
- ET_Undo_File_Data(ETFile);
-
- if (ETCore->ETHistoryFileList->prev)
- ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->prev;
- return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains undo data
- */
-gboolean ET_History_File_List_Has_Undo_Data (void)
-{
- if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
- return TRUE;
- else
- return FALSE;
-}
-
-
-/*
- * Execute one 'redo' in the main undo list
- */
-ET_File *ET_Redo_History_File_Data (void)
-{
- ET_File *ETFile;
- ET_History_File *ETHistoryFile;
-
- if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
-
- ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
- ETFile = (ET_File *)ETHistoryFile->ETFile;
- ET_Displayed_File_List_By_Etfile(ETFile);
- ET_Redo_File_Data(ETFile);
-
- if (ETCore->ETHistoryFileList->next)
- ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->next;
- return ETFile;
-}
-
-
-/*
- * Returns TRUE if undo file list contains redo data
- */
-gboolean ET_History_File_List_Has_Redo_Data (void)
-{
- if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
- return TRUE;
- else
- return FALSE;
-}
-
-
-
-
-/**********************
- * Checking functions *
- **********************/
-
-
/*
* Ckecks if the current files had been changed but not saved.
* Returns TRUE if the file has been saved.
@@ -3524,35 +2245,6 @@ ET_Check_If_File_Is_Saved (const ET_File *ETFile)
return TRUE;
}
-
-/*
- * Ckecks if some files, in the list, had been changed but not saved.
- * Returns TRUE if all files have been saved.
- * Returns FALSE if some changes haven't been saved.
- */
-gboolean ET_Check_If_All_Files_Are_Saved (void)
-{
- /* Check if some files haven't been saved, if didn't nochange=0 */
- if (!ETCore->ETFileList)
- {
- return TRUE;
- }else
- {
- GList *l;
-
- for (l = g_list_first (ETCore->ETFileList); l != NULL;
- l = g_list_next (l))
- {
- if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
- return FALSE;
- }
- return TRUE;
- }
-}
-
-
-
-
/*******************
* Extra functions *
*******************/
@@ -3591,50 +2283,6 @@ void ET_Mark_File_Name_As_Saved (ET_File *ETFile)
FileNameNew->saved = TRUE;
}
-
-/*
- * et_core_read_file_info:
- * @file: a file from which to read information
- * @ETFileInfo: (out caller-allocates): a file information structure
- * @error: a #GError to provide information on erros, or %NULL to ignore
- *
- * Fille @ETFileInfo with information about the file. Currently, this only
- * fills the file size.
- *
- * Returns: %TRUE on success, %FALSE otherwise
- */
-static gboolean
-et_core_read_file_info (GFile *file,
- ET_File_Info *ETFileInfo,
- GError **error)
-{
- GFileInfo *info;
-
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
-
- info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
- G_FILE_QUERY_INFO_NONE, NULL, error);
-
- if (!info)
- {
- g_assert (error == NULL || *error != NULL);
- return FALSE;
- }
-
- ETFileInfo->version = 0;
- ETFileInfo->bitrate = 0;
- ETFileInfo->samplerate = 0;
- ETFileInfo->mode = 0;
- ETFileInfo->size = g_file_info_get_size (info);
- ETFileInfo->duration = 0;
-
- g_assert (error == NULL || *error == NULL);
- g_object_unref (info);
-
- return TRUE;
-}
-
/*
* This function generates a new filename using path of the old file and the
* new name.
@@ -3805,89 +2453,3 @@ gboolean ET_File_Name_Convert_Character (gchar *filename_utf8)
}
return TRUE;
}
-
-
-/*
- * Returns the number of file in the directory of the selected file.
- * Parameter "path" should be in UTF-8
- */
-guint
-ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
-{
- gchar *path_key;
- GList *l;
- guint count = 0;
-
- g_return_val_if_fail (path_utf8 != NULL, count);
-
- path_key = g_utf8_collate_key (path_utf8, -1);
-
- for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
- {
- ET_File *ETFile = (ET_File *)l->data;
- const gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
- gchar *dirname_utf8 = g_path_get_dirname(cur_filename_utf8);
- gchar *dirname_key = g_utf8_collate_key (dirname_utf8, -1);
-
- if (strcmp (dirname_utf8, path_utf8) == 0)
- {
- count++;
- }
-
- g_free (dirname_utf8);
- g_free (dirname_key);
- }
-
- g_free (path_key);
-
- return count;
-}
-
-/*
- * Set appropriate sort order for the given column_id
- */
-static void
-set_sort_order_for_column_id (gint column_id, GtkTreeViewColumn *column,
- EtSortMode sort_type)
-{
- EtApplicationWindow *window;
- EtSortMode current_mode;
-
- window = ET_APPLICATION_WINDOW (MainWindow);
-
- /* Removing the sort indicator for the currently selected treeview
- * column. */
- current_mode = g_settings_get_enum (MainSettings, "sort-mode");
-
- if (current_mode < ET_SORT_MODE_ASCENDING_CREATION_DATE)
- {
- gtk_tree_view_column_set_sort_indicator (et_application_window_browser_get_column_for_column_id
(window, current_mode / 2),
- FALSE);
- }
-
- if (sort_type < ET_SORT_MODE_ASCENDING_CREATION_DATE)
- {
- gtk_tree_view_column_clicked (et_application_window_browser_get_column_for_column_id (window,
column_id));
-
- if (sort_type % 2 == 0)
- {
- /* GTK_SORT_ASCENDING */
- if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
- == GTK_SORT_DESCENDING)
- {
- gtk_tree_view_column_set_sort_order (column,
- GTK_SORT_ASCENDING);
- }
- }
- else
- {
- /* GTK_SORT_DESCENDING */
- if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
- == GTK_SORT_ASCENDING)
- {
- gtk_tree_view_column_set_sort_order (column,
- GTK_SORT_DESCENDING);
- }
- }
- }
-}
diff --git a/src/file.h b/src/file.h
index 3a08f31..10129dc 100644
--- a/src/file.h
+++ b/src/file.h
@@ -26,7 +26,6 @@ G_BEGIN_DECLS
#include "core_types.h"
#include "file_description.h"
#include "file_tag.h"
-#include "setting.h"
/*
* Description of each item of the FileNameList list
@@ -73,63 +72,37 @@ typedef struct
ET_File *ETFile; /* Pointer to item of ETFileList changed */
} ET_History_File;
-GList *ET_Add_File_To_File_List (gchar *filename);
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
-gboolean ET_Free_File_List (void);
-
-gboolean ET_Create_Artist_Album_File_List (void);
-gboolean ET_Free_Artist_Album_File_List (void);
-gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
-
gboolean ET_Check_If_File_Is_Saved (const ET_File *ETFile);
-gboolean ET_Check_If_All_Files_Are_Saved (void);
-ET_File *ET_File_Item_New (void);
-File_Name *ET_File_Name_Item_New (void);
-void ET_Free_File_List_Item (ET_File *ETFile);
+ET_File * ET_File_Item_New (void);
+ET_File_Info * ET_File_Info_Item_New (void);
+File_Name * ET_File_Name_Item_New (void);
+void ET_Free_File_List_Item (ET_File *ETFile);
-gboolean ET_Set_Field_File_Name_Item (gchar **FileNameField, gchar *value);
gboolean ET_Set_Filename_File_Name_Item (File_Name *FileName, const gchar *filename_utf8, const gchar
*filename);
/* FIXME: Move to file_tag.h. */
gboolean ET_Copy_File_Tag_Item (const ET_File *ETFile, File_Tag *FileTag);
void ET_Copy_File_Tag_Item_Other_Field (const ET_File *ETFile, File_Tag *FileTag);
-GList *ET_Displayed_File_List_First (void);
-GList *ET_Displayed_File_List_Previous (void);
-GList *ET_Displayed_File_List_Next (void);
-GList *ET_Displayed_File_List_Last (void);
-GList *ET_Displayed_File_List_By_Etfile (const ET_File *ETFile);
-
-gboolean ET_Set_Displayed_File_List (GList *ETFileList);
-gboolean ET_Free_Displayed_File_List (void);
-
-void ET_Display_File_Data_To_UI (ET_File *ETFile);
-void ET_Save_File_Data_From_UI (ET_File *ETFile);
+void ET_Display_File_Data_To_UI (ET_File *ETFile);
+void ET_Save_File_Data_From_UI (ET_File *ETFile);
+gboolean ET_Save_File_Name_Internal (const ET_File *ETFile, File_Name *FileName);
gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error);
+gboolean ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag);
guint ET_Undo_Key_New (void);
-gboolean ET_Undo_File_Data (ET_File *ETFile);
-gboolean ET_Redo_File_Data (ET_File *ETFile);
+gboolean ET_Undo_File_Data (ET_File *ETFile);
+gboolean ET_Redo_File_Data (ET_File *ETFile);
gboolean ET_File_Data_Has_Undo_Data (const ET_File *ETFile);
gboolean ET_File_Data_Has_Redo_Data (const ET_File *ETFile);
-ET_File *ET_Undo_History_File_Data (void);
-ET_File *ET_Redo_History_File_Data (void);
-gboolean ET_History_File_List_Has_Undo_Data (void);
-gboolean ET_History_File_List_Has_Redo_Data (void);
-gboolean ET_Free_History_File_List (void);
-
-gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag);
-void ET_Mark_File_Name_As_Saved (ET_File *ETFile);
-void ET_Update_Directory_Name_Into_File_List (const gchar *last_path, const gchar *new_path);
-gboolean ET_File_Name_Convert_Character (gchar *filename_utf8);
+gboolean ET_Manage_Changes_Of_File_Data (ET_File *ETFile, File_Name *FileName, File_Tag *FileTag);
+void ET_Mark_File_Name_As_Saved (ET_File *ETFile);
+gboolean ET_File_Name_Convert_Character (gchar *filename_utf8);
gchar *ET_File_Name_Generate (const ET_File *ETFile, const gchar *new_file_name);
-guint ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8);
-GList *ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type);
-void ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type);
gint ET_Comp_Func_Sort_File_By_Ascending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
gint ET_Comp_Func_Sort_File_By_Descending_Filename (const ET_File *ETFile1, const ET_File *ETFile2);
gint ET_Comp_Func_Sort_File_By_Ascending_Creation_Date (const ET_File *ETFile1, const ET_File *ETFile2);
diff --git a/src/file_area.c b/src/file_area.c
index c197950..dddc311 100644
--- a/src/file_area.c
+++ b/src/file_area.c
@@ -25,6 +25,7 @@
#include "charset.h"
#include "et_core.h"
#include "log.h"
+#include "setting.h"
#include "tag_area.h"
/* TODO: Use G_DEFINE_TYPE_WITH_PRIVATE. */
diff --git a/src/file_list.c b/src/file_list.c
new file mode 100644
index 0000000..c4d79d8
--- /dev/null
+++ b/src/file_list.c
@@ -0,0 +1,1445 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave amigadave com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#include "file_list.h"
+
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <utime.h>
+
+#include "application_window.h"
+#include "charset.h"
+#include "easytag.h"
+#include "log.h"
+#include "mpeg_header.h"
+#include "monkeyaudio_header.h"
+#include "musepack_header.h"
+#include "picture.h"
+#include "ape_tag.h"
+#ifdef ENABLE_MP3
+#include "id3_tag.h"
+#endif
+#ifdef ENABLE_OGG
+#include "ogg_header.h"
+#include "ogg_tag.h"
+#endif
+#ifdef ENABLE_FLAC
+#include "flac_header.h"
+#include "flac_tag.h"
+#endif
+#ifdef ENABLE_MP4
+#include "mp4_header.h"
+#include "mp4_tag.h"
+#endif
+#ifdef ENABLE_WAVPACK
+#include "wavpack_header.h"
+#include "wavpack_tag.h"
+#endif
+#ifdef ENABLE_OPUS
+#include "opus_header.h"
+#include "opus_tag.h"
+#endif
+
+/*
+ * Frees the full main list of files: GList *ETFileList and reinitialize it.
+ */
+gboolean
+ET_Free_File_List (void)
+{
+ g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
+
+ g_list_free_full (ETCore->ETFileList,
+ (GDestroyNotify)ET_Free_File_List_Item);
+ ETCore->ETFileList = NULL;
+
+ return TRUE;
+}
+
+static void
+et_history_file_free (ET_History_File *file)
+{
+ g_slice_free (ET_History_File, file);
+}
+
+/*
+ * History list contains only pointers, so no data to free except the history structure.
+ */
+gboolean
+ET_Free_History_File_List (void)
+{
+ g_return_val_if_fail (ETCore != NULL && ETCore->ETHistoryFileList != NULL,
+ FALSE);
+
+ ETCore->ETHistoryFileList = g_list_first (ETCore->ETHistoryFileList);
+
+ g_list_free_full (ETCore->ETHistoryFileList,
+ (GDestroyNotify)et_history_file_free);
+
+ ETCore->ETHistoryFileList = NULL;
+
+ return TRUE;
+}
+
+/*
+ * "Display" list contains only pointers, so NOTHING to free
+ */
+gboolean
+ET_Free_Displayed_File_List (void)
+{
+ g_return_val_if_fail (ETCore != NULL
+ && ETCore->ETFileDisplayedList != NULL, FALSE);
+
+ ETCore->ETFileDisplayedList = NULL;
+
+ return TRUE;
+}
+
+/*
+ * ArtistAlbum list contains 3 levels of lists
+ */
+gboolean
+ET_Free_Artist_Album_File_List (void)
+{
+ GList *l;
+
+ g_return_val_if_fail (ETCore != NULL
+ && ETCore->ETArtistAlbumFileList != NULL, FALSE);
+
+ /* Pointers are stored inside the artist/album list-stores, so free them
+ * first. */
+ et_application_window_browser_clear_artist_model (ET_APPLICATION_WINDOW (MainWindow));
+ et_application_window_browser_clear_album_model (ET_APPLICATION_WINDOW (MainWindow));
+
+ for (l = ETCore->ETArtistAlbumFileList; l != NULL; l = g_list_next (l))
+ {
+ GList *m;
+
+ for (m = (GList *)l->data; m != NULL; m = g_list_next (m))
+ {
+ GList *n = (GList *)m->data;
+ if (n)
+ g_list_free (n);
+ }
+
+ if (l->data) /* Free AlbumList list. */
+ g_list_free ((GList *)l->data);
+ }
+
+ if (ETCore->ETArtistAlbumFileList)
+ g_list_free(ETCore->ETArtistAlbumFileList);
+
+ ETCore->ETArtistAlbumFileList = NULL;
+
+ return TRUE;
+}
+
+/* Key for each item of ETFileList */
+static guint
+ET_File_Key_New (void)
+{
+ static guint ETFileKey = 0;
+ return ++ETFileKey;
+}
+
+/*
+ * et_core_read_file_info:
+ * @file: a file from which to read information
+ * @ETFileInfo: (out caller-allocates): a file information structure
+ * @error: a #GError to provide information on erros, or %NULL to ignore
+ *
+ * Fille @ETFileInfo with information about the file. Currently, this only
+ * fills the file size.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise
+ */
+static gboolean
+et_core_read_file_info (GFile *file,
+ ET_File_Info *ETFileInfo,
+ GError **error)
+{
+ GFileInfo *info;
+
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ g_return_val_if_fail (file != NULL && ETFileInfo != NULL, FALSE);
+
+ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE,
+ G_FILE_QUERY_INFO_NONE, NULL, error);
+
+ if (!info)
+ {
+ g_assert (error == NULL || *error != NULL);
+ return FALSE;
+ }
+
+ ETFileInfo->version = 0;
+ ETFileInfo->bitrate = 0;
+ ETFileInfo->samplerate = 0;
+ ETFileInfo->mode = 0;
+ ETFileInfo->size = g_file_info_get_size (info);
+ ETFileInfo->duration = 0;
+
+ g_assert (error == NULL || *error == NULL);
+ g_object_unref (info);
+
+ return TRUE;
+}
+
+/*
+ * ET_Add_File_To_File_List: Add a file to the "main" list. And get all information of the file.
+ * The filename passed in should be in raw format, only convert it to UTF8 when displaying it.
+ */
+GList *
+ET_Add_File_To_File_List (gchar *filename)
+{
+ const ET_File_Description *ETFileDescription;
+ ET_File *ETFile;
+ File_Name *FileName;
+ File_Tag *FileTag;
+ ET_File_Info *ETFileInfo;
+ gchar *ETFileExtension;
+ guint ETFileKey;
+ guint undo_key;
+ GFile *file;
+ GFileInfo *fileinfo;
+ gchar *filename_utf8 = filename_to_display(filename);
+ const gchar *locale_lc_ctype = getenv("LC_CTYPE");
+ GError *error = NULL;
+ gboolean success;
+
+ if (!filename)
+ return ETCore->ETFileList;
+
+ file = g_file_new_for_path (filename);
+
+ /* Primary Key for this file */
+ ETFileKey = ET_File_Key_New();
+
+ /* Get description of the file */
+ ETFileDescription = ET_Get_File_Description(filename);
+
+ /* Get real extension of the file (keeping the case) */
+ ETFileExtension = g_strdup(ET_Get_File_Extension(filename));
+
+ /* Fill the File_Name structure for FileNameList */
+ FileName = ET_File_Name_Item_New();
+ FileName->saved = TRUE; /* The file hasn't been changed, so it's saved */
+ FileName->value = filename;
+ FileName->value_utf8 = filename_utf8;
+ FileName->value_ck = g_utf8_collate_key_for_filename(filename_utf8, -1);
+
+ /* Fill the File_Tag structure for FileTagList */
+ FileTag = ET_File_Tag_Item_New();
+ FileTag->saved = TRUE; /* The file hasn't been changed, so it's saved */
+
+ /* Patch from Doruk Fisek and Onur Kucuk: avoid upper/lower conversion bugs
+ * (like I->i conversion in some locales) in tag parsing. The problem occurs
+ * for example with Turkish language where it can't read 'TITLE=' field if
+ * it is written as 'Title=' in the file */
+ setlocale(LC_CTYPE, "C");
+
+ switch (ETFileDescription->TagType)
+ {
+#ifdef ENABLE_MP3
+ case ID3_TAG:
+ if (!id3tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ "Error reading ID3 tag from file ‘%s’: %s",
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+#ifdef ENABLE_OGG
+ case OGG_TAG:
+ if (!ogg_tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading tag from Ogg file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+#ifdef ENABLE_FLAC
+ case FLAC_TAG:
+ if (!flac_tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading tag from FLAC file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+ case APE_TAG:
+ if (!ape_tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading APE tag from file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#ifdef ENABLE_MP4
+ case MP4_TAG:
+ if (!mp4tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading tag from MP4 file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+#ifdef ENABLE_WAVPACK
+ case WAVPACK_TAG:
+ if (!wavpack_tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading tag from WavPack file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+#ifdef ENABLE_OPUS
+ case OPUS_TAG:
+ if (!et_opus_tag_read_file_tag (file, FileTag, &error))
+ {
+ Log_Print (LOG_ERROR,
+ _("Error reading tag from Opus file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_clear_error (&error);
+ }
+ break;
+#endif
+ case UNKNOWN_TAG:
+ default:
+ /* FIXME: Translatable string. */
+ Log_Print(LOG_ERROR,"FileTag: Undefined tag type (%d) for file
%s",ETFileDescription->TagType,filename_utf8);
+ break;
+ }
+
+ if (FileTag->year && g_utf8_strlen (FileTag->year, -1) > 4)
+ {
+ Log_Print (LOG_WARNING,
+ _("The year value ‘%s’ seems to be invalid in file ‘%s’. The information will be lost
when saving"),
+ FileTag->year, filename_utf8);
+ }
+
+ /* Fill the ET_File_Info structure */
+ ETFileInfo = ET_File_Info_Item_New ();
+
+ switch (ETFileDescription->FileType)
+ {
+#if defined ENABLE_MP3 && defined ENABLE_ID3LIB
+ case MP3_FILE:
+ case MP2_FILE:
+ success = et_mpeg_header_read_file_info (file, ETFileInfo, &error);
+ break;
+#endif
+#ifdef ENABLE_OGG
+ case OGG_FILE:
+ success = et_ogg_header_read_file_info (file, ETFileInfo, &error);
+ break;
+#endif
+#ifdef ENABLE_SPEEX
+ case SPEEX_FILE:
+ success = et_speex_header_read_file_info (file, ETFileInfo,
+ &error);
+ break;
+#endif
+#ifdef ENABLE_FLAC
+ case FLAC_FILE:
+ success = et_flac_header_read_file_info (file, ETFileInfo, &error);
+ break;
+#endif
+ case MPC_FILE:
+ success = et_mpc_header_read_file_info (file, ETFileInfo, &error);
+ break;
+ case MAC_FILE:
+ success = et_mac_header_read_file_info (file, ETFileInfo, &error);
+ break;
+#ifdef ENABLE_WAVPACK
+ case WAVPACK_FILE:
+ success = et_wavpack_header_read_file_info (file, ETFileInfo,
+ &error);
+ break;
+#endif
+#ifdef ENABLE_MP4
+ case MP4_FILE:
+ success = et_mp4_header_read_file_info (file, ETFileInfo, &error);
+ break;
+#endif
+#ifdef ENABLE_OPUS
+ case OPUS_FILE:
+ success = et_opus_read_file_info (file, ETFileInfo, &error);
+ break;
+#endif
+ case UNKNOWN_FILE:
+ default:
+ /* FIXME: Translatable string. */
+ Log_Print(LOG_ERROR,"ETFileInfo: Undefined file type (%d) for file
%s",ETFileDescription->FileType,filename_utf8);
+ /* To get at least the file size. */
+ success = et_core_read_file_info (file, ETFileInfo, &error);
+ break;
+ }
+
+ if (!success)
+ {
+ Log_Print (LOG_ERROR,
+ _("Error while querying information for file ‘%s’: %s"),
+ filename_utf8, error->message);
+ g_error_free (error);
+ }
+
+ /* Restore previous value */
+ setlocale(LC_CTYPE, locale_lc_ctype ? locale_lc_ctype : "");
+
+ /* Store the modification time of the file to check if the file was changed
+ * before saving */
+ fileinfo = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
+ G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ g_object_unref (file);
+
+ /* Attach all data defined above to this ETFile item */
+ ETFile = ET_File_Item_New();
+
+ if (fileinfo)
+ {
+ ETFile->FileModificationTime = g_file_info_get_attribute_uint64 (fileinfo,
+ G_FILE_ATTRIBUTE_TIME_MODIFIED);
+ g_object_unref (fileinfo);
+ }
+ else
+ {
+ ETFile->FileModificationTime = 0;
+ }
+
+ ETFile->IndexKey = 0; // Will be renumered after...
+ ETFile->ETFileKey = ETFileKey;
+ ETFile->ETFileDescription = ETFileDescription;
+ ETFile->ETFileExtension = ETFileExtension;
+ ETFile->FileNameList = g_list_append(NULL,FileName);
+ ETFile->FileNameCur = ETFile->FileNameList;
+ ETFile->FileNameNew = ETFile->FileNameList;
+ ETFile->FileTagList = g_list_append(NULL,FileTag);
+ ETFile->FileTag = ETFile->FileTagList;
+ ETFile->ETFileInfo = ETFileInfo;
+
+ /* Add the item to the "main list" */
+ ETCore->ETFileList = g_list_append(ETCore->ETFileList,ETFile);
+
+
+ /*
+ * Process the filename and tag to generate undo if needed...
+ * The undo key must be the same for FileName and FileTag => changed in the same time
+ */
+ undo_key = ET_Undo_Key_New();
+
+ FileName = ET_File_Name_Item_New();
+ FileName->key = undo_key;
+ ET_Save_File_Name_Internal(ETFile,FileName);
+
+ FileTag = ET_File_Tag_Item_New();
+ FileTag->key = undo_key;
+ ET_Save_File_Tag_Internal(ETFile,FileTag);
+
+ /*
+ * Generate undo for the file and the main undo list.
+ * If no changes detected, FileName and FileTag item are deleted.
+ */
+ ET_Manage_Changes_Of_File_Data(ETFile,FileName,FileTag);
+
+ /*
+ * Display a message if the file was changed at start
+ */
+ FileTag = (File_Tag *)ETFile->FileTag->data;
+ FileName = (File_Name *)ETFile->FileNameNew->data;
+ if ( (FileName && FileName->saved==FALSE) || (FileTag && FileTag->saved==FALSE) )
+ {
+ Log_Print (LOG_INFO, _("Automatic corrections applied for file ‘%s’"),
+ filename_utf8);
+ }
+
+ /* Add the item to the ArtistAlbum list (placed here to take advantage of previous changes) */
+ //ET_Add_File_To_Artist_Album_File_List(ETFile);
+
+ //ET_Debug_Print_File_List(ETCore->ETFileList,__FILE__,__LINE__,__FUNCTION__);
+ return ETCore->ETFileList;
+}
+
+/*
+ * Comparison function for sorting by ascending artist in the ArtistAlbumList.
+ */
+static gint
+ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist (const GList *AlbumList1,
+ const GList *AlbumList2)
+{
+ const GList *etfilelist1 = NULL;
+ const GList *etfilelist2 = NULL;
+ const ET_File *etfile1 = NULL;
+ const ET_File *etfile2 = NULL;
+ const gchar *etfile1_artist;
+ const gchar *etfile2_artist;
+
+ if (!AlbumList1
+ || !(etfilelist1 = (GList *)AlbumList1->data)
+ || !(etfile1 = (ET_File *)etfilelist1->data)
+ || !(etfile1_artist = ((File_Tag *)etfile1->FileTag->data)->artist) )
+ return -1;
+
+ if (!AlbumList2
+ || !(etfilelist2 = (GList *)AlbumList2->data)
+ || !(etfile2 = (ET_File *)etfilelist2->data)
+ || !(etfile2_artist = ((File_Tag *)etfile2->FileTag->data)->artist) )
+ return 1;
+
+ /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
+ * return strcmp(etfile1_artist,etfile2_artist); */
+ //else
+ return strcasecmp(etfile1_artist,etfile2_artist);
+}
+
+/*
+ * Comparison function for sorting by ascending album in the ArtistAlbumList.
+ */
+static gint
+ET_Comp_Func_Sort_Album_Item_By_Ascending_Album (const GList *etfilelist1,
+ const GList *etfilelist2)
+{
+ const ET_File *etfile1;
+ const ET_File *etfile2;
+ const gchar *etfile1_album;
+ const gchar *etfile2_album;
+
+ if (!etfilelist1
+ || !(etfile1 = (ET_File *)etfilelist1->data)
+ || !(etfile1_album = ((File_Tag *)etfile1->FileTag->data)->album) )
+ return -1;
+
+ if (!etfilelist2
+ || !(etfile2 = (ET_File *)etfilelist2->data)
+ || !(etfile2_album = ((File_Tag *)etfile2->FileTag->data)->album) )
+ return 1;
+
+ /*if (g_settings_get_boolean (MainSettings, "sort-case-sensitive"))
+ * return strcmp(etfile1_album,etfile2_album); */
+ //else
+ return strcasecmp(etfile1_album,etfile2_album);
+}
+
+/*
+ * Comparison function for sorting etfile in the ArtistAlbumList.
+ * FIX ME : should use the default sorting!
+ */
+static gint
+ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename (const ET_File *ETFile1,
+ const ET_File *ETFile2)
+{
+
+ if (!ETFile1) return -1;
+ if (!ETFile2) return 1;
+
+ return ET_Comp_Func_Sort_File_By_Ascending_Filename(ETFile1,ETFile2);
+}
+
+/*
+ * The ETArtistAlbumFileList contains 3 levels of lists to sort the ETFile by artist then by album :
+ * - "ETArtistAlbumFileList" list is a list of "ArtistList" items,
+ * - "ArtistList" list is a list of "AlbumList" items,
+ * - "AlbumList" list is a list of ETFile items.
+ * Note : use the function ET_Debug_Print_Artist_Album_List(...) to understand how it works, it needed...
+ */
+static gboolean
+ET_Add_File_To_Artist_Album_File_List (ET_File *ETFile)
+{
+ const gchar *ETFile_Artist;
+ const gchar *ETFile_Album;
+ const gchar *etfile_artist;
+ const gchar *etfile_album;
+ GList *ArtistList;
+ GList *AlbumList = NULL;
+ GList *etfilelist = NULL;
+ ET_File *etfile = NULL;
+
+ g_return_val_if_fail (ETFile != NULL, FALSE);
+
+ /* Album value of the ETFile passed in parameter. */
+ ETFile_Album = ((File_Tag *)ETFile->FileTag->data)->album;
+ /* Artist value of the ETFile passed in parameter. */
+ ETFile_Artist = ((File_Tag *)ETFile->FileTag->data)->artist;
+
+ for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+ ArtistList = g_list_next (ArtistList))
+ {
+ AlbumList = (GList *)ArtistList->data; /* Take the first item */
+ /* Take the first item, and the first etfile item. */
+ if (AlbumList && (etfilelist = (GList *)AlbumList->data)
+ && (etfile = (ET_File *)etfilelist->data)
+ && ((File_Tag *)etfile->FileTag->data) != NULL)
+ {
+ etfile_artist = ((File_Tag *)etfile->FileTag->data)->artist;
+ }
+ else
+ {
+ etfile_artist = NULL;
+ }
+
+ if ((etfile_artist && ETFile_Artist && strcmp (etfile_artist,
+ ETFile_Artist) == 0)
+ || (!etfile_artist && !ETFile_Artist)) /* The "artist" values correspond? */
+ {
+ /* The "ArtistList" item was found! */
+ while (AlbumList)
+ {
+ if ((etfilelist = (GList *)AlbumList->data)
+ && (etfile = (ET_File *)etfilelist->data)
+ && ((File_Tag *)etfile->FileTag->data) != NULL)
+ {
+ etfile_album = ((File_Tag *)etfile->FileTag->data)->album;
+ }
+ else
+ {
+ etfile_album = NULL;
+ }
+
+ if ((etfile_album && ETFile_Album && strcmp (etfile_album,
+ ETFile_Album) == 0)
+ || (!etfile_album && !ETFile_Album))
+ /* The "album" values correspond? */
+ {
+ /* The "AlbumList" item was found!
+ * Add the ETFile to this AlbumList item */
+ AlbumList->data = g_list_append ((GList *)AlbumList->data,
+ ETFile);
+ AlbumList->data = g_list_sort ((GList *)AlbumList->data,
+
(GCompareFunc)ET_Comp_Func_Sort_Etfile_Item_By_Ascending_Filename);
+ return TRUE;
+ }
+
+ AlbumList = g_list_next (AlbumList);
+ }
+
+ /* The "AlbumList" item was NOT found! => Add a new "AlbumList"
+ * item (+...) item to the "ArtistList" list. */
+ etfilelist = g_list_append (NULL, ETFile);
+ ArtistList->data = g_list_append ((GList *)ArtistList->data,
+ etfilelist);
+ ArtistList->data = g_list_sort ((GList *)ArtistList->data,
+ (GCompareFunc)ET_Comp_Func_Sort_Album_Item_By_Ascending_Album);
+ return TRUE;
+ }
+ }
+
+ /* The "ArtistList" item was NOT found! => Add a new "ArtistList" to the
+ * main list (=ETArtistAlbumFileList). */
+ etfilelist = g_list_append (NULL, ETFile);
+ AlbumList = g_list_append (NULL, etfilelist);
+ ETCore->ETArtistAlbumFileList = g_list_append (ETCore->ETArtistAlbumFileList,
+ AlbumList);
+
+ /* Sort the list by ascending Artist. */
+ ETCore->ETArtistAlbumFileList = g_list_sort (ETCore->ETArtistAlbumFileList,
+
(GCompareFunc)ET_Comp_Func_Sort_Artist_Item_By_Ascending_Artist);
+
+ return TRUE;
+}
+
+gboolean
+ET_Create_Artist_Album_File_List (void)
+{
+ GList *l;
+
+ if (ETCore->ETArtistAlbumFileList)
+ ET_Free_Artist_Album_File_List();
+
+ for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+ {
+ ET_File *ETFile = (ET_File *)l->data;
+ ET_Add_File_To_Artist_Album_File_List(ETFile);
+ }
+ //ET_Debug_Print_Artist_Album_List(__FILE__,__LINE__,__FUNCTION__);
+ return TRUE;
+}
+
+/*
+ * Delete the corresponding file (allocated data was previously freed!). Return TRUE if deleted.
+ */
+static gboolean
+ET_Remove_File_From_Artist_Album_List (ET_File *ETFile)
+{
+ GList *ArtistList;
+ GList *AlbumList;
+ GList *etfilelist;
+
+ g_return_val_if_fail (ETFile != NULL, FALSE);
+
+ /* Search for the ETFile in the list. */
+ for (ArtistList = ETCore->ETArtistAlbumFileList; ArtistList != NULL;
+ ArtistList = g_list_next (ArtistList))
+ {
+ for (AlbumList = g_list_first ((GList *)ArtistList->data);
+ AlbumList != NULL; AlbumList = g_list_next (AlbumList))
+ {
+ for (etfilelist = g_list_first ((GList *)AlbumList->data);
+ etfilelist != NULL; etfilelist = g_list_next (etfilelist))
+ {
+ ET_File *etfile = (ET_File *)etfilelist->data;
+
+ if (ETFile == etfile) /* The ETFile to delete was found! */
+ {
+ etfilelist = g_list_remove (etfilelist, ETFile);
+
+ if (etfilelist) /* Delete from AlbumList. */
+ {
+ AlbumList->data = (gpointer) g_list_first (etfilelist);
+ }
+ else
+ {
+ AlbumList = g_list_remove (AlbumList, AlbumList->data);
+
+ if (AlbumList) /* Delete from ArtistList. */
+ {
+ ArtistList->data = AlbumList;
+ }
+ else
+ {
+ /* Delete from the main list. */
+ ETCore->ETArtistAlbumFileList = g_list_remove (ArtistList,ArtistList->data);
+
+ return TRUE;
+ }
+
+ return TRUE;
+ }
+
+ return TRUE;
+ }
+ }
+ }
+ }
+
+ return FALSE; /* ETFile is NUL, or not found in the list. */
+}
+
+/*
+ * Returns the length of the list of displayed files
+ */
+static guint
+ET_Displayed_File_List_Get_Length (void)
+{
+ GList *list = NULL;
+
+ list = g_list_first(ETCore->ETFileDisplayedList);
+ ETCore->ETFileDisplayedList_Length = g_list_length(list);
+ return ETCore->ETFileDisplayedList_Length;
+}
+
+/*
+ * Renumber the list of displayed files (IndexKey) from 1 to n
+ */
+static void
+ET_Displayed_File_List_Number (void)
+{
+ GList *l = NULL;
+ guint i = 1;
+
+ for (l = g_list_first (ETCore->ETFileDisplayedList); l != NULL;
+ l = g_list_next (l))
+ {
+ ((ET_File *)l->data)->IndexKey = i++;
+ }
+}
+
+/*
+ * Delete the corresponding file and free the allocated data. Return TRUE if deleted.
+ */
+gboolean
+ET_Remove_File_From_File_List (ET_File *ETFile)
+{
+ GList *ETFileList = NULL; // Item containing the ETFile to delete... (in ETCore->ETFileList)
+ GList *ETFileDisplayedList = NULL; // Item containing the ETFile to delete... (in
ETCore->ETFileDisplayedList)
+
+ // Remove infos of the file
+ ETCore->ETFileDisplayedList_TotalSize -= ((ET_File_Info *)ETFile->ETFileInfo)->size;
+ ETCore->ETFileDisplayedList_TotalDuration -= ((ET_File_Info *)ETFile->ETFileInfo)->duration;
+
+ // Find the ETFileList containing the ETFile item
+ ETFileDisplayedList = g_list_find(g_list_first(ETCore->ETFileDisplayedList),ETFile);
+ ETFileList = g_list_find(g_list_first(ETCore->ETFileList),ETFile);
+
+ // Note : this ETFileList must be used only for ETCore->ETFileDisplayedList, and not
ETCore->ETFileDisplayed
+ if (ETCore->ETFileDisplayedList == ETFileDisplayedList)
+ {
+ if (ETFileList->next)
+ ETCore->ETFileDisplayedList = ETFileDisplayedList->next;
+ else if (ETFileList->prev)
+ ETCore->ETFileDisplayedList = ETFileDisplayedList->prev;
+ else
+ ETCore->ETFileDisplayedList = NULL;
+ }
+ // If the current displayed file is just removing, it will be unable to display it again!
+ if (ETCore->ETFileDisplayed == ETFile)
+ {
+ if (ETCore->ETFileDisplayedList)
+ ETCore->ETFileDisplayed = (ET_File *)ETCore->ETFileDisplayedList->data;
+ else
+ ETCore->ETFileDisplayed = (ET_File *)NULL;
+ }
+
+ /* Remove the file from the ETFileList list. */
+ ETCore->ETFileList = g_list_remove (g_list_first (ETCore->ETFileList),
+ ETFileList);
+
+ // Remove the file from the ETArtistAlbumList list
+ ET_Remove_File_From_Artist_Album_List(ETFile);
+
+ /* Remove the file from the ETFileDisplayedList list (if not already). */
+ ETCore->ETFileDisplayedList = g_list_remove (g_list_first (ETCore->ETFileDisplayedList),
+ ETFileDisplayedList);
+
+ // Free data of the file
+ ET_Free_File_List_Item(ETFile);
+ if (ETFileList)
+ g_list_free(ETFileList);
+ if (ETFileDisplayedList)
+ g_list_free(ETFileDisplayedList);
+
+ // Recalculate length of ETFileDisplayedList list
+ ET_Displayed_File_List_Get_Length();
+
+ // To number the ETFile in the list
+ ET_Displayed_File_List_Number();
+
+ // Displaying...
+ if (ETCore->ETFileDisplayedList)
+ {
+ if (ETCore->ETFileDisplayed)
+ {
+ ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed);
+ }else if (ETCore->ETFileDisplayedList->data)
+ {
+ // Select the new file (synchronize index,...)
+ ET_Displayed_File_List_By_Etfile((ET_File *)ETCore->ETFileDisplayedList->data);
+ }
+ }else
+ {
+ // Reinit the tag and file area
+ et_application_window_file_area_clear (ET_APPLICATION_WINDOW (MainWindow));
+ et_application_window_tag_area_clear (ET_APPLICATION_WINDOW (MainWindow));
+ et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
+ }
+
+ return TRUE;
+}
+
+/**************************
+ * File sorting functions *
+ **************************/
+
+/*
+ * Sort the 'ETFileDisplayedList' following the 'Sorting_Type'
+ * Note : Add also new sorting in 'Browser_List_Sort_Func'
+ */
+void
+ET_Sort_Displayed_File_List (EtSortMode Sorting_Type)
+{
+ ETCore->ETFileDisplayedList = ET_Sort_File_List(ETCore->ETFileDisplayedList,Sorting_Type);
+}
+
+
+/*
+ * Set appropriate sort order for the given column_id
+ */
+static void
+set_sort_order_for_column_id (gint column_id, GtkTreeViewColumn *column,
+ EtSortMode sort_type)
+{
+ EtApplicationWindow *window;
+ EtSortMode current_mode;
+
+ window = ET_APPLICATION_WINDOW (MainWindow);
+
+ /* Removing the sort indicator for the currently selected treeview
+ * column. */
+ current_mode = g_settings_get_enum (MainSettings, "sort-mode");
+
+ if (current_mode < ET_SORT_MODE_ASCENDING_CREATION_DATE)
+ {
+ gtk_tree_view_column_set_sort_indicator (et_application_window_browser_get_column_for_column_id
(window, current_mode / 2),
+ FALSE);
+ }
+
+ if (sort_type < ET_SORT_MODE_ASCENDING_CREATION_DATE)
+ {
+ gtk_tree_view_column_clicked (et_application_window_browser_get_column_for_column_id (window,
column_id));
+
+ if (sort_type % 2 == 0)
+ {
+ /* GTK_SORT_ASCENDING */
+ if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
+ == GTK_SORT_DESCENDING)
+ {
+ gtk_tree_view_column_set_sort_order (column,
+ GTK_SORT_ASCENDING);
+ }
+ }
+ else
+ {
+ /* GTK_SORT_DESCENDING */
+ if (et_application_window_browser_get_sort_order_for_column_id (window, column_id)
+ == GTK_SORT_ASCENDING)
+ {
+ gtk_tree_view_column_set_sort_order (column,
+ GTK_SORT_DESCENDING);
+ }
+ }
+ }
+}
+
+/*
+ * Sort an 'ETFileList'
+ */
+GList *
+ET_Sort_File_List (GList *ETFileList,
+ EtSortMode Sorting_Type)
+{
+ EtApplicationWindow *window;
+ GtkTreeViewColumn *column;
+ GList *etfilelist;
+ gint column_id = Sorting_Type / 2;
+
+ window = ET_APPLICATION_WINDOW (MainWindow);
+ column = et_application_window_browser_get_column_for_column_id (window,
+ column_id);
+
+ /* Important to rewind before. */
+ etfilelist = g_list_first (ETFileList);
+
+ /* FIXME: Port to sort-mode? */
+ set_sort_order_for_column_id (column_id, column, Sorting_Type);
+
+ /* Sort... */
+ switch (Sorting_Type)
+ {
+ case ET_SORT_MODE_ASCENDING_FILENAME:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Filename);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILENAME:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Filename);
+ break;
+ case ET_SORT_MODE_ASCENDING_TITLE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Title);
+ break;
+ case ET_SORT_MODE_DESCENDING_TITLE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Title);
+ break;
+ case ET_SORT_MODE_ASCENDING_ARTIST:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Artist);
+ break;
+ case ET_SORT_MODE_DESCENDING_ARTIST:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Artist);
+ break;
+ case ET_SORT_MODE_ASCENDING_ALBUM_ARTIST:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album_Artist);
+ break;
+ case ET_SORT_MODE_DESCENDING_ALBUM_ARTIST:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album_Artist);
+ break;
+ case ET_SORT_MODE_ASCENDING_ALBUM:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Album);
+ break;
+ case ET_SORT_MODE_DESCENDING_ALBUM:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Album);
+ break;
+ case ET_SORT_MODE_ASCENDING_YEAR:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Year);
+ break;
+ case ET_SORT_MODE_DESCENDING_YEAR:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Year);
+ break;
+ case ET_SORT_MODE_ASCENDING_DISC_NUMBER:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)et_comp_func_sort_file_by_ascending_disc_number);
+ break;
+ case ET_SORT_MODE_DESCENDING_DISC_NUMBER:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)et_comp_func_sort_file_by_descending_disc_number);
+ break;
+ case ET_SORT_MODE_ASCENDING_TRACK_NUMBER:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Track_Number);
+ break;
+ case ET_SORT_MODE_DESCENDING_TRACK_NUMBER:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Track_Number);
+ break;
+ case ET_SORT_MODE_ASCENDING_GENRE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Genre);
+ break;
+ case ET_SORT_MODE_DESCENDING_GENRE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Genre);
+ break;
+ case ET_SORT_MODE_ASCENDING_COMMENT:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Comment);
+ break;
+ case ET_SORT_MODE_DESCENDING_COMMENT:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Comment);
+ break;
+ case ET_SORT_MODE_ASCENDING_COMPOSER:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Composer);
+ break;
+ case ET_SORT_MODE_DESCENDING_COMPOSER:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Composer);
+ break;
+ case ET_SORT_MODE_ASCENDING_ORIG_ARTIST:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Orig_Artist);
+ break;
+ case ET_SORT_MODE_DESCENDING_ORIG_ARTIST:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Orig_Artist);
+ break;
+ case ET_SORT_MODE_ASCENDING_COPYRIGHT:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Copyright);
+ break;
+ case ET_SORT_MODE_DESCENDING_COPYRIGHT:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Copyright);
+ break;
+ case ET_SORT_MODE_ASCENDING_URL:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Url);
+ break;
+ case ET_SORT_MODE_DESCENDING_URL:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Url);
+ break;
+ case ET_SORT_MODE_ASCENDING_ENCODED_BY:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Encoded_By);
+ break;
+ case ET_SORT_MODE_DESCENDING_ENCODED_BY:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Encoded_By);
+ break;
+ case ET_SORT_MODE_ASCENDING_CREATION_DATE:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_Creation_Date);
+ break;
+ case ET_SORT_MODE_DESCENDING_CREATION_DATE:
+ etfilelist = g_list_sort (etfilelist,
+ (GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_Creation_Date);
+ break;
+ case ET_SORT_MODE_ASCENDING_FILE_TYPE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Type);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILE_TYPE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Type);
+ break;
+ case ET_SORT_MODE_ASCENDING_FILE_SIZE:
+ etfilelist = g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Size);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILE_SIZE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Size);
+ break;
+ case ET_SORT_MODE_ASCENDING_FILE_DURATION:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Duration);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILE_DURATION:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Duration);
+ break;
+ case ET_SORT_MODE_ASCENDING_FILE_BITRATE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Bitrate);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILE_BITRATE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Bitrate);
+ break;
+ case ET_SORT_MODE_ASCENDING_FILE_SAMPLERATE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Ascending_File_Samplerate);
+ break;
+ case ET_SORT_MODE_DESCENDING_FILE_SAMPLERATE:
+ etfilelist =
g_list_sort(etfilelist,(GCompareFunc)ET_Comp_Func_Sort_File_By_Descending_File_Samplerate);
+ break;
+ }
+ /* Save sorting mode (note: needed when called from UI). */
+ g_settings_set_enum (MainSettings, "sort-mode", Sorting_Type);
+
+ //ETFileList = g_list_first(etfilelist);
+ return etfilelist;
+}
+
+/*
+ * Sort the list of files following the 'Sorting_Type' value. The new sorting is displayed in the UI.
+ */
+void
+ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type)
+{
+ g_return_if_fail (ETCore->ETFileList != NULL);
+
+ ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed);
+
+ /* Sort the list */
+ ET_Sort_Displayed_File_List(Sorting_Type);
+
+ /* To number the ETFile in the list */
+ ET_Displayed_File_List_Number();
+
+ /* Reload files in browser list */
+ ET_Displayed_File_List_By_Etfile(ETCore->ETFileDisplayed); // Just to update 'ETFileDisplayedList'
+ et_application_window_browser_select_file_by_et_file (ET_APPLICATION_WINDOW (MainWindow),
+ ETCore->ETFileDisplayed,
+ TRUE);
+ ET_Display_File_Data_To_UI(ETCore->ETFileDisplayed);
+
+ et_application_window_browser_refresh_sort (ET_APPLICATION_WINDOW (MainWindow));
+ et_application_window_update_actions (ET_APPLICATION_WINDOW (MainWindow));
+}
+
+/*
+ * Returns the first item of the "displayed list"
+ */
+GList *
+ET_Displayed_File_List_First (void)
+{
+ ETCore->ETFileDisplayedList = g_list_first(ETCore->ETFileDisplayedList);
+ return ETCore->ETFileDisplayedList;
+}
+
+/*
+ * Returns the previous item of the "displayed list". When no more item, it returns NULL.
+ */
+GList *
+ET_Displayed_File_List_Previous (void)
+{
+ if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->prev)
+ return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->prev;
+ else
+ return NULL;
+}
+
+/*
+ * Returns the next item of the "displayed list".
+ * When no more item, it returns NULL to don't "overwrite" the list.
+ */
+GList *
+ET_Displayed_File_List_Next (void)
+{
+ if (ETCore->ETFileDisplayedList && ETCore->ETFileDisplayedList->next)
+ return ETCore->ETFileDisplayedList = ETCore->ETFileDisplayedList->next;
+ else
+ return NULL;
+}
+
+/*
+ * Returns the last item of the "displayed list"
+ */
+GList *
+ET_Displayed_File_List_Last (void)
+{
+ ETCore->ETFileDisplayedList = g_list_last(ETCore->ETFileDisplayedList);
+ return ETCore->ETFileDisplayedList;
+}
+
+/*
+ * Returns the item of the "displayed list" which correspond to the given 'ETFile' (used into browser list).
+ */
+GList *
+ET_Displayed_File_List_By_Etfile (const ET_File *ETFile)
+{
+ GList *etfilelist;
+
+ for (etfilelist = ET_Displayed_File_List_First (); etfilelist != NULL;
+ etfilelist = ET_Displayed_File_List_Next ())
+ {
+ if (ETFile == (ET_File *)etfilelist->data)
+ break;
+ }
+
+ if (etfilelist)
+ {
+ /* To "save" the position like in ET_File_List_Next... (not very good -
+ * FIXME) */
+ ETCore->ETFileDisplayedList = etfilelist;
+ }
+ return etfilelist;
+}
+
+/*
+ * Just returns the current item of the "main list"
+ */
+/*GList *ET_Displayed_File_List_Current (void)
+{
+ return ETCore->ETFileDisplayedList;
+ //return ETCore->ETFileDisplayedListPtr;
+}*/
+
+/*
+ * Load the list of displayed files (calculate length, size, ...)
+ * It contains part (filtrated : view by artists and albums) or full ETCore->ETFileList list
+ */
+gboolean
+ET_Set_Displayed_File_List (GList *ETFileList)
+{
+ GList *l = NULL;
+
+ ETCore->ETFileDisplayedList = g_list_first(ETFileList);
+
+ //ETCore->ETFileDisplayedListPtr = ETCore->ETFileDisplayedList;
+ ETCore->ETFileDisplayedList_Length = ET_Displayed_File_List_Get_Length();
+ ETCore->ETFileDisplayedList_TotalSize = 0;
+ ETCore->ETFileDisplayedList_TotalDuration = 0;
+
+ // Get size and duration of files in the list
+ for (l = ETCore->ETFileDisplayedList; l != NULL; l = g_list_next (l))
+ {
+ ETCore->ETFileDisplayedList_TotalSize += ((ET_File_Info *)((ET_File *)l->data)->ETFileInfo)->size;
+ ETCore->ETFileDisplayedList_TotalDuration += ((ET_File_Info *)((ET_File
*)l->data)->ETFileInfo)->duration;
+ }
+
+ /* Sort the file list. */
+ ET_Sort_Displayed_File_List (g_settings_get_enum (MainSettings,
+ "sort-mode"));
+
+ // Should renums ETCore->ETFileDisplayedList only!
+ ET_Displayed_File_List_Number();
+
+ return TRUE;
+}
+
+/*
+ * Function used to update path of filenames into list after renaming a parent directory
+ * (for ex: "/mp3/old_path/file.mp3" to "/mp3/new_path/file.mp3"
+ */
+void
+ET_Update_Directory_Name_Into_File_List (const gchar *last_path,
+ const gchar *new_path)
+{
+ GList *filelist;
+ ET_File *file;
+ GList *filenamelist;
+ gchar *filename;
+ gchar *last_path_tmp;
+
+ if (!ETCore->ETFileList || !last_path || !new_path ||
+ strlen(last_path) < 1 || strlen(new_path) < 1 )
+ return;
+
+ // Add '/' to end of path to avoid ambiguity between a directory and a filename...
+ if (last_path[strlen(last_path)-1]==G_DIR_SEPARATOR)
+ last_path_tmp = g_strdup(last_path);
+ else
+ last_path_tmp = g_strconcat(last_path,G_DIR_SEPARATOR_S,NULL);
+
+ for (filelist = g_list_first (ETCore->ETFileList); filelist != NULL;
+ filelist = g_list_next (filelist))
+ {
+ if ((file = filelist->data))
+ {
+ for (filenamelist = file->FileNameList; filenamelist != NULL;
+ filenamelist = g_list_next (filenamelist))
+ {
+ File_Name *FileName = (File_Name *)filenamelist->data;
+
+ if ( FileName && (filename=FileName->value) )
+ {
+ // Replace path of filename
+ if ( strncmp(filename,last_path_tmp,strlen(last_path_tmp))==0 )
+ {
+ gchar *filename_tmp;
+
+ // Create the new filename
+ filename_tmp = g_strconcat(new_path,
+ (new_path[strlen(new_path)-1]==G_DIR_SEPARATOR) ? "" :
G_DIR_SEPARATOR_S,
+ &filename[strlen(last_path_tmp)],NULL);
+
+ /* Replace the filename (in file system encoding). */
+ g_free(FileName->value);
+ FileName->value = filename_tmp;
+ /* Replace the filename (in file system encoding). */
+ g_free(FileName->value_utf8);
+ FileName->value_utf8 = filename_to_display(FileName->value);
+ // Recalculate the collate key
+ g_free(FileName->value_ck);
+ FileName->value_ck = g_utf8_collate_key_for_filename(FileName->value_utf8, -1);
+ }
+ }
+ }
+ }
+ }
+
+ g_free(last_path_tmp);
+}
+
+/*
+ * Execute one 'undo' in the main undo list (it selects the last ETFile changed,
+ * before to apply an undo action)
+ */
+ET_File *
+ET_Undo_History_File_Data (void)
+{
+ ET_File *ETFile;
+ const ET_History_File *ETHistoryFile;
+
+ g_return_val_if_fail (ETCore->ETHistoryFileList != NULL ||
+ ET_History_File_List_Has_Undo_Data (), NULL);
+
+ ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->data;
+ ETFile = (ET_File *)ETHistoryFile->ETFile;
+ ET_Displayed_File_List_By_Etfile(ETFile);
+ ET_Undo_File_Data(ETFile);
+
+ if (ETCore->ETHistoryFileList->prev)
+ ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->prev;
+ return ETFile;
+}
+
+/*
+ * Returns TRUE if undo file list contains undo data
+ */
+gboolean
+ET_History_File_List_Has_Undo_Data (void)
+{
+ if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->prev)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+
+/*
+ * Execute one 'redo' in the main undo list
+ */
+ET_File *
+ET_Redo_History_File_Data (void)
+{
+ ET_File *ETFile;
+ ET_History_File *ETHistoryFile;
+
+ if (!ETCore->ETHistoryFileList || !ET_History_File_List_Has_Redo_Data()) return NULL;
+
+ ETHistoryFile = (ET_History_File *)ETCore->ETHistoryFileList->next->data;
+ ETFile = (ET_File *)ETHistoryFile->ETFile;
+ ET_Displayed_File_List_By_Etfile(ETFile);
+ ET_Redo_File_Data(ETFile);
+
+ if (ETCore->ETHistoryFileList->next)
+ ETCore->ETHistoryFileList = ETCore->ETHistoryFileList->next;
+ return ETFile;
+}
+
+
+/*
+ * Returns TRUE if undo file list contains redo data
+ */
+gboolean ET_History_File_List_Has_Redo_Data (void)
+{
+ if (ETCore->ETHistoryFileList && ETCore->ETHistoryFileList->next)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+/*
+* - * Add a ETFile item to the main undo list of files
+* - */
+gboolean
+ET_Add_File_To_History_List (ET_File *ETFile)
+{
+ ET_History_File *ETHistoryFile;
+
+ g_return_val_if_fail (ETFile != NULL, FALSE);
+
+ ETHistoryFile = g_slice_new0 (ET_History_File);
+ ETHistoryFile->ETFile = ETFile;
+
+ /* The undo list must contains one item before the 'first undo' data */
+ if (!ETCore->ETHistoryFileList)
+ {
+ ETCore->ETHistoryFileList = g_list_append (ETCore->ETHistoryFileList,
+ g_slice_new0 (ET_History_File));
+ }
+
+ /* Add the item to the list (cut end of list from the current element) */
+ ETCore->ETHistoryFileList = g_list_append(ETCore->ETHistoryFileList,ETHistoryFile);
+ ETCore->ETHistoryFileList = g_list_last(ETCore->ETHistoryFileList);
+
+ return TRUE;
+}
+/*
+ * Ckecks if some files, in the list, had been changed but not saved.
+ * Returns TRUE if all files have been saved.
+ * Returns FALSE if some changes haven't been saved.
+ */
+gboolean
+ET_Check_If_All_Files_Are_Saved (void)
+{
+ /* Check if some files haven't been saved, if didn't nochange=0 */
+ if (!ETCore->ETFileList)
+ {
+ return TRUE;
+ }else
+ {
+ GList *l;
+
+ for (l = g_list_first (ETCore->ETFileList); l != NULL;
+ l = g_list_next (l))
+ {
+ if (ET_Check_If_File_Is_Saved ((ET_File *)l->data) == FALSE)
+ return FALSE;
+ }
+ return TRUE;
+ }
+}
+
+/*
+ * Returns the number of file in the directory of the selected file.
+ * Parameter "path" should be in UTF-8
+ */
+guint
+ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8)
+{
+ gchar *path_key;
+ GList *l;
+ guint count = 0;
+
+ g_return_val_if_fail (path_utf8 != NULL, count);
+
+ path_key = g_utf8_collate_key (path_utf8, -1);
+
+ for (l = g_list_first (ETCore->ETFileList); l != NULL; l = g_list_next (l))
+ {
+ ET_File *ETFile = (ET_File *)l->data;
+ const gchar *cur_filename_utf8 = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value_utf8;
+ gchar *dirname_utf8 = g_path_get_dirname(cur_filename_utf8);
+ gchar *dirname_key = g_utf8_collate_key (dirname_utf8, -1);
+
+ if (strcmp (dirname_utf8, path_utf8) == 0)
+ {
+ count++;
+ }
+
+ g_free (dirname_utf8);
+ g_free (dirname_key);
+ }
+
+ g_free (path_key);
+
+ return count;
+}
diff --git a/src/file_list.h b/src/file_list.h
new file mode 100644
index 0000000..be7ba20
--- /dev/null
+++ b/src/file_list.h
@@ -0,0 +1,65 @@
+/* EasyTAG - tag editor for audio files
+ * Copyright (C) 2014 David King <amigadave amigadave com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef ET_FILE_LIST_H_
+#define ET_FILE_LIST_H_
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include "file.h"
+#include "file_tag.h"
+#include "setting.h"
+
+GList * ET_Add_File_To_File_List (gchar *filename);
+gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
+gboolean ET_Free_File_List (void);
+
+gboolean ET_Create_Artist_Album_File_List (void);
+gboolean ET_Free_Artist_Album_File_List (void);
+gboolean ET_Remove_File_From_File_List (ET_File *ETFile);
+
+gboolean ET_Check_If_All_Files_Are_Saved (void);
+
+GList * ET_Displayed_File_List_First (void);
+GList * ET_Displayed_File_List_Previous (void);
+GList * ET_Displayed_File_List_Next (void);
+GList * ET_Displayed_File_List_Last (void);
+GList * ET_Displayed_File_List_By_Etfile (const ET_File *ETFile);
+
+gboolean ET_Set_Displayed_File_List (GList *ETFileList);
+gboolean ET_Free_Displayed_File_List (void);
+
+gboolean ET_Add_File_To_History_List (ET_File *ETFile);
+ET_File * ET_Undo_History_File_Data (void);
+ET_File * ET_Redo_History_File_Data (void);
+gboolean ET_History_File_List_Has_Undo_Data (void);
+gboolean ET_History_File_List_Has_Redo_Data (void);
+gboolean ET_Free_History_File_List (void);
+
+void ET_Update_Directory_Name_Into_File_List (const gchar *last_path, const gchar *new_path);
+guint ET_Get_Number_Of_Files_In_Directory (const gchar *path_utf8);
+
+GList *ET_Sort_File_List (GList *ETFileList, EtSortMode Sorting_Type);
+void ET_Sort_Displayed_File_List (EtSortMode Sorting_Type);
+void ET_Sort_Displayed_File_List_And_Update_UI (EtSortMode Sorting_Type);
+
+G_END_DECLS
+
+#endif /* !ET_FILE_H_ */
diff --git a/src/scan_dialog.h b/src/scan_dialog.h
index 4784ced..4819d86 100644
--- a/src/scan_dialog.h
+++ b/src/scan_dialog.h
@@ -21,12 +21,13 @@
#ifndef ET_SCAN_DIALOG_H_
#define ET_SCAN_DIALOG_H_
-#include "et_core.h"
-
#include <gtk/gtk.h>
G_BEGIN_DECLS
+#include "file.h"
+#include "setting.h"
+
#define ET_TYPE_SCAN_DIALOG (et_scan_dialog_get_type ())
#define ET_SCAN_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), ET_TYPE_SCAN_DIALOG, EtScanDialog))
diff --git a/src/tag_area.c b/src/tag_area.c
index a34a639..d6ea9ef 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -25,7 +25,7 @@
#include "application_window.h"
#include "charset.h"
#include "easytag.h"
-#include "et_core.h"
+#include "file_list.h"
#include "genres.h"
#include "log.h"
#include "misc.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
