From 46bc59084483bef0761a4c5d5506b978487a96d4 Mon Sep 17 00:00:00 2001
From: Cameron Ball <cameron@getapproved.com.au>
Date: Wed, 26 Nov 2014 11:52:45 +0800
Subject: [PATCH] Misc bugfixes.

---
 Controllers/SimfileController.php                   | 2 +-
 Domain/Entities/StepMania/IPackBuilder.php          | 2 +-
 Domain/Entities/StepMania/PackBuilder.php           | 2 +-
 Domain/Entities/StepMania/PackStepByStepBuilder.php | 4 ++--
 Services/SimfileParser.php                          | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Controllers/SimfileController.php b/Controllers/SimfileController.php
index ecf04b2..28a3061 100644
--- a/Controllers/SimfileController.php
+++ b/Controllers/SimfileController.php
@@ -103,7 +103,7 @@ class SimfileController implements IDivineController
                 //I tried to be clever and call pack() multiple times thinking I was getting the same
                 //object. Should I cache it in zipparser?
                 $pack = $zipParser->pack();
-                $this->_fileRepository->save($pack->getBanner());
+                $packBanner = $pack->getBanner() ? $this->_fileRepository->save($pack->getBanner()) : null;
                 $this->_packRepository->save($pack);
             }
             
diff --git a/Domain/Entities/StepMania/IPackBuilder.php b/Domain/Entities/StepMania/IPackBuilder.php
index d99c53e..546558b 100644
--- a/Domain/Entities/StepMania/IPackBuilder.php
+++ b/Domain/Entities/StepMania/IPackBuilder.php
@@ -10,7 +10,7 @@ interface IPackBuilder
     public function With_Title($title);
     public function With_Uploader(IUser $uploader);
     public function With_Simfiles(array $simfiles);
-    public function With_Banner(IFile $banner);
+    public function With_Banner(IFile $banner = null);
     public function With_File(IFile $file);
     public function build();
 }
\ No newline at end of file
diff --git a/Domain/Entities/StepMania/PackBuilder.php b/Domain/Entities/StepMania/PackBuilder.php
index 3abb934..3e42cc1 100644
--- a/Domain/Entities/StepMania/PackBuilder.php
+++ b/Domain/Entities/StepMania/PackBuilder.php
@@ -29,7 +29,7 @@ class PackBuilder implements IPackBuilder
         return $this;
     }
     
-    public function With_Banner(IFile $banner)
+    public function With_Banner(IFile $banner = null)
     {
         $this->_banner = $banner;
     }
diff --git a/Domain/Entities/StepMania/PackStepByStepBuilder.php b/Domain/Entities/StepMania/PackStepByStepBuilder.php
index 3c02ed1..ac2ed5d 100644
--- a/Domain/Entities/StepMania/PackStepByStepBuilder.php
+++ b/Domain/Entities/StepMania/PackStepByStepBuilder.php
@@ -23,7 +23,7 @@ interface IPackStepByStepBuilder_With_Uploader
 
 interface IPackStepByStepBuilder_With_Simfiles
 {
-    public function With_Banner(IFile $banner);
+    public function With_Banner(IFile $banner = null);
     public function With_File(IFile $file);
     public function build();
 }
@@ -69,7 +69,7 @@ class PackStepByStepBuilder_With_Uploader extends AbstractPackStepByStepBuilder
 
 class PackStepByStepBuilder_With_Simfiles extends AbstractPackStepByStepBuilder implements IPackStepByStepBuilder_With_Simfiles
 {
-    public function With_Banner(IFile $banner)
+    public function With_Banner(IFile $banner = null)
     {
         $this->_packBuilder->With_Banner($banner);
         return $this;
diff --git a/Services/SimfileParser.php b/Services/SimfileParser.php
index b5c0c64..b2438d0 100644
--- a/Services/SimfileParser.php
+++ b/Services/SimfileParser.php
@@ -67,6 +67,7 @@ class SimfileParser implements ISimfileParser
         if($displayBpm)
         {
             $bpmRange = explode(":",$displayBpm);
+            $bpmRange[1] = @$bpmRange[1] ?: $bpmRange[0];
         } else {
             $bpms = $this->extractKey('BPMS');
             $bpmRange = $this->parseBpms($bpms);
-- 
2.11.0