Changeset 16744

Timestamp:

06/20/12 18:40:12 (12 years ago)

Author:

nit

Message:

[titan] fix mediadb scan

File:

• titan/titan/mediadb.h (modified) (10 diffs)

titan/titan/mediadb.h

@@ -423 +423 @@
 }
 
-//flag1 0: with lock
-//flag1 1: without lock
+//flag 0: with lock
+//flag 1: without lock
 struct mediadb* addmediadb(char *line, int len, int count, struct mediadb* last, int sort, int flag)
 {
@@ -1079 +1079 @@
         if(path == NULL)
         {
-                findfiles("/media", type, 0, 0);
+                findfiles("/media", type);
                 /*
                 addhddall();
@@ -1089 +1089 @@
                         {
                                 tmpstr = ostrcat("/autofs/", hddnode->device, 0, 0);
-                                findfiles(tmpstr, type, 1, 0);
+                                findfiles(tmpstr, type);
                                 free(tmpstr); tmpstr = NULL;
                         }
@@ -1097 +1097 @@
         }
         else
-                findfiles(path, type, 0, 0);
+                findfiles(path, type);
 
         writemediadb(getconfig("mediadbfile", NULL));
@@ -1641 +1641 @@
 }
 
-// flag = 0 (rekursive aktive)
-// flag = 1 (rekursive deactive)
-// flag1 = 0 (scan files and start)
-// flag1 = 1 (count files)
-int findfiles(char* dirname, int type, int flag, int flag1)
-{
-        debug(777, "dir=%s type=%d flag=%d flag1=%d\n", dirname, type, flag, flag1);
+//flag: bit 31 = 0 (rekursive), 1 (no recursive)
+//flag: bit 30 = 0 (scan files and start), 1 (count files)
+int findfiles(char* dirname, int flag)
+{
+        int type = flag;
+        int onlydir = checkbit(flag, 31);
+        int onlycount = checkbit(flag, 30);
+
+        type = clearbit(type, 31);
+        type = clearbit(type, 30);
+
+        debug(777, "dir=%s type=%d onlydir=%d, onlycount=%d\n", dirname, type, onlydir, onlycount);
         DIR *d;
         //Open the directory specified by dirname
@@ -1685 +1690 @@
                                 {
                                         err("path length has got too long");
-                                        return 1;
+                                        return -1;
                                 }
                                 //Recursively call findfiles with the new path
-                                if(flag == 0)
-                                        findfiles(path, type, 1, 0);
+                                if(onlydir == 0)
+                                        findfiles(path, type);
                         }
                 }
@@ -1700 +1705 @@
                                 if(type == 0 || type == 100 || type == 90 || type == 91)
                                 {
-                                        if(flag1 == 0)
+                                        if(onlycount == 0)
                                                 mediadbfindfilecb(path, entry->d_name, 0);
                                         else
@@ -1711 +1716 @@
                                 if(type == 1 || type == 100 || type == 90 || type == 92)
                                 {
-                                        if(flag1 == 0)
+                                        if(onlycount == 0)
                                                 mediadbfindfilecb(path, entry->d_name, 1);
                                         else
@@ -1722 +1727 @@
                                 if(type == 2 || type == 100 || type == 91 || type == 92)
                                 {
-                                        if(flag1 == 0)
+                                        if(onlycount == 0)
                                                 mediadbfindfilecb(path, entry->d_name, 2);
                                         else
@@ -1735 +1740 @@
         {
                 perr("Could not close %s", dirname);
-                return 1;
-        }
-
-        if(flag1 == 1)
+                return -1;
+        }
+
+        if(onlycount == 1)
                 return count;
         return 0;