GitHub PullRequestEvent at 2014-12-28 08:40:40
Repository: ampache
Actor: Afterster
Payload: {"action":"closed","number":631,"pull_request":{"url":"https://api.github.com/repos/ampache/ampache/pulls/631","id":26570877,"html_url":"https://github.com/ampache/ampache/pull/631","diff_url":"https://github.com/ampache/ampache/pull/631.diff","patch_url":"https://github.com/ampache/ampache/pull/631.patch","issue_url":"https://api.github.com/repos/ampache/ampache/issues/631","number":631,"state":"closed","locked":false,"title":"Fix multiple genre processing.","user":{"login":"lotan","id":1488049,"avatar_url":"https://avatars.githubusercontent.com/u/1488049?v=3","gravatar_id":"","url":"https://api.github.com/users/lotan","html_url":"https://github.com/lotan","followers_url":"https://api.github.com/users/lotan/followers","following_url":"https://api.github.com/users/lotan/following{/other_user}","gists_url":"https://api.github.com/users/lotan/gists{/gist_id}","starred_url":"https://api.github.com/users/lotan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lotan/subscriptions","organizations_url":"https://api.github.com/users/lotan/orgs","repos_url":"https://api.github.com/users/lotan/repos","events_url":"https://api.github.com/users/lotan/events{/privacy}","received_events_url":"https://api.github.com/users/lotan/received_events","type":"User","site_admin":false},"body":"This isn't really a fix for ampache but for getid3 and I'll try to bring it upstream.\r\n\r\nTo me, the multiple genre processing is wrong because it tries to merge genre arrays together (using function array_merge_noclobber) on the basis of their index, not their content.\r\n\r\nFor example:\r\n```\r\n   [0] -> 'Trance'\r\n```\r\nmerged with \r\n```\r\n   [0] -> 'Rock'\r\n```\r\nresults in\r\n```\r\n   [0] -> 'Trance'\r\n```\r\nbecause the index is the same. But really, the content should be compared and added if not in the array yet, like this:\r\n```\r\n   [0] -> 'Trance',\r\n   [1] -> 'Rock'\r\n```\r\nSo I added a new merge function that should do that merge properly.\r\n\r\nThis in turn makes the workaround for multiple genres in ampache redundant.","created_at":"2014-12-25T00:19:43Z","updated_at":"2014-12-28T08:40:40Z","closed_at":"2014-12-28T08:40:40Z","merged_at":null,"merge_commit_sha":"97aa4a87504cb6111ec1433203a0937bcc4d2210","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/ampache/ampache/pulls/631/commits","review_comments_url":"https://api.github.com/repos/ampache/ampache/pulls/631/comments","review_comment_url":"https://api.github.com/repos/ampache/ampache/pulls/comments/{number}","comments_url":"https://api.github.com/repos/ampache/ampache/issues/631/comments","statuses_url":"https://api.github.com/repos/ampache/ampache/statuses/a37769f4785e79c32fb49b9218c3f5d084c41ad2","head":{"label":"lotan:develop","ref":"develop","sha":"a37769f4785e79c32fb49b9218c3f5d084c41ad2","user":{"login":"lotan","id":1488049,"avatar_url":"https://avatars.githubusercontent.com/u/1488049?v=3","gravatar_id":"","url":"https://api.github.com/users/lotan","html_url":"https://github.com/lotan","followers_url":"https://api.github.com/users/lotan/followers","following_url":"https://api.github.com/users/lotan/following{/other_user}","gists_url":"https://api.github.com/users/lotan/gists{/gist_id}","starred_url":"https://api.github.com/users/lotan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lotan/subscriptions","organizations_url":"https://api.github.com/users/lotan/orgs","repos_url":"https://api.github.com/users/lotan/repos","events_url":"https://api.github.com/users/lotan/events{/privacy}","received_events_url":"https://api.github.com/users/lotan/received_events","type":"User","site_admin":false},"repo":{"id":27997621,"name":"ampache","full_name":"lotan/ampache","owner":{"login":"lotan","id":1488049,"avatar_url":"https://avatars.githubusercontent.com/u/1488049?v=3","gravatar_id":"","url":"https://api.github.com/users/lotan","html_url":"https://github.com/lotan","followers_url":"https://api.github.com/users/lotan/followers","following_url":"https://api.github.com/users/lotan/following{/other_user}","gists_url":"https://api.github.com/users/lotan/gists{/gist_id}","starred_url":"https://api.github.com/users/lotan/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lotan/subscriptions","organizations_url":"https://api.github.com/users/lotan/orgs","repos_url":"https://api.github.com/users/lotan/repos","events_url":"https://api.github.com/users/lotan/events{/privacy}","received_events_url":"https://api.github.com/users/lotan/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/lotan/ampache","description":"A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.","fork":true,"url":"https://api.github.com/repos/lotan/ampache","forks_url":"https://api.github.com/repos/lotan/ampache/forks","keys_url":"https://api.github.com/repos/lotan/ampache/keys{/key_id}","collaborators_url":"https://api.github.com/repos/lotan/ampache/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/lotan/ampache/teams","hooks_url":"https://api.github.com/repos/lotan/ampache/hooks","issue_events_url":"https://api.github.com/repos/lotan/ampache/issues/events{/number}","events_url":"https://api.github.com/repos/lotan/ampache/events","assignees_url":"https://api.github.com/repos/lotan/ampache/assignees{/user}","branches_url":"https://api.github.com/repos/lotan/ampache/branches{/branch}","tags_url":"https://api.github.com/repos/lotan/ampache/tags","blobs_url":"https://api.github.com/repos/lotan/ampache/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/lotan/ampache/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/lotan/ampache/git/refs{/sha}","trees_url":"https://api.github.com/repos/lotan/ampache/git/trees{/sha}","statuses_url":"https://api.github.com/repos/lotan/ampache/statuses/{sha}","languages_url":"https://api.github.com/repos/lotan/ampache/languages","stargazers_url":"https://api.github.com/repos/lotan/ampache/stargazers","contributors_url":"https://api.github.com/repos/lotan/ampache/contributors","subscribers_url":"https://api.github.com/repos/lotan/ampache/subscribers","subscription_url":"https://api.github.com/repos/lotan/ampache/subscription","commits_url":"https://api.github.com/repos/lotan/ampache/commits{/sha}","git_commits_url":"https://api.github.com/repos/lotan/ampache/git/commits{/sha}","comments_url":"https://api.github.com/repos/lotan/ampache/comments{/number}","issue_comment_url":"https://api.github.com/repos/lotan/ampache/issues/comments/{number}","contents_url":"https://api.github.com/repos/lotan/ampache/contents/{+path}","compare_url":"https://api.github.com/repos/lotan/ampache/compare/{base}...{head}","merges_url":"https://api.github.com/repos/lotan/ampache/merges","archive_url":"https://api.github.com/repos/lotan/ampache/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/lotan/ampache/downloads","issues_url":"https://api.github.com/repos/lotan/ampache/issues{/number}","pulls_url":"https://api.github.com/repos/lotan/ampache/pulls{/number}","milestones_url":"https://api.github.com/repos/lotan/ampache/milestones{/number}","notifications_url":"https://api.github.com/repos/lotan/ampache/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/lotan/ampache/labels{/name}","releases_url":"https://api.github.com/repos/lotan/ampache/releases{/id}","created_at":"2014-12-14T14:58:28Z","updated_at":"2014-12-24T23:56:19Z","pushed_at":"2014-12-24T23:56:19Z","git_url":"git://github.com/lotan/ampache.git","ssh_url":"git@github.com:lotan/ampache.git","clone_url":"https://github.com/lotan/ampache.git","svn_url":"https://github.com/lotan/ampache","homepage":"http://ampache.org","size":97120,"stargazers_count":0,"watchers_count":0,"language":"PHP","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"ampache:develop","ref":"develop","sha":"ed70ccffbc33995415fc2104f374a53a0eee1e27","user":{"login":"ampache","id":3933051,"avatar_url":"https://avatars.githubusercontent.com/u/3933051?v=3","gravatar_id":"","url":"https://api.github.com/users/ampache","html_url":"https://github.com/ampache","followers_url":"https://api.github.com/users/ampache/followers","following_url":"https://api.github.com/users/ampache/following{/other_user}","gists_url":"https://api.github.com/users/ampache/gists{/gist_id}","starred_url":"https://api.github.com/users/ampache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ampache/subscriptions","organizations_url":"https://api.github.com/users/ampache/orgs","repos_url":"https://api.github.com/users/ampache/repos","events_url":"https://api.github.com/users/ampache/events{/privacy}","received_events_url":"https://api.github.com/users/ampache/received_events","type":"Organization","site_admin":false},"repo":{"id":8933498,"name":"ampache","full_name":"ampache/ampache","owner":{"login":"ampache","id":3933051,"avatar_url":"https://avatars.githubusercontent.com/u/3933051?v=3","gravatar_id":"","url":"https://api.github.com/users/ampache","html_url":"https://github.com/ampache","followers_url":"https://api.github.com/users/ampache/followers","following_url":"https://api.github.com/users/ampache/following{/other_user}","gists_url":"https://api.github.com/users/ampache/gists{/gist_id}","starred_url":"https://api.github.com/users/ampache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ampache/subscriptions","organizations_url":"https://api.github.com/users/ampache/orgs","repos_url":"https://api.github.com/users/ampache/repos","events_url":"https://api.github.com/users/ampache/events{/privacy}","received_events_url":"https://api.github.com/users/ampache/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ampache/ampache","description":"A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device.","fork":false,"url":"https://api.github.com/repos/ampache/ampache","forks_url":"https://api.github.com/repos/ampache/ampache/forks","keys_url":"https://api.github.com/repos/ampache/ampache/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ampache/ampache/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ampache/ampache/teams","hooks_url":"https://api.github.com/repos/ampache/ampache/hooks","issue_events_url":"https://api.github.com/repos/ampache/ampache/issues/events{/number}","events_url":"https://api.github.com/repos/ampache/ampache/events","assignees_url":"https://api.github.com/repos/ampache/ampache/assignees{/user}","branches_url":"https://api.github.com/repos/ampache/ampache/branches{/branch}","tags_url":"https://api.github.com/repos/ampache/ampache/tags","blobs_url":"https://api.github.com/repos/ampache/ampache/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ampache/ampache/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ampache/ampache/git/refs{/sha}","trees_url":"https://api.github.com/repos/ampache/ampache/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ampache/ampache/statuses/{sha}","languages_url":"https://api.github.com/repos/ampache/ampache/languages","stargazers_url":"https://api.github.com/repos/ampache/ampache/stargazers","contributors_url":"https://api.github.com/repos/ampache/ampache/contributors","subscribers_url":"https://api.github.com/repos/ampache/ampache/subscribers","subscription_url":"https://api.github.com/repos/ampache/ampache/subscription","commits_url":"https://api.github.com/repos/ampache/ampache/commits{/sha}","git_commits_url":"https://api.github.com/repos/ampache/ampache/git/commits{/sha}","comments_url":"https://api.github.com/repos/ampache/ampache/comments{/number}","issue_comment_url":"https://api.github.com/repos/ampache/ampache/issues/comments/{number}","contents_url":"https://api.github.com/repos/ampache/ampache/contents/{+path}","compare_url":"https://api.github.com/repos/ampache/ampache/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ampache/ampache/merges","archive_url":"https://api.github.com/repos/ampache/ampache/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ampache/ampache/downloads","issues_url":"https://api.github.com/repos/ampache/ampache/issues{/number}","pulls_url":"https://api.github.com/repos/ampache/ampache/pulls{/number}","milestones_url":"https://api.github.com/repos/ampache/ampache/milestones{/number}","notifications_url":"https://api.github.com/repos/ampache/ampache/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ampache/ampache/labels{/name}","releases_url":"https://api.github.com/repos/ampache/ampache/releases{/id}","created_at":"2013-03-21T16:42:53Z","updated_at":"2014-12-28T08:39:01Z","pushed_at":"2014-12-28T08:38:59Z","git_url":"git://github.com/ampache/ampache.git","ssh_url":"git@github.com:ampache/ampache.git","clone_url":"https://github.com/ampache/ampache.git","svn_url":"https://github.com/ampache/ampache","homepage":"http://ampache.org","size":102343,"stargazers_count":740,"watchers_count":740,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":136,"mirror_url":null,"open_issues_count":97,"forks":136,"open_issues":97,"watchers":740,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/ampache/ampache/pulls/631"},"html":{"href":"https://github.com/ampache/ampache/pull/631"},"issue":{"href":"https://api.github.com/repos/ampache/ampache/issues/631"},"comments":{"href":"https://api.github.com/repos/ampache/ampache/issues/631/comments"},"review_comments":{"href":"https://api.github.com/repos/ampache/ampache/pulls/631/comments"},"review_comment":{"href":"https://api.github.com/repos/ampache/ampache/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/ampache/ampache/pulls/631/commits"},"statuses":{"href":"https://api.github.com/repos/ampache/ampache/statuses/a37769f4785e79c32fb49b9218c3f5d084c41ad2"}},"merged":false,"mergeable":true,"mergeable_state":"clean","merged_by":null,"comments":2,"review_comments":0,"commits":3,"additions":17,"deletions":17,"changed_files":3}}