{"action":"created","comment":{"url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/comments/62713380","id":62713380,"diff_hunk":"@@ -300,37 +337,35 @@ class WorkProcessingScript(IdentifierInputScript):\n     name = \"Work processing script\"\n \n     def __init__(self, force=False, batch_size=10):\n-\n-        identifiers_or_source = self.parse_identifiers_or_data_source()\n+        args = self.parse_command_line(self._db)\n+        identifier_type = args.identifier_type\n         self.batch_size = batch_size\n-        self.query = self.make_query(identifiers_or_source)\n+        self.query = self.make_query(identifier_type, args.identifiers)\n         self.force = force\n \n-    def make_query(self, identifiers):\n+    def make_query(self, identifier_type, identifiers):\n         query = self._db.query(Work)\n-        if not identifiers:\n-            self.log.info(\n-                \"Processing all %d works.\", query.count()\n-            )\n-        elif isinstance(identifiers, DataSource):\n-            # Find all works from the given data source.\n-            query = query.join(Edition).filter(\n-                Edition.data_source==identifiers\n-            )\n+        if identifiers or identifier_type:\n+            query = query.join(Work.license_pools)\n+        if identifiers:\n+            query = query.join(LicensePool.identifier)\n+\n+        if identifiers:\n             self.log.info(\n-                \"Processing %d works from %s\", query.count(),\n-                identifiers.name\n+                'Restricted to %d specific identifiers.' % len(identifiers)\n             )\n-        else:\n-            # Find works with specific identifiers.\n-            query = query.join(Edition).filter(\n-                    Edition.primary_identifier_id.in_(\n-                        [x.id for x in identifiers]\n-                    )\n+            query = query.filter(\n+                LicensePool.identifier_id.in_([x.id for x in identifiers])\n             )\n+        if identifier_type:\n             self.log.info(\n-                \"Processing %d specific works.\" % query.count()\n+                'Restricted to identifier type \"%s\".' % identifier_type\n             )\n+            query = query.filter(Identifier.type==identifier_type)","path":"scripts.py","position":295,"original_position":295,"commit_id":"273393755bdbfe2438cf260fbb7ae20b5a70da77","original_commit_id":"273393755bdbfe2438cf260fbb7ae20b5a70da77","user":{"login":"aslagle","id":3409215,"avatar_url":"https://avatars.githubusercontent.com/u/3409215?v=3","gravatar_id":"","url":"https://api.github.com/users/aslagle","html_url":"https://github.com/aslagle","followers_url":"https://api.github.com/users/aslagle/followers","following_url":"https://api.github.com/users/aslagle/following{/other_user}","gists_url":"https://api.github.com/users/aslagle/gists{/gist_id}","starred_url":"https://api.github.com/users/aslagle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aslagle/subscriptions","organizations_url":"https://api.github.com/users/aslagle/orgs","repos_url":"https://api.github.com/users/aslagle/repos","events_url":"https://api.github.com/users/aslagle/events{/privacy}","received_events_url":"https://api.github.com/users/aslagle/received_events","type":"User","site_admin":false},"body":"Does this work if you haven't joined Identifier?","created_at":"2016-05-10T17:17:44Z","updated_at":"2016-05-10T17:17:44Z","html_url":"https://github.com/NYPL-Simplified/server_core/pull/223#discussion_r62713380","pull_request_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223","_links":{"self":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/comments/62713380"},"html":{"href":"https://github.com/NYPL-Simplified/server_core/pull/223#discussion_r62713380"},"pull_request":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223"}}},"pull_request":{"url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223","id":69541605,"html_url":"https://github.com/NYPL-Simplified/server_core/pull/223","diff_url":"https://github.com/NYPL-Simplified/server_core/pull/223.diff","patch_url":"https://github.com/NYPL-Simplified/server_core/pull/223.patch","issue_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/223","number":223,"state":"open","locked":false,"title":"Start using `argparse` to gather command-line arguments instead of per-script hacks","user":{"login":"leonardr","id":662474,"avatar_url":"https://avatars.githubusercontent.com/u/662474?v=3","gravatar_id":"","url":"https://api.github.com/users/leonardr","html_url":"https://github.com/leonardr","followers_url":"https://api.github.com/users/leonardr/followers","following_url":"https://api.github.com/users/leonardr/following{/other_user}","gists_url":"https://api.github.com/users/leonardr/gists{/gist_id}","starred_url":"https://api.github.com/users/leonardr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/leonardr/subscriptions","organizations_url":"https://api.github.com/users/leonardr/orgs","repos_url":"https://api.github.com/users/leonardr/repos","events_url":"https://api.github.com/users/leonardr/events{/privacy}","received_events_url":"https://api.github.com/users/leonardr/received_events","type":"User","site_admin":false},"body":"This branch overhauls script.py to use the Python standard library's `argparse` module to parse command-line arguments. The alternative was an increasingly hacky arrangement which made it very difficult to add features to scripts.\r\n\r\nThere are basically three types of scripts:\r\n\r\n* `IdentifierInputScript`s, which accept a named --identifier-type argument and an optional list of IDENTIFIER positional arguments. If you specify an identifier-type but no IDENTIFIERs, it's assumed that you want to operate on all identifiers of a given type. Once you parse the command line, the corresponding Identifier objects will be automatically loaded from the database and be made available as `parsed.identifiers`.\r\n\r\nPreviously we only took positional arguments and the first positional argument was equivalent to --identifier-type, unless it was the _only_ positional argument, in which case it identified the data source. I took out the data source code as not currently useful.\r\n\r\n* `RunCoverageProviderScript`s, which are like `IdentifierInputScript`s except that they also take a --cutoff-date argument.\r\n\r\n* `SubjectInputScript`s, which take arguments --subject-type (to restrict their operation to subjects of a specific type) and --subject-filter (to restrict their operation to subjects that match a substring filter).\r\n\r\nWe should also convert `CustomListManagementScript`, which currently doesn't really interact with the command line (it expects positional arguments in a very specific order), but that can wait til later.\r\n\r\nI've added some front-to-back tests of the command-line parsing functionality to show how these things work.","created_at":"2016-05-10T17:00:42Z","updated_at":"2016-05-10T17:17:44Z","closed_at":null,"merged_at":null,"merge_commit_sha":"512cbe385e3f2e72085fbbd4c828a2b154cabed4","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223/commits","review_comments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223/comments","review_comment_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/comments{/number}","comments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/223/comments","statuses_url":"https://api.github.com/repos/NYPL-Simplified/server_core/statuses/273393755bdbfe2438cf260fbb7ae20b5a70da77","head":{"label":"NYPL-Simplified:add-identifier-type-command-line-argument","ref":"add-identifier-type-command-line-argument","sha":"273393755bdbfe2438cf260fbb7ae20b5a70da77","user":{"login":"NYPL-Simplified","id":16416905,"avatar_url":"https://avatars.githubusercontent.com/u/16416905?v=3","gravatar_id":"","url":"https://api.github.com/users/NYPL-Simplified","html_url":"https://github.com/NYPL-Simplified","followers_url":"https://api.github.com/users/NYPL-Simplified/followers","following_url":"https://api.github.com/users/NYPL-Simplified/following{/other_user}","gists_url":"https://api.github.com/users/NYPL-Simplified/gists{/gist_id}","starred_url":"https://api.github.com/users/NYPL-Simplified/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NYPL-Simplified/subscriptions","organizations_url":"https://api.github.com/users/NYPL-Simplified/orgs","repos_url":"https://api.github.com/users/NYPL-Simplified/repos","events_url":"https://api.github.com/users/NYPL-Simplified/events{/privacy}","received_events_url":"https://api.github.com/users/NYPL-Simplified/received_events","type":"Organization","site_admin":false},"repo":{"id":27601287,"name":"server_core","full_name":"NYPL-Simplified/server_core","owner":{"login":"NYPL-Simplified","id":16416905,"avatar_url":"https://avatars.githubusercontent.com/u/16416905?v=3","gravatar_id":"","url":"https://api.github.com/users/NYPL-Simplified","html_url":"https://github.com/NYPL-Simplified","followers_url":"https://api.github.com/users/NYPL-Simplified/followers","following_url":"https://api.github.com/users/NYPL-Simplified/following{/other_user}","gists_url":"https://api.github.com/users/NYPL-Simplified/gists{/gist_id}","starred_url":"https://api.github.com/users/NYPL-Simplified/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NYPL-Simplified/subscriptions","organizations_url":"https://api.github.com/users/NYPL-Simplified/orgs","repos_url":"https://api.github.com/users/NYPL-Simplified/repos","events_url":"https://api.github.com/users/NYPL-Simplified/events{/privacy}","received_events_url":"https://api.github.com/users/NYPL-Simplified/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NYPL-Simplified/server_core","description":"Shared data model and utilities for Library Simplified server applications","fork":false,"url":"https://api.github.com/repos/NYPL-Simplified/server_core","forks_url":"https://api.github.com/repos/NYPL-Simplified/server_core/forks","keys_url":"https://api.github.com/repos/NYPL-Simplified/server_core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NYPL-Simplified/server_core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NYPL-Simplified/server_core/teams","hooks_url":"https://api.github.com/repos/NYPL-Simplified/server_core/hooks","issue_events_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/events{/number}","events_url":"https://api.github.com/repos/NYPL-Simplified/server_core/events","assignees_url":"https://api.github.com/repos/NYPL-Simplified/server_core/assignees{/user}","branches_url":"https://api.github.com/repos/NYPL-Simplified/server_core/branches{/branch}","tags_url":"https://api.github.com/repos/NYPL-Simplified/server_core/tags","blobs_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/refs{/sha}","trees_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NYPL-Simplified/server_core/statuses/{sha}","languages_url":"https://api.github.com/repos/NYPL-Simplified/server_core/languages","stargazers_url":"https://api.github.com/repos/NYPL-Simplified/server_core/stargazers","contributors_url":"https://api.github.com/repos/NYPL-Simplified/server_core/contributors","subscribers_url":"https://api.github.com/repos/NYPL-Simplified/server_core/subscribers","subscription_url":"https://api.github.com/repos/NYPL-Simplified/server_core/subscription","commits_url":"https://api.github.com/repos/NYPL-Simplified/server_core/commits{/sha}","git_commits_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/commits{/sha}","comments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/comments{/number}","issue_comment_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/comments{/number}","contents_url":"https://api.github.com/repos/NYPL-Simplified/server_core/contents/{+path}","compare_url":"https://api.github.com/repos/NYPL-Simplified/server_core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NYPL-Simplified/server_core/merges","archive_url":"https://api.github.com/repos/NYPL-Simplified/server_core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NYPL-Simplified/server_core/downloads","issues_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues{/number}","pulls_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls{/number}","milestones_url":"https://api.github.com/repos/NYPL-Simplified/server_core/milestones{/number}","notifications_url":"https://api.github.com/repos/NYPL-Simplified/server_core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NYPL-Simplified/server_core/labels{/name}","releases_url":"https://api.github.com/repos/NYPL-Simplified/server_core/releases{/id}","deployments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/deployments","created_at":"2014-12-05T17:03:04Z","updated_at":"2016-01-25T15:38:10Z","pushed_at":"2016-05-10T17:01:56Z","git_url":"git://github.com/NYPL-Simplified/server_core.git","ssh_url":"git@github.com:NYPL-Simplified/server_core.git","clone_url":"https://github.com/NYPL-Simplified/server_core.git","svn_url":"https://github.com/NYPL-Simplified/server_core","homepage":null,"size":3559,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":25,"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"base":{"label":"NYPL-Simplified:master","ref":"master","sha":"12f7f57fde9c1e4d7808c79d4ccecea3b22466b7","user":{"login":"NYPL-Simplified","id":16416905,"avatar_url":"https://avatars.githubusercontent.com/u/16416905?v=3","gravatar_id":"","url":"https://api.github.com/users/NYPL-Simplified","html_url":"https://github.com/NYPL-Simplified","followers_url":"https://api.github.com/users/NYPL-Simplified/followers","following_url":"https://api.github.com/users/NYPL-Simplified/following{/other_user}","gists_url":"https://api.github.com/users/NYPL-Simplified/gists{/gist_id}","starred_url":"https://api.github.com/users/NYPL-Simplified/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NYPL-Simplified/subscriptions","organizations_url":"https://api.github.com/users/NYPL-Simplified/orgs","repos_url":"https://api.github.com/users/NYPL-Simplified/repos","events_url":"https://api.github.com/users/NYPL-Simplified/events{/privacy}","received_events_url":"https://api.github.com/users/NYPL-Simplified/received_events","type":"Organization","site_admin":false},"repo":{"id":27601287,"name":"server_core","full_name":"NYPL-Simplified/server_core","owner":{"login":"NYPL-Simplified","id":16416905,"avatar_url":"https://avatars.githubusercontent.com/u/16416905?v=3","gravatar_id":"","url":"https://api.github.com/users/NYPL-Simplified","html_url":"https://github.com/NYPL-Simplified","followers_url":"https://api.github.com/users/NYPL-Simplified/followers","following_url":"https://api.github.com/users/NYPL-Simplified/following{/other_user}","gists_url":"https://api.github.com/users/NYPL-Simplified/gists{/gist_id}","starred_url":"https://api.github.com/users/NYPL-Simplified/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/NYPL-Simplified/subscriptions","organizations_url":"https://api.github.com/users/NYPL-Simplified/orgs","repos_url":"https://api.github.com/users/NYPL-Simplified/repos","events_url":"https://api.github.com/users/NYPL-Simplified/events{/privacy}","received_events_url":"https://api.github.com/users/NYPL-Simplified/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/NYPL-Simplified/server_core","description":"Shared data model and utilities for Library Simplified server applications","fork":false,"url":"https://api.github.com/repos/NYPL-Simplified/server_core","forks_url":"https://api.github.com/repos/NYPL-Simplified/server_core/forks","keys_url":"https://api.github.com/repos/NYPL-Simplified/server_core/keys{/key_id}","collaborators_url":"https://api.github.com/repos/NYPL-Simplified/server_core/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/NYPL-Simplified/server_core/teams","hooks_url":"https://api.github.com/repos/NYPL-Simplified/server_core/hooks","issue_events_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/events{/number}","events_url":"https://api.github.com/repos/NYPL-Simplified/server_core/events","assignees_url":"https://api.github.com/repos/NYPL-Simplified/server_core/assignees{/user}","branches_url":"https://api.github.com/repos/NYPL-Simplified/server_core/branches{/branch}","tags_url":"https://api.github.com/repos/NYPL-Simplified/server_core/tags","blobs_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/refs{/sha}","trees_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/trees{/sha}","statuses_url":"https://api.github.com/repos/NYPL-Simplified/server_core/statuses/{sha}","languages_url":"https://api.github.com/repos/NYPL-Simplified/server_core/languages","stargazers_url":"https://api.github.com/repos/NYPL-Simplified/server_core/stargazers","contributors_url":"https://api.github.com/repos/NYPL-Simplified/server_core/contributors","subscribers_url":"https://api.github.com/repos/NYPL-Simplified/server_core/subscribers","subscription_url":"https://api.github.com/repos/NYPL-Simplified/server_core/subscription","commits_url":"https://api.github.com/repos/NYPL-Simplified/server_core/commits{/sha}","git_commits_url":"https://api.github.com/repos/NYPL-Simplified/server_core/git/commits{/sha}","comments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/comments{/number}","issue_comment_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/comments{/number}","contents_url":"https://api.github.com/repos/NYPL-Simplified/server_core/contents/{+path}","compare_url":"https://api.github.com/repos/NYPL-Simplified/server_core/compare/{base}...{head}","merges_url":"https://api.github.com/repos/NYPL-Simplified/server_core/merges","archive_url":"https://api.github.com/repos/NYPL-Simplified/server_core/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/NYPL-Simplified/server_core/downloads","issues_url":"https://api.github.com/repos/NYPL-Simplified/server_core/issues{/number}","pulls_url":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls{/number}","milestones_url":"https://api.github.com/repos/NYPL-Simplified/server_core/milestones{/number}","notifications_url":"https://api.github.com/repos/NYPL-Simplified/server_core/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/NYPL-Simplified/server_core/labels{/name}","releases_url":"https://api.github.com/repos/NYPL-Simplified/server_core/releases{/id}","deployments_url":"https://api.github.com/repos/NYPL-Simplified/server_core/deployments","created_at":"2014-12-05T17:03:04Z","updated_at":"2016-01-25T15:38:10Z","pushed_at":"2016-05-10T17:01:56Z","git_url":"git://github.com/NYPL-Simplified/server_core.git","ssh_url":"git@github.com:NYPL-Simplified/server_core.git","clone_url":"https://github.com/NYPL-Simplified/server_core.git","svn_url":"https://github.com/NYPL-Simplified/server_core","homepage":null,"size":3559,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":25,"forks":0,"open_issues":25,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223"},"html":{"href":"https://github.com/NYPL-Simplified/server_core/pull/223"},"issue":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/223"},"comments":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/issues/223/comments"},"review_comments":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223/comments"},"review_comment":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/pulls/223/commits"},"statuses":{"href":"https://api.github.com/repos/NYPL-Simplified/server_core/statuses/273393755bdbfe2438cf260fbb7ae20b5a70da77"}}}}