{"action":"created","comment":{"url":"https://api.github.com/repos/mozilla/olympia/pulls/comments/43139235","id":43139235,"diff_hunk":"@@ -91,49 +91,77 @@ class Extractor(object):\n     def parse(cls, path):\n         install_rdf = os.path.join(path, 'install.rdf')\n         package_json = os.path.join(path, 'package.json')\n+        manifest_json = os.path.join(path, 'manifest.json')\n         if os.path.exists(install_rdf):\n             return RDFExtractor(path).data\n         elif os.path.exists(package_json):\n             return PackageJSONExtractor(package_json).parse()\n+        elif os.path.exists(manifest_json):\n+            return ManifestJSONExtractor(manifest_json).parse()\n         else:\n-            raise forms.ValidationError(\"No install.rdf or package.json found\")\n+            raise forms.ValidationError(\n+                \"No install.rdf or package.json or manifest.json found\")\n \n \n-class PackageJSONExtractor(object):\n-    def __init__(self, path):\n+def get_appversions(app, min_version, max_version):\n+    \"\"\"Return the `AppVersion`s that correspond to the given versions.\"\"\"\n+    qs = AppVersion.objects.filter(application=app.id)\n+    min_appver = qs.get(version=min_version)\n+    max_appver = qs.get(version=max_version)\n+    return min_appver, max_appver\n+\n+\n+def get_simple_version(version_string):","path":"apps/files/utils.py","position":27,"original_position":27,"commit_id":"bf5b94cb721771c5c3e14869bdf5344ac949ef05","original_commit_id":"bc48311c87c37ab0d6df9550401937a8bda9a06f","user":{"login":"magopian","id":167767,"avatar_url":"https://avatars.githubusercontent.com/u/167767?v=3","gravatar_id":"","url":"https://api.github.com/users/magopian","html_url":"https://github.com/magopian","followers_url":"https://api.github.com/users/magopian/followers","following_url":"https://api.github.com/users/magopian/following{/other_user}","gists_url":"https://api.github.com/users/magopian/gists{/gist_id}","starred_url":"https://api.github.com/users/magopian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magopian/subscriptions","organizations_url":"https://api.github.com/users/magopian/orgs","repos_url":"https://api.github.com/users/magopian/repos","events_url":"https://api.github.com/users/magopian/events{/privacy}","received_events_url":"https://api.github.com/users/magopian/received_events","type":"User","site_admin":false},"body":"I'm not too keen on using external dependencies for such a simple and basic task. Also, we don't want something too clever, which would extract version number, or worse, fail on badly formed version numbers.","created_at":"2015-10-27T15:38:15Z","updated_at":"2015-10-27T15:38:15Z","html_url":"https://github.com/mozilla/olympia/pull/839#discussion_r43139235","pull_request_url":"https://api.github.com/repos/mozilla/olympia/pulls/839","_links":{"self":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/comments/43139235"},"html":{"href":"https://github.com/mozilla/olympia/pull/839#discussion_r43139235"},"pull_request":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/839"}}},"pull_request":{"url":"https://api.github.com/repos/mozilla/olympia/pulls/839","id":48573806,"html_url":"https://github.com/mozilla/olympia/pull/839","diff_url":"https://github.com/mozilla/olympia/pull/839.diff","patch_url":"https://github.com/mozilla/olympia/pull/839.patch","issue_url":"https://api.github.com/repos/mozilla/olympia/issues/839","number":839,"state":"open","locked":false,"title":"Parse the WebExtension's manifest on submission (bug 1217358)","user":{"login":"magopian","id":167767,"avatar_url":"https://avatars.githubusercontent.com/u/167767?v=3","gravatar_id":"","url":"https://api.github.com/users/magopian","html_url":"https://github.com/magopian","followers_url":"https://api.github.com/users/magopian/followers","following_url":"https://api.github.com/users/magopian/following{/other_user}","gists_url":"https://api.github.com/users/magopian/gists{/gist_id}","starred_url":"https://api.github.com/users/magopian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magopian/subscriptions","organizations_url":"https://api.github.com/users/magopian/orgs","repos_url":"https://api.github.com/users/magopian/repos","events_url":"https://api.github.com/users/magopian/events{/privacy}","received_events_url":"https://api.github.com/users/magopian/received_events","type":"User","site_admin":false},"body":"Fixes [bug 1217358](https://bugzilla.mozilla.org/show_bug.cgi?id=1217358)\n\nTo allow the submission for real, we need [bug 1217810](https://bugzilla.mozilla.org/show_bug.cgi?id=1217810). This PR is only about parsing the new manifest.json format.","created_at":"2015-10-23T12:25:41Z","updated_at":"2015-10-27T15:38:15Z","closed_at":null,"merged_at":null,"merge_commit_sha":"fcc51ea88a4b8c897d5d9da06538484e4a22651d","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/mozilla/olympia/pulls/839/commits","review_comments_url":"https://api.github.com/repos/mozilla/olympia/pulls/839/comments","review_comment_url":"https://api.github.com/repos/mozilla/olympia/pulls/comments{/number}","comments_url":"https://api.github.com/repos/mozilla/olympia/issues/839/comments","statuses_url":"https://api.github.com/repos/mozilla/olympia/statuses/bf5b94cb721771c5c3e14869bdf5344ac949ef05","head":{"label":"magopian:1217358-parse-webextension-manifest-on-submission","ref":"1217358-parse-webextension-manifest-on-submission","sha":"bf5b94cb721771c5c3e14869bdf5344ac949ef05","user":{"login":"magopian","id":167767,"avatar_url":"https://avatars.githubusercontent.com/u/167767?v=3","gravatar_id":"","url":"https://api.github.com/users/magopian","html_url":"https://github.com/magopian","followers_url":"https://api.github.com/users/magopian/followers","following_url":"https://api.github.com/users/magopian/following{/other_user}","gists_url":"https://api.github.com/users/magopian/gists{/gist_id}","starred_url":"https://api.github.com/users/magopian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magopian/subscriptions","organizations_url":"https://api.github.com/users/magopian/orgs","repos_url":"https://api.github.com/users/magopian/repos","events_url":"https://api.github.com/users/magopian/events{/privacy}","received_events_url":"https://api.github.com/users/magopian/received_events","type":"User","site_admin":false},"repo":{"id":17664164,"name":"olympia","full_name":"magopian/olympia","owner":{"login":"magopian","id":167767,"avatar_url":"https://avatars.githubusercontent.com/u/167767?v=3","gravatar_id":"","url":"https://api.github.com/users/magopian","html_url":"https://github.com/magopian","followers_url":"https://api.github.com/users/magopian/followers","following_url":"https://api.github.com/users/magopian/following{/other_user}","gists_url":"https://api.github.com/users/magopian/gists{/gist_id}","starred_url":"https://api.github.com/users/magopian/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/magopian/subscriptions","organizations_url":"https://api.github.com/users/magopian/orgs","repos_url":"https://api.github.com/users/magopian/repos","events_url":"https://api.github.com/users/magopian/events{/privacy}","received_events_url":"https://api.github.com/users/magopian/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/magopian/olympia","description":"AMO, reloaded.","fork":true,"url":"https://api.github.com/repos/magopian/olympia","forks_url":"https://api.github.com/repos/magopian/olympia/forks","keys_url":"https://api.github.com/repos/magopian/olympia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/magopian/olympia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/magopian/olympia/teams","hooks_url":"https://api.github.com/repos/magopian/olympia/hooks","issue_events_url":"https://api.github.com/repos/magopian/olympia/issues/events{/number}","events_url":"https://api.github.com/repos/magopian/olympia/events","assignees_url":"https://api.github.com/repos/magopian/olympia/assignees{/user}","branches_url":"https://api.github.com/repos/magopian/olympia/branches{/branch}","tags_url":"https://api.github.com/repos/magopian/olympia/tags","blobs_url":"https://api.github.com/repos/magopian/olympia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/magopian/olympia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/magopian/olympia/git/refs{/sha}","trees_url":"https://api.github.com/repos/magopian/olympia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/magopian/olympia/statuses/{sha}","languages_url":"https://api.github.com/repos/magopian/olympia/languages","stargazers_url":"https://api.github.com/repos/magopian/olympia/stargazers","contributors_url":"https://api.github.com/repos/magopian/olympia/contributors","subscribers_url":"https://api.github.com/repos/magopian/olympia/subscribers","subscription_url":"https://api.github.com/repos/magopian/olympia/subscription","commits_url":"https://api.github.com/repos/magopian/olympia/commits{/sha}","git_commits_url":"https://api.github.com/repos/magopian/olympia/git/commits{/sha}","comments_url":"https://api.github.com/repos/magopian/olympia/comments{/number}","issue_comment_url":"https://api.github.com/repos/magopian/olympia/issues/comments{/number}","contents_url":"https://api.github.com/repos/magopian/olympia/contents/{+path}","compare_url":"https://api.github.com/repos/magopian/olympia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/magopian/olympia/merges","archive_url":"https://api.github.com/repos/magopian/olympia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/magopian/olympia/downloads","issues_url":"https://api.github.com/repos/magopian/olympia/issues{/number}","pulls_url":"https://api.github.com/repos/magopian/olympia/pulls{/number}","milestones_url":"https://api.github.com/repos/magopian/olympia/milestones{/number}","notifications_url":"https://api.github.com/repos/magopian/olympia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/magopian/olympia/labels{/name}","releases_url":"https://api.github.com/repos/magopian/olympia/releases{/id}","created_at":"2014-03-12T11:05:51Z","updated_at":"2015-04-24T16:05:25Z","pushed_at":"2015-10-27T15:34:47Z","git_url":"git://github.com/magopian/olympia.git","ssh_url":"git@github.com:magopian/olympia.git","clone_url":"https://github.com/magopian/olympia.git","svn_url":"https://github.com/magopian/olympia","homepage":"","size":435518,"stargazers_count":0,"watchers_count":0,"language":"Python","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":"master"}},"base":{"label":"mozilla:master","ref":"master","sha":"be8be0160470946ad27e0d4931ebfb00808164ab","user":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"repo":{"id":16416867,"name":"olympia","full_name":"mozilla/olympia","owner":{"login":"mozilla","id":131524,"avatar_url":"https://avatars.githubusercontent.com/u/131524?v=3","gravatar_id":"","url":"https://api.github.com/users/mozilla","html_url":"https://github.com/mozilla","followers_url":"https://api.github.com/users/mozilla/followers","following_url":"https://api.github.com/users/mozilla/following{/other_user}","gists_url":"https://api.github.com/users/mozilla/gists{/gist_id}","starred_url":"https://api.github.com/users/mozilla/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mozilla/subscriptions","organizations_url":"https://api.github.com/users/mozilla/orgs","repos_url":"https://api.github.com/users/mozilla/repos","events_url":"https://api.github.com/users/mozilla/events{/privacy}","received_events_url":"https://api.github.com/users/mozilla/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mozilla/olympia","description":"addons.mozilla.org, reloaded.","fork":false,"url":"https://api.github.com/repos/mozilla/olympia","forks_url":"https://api.github.com/repos/mozilla/olympia/forks","keys_url":"https://api.github.com/repos/mozilla/olympia/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mozilla/olympia/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mozilla/olympia/teams","hooks_url":"https://api.github.com/repos/mozilla/olympia/hooks","issue_events_url":"https://api.github.com/repos/mozilla/olympia/issues/events{/number}","events_url":"https://api.github.com/repos/mozilla/olympia/events","assignees_url":"https://api.github.com/repos/mozilla/olympia/assignees{/user}","branches_url":"https://api.github.com/repos/mozilla/olympia/branches{/branch}","tags_url":"https://api.github.com/repos/mozilla/olympia/tags","blobs_url":"https://api.github.com/repos/mozilla/olympia/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mozilla/olympia/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mozilla/olympia/git/refs{/sha}","trees_url":"https://api.github.com/repos/mozilla/olympia/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mozilla/olympia/statuses/{sha}","languages_url":"https://api.github.com/repos/mozilla/olympia/languages","stargazers_url":"https://api.github.com/repos/mozilla/olympia/stargazers","contributors_url":"https://api.github.com/repos/mozilla/olympia/contributors","subscribers_url":"https://api.github.com/repos/mozilla/olympia/subscribers","subscription_url":"https://api.github.com/repos/mozilla/olympia/subscription","commits_url":"https://api.github.com/repos/mozilla/olympia/commits{/sha}","git_commits_url":"https://api.github.com/repos/mozilla/olympia/git/commits{/sha}","comments_url":"https://api.github.com/repos/mozilla/olympia/comments{/number}","issue_comment_url":"https://api.github.com/repos/mozilla/olympia/issues/comments{/number}","contents_url":"https://api.github.com/repos/mozilla/olympia/contents/{+path}","compare_url":"https://api.github.com/repos/mozilla/olympia/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mozilla/olympia/merges","archive_url":"https://api.github.com/repos/mozilla/olympia/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mozilla/olympia/downloads","issues_url":"https://api.github.com/repos/mozilla/olympia/issues{/number}","pulls_url":"https://api.github.com/repos/mozilla/olympia/pulls{/number}","milestones_url":"https://api.github.com/repos/mozilla/olympia/milestones{/number}","notifications_url":"https://api.github.com/repos/mozilla/olympia/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mozilla/olympia/labels{/name}","releases_url":"https://api.github.com/repos/mozilla/olympia/releases{/id}","created_at":"2014-01-31T18:44:15Z","updated_at":"2015-10-24T03:17:25Z","pushed_at":"2015-10-27T15:34:47Z","git_url":"git://github.com/mozilla/olympia.git","ssh_url":"git@github.com:mozilla/olympia.git","clone_url":"https://github.com/mozilla/olympia.git","svn_url":"https://github.com/mozilla/olympia","homepage":"https://addons.mozilla.org/","size":486285,"stargazers_count":58,"watchers_count":58,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":115,"mirror_url":null,"open_issues_count":8,"forks":115,"open_issues":8,"watchers":58,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/839"},"html":{"href":"https://github.com/mozilla/olympia/pull/839"},"issue":{"href":"https://api.github.com/repos/mozilla/olympia/issues/839"},"comments":{"href":"https://api.github.com/repos/mozilla/olympia/issues/839/comments"},"review_comments":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/839/comments"},"review_comment":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/mozilla/olympia/pulls/839/commits"},"statuses":{"href":"https://api.github.com/repos/mozilla/olympia/statuses/bf5b94cb721771c5c3e14869bdf5344ac949ef05"}}}}