Drush install broken

Installing with Drush is broken because the library is expected to be at sites/all/libraries/getid3, however it is instead at sites/all/libraries/getid3/getID3-1.9.9.

Rather than extracting directly to sites/all/libraries/getid3 here are the changes I made to first extract to /tmp, then move to sites/all/libraries/getid3, which fixes the issue.

Anyone feel free to roll a patch if you have time.

  /**
   * Download the getID3 library from SourceForge.
   */
  function drush_getid3_download() {
    $args = func_get_args();
    if (!empty($args[0])) {
      $library_path = $args[0];
    }
    else {
      $library_path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries/getid3';
    }

    if (!file_exists($library_path)) {
      // TODO: It would be great if we could use GETID3_RECOMMEND_VERSION.
      $version = '1.9.9';
      $filename = 'getID3-1.9.9-20141218.zip';
+     $directory = 'getID3-1.9.9';
      $md5 = "fc9a902d9ee09b281c4b35926bf00f0b";
      $url = "http://downloads.sourceforge.net/project/getid3/getID3%28%29%201.x/{$version}/{$filename}";

-     // Create the directory.
-     if (!drush_shell_exec('mkdir -p  %s', $library_path)) {
-       return drush_set_error('GETID3_MKDIR', dt('Drush was unable to create the getID3 directory at @path.', array('@path' => $library_path)));
-     }
-     $zipfile_path = $library_path . '/' . $filename;
+     $tmp_path = drush_find_tmp();
+     $zipfile_path = $tmp_path . '/' . $filename;
      drush_register_file_for_deletion($zipfile_path);
      // Download the file.
      if (!drush_shell_exec('wget -O %s %s', $zipfile_path, $url)) {
        return drush_set_error('GETID3_FETCH', dt('Drush was unable to download the getID3 library to @path.', array('@path' => $zipfile_path)));
      }
      // Check MD5 hash.
      if (md5_file($zipfile_path) != $md5) {
        return drush_set_error('GETID3_MD5', dt('The downloaded file @path was corrupted. Expected MD5 checksum: @md5.', array('@path' => $zipfile_path, '@md5' => $md5)));
      }
      // Unzip it the file -- using the "update" option to avoid being prompted
      // about overwriting files.
-     if (!drush_shell_exec('unzip -u %s -d %s', $zipfile_path, $library_path)) {
+     $directory_path = $tmp_path . '/' . $directory;
+     if (!drush_shell_exec('unzip -u %s -d %s', $zipfile_path, $tmp_path) || !drush_move_dir($directory_path, $library_path)) {
        return drush_set_error('GETID3_UNZIP', dt('Drush was unable to unzip the archive @path.', array('@path' => $zipfile_path)));
      }
      // Delete the demos. They're a security risk.
      $demos_path = $library_path . '/demos';
      if (!drush_shell_exec('rm -r %s', $demos_path)) {
        return drush_set_error('GETID3_RM', dt("Drush was unable to remove getID3's demos directory. You should do so manually.", array('@path' => $demos_path)));
      }

      drush_log(dt('getID3 has been installed to @path.', array('@path' => $library_path)), 'success');
    }
    else {
      drush_log(dt('getID3 was already installed to @path.', array('@path' => $library_path)), 'success');
    }
  }