From 1eea96eefc0e5e9416ef8e60108aecd53b230f0c Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 13 May 2011 13:27:25 -0400
Subject: [PATCH] CC-1799 Put Airtime Storage into a Human Readable File Naming
 Convention

naming convention in fallback order

stor/artist/album/track - title.ext
stor/artist/album/title.ext
stor/artist/album/originalfilename.ext
stor/artist/track - title.ext
stor/artist/title.ext
stor/artist/originalfilename.ext
stor/originalfilename.ext
---
 airtime_mvc/application/models/StoredFile.php | 71 +++++++++++++++++--
 1 file changed, 65 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index d5d4faf80..32ced891d 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -773,6 +773,31 @@ class StoredFile {
         return $rows;
     }
 
+    private function ensureDir($dir)
+    {
+        if (!is_dir($dir)) {
+            mkdir($dir, 02775);
+            chmod($dir, 02775);
+        }
+    }
+
+    private function createUniqueFilename($base, $ext)
+    {
+        if(file_exists("$base.$ext")) {
+            $i = 1;
+            while(true) {
+                if(file_exists("$base($i).$ext")) {
+                    $i = $i+1;
+                }
+                else {
+                    return "$base($i).$ext";
+                }
+            }
+        }
+
+        return "$base.$ext";
+    }
+
     /**
      * Generate the location to store the file.
      * It creates the subdirectory if needed.
@@ -780,14 +805,48 @@ class StoredFile {
     private function generateFilePath()
     {
         global $CC_CONFIG, $CC_DBC;
-        $resDir = $CC_CONFIG['storageDir']."/".substr($this->gunid, 0, 3);
-        if (!is_dir($resDir)) {
-            mkdir($resDir, 02775);
-            chmod($resDir, 02775);
-        }
+
+        $storageDir = $CC_CONFIG['storageDir'];
         $info = pathinfo($this->name);
+        $origName = $info['filename'];
         $fileExt = strtolower($info["extension"]);
-        return "{$resDir}/{$this->gunid}.{$fileExt}";
+
+        $this->loadMetadata();
+
+        $artist = $this->md["dc:creator"];
+        $album = $this->md["dc:source"];
+        $title = $this->md["dc:title"];
+        $track_num = $this->md["ls:track_num"];
+
+        if(isset($artist) && $artist != "") {
+            $base = "$storageDir/$artist";
+            $this->ensureDir($base);
+
+            if(isset($album) && $album != "") {
+                $base = "$base/$album";
+                $this->ensureDir($base);
+            }
+
+            if(isset($title) && $title != "") {
+                if(isset($track_num) && $track_num != "") {
+                    if($track_num < 10 && strlen($track_num) == 1) {
+                        $track_num = "0$track_num";
+                    }
+                    $base = "$base/$track_num - $title";
+                }
+                else {
+                    $base = "$base/$title";
+                }
+            }
+            else {
+                $base = "$base/$origName";
+            }
+        }
+        else {
+            $base = "$storageDir/$origName";
+        }
+
+        return $this->createUniqueFilename($base, $fileExt);
     }
 
     /**