Changeset 24035

Timestamp:

10/03/13 09:08:09 (9 years ago)

Author:

nit

Message:

[titan] first step for more then one pluginpath

Location:

titan

Files:

• plugins/catcatch/catcatch.c (modified) (1 diff)
• titan/global.h (modified) (2 diffs)
• titan/plugin.h (modified) (3 diffs)
• titan/skin.h (modified) (1 diff)

titan/plugins/catcatch/catcatch.c

@@ -23 +23 @@
         char* tmpstr = NULL;
 
-        tmpstr = ostrcat(getconfig("pluginpath", NULL), "/catcatch/skin.xml", 0, 0);
+        tmpstr = createpluginpath("/catcatch/skin.xml", 0);
         readscreen(tmpstr, 241, 1);
         free(tmpstr); tmpstr = NULL;

titan/titan/global.h

@@ -1 +1 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
+
+//flag 0: get pluginpath an add text
+//flag 1: get pluginpath and change "%pluginpath%/"
+char* createpluginpath(char* text, int flag)
+{
+        char* tmpstr = NULL;
+        if(text == NULL) return NULL;
+        
+        if(flag == 0)
+        {
+          tmpstr = ostrcat(getconfig("pluginpath", NULL), text, 0, 0);
+          if(file_exist(tmpstr) == 1) return tmpstr;
+          
+          free(tmpstr); tmpstr = NULL;
+          tmpstr = ostrcat(getconfig("pluginpath1", NULL), text, 0, 0);
+          if(file_exist(tmpstr) == 1) return tmpstr;
+          
+          free(tmpstr); tmpstr = NULL;
+          tmpstr = ostrcat(getconfig("pluginpath2", NULL), text, 0, 0);
+          if(file_exist(tmpstr) == 1) return tmpstr;
+          
+          return NULL;
+        }
+        else
+        {
+                if(strlen(text) < 13) return NULL;
+                
+                tmpstr = ostrcat(getconfig("pluginpath", NULL), &text[13]);
+                if(file_exist(tmpstr) == 1) return tmpstr;
+                
+                free(tmpstr); tmpstr = NULL;
+                tmpstr = ostrcat(getconfig("pluginpath1", NULL), &text[13]);
+                if(file_exist(tmpstr) == 1) return tmpstr;
+                
+                free(tmpstr); tmpstr = NULL;
+                tmpstr = ostrcat(getconfig("pluginpath2", NULL), &text[13]);
+                if(file_exist(tmpstr) == 1) return tmpstr;
+        }
+        
+        return NULL;
+} 
 
 int osystem(char* cmd, int timeout)
@@ -1692 +1733 @@
 }
 
+//flag 0: normal picons
+//flag 1: alternate picons
 char* createpiconpath(struct channel* chnode, int flag)
 {

titan/titan/plugin.h

@@ -218 +218 @@
         char *tmppath = NULL;
 
+        //pluginpath
         tmppath = getconfig("pluginpath", NULL);
 
@@ -252 +253 @@
         free(filelist);
         
-        
-        // 2. plugindir
-        tmppath = getconfig("pluginpath_2", NULL);
+        //pluginpath1
+        tmppath = getconfig("pluginpath1", NULL);
 
         if(tmppath == NULL)
@@ -262 +262 @@
         if(count < 0)
         {
-                perr("scandir_2");
+                perr("scandir1");
+                return 0;
+        }
+
+        while(count--)
+        {
+                //check if link is a dir
+                if(filelist[count]->d_type == DT_LNK || filelist[count]->d_type == DT_UNKNOWN)
+                {
+                        tmpstr = createpath(tmppath, filelist[count]->d_name);
+                        if(isdir(tmpstr) == 1)
+                                filelist[count]->d_type = DT_DIR;
+
+                        free(tmpstr); tmpstr = NULL;
+                }
+
+                if(filelist[count]->d_type == DT_DIR && ostrcmp(filelist[count]->d_name, ".") != 0 && ostrcmp(filelist[count]->d_name, "..") != 0)
+                {
+                        pluginpath = createpath(tmppath, filelist[count]->d_name);
+                        readplugin(pluginpath);
+                        free(pluginpath); pluginpath = NULL;
+                }
+                free(filelist[count]);
+        }
+        free(filelist);
+        
+        //pluginpath2
+        tmppath = getconfig("pluginpath2", NULL);
+
+        if(tmppath == NULL)
+                return 0;
+
+        count = scandir(tmppath, &filelist, 0, 0);
+        if(count < 0)
+        {
+                perr("scandir2");
                 return 0;
         }

titan/titan/skin.h

@@ -478 +478 @@
         {
                 if(ostrstr(picname, "%pluginpath%/") != NULL)
-                {
-                        tmpstr = createpath(getconfig("pluginpath", NULL), &picname[13]);
-                }
+                        tmpstr = createpluginpath(picname, 1);
                 else
                         tmpstr = createpath(getconfig("skinpath", NULL), picname);