Multiple caches

diff --git a/videocache/videocache.py b/videocache/videocache.py
index b13309b..f2cab26 100755
--- a/videocache/videocache.py
+++ b/videocache/videocache.py
@@ -311,8 +311,9 @@ def get_cache_size(cache_dir):
     """
     # Initialize with 4096bytes as the size of an empty dir is 4096bytes.
     size = 4096
+    pid = os.getpid()
     if not os.path.isdir(cache_dir):
-        log(format%(os.getpid(), '-', '-', 'CACHE_DIR_ERR', cache_dir, 'Not a directory.'))
+        log(format%(pid, '-', '-', 'CACHE_DIR_ERR', cache_dir, 'Not a directory.'))
         return -1
     try:
         for dir in os.listdir(cache_dir):
@@ -321,9 +322,9 @@ def get_cache_size(cache_dir):
                 for file in os.listdir(dir):
                     size += int(os.stat(os.path.join(dir, file))[6])
             else:
-                log(format%(os.getpid(), '-', '-', 'CACHE_DIR_ERR', os.path.join(cache_dir, dir), 'Not a directory.'))
+                log(format%(pid, '-', '-', 'CACHE_DIR_ERR', dir, 'Not a directory (2).'))
     except:
-        log(format%(os.getpid(), '-', '-', 'CACHE_SIZE_ERR', cache_dir, 'Error occurred while calculating the size of directory.'))
+        log(format%(pid, '-', '-', 'CACHE_SIZE_ERR', cache_dir, 'Error occurred while calculating the size of directory.'))
         return -1
     return size / (1024*1024)
 
@@ -383,7 +384,7 @@ def download_from_source(args):
         return
 
     # Check if we have enough disk space left to download more videos. 
-    if cache_size != 0 and get_cache_size(cache_dir) >= cache_size:
+    if cache_size != 0 and get_cache_size(os.path.dirname(cache_dir.rstrip('/'))) >= cache_size:
         log(format%(pid, client, video_id, 'CACHE_FULL', type, 'Cache directory \'' + cache_dir + '\' has exceeded the maximum size allowed.'))
         remove(video_id)
         return
@@ -491,13 +492,13 @@ def cache_video(client, url, type, video_id):
                 disk_stat = os.statvfs(cache_dir)
                 disk_available = disk_stat[statvfs.F_BSIZE] * disk_stat[statvfs.F_BAVAIL] / (1024*1024.0)
                 # If cache_size is not 0 and the cache directory size is more than cache_size, we are done with this cache directory.
-                if cache_size != 0 and get_cache_size(cache_dir) >= cache_size:
-                    log(format%(pid, client, video_id, 'CACHE_FULL', type, 'Cache directory \'' + cache_dir + '\' has exceeded the maximum size allowed.'))
+                if cache_size != 0 and get_cache_size(base_tup[0]) >= cache_size:
+                    log(format%(pid, client, video_id, 'CACHE_FULL', type, 'Cache directory \'' + base_tup[0] + '\' has exceeded the maximum size allowed.'))
                     # Check next cache directory
                     continue
                 # If disk availability reached disk_avail_threshold, then we can't use this cache anymore.
                 elif disk_available < disk_avail_threshold:
-                    log(format%(pid, client, video_id, 'CACHE_FULL', type, 'Cache directory \'' + cache_dir + '\' has reached the disk availability threshold.'))
+                    log(format%(pid, client, video_id, 'CACHE_FULL', type, 'Cache directory \'' + base_tup[0] + '\' has reached the disk availability threshold.'))
                     # Check next cache directory
                     continue
                 else: