Gerneralize for_each_matching_blob().

[paraslash.git] / afs.h

diff --git a/afs.h b/afs.h
index 9294ccfe6e864aa0ff624aff8e80d4742d622eea..f4f022207790254254b2beaebb4af6608a694f3b 100644 (file)
--- a/afs.h
+++ b/afs.h
@@ -28,37 +28,9 @@ enum afs_table_flags {TBLFLAG_SKIP_CREATE};
 
 struct table_info {
        const struct osl_table_description *desc;
 
 struct table_info {
        const struct osl_table_description *desc;

-       struct osl_table *table;

        enum afs_table_flags flags;
 };
 
        enum afs_table_flags flags;
 };
 

-enum ls_sorting_method {
-       /** -sp (default) */
-       LS_SORT_BY_PATH,
-       /** -ss */
-       LS_SORT_BY_SCORE,
-       /** -sl */
-       LS_SORT_BY_LAST_PLAYED,
-       /** -sn */
-       LS_SORT_BY_NUM_PLAYED,
-       /** -sf */
-       LS_SORT_BY_FREQUENCY,
-       /** -sc */
-       LS_SORT_BY_CHANNELS,
-       /** -si */
-       LS_SORT_BY_IMAGE_ID,
-       /** -sy */
-       LS_SORT_BY_LYRICS_ID,
-       /** -sb */
-       LS_SORT_BY_BITRATE,
-       /** -sd */
-       LS_SORT_BY_DURATION,
-       /** -sa */
-       LS_SORT_BY_AUDIO_FORMAT,
-       /** -sh */
-       LS_SORT_BY_HASH,
-};
-

 enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
 struct audio_file_data {
 enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
 
 struct audio_file_data {


@@ -70,6 +42,23 @@ struct audio_file_data {
        struct osl_object map;
 };
 
        struct osl_object map;
 };
 

+enum pattern_match_flags {
+       PM_REVERSE_LOOP = 1,
+       PM_NO_PATTERN_MATCHES_EVERYTHING = 2,
+       PM_SKIP_EMPTY_NAME = 4,
+};
+
+struct pattern_match_data {
+       struct osl_table *table;
+       unsigned loop_col_num;
+       unsigned match_col_num;
+       unsigned pm_flags;
+       int fnmatch_flags;
+       struct osl_object patterns;
+       void *data;
+       int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
+};
+

 /* afs */
 typedef int callback_function(const struct osl_object *, struct osl_object *);
 __noreturn int afs_init(uint32_t cookie, int socket_fd);
 /* afs */
 typedef int callback_function(const struct osl_object *, struct osl_object *);
 __noreturn int afs_init(uint32_t cookie, int socket_fd);


@@ -86,6 +75,7 @@ int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 int para_atol(const char *str, long *result);
 int open_next_audio_file(struct audio_file_data *afd);
 int close_audio_file(struct audio_file_data *afd);
 int para_atol(const char *str, long *result);
 int open_next_audio_file(struct audio_file_data *afd);
 int close_audio_file(struct audio_file_data *afd);

+int for_each_matching_row(struct pattern_match_data *pmd);

 
 /* score */
 int score_init(struct table_info *ti, const char *db);
 
 /* score */
 int score_init(struct table_info *ti, const char *db);


@@ -126,6 +116,8 @@ void close_current_mood(void);
 int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi);
 int reload_current_mood(void);
 int mood_delete_audio_file(const struct osl_row *aft_row);
 int mood_update_audio_file(const struct osl_row *aft_row, struct afs_info *old_afsi);
 int reload_current_mood(void);
 int mood_delete_audio_file(const struct osl_row *aft_row);

+int mood_check_callback(__a_unused const struct osl_object *query,
+       struct osl_object *result);

 
 
 /* playlist */
 
 
 /* playlist */


@@ -143,7 +135,7 @@ int playlist_check_callback(__a_unused const struct osl_object *query,
        int table_name ## _init(struct table_info *ti, const char *db); \
        void table_name ## _shutdown(enum osl_close_flags flags); \
        int cmd_prefix ## _get_name_by_id(uint32_t id, char **name); \
        int table_name ## _init(struct table_info *ti, const char *db); \
        void table_name ## _shutdown(enum osl_close_flags flags); \
        int cmd_prefix ## _get_name_by_id(uint32_t id, char **name); \

-       int cmd_prefix ## _get_name_and_def_by_row(struct osl_row *row, \
+       int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \

                char **name, struct osl_object *def); \
        extern struct osl_table *table_name ## _table;
 
                char **name, struct osl_object *def); \
        extern struct osl_table *table_name ## _table;
 


@@ -152,7 +144,18 @@ DECLARE_BLOB_SYMBOLS(images, img);
 DECLARE_BLOB_SYMBOLS(moods, mood);
 DECLARE_BLOB_SYMBOLS(playlists, pl);
 
 DECLARE_BLOB_SYMBOLS(moods, mood);
 DECLARE_BLOB_SYMBOLS(playlists, pl);
 

-enum blob_table_columns {BLOBCOL_ID, BLOBCOL_NAME, BLOBCOL_DEF, NUM_BLOB_COLUMNS};
+/** The columns of an abstract blob table. */
+enum blob_table_columns {
+       /** The identifier, a positive integer that never repeats. */
+       BLOBCOL_ID,
+       /** The unique name of the blob. */
+       BLOBCOL_NAME,
+       /** The actual blob contents. */
+       BLOBCOL_DEF,
+       /** A blob table has that many columns. */
+       NUM_BLOB_COLUMNS
+};
+

 #define DEFINE_BLOB_TABLE_DESC(table_name) \
        struct osl_table_description table_name ## _table_desc = { \
                .name = #table_name, \
 #define DEFINE_BLOB_TABLE_DESC(table_name) \
        struct osl_table_description table_name ## _table_desc = { \
                .name = #table_name, \