Switch to unified view

a/src/common/rclconfig.h b/src/common/rclconfig.h
...
...
42
class ParamStale {
42
class ParamStale {
43
public:
43
public:
44
    RclConfig *parent;
44
    RclConfig *parent;
45
    ConfNull  *conffile;
45
    ConfNull  *conffile;
46
    string    paramname;
46
    string    paramname;
47
    bool      active; // Check at init if config defines name at all
47
    int       savedkeydirgen;
48
    int       savedkeydirgen;
48
    string    savedvalue;
49
    string    savedvalue;
49
50
50
    void init(RclConfig *rconf, ConfNull *cnf, const string& nm);
51
    void init(RclConfig *rconf, ConfNull *cnf, const string& nm);
51
    bool needrecompute();
52
    bool needrecompute();
53
};
54
55
// Hold the description for an external metadata-gathering command
56
struct MDReaper {
57
  string fieldname;
58
  vector<string> cmdv;
52
};
59
};
53
60
54
// Data associated to a indexed field name: 
61
// Data associated to a indexed field name: 
55
struct FieldTraits {
62
struct FieldTraits {
56
    string pfx; // indexing prefix, 
63
    string pfx; // indexing prefix, 
...
...
242
    /** Check if mime type is designated as needing no uncompress before view
249
    /** Check if mime type is designated as needing no uncompress before view
243
     * (if a file of this type is found compressed). Default is true,
250
     * (if a file of this type is found compressed). Default is true,
244
     *  exceptions are found in the nouncompforviewmts mimeview list */
251
     *  exceptions are found in the nouncompforviewmts mimeview list */
245
    bool mimeViewerNeedsUncomp(const string &mimetype) const;
252
    bool mimeViewerNeedsUncomp(const string &mimetype) const;
246
253
254
    /** Retrieve extra metadata-gathering commands */
255
    const vector<MDReaper>& getMDReapers();
256
247
    /** Store/retrieve missing helpers description string */
257
    /** Store/retrieve missing helpers description string */
248
    bool getMissingHelperDesc(string&) const;
258
    bool getMissingHelperDesc(string&) const;
249
    void storeMissingHelperDesc(const string &s);
259
    void storeMissingHelperDesc(const string &s);
250
260
251
    /** Find exec file for external filter. cmd is the command name from the
261
    /** Find exec file for external filter. cmd is the command name from the
...
...
317
    // Limiting set of mime types to be processed. Normally empty.
327
    // Limiting set of mime types to be processed. Normally empty.
318
    ParamStale    m_rmtstate;
328
    ParamStale    m_rmtstate;
319
    set<string>   m_restrictMTypes; 
329
    set<string>   m_restrictMTypes; 
320
    vector<pair<int, int> > m_thrConf;
330
    vector<pair<int, int> > m_thrConf;
321
331
332
    // Same idea with the metadata-gathering external commands,
333
    // (e.g. used to reap tagging info: "tmsu tags %f")
334
    ParamStale    m_mdrstate;
335
    vector<MDReaper> m_mdreapers;
336
322
    /** Create initial user configuration */
337
    /** Create initial user configuration */
323
    bool initUserConfig();
338
    bool initUserConfig();
324
    /** Copy from other */
339
    /** Copy from other */
325
    void initFrom(const RclConfig& r);
340
    void initFrom(const RclConfig& r);
326
    /** Init pointers to 0 */
341
    /** Init pointers to 0 */