Add btr support to the oggdec filter.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index d67aeae44a8d226866c6fcf1a46c192ea4a15cc7..88a0bd75dcb2ec3a70cd83854827aca3dce9b8a6 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,17 +1,20 @@
 /*
 /*

- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file filter.c The stand-alone filter program. */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file filter.c The stand-alone filter program. */
 

-#include "para.h"
+#include <regex.h>
+#include <stdbool.h>

 
 

+#include "para.h"

 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"

+#include "buffer_tree.h"

 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"


@@ -44,7 +47,8 @@ static struct stdout_task *sot = &stdout_task_struct;
 /** Gengetopt struct that holds the command line args. */
 static struct filter_args_info conf;
 
 /** Gengetopt struct that holds the command line args. */
 static struct filter_args_info conf;
 

-INIT_STDERR_LOGGING(conf.loglevel_arg);
+static int loglevel;
+INIT_STDERR_LOGGING(loglevel);

 
 static void open_filters(void)
 {
 
 static void open_filters(void)
 {


@@ -55,11 +59,20 @@ static void open_filters(void)
                struct filter *f = filters + fn->filter_num;
                f->open(fn);
                PARA_INFO_LOG("opened %s filter\n", f->name);
                struct filter *f = filters + fn->filter_num;
                f->open(fn);
                PARA_INFO_LOG("opened %s filter\n", f->name);

-               fc->outbuf = fn->buf;
+               fc->outbufp = &fn->buf;

                fc->out_loaded = &fn->loaded;
        }
 }
 
                fc->out_loaded = &fn->loaded;
        }
 }
 

+static void free_filter_confs(void)
+{
+       int i;
+       struct filter_node *fn;
+
+       FOR_EACH_FILTER_NODE(fn, fc, i)
+               free(fn->conf);
+}
+

 static int init_filter_chain(void)
 {
        int i, ret;
 static int init_filter_chain(void)
 {
        int i, ret;


@@ -68,13 +81,13 @@ static int init_filter_chain(void)
        if (!conf.filter_given)
                return -E_NO_FILTERS;
        fc->num_filters = conf.filter_given;
        if (!conf.filter_given)
                return -E_NO_FILTERS;
        fc->num_filters = conf.filter_given;

-       fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
-       fc->inbuf = sit->buf;
+       fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
+       fc->inbufp = &sit->buf;

        fc->in_loaded = &sit->loaded;
        fc->input_error = &sit->task.error;
        fc->task.error = 0;
        fc->output_error = &sot->task.error;
        fc->in_loaded = &sit->loaded;
        fc->input_error = &sit->task.error;
        fc->task.error = 0;
        fc->output_error = &sot->task.error;

-       fc->task.pre_select = filter_pre_select;
+       fc->task.post_select = filter_post_select;

        sprintf(fc->task.status, "filter chain");
 
        FOR_EACH_FILTER_NODE(fn, fc, i) {
        sprintf(fc->task.status, "filter chain");
 
        FOR_EACH_FILTER_NODE(fn, fc, i) {


@@ -91,6 +104,7 @@ static int init_filter_chain(void)
        open_filters();
        return 1;
 err:
        open_filters();
        return 1;
 err:

+       free_filter_confs();

        free(fc->filter_nodes);
        return ret;
 }
        free(fc->filter_nodes);
        return ret;
 }


@@ -120,6 +134,7 @@ static int parse_config(int argc, char *argv[])
        HANDLE_VERSION_FLAG("filter", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
        HANDLE_VERSION_FLAG("filter", conf);
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();

+       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        if (!cf) {
                char *home = para_homedir();
                cf = make_message("%s/.paraslash/filter.conf", home);
        if (!cf) {
                char *home = para_homedir();
                cf = make_message("%s/.paraslash/filter.conf", home);


@@ -130,7 +145,8 @@ static int parse_config(int argc, char *argv[])
                        .override = 0,
                        .initialize = 0,
                        .check_required = 0,
                        .override = 0,
                        .initialize = 0,
                        .check_required = 0,

-                       .check_ambiguity = 0
+                       .check_ambiguity = 0,
+                       .print_errors = 1

                };
                if (filter_cmdline_parser_config_file(cf, &conf, &params))
                        return -E_FILTER_SYNTAX;
                };
                if (filter_cmdline_parser_config_file(cf, &conf, &params))
                        return -E_FILTER_SYNTAX;


@@ -138,6 +154,51 @@ static int parse_config(int argc, char *argv[])
        return 1;
 }
 
        return 1;
 }
 

+/* TODO: support more than one filter, actually parse options */
+static int __noreturn main_btr(void)
+{
+       static struct sched s;
+       int i, ret;
+       struct filter *f;
+       struct btr_node *parent;
+
+       sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
+       stdin_set_defaults(sit);
+       register_task(&sit->task);
+
+       for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
+               char *fa = conf.filter_arg[i];
+               struct filter_node *fn = para_calloc(sizeof(*fn));
+
+               ret = check_filter_arg(fa, &fn->conf);
+               if (ret < 0) {
+                       free(fn);
+                       goto err;
+               }
+               fn->filter_num = ret;
+               f = filters + fn->filter_num;
+               sprintf(fn->task.status, "%s", f->name);
+               PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
+               fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+               fn->task.pre_select = f->pre_select;
+               fn->task.post_select = f->post_select;
+               f->open(fn);
+               register_task(&fn->task);
+               parent = fn->btrn;
+       }
+       sot->btrn = btr_new_node("stdout", parent, NULL, NULL);
+       stdout_set_defaults(sot);
+       register_task(&sot->task);
+
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
+       ret = schedule(&s);
+err:
+       if (ret < 0)
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
+}
+

 /**
  * The main function of para_filter.
  *
 /**
  * The main function of para_filter.
  *


@@ -155,29 +216,34 @@ int main(int argc, char *argv[])
        int ret;
        static struct sched s;
 
        int ret;
        static struct sched s;
 

-       stdin_set_defaults(sit);
-       sit->buf = para_malloc(sit->bufsize),
-
-       filter_init(filters);
+       filter_init();

        ret = parse_config(argc, argv);
        if (ret < 0)
                goto out;
        ret = parse_config(argc, argv);
        if (ret < 0)
                goto out;

+       if (conf.buffer_tree_given) {
+               ret = main_btr();
+               goto out;
+       }
+       stdin_set_defaults(sit);
+       sit->buf = para_malloc(sit->bufsize),
+

        ret = init_filter_chain();
        if (ret < 0)
                goto out;
        sit->output_error = &fc->task.error;
 
        stdout_set_defaults(sot);
        ret = init_filter_chain();
        if (ret < 0)
                goto out;
        sit->output_error = &fc->task.error;
 
        stdout_set_defaults(sot);

-       sot->buf = fc->outbuf;
+       sot->bufp = fc->outbufp;

        sot->loaded = fc->out_loaded;
        sot->input_error = &fc->task.error;
 
        register_task(&sit->task);
        sot->loaded = fc->out_loaded;
        sot->input_error = &fc->task.error;
 
        register_task(&sit->task);

-       register_task(&fc->task);

        register_task(&sot->task);
        register_task(&sot->task);

+       register_task(&fc->task);

        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);

+       free_filter_confs();

        close_filters(fc);
 out:
        free(sit->buf);
        close_filters(fc);
 out:
        free(sit->buf);