ditkrg/todo-to-issue-action
4
0
Fork 0
mirror of https://github.com/ditkrg/todo-to-issue-action.git synced 2026-01-23 06:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #204 from alstr/v5

Browse Source 
v5
This commit is contained in:
Alastair Mooney 2024-09-24 14:37:32 +01:00 committed by GitHub
commit b70b9d159e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 711 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -6,8 +6,10 @@ jobs:
build: build:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v3" - uses: "actions/checkout@v4"
- uses: "actions/setup-python@v4" - uses: "actions/setup-python@v5"
with:
python-version: '3.12'
- name: "Install test dependencies" - name: "Install test dependencies"
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip

4
.github/workflows/todo.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
build: build:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v3" - uses: "actions/checkout@v4"
- name: "TODO to Issue" - name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@master" uses: "alstr/todo-to-issue-action@master"
env: env:
@ -21,5 +21,3 @@ jobs:
${{ inputs.MANUAL_COMMIT_REF }} ${{ inputs.MANUAL_COMMIT_REF }}
MANUAL_BASE_REF: MANUAL_BASE_REF:
${{ inputs.MANUAL_BASE_REF }} ${{ inputs.MANUAL_BASE_REF }}
with:
PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}

2
Dockerfile
View File

@ -6,7 +6,7 @@ RUN pip install --target=/app requests
RUN pip install --target=/app -U pip setuptools wheel RUN pip install --target=/app -U pip setuptools wheel
RUN pip install --target=/app ruamel.yaml RUN pip install --target=/app ruamel.yaml
FROM gcr.io/distroless/python3-debian10 FROM gcr.io/distroless/python3-debian12
COPY --from=builder /app /app COPY --from=builder /app /app
WORKDIR /app WORKDIR /app
ENV PYTHONPATH /app ENV PYTHONPATH /app

423
README.md
View File

@ -1,27 +1,41 @@
# TODO to Issue Action # TODO to Issue
This action will convert newly committed TODO comments to GitHub issues on push. Action to create, update and close issues based on committed TODO comments.
Optionally, issues can also be closed when the TODOs are removed in a future commit. ![Diagram showing how the action works](diagram.png)
Action supports: Features:
* Multiple, customizable comments identifiers (FIXME, etc.), * Multiple, customisable comment identifiers (`FIXME`, etc.)
* Configurable auto-labeling, * Configurable auto-labeling
* Assignees, * Assignees
* Milestones, * Milestones
* Projects (classic). * Projects
`todo-to-issue` works with almost any programming language. `todo-to-issue` works with almost any programming language.
## What's New
v5 is the biggest release yet:
* TODO reference handling
* Issue URL insertion
* Update and comment on existing issues
* Support for v2 projects
* Assign milestones by name
* Improved issue formatting
* Link issues to PRs
See [Upgrading](#upgrading) for breaking changes.
## Usage ## Usage
Simply add a comment starting with TODO (or any other comment identifiers configured), followed by a colon and/or space. Simply add a line or block comment starting with TODO (or any other comment identifiers configured), followed by a colon and/or space.
Here's an example for Python creating an issue named after the TODO _description_: Here's an example for Python creating an issue named after the TODO _description_:
```python ```python
def hello_world(): def hello_world():
# TODO Come up with a more imaginative greeting # TODO Come up with a more imaginative greeting
print('Hello world!') print('Hello world!')
``` ```
@ -29,27 +43,39 @@ Here's an example for Python creating an issue named after the TODO _description
_Multiline_ TODOs are supported, with additional lines inserted into the issue body: _Multiline_ TODOs are supported, with additional lines inserted into the issue body:
```python ```python
def hello_world(): def hello_world():
# TODO: Come up with a more imaginative greeting # TODO: Come up with a more imaginative greeting
# Everyone uses hello world and it's boring. # Everyone uses hello world and it's boring.
print('Hello world!') print('Hello world!')
``` ```
As per the [Google Style Guide](https://google.github.io/styleguide/cppguide.html#TODO_Comments), you can provide a As per the [Google Style Guide](https://google.github.io/styleguide/cppguide.html#TODO_Comments), you can provide a _reference_ after the TODO identifier:
_reference_ after the TODO identifier. This will be included in the issue title for searchability.
```python ```python
def hello_world(): def hello_world():
# TODO(alstr) Come up with a more imaginative greeting # TODO(@alstr): Come up with a more imaginative greeting
# Everyone uses hello world and it's boring. # This will assign the issue to alstr.
print('Hello world!') print('Hello world!')
# TODO(!urgent): This is wrong
# This will add an 'urgent' label.
assert 1 + 1 == 3
# TODO(#99): We need error handling here
# This will add the comment to the existing issue 99.
greeting_time = datetime.fromisoformat(date_string)
# TODO(language): Localise this string
# This will prepend the reference to the issue title
dialogue = "TODO or not TODO, that is the question."
``` ```
Don't include parentheses within the reference itself. Only one reference can be provided. Should you wish to further configure the issue, you can do so via
[TODO Options](#todo-options).
## TODO Options ## TODO Options
A range of options can also be provided to apply to the new issue. A range of options can also be provided to apply to the issue, in addition to any reference supplied.
Options follow the `name: value` syntax. Options follow the `name: value` syntax.
Unless otherwise specified, options should be on their own line, below the initial TODO declaration and 'body'. Unless otherwise specified, options should be on their own line, below the initial TODO declaration and 'body'.
@ -59,8 +85,8 @@ Unless otherwise specified, options should be on their own line, below the initi
Comma-separated list of usernames to assign to the issue: Comma-separated list of usernames to assign to the issue:
```python ```python
def hello_world(): def hello_world():
# TODO(alstr): Come up with a more imaginative greeting # TODO: Come up with a more imaginative greeting
# Everyone uses hello world and it's boring. # Everyone uses hello world and it's boring.
# assignees: alstr, bouteillerAlan, hbjydev # assignees: alstr, bouteillerAlan, hbjydev
print('Hello world!') print('Hello world!')
@ -71,8 +97,8 @@ Comma-separated list of usernames to assign to the issue:
Comma-separated list of labels to add to the issue: Comma-separated list of labels to add to the issue:
```python ```python
def hello_world(): def hello_world():
# TODO(alstr): Come up with a more imaginative greeting # TODO: Come up with a more imaginative greeting
# Everyone uses hello world and it's boring. # Everyone uses hello world and it's boring.
# labels: enhancement, help wanted # labels: enhancement, help wanted
print('Hello world!') print('Hello world!')
@ -80,57 +106,19 @@ Comma-separated list of labels to add to the issue:
If any of the labels do not already exist, they will be created. If any of the labels do not already exist, they will be created.
The `todo` label is automatically added to issues to help the action efficiently retrieve them in the future.
### Milestone ### Milestone
Milestone `ID` to assign to the issue: Milestone name to assign to the issue:
```python ```python
def hello_world(): def hello_world():
# TODO(alstr): Come up with a more imaginative greeting # TODO: Come up with a more imaginative greeting
# Everyone uses hello world and it's boring. # Everyone uses hello world and it's boring.
# milestone: 1 # milestone: v3.0
print('Hello world!') print('Hello world!')
``` ```
Only a single milestone can be specified and it must already exist. Only a single milestone can be specified. If the milestone does not exist, it will be created.
### Projects
_Please note, the action currently only supports classic user and organisation projects, and not 'new' projects._
With some additional setup, you can assign the created issues a status (column) within user or organisation projects.
By default, the action cannot access your projects. To enable it, you must:
* [Create a Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token),
* [Create an encrypted secret in your repo settings](https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-a-repository),
with the value set to the Personal Access Token,
* Assign the secret in the workflow file like `PROJECTS_SECRET: ${{ secrets.PROJECTS_SECRET }}`. _Do not enter the raw
secret_.
Projects are identified by their `full project name and issue status` (column) reference with
the `<user or org name>/project name/status name` syntax.
* To assign to a _user project_, use the `user projects:` option.
* To assign to an _organisation project_, use `org projects:` option.
```python
def hello_world():
# TODO Come up with a more imaginative greeting
# Everyone uses hello world and it's boring.
# user projects: alstr/Test User Project/To Do
# org projects: alstrorg/Test Org Project/To Do
print('Hello world!')
```
You can assign issues to multiple projects separating them with commas,
i.e. `user projects: alstr/Test User Project 1/To Do, alstr/Test User Project 2/Tasks`.
You can also specify `default projects` in the same way by defining `USER_PROJECTS` or `ORG_PROJECTS` in your workflow
file.
These will be applied automatically to every issue, but will be overrode by any specified within the TODO.
## Supported Languages ## Supported Languages
@ -189,19 +177,16 @@ These will be applied automatically to every issue, but will be overrode by any
- XML - XML
- YAML - YAML
New languages can easily be added to the `syntax.json` file, used by the action to identify TODO comments. New languages can easily be added to the `syntax.json` file used by the action to identify TODO comments.
When adding languages, follow the structure of existing entries, and use the language name defined by GitHub PRs adding new languages are welcome and appreciated. See [Contributing](#contributing--issues).
in [`languages.yml`](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml).
Of course, PRs adding new languages are welcome and appreciated. Please add a test for your language in order for your
PR to be accepted. See [Contributing](#contributing--issues).
## Setup ## Setup
On your repo go to `Settings -> Actions (General) -> Workflow permissions` and enable "Read and write permissions". In the repo where you want the action to run, go to `Settings -> Actions (General) -> Workflow permissions` and enable
"Read and write permissions".
Create a `workflow.yml` file in your `.github/workflows` directory like: Next, create a `workflow.yml` file in your `.github/workflows` directory:
```yml ```yml
name: "Run TODO to Issue" name: "Run TODO to Issue"
@ -210,42 +195,19 @@ jobs:
build: build:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v3" - uses: "actions/checkout@v4"
- name: "TODO to Issue" - name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@v4" uses: "alstr/todo-to-issue-action@v5"
``` ```
See [Github's workflow syntax](https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions) for ### URL Insertion
further details on this file.
The workflow file takes the following optional inputs: The action can insert the URL for a created issue back into the associated TODO.
| Parameter | Required | Description | This allows for tighter integration between issues and TODOs, enables updating issues by editing TODOs, and improves the
|-----------------|----------|------------------------------------------------------------------------------------------------------------------------------------| accuracy of the action when closing TODOs.
| REPO | False | The path to the repository where the action will be used, e.g., 'alstr/my-repo' (automatically set) |
| BEFORE | False | The SHA of the last pushed commit (automatically set) |
| COMMITS | False | An array of commit objects describing the pushed commits |
| DIFF_URL | False | The URL to use to get the diff (automatically set) |
| SHA | False | The SHA of the latest commit (automatically set) |
| TOKEN | False | The GitHub access token to allow us to retrieve, create and update issues (automatically set) |
| LABEL | False | The label that will be used to identify TODO comments (deprecated) |
| COMMENT_MARKER | False | The marker used to signify a line comment in your code (deprecated) |
| CLOSE_ISSUES | False | Optional input that specifies whether to attempt to close an issue when a TODO is removed |
| AUTO_P | False | For multiline TODOs, format each line as a new paragraph when creating the issue |
| PROJECTS_SECRET | False | Encrypted secret corresponding to your personal access token (do not enter the actual secret) |
| USER_PROJECTS | False | Default user projects |
| ORG_PROJECTS | False | Default organization projects |
| IGNORE | False | A collection of comma-delimited regular expressions that match files that should be ignored when searching for TODOs |
| AUTO_ASSIGN | False | Automatically assign new issues to the user who triggered the action |
| ACTOR | False | The username of the person who triggered the action |
| ISSUE_TEMPLATE | False | The template used to format new issues, e.g. `TODO title: {{ title }}\nBody: {{ body }}\nLink: {{ url }}\nCode:\n{{ snippet }}` |
| IDENTIFIERS | False | List of custom identifier dictionaries of the form `[{"name": "TODO", "labels": [todo]}]` |
| GITHUB_URL | False | Base URL of GitHub API |
| ESCAPE | False | Escape all special Markdown characters |
| LANGUAGES | False | A collection of comma-delimited URLs or local paths starting from the current working directory of the action for custom languages |
| NO_STANDARD | False | Exclude loading the default 'syntax.json' and 'language.yml' files from the repository |
These can be specified using `with` parameter in the workflow file, as below: A new feature in v5, it is disabled by default. To enable URL insertion, some extra config is required:
```yml ```yml
name: "Run TODO to Issue" name: "Run TODO to Issue"
@ -254,33 +216,62 @@ jobs:
build: build:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v3" - uses: "actions/checkout@v4"
- name: "TODO to Issue" - name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@v4" uses: "alstr/todo-to-issue-action@v5"
with: with:
AUTO_ASSIGN: true INSERT_ISSUE_URLS: "true"
- name: Set Git user
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
- name: Commit and Push Changes
run: |
git add .
git commit -m "Automatically added GitHub issue links to TODOs"
git push origin main
``` ```
### Considerations You will probably also want to use the setting `CLOSE_ISSUES: "true"`, to allow issues to be closed when a TODO is
removed.
- TODOs are found by analysing the difference between the new commit and its previous one (i.e., the diff). That means Please note, URL insertion works best with line comments, as it has to insert a line into the file. If using block
that if this action is implemented during development, any existing TODOs will not be detected. For them to be comments, you should put the start and end tags on their own lines. This may be improved in the future.
detected, you would have to remove them, commit, put them back, and commit again,
or [run the action manually](#running-the-action-manually).
- Should you change the TODO text, this will currently create a new issue.
- Closing TODOs is still somewhat experimental.
## Custom Languages This feature is not perfect. Please make sure you're comfortable with that before enabling.
If you want to add or overwrite language detections that are not currently supported, you can add them manually using the `LANGUAGES` input. ### Projects
Just create a file that contains an array with languages, each having the following properties: You can configure the action to add newly created issues to a specified v2 project (i.e., not a classic project).
| Property | Type | Description | The action does not have sufficient permissions by default, so you will need to create a new Personal Access Token with
|------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------| the `repo` and `project` scopes.
| language | string | The unique name of the language |
| extensions | string[] | A list of file extensions for the custom language | Then, in your repo, go to `Settings -> Secrets and variables (Actions) -> Secrets`, and enter the value as a new
| markers | object[] | A list of objects (see example below) to declare the comment markers. Make sure to escape all special Markdown characters with a double backslash. | repository secret with the name `PROJECTS_SECRET`.
Finally, add the following to the workflow file, under `with`:
```
PROJECT: "user/alstr/test"
PROJECTS_SECRET: "${{ secrets.PROJECTS_SECRET }}"
```
Where `PROJECT` is a string of the form `account_type/owner/project_name`. Valid values for `account_type` are `user` or `organization`.
All newly created issues will then be automatically added to the specified project.
### Custom Languages
If you want to add language definitions that are not currently supported, or overwrite existing ones, you can do so
using the `LANGUAGES` input.
Just create a file that contains an array of languages, each with the following properties:
| Property | Description |
|------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
| language | The unique name of the language |
| extensions | A list of file extensions for the custom language |
| markers | A list of objects (see example below) to declare the comment markers. Make sure to escape all special Markdown characters with a double backslash. |
For example, here is a language declaration file for Java: For example, here is a language declaration file for Java:
@ -307,41 +298,113 @@ For example, here is a language declaration file for Java:
} }
] ]
``` ```
Next, add the file to the `LANGUAGES` property in your workflow YAML file. Please note that if multiple paths are provided, the last path specified will take precedence over any previous ones:
Next, add the file to the `LANGUAGES` property in your workflow file.
**Using a Local File:** **Using a Local File:**
```yaml `LANGUAGES: "path/to/my/file.json"`
name: "Run TODO to Issue"
on: [ "push" ]
jobs:
build:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@v4"
with:
LANGUAGES: "path/to/my/file.json"
```
**Using a File from HTTP(s):** **Using a Remote File:**
```yaml `LANGUAGES: "https://myserver.com/path/to/my/file.json"`
name: "Run TODO to Issue"
on: [ "push" ]
jobs:
build:
runs-on: "ubuntu-latest"
steps:
- uses: "actions/checkout@v3"
- name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@v4"
with:
LANGUAGES: "http://myserver.com/path/to/my/file.json"
```
This will configure the action to use your custom language file for detecting TODO comments. Multiple paths can be provided by entering a comma-delimited string.
### All Settings
The workflow file takes the following optional inputs, specified under the `with` parameter:
#### AUTO_ASSIGN
Automatically assign new issues to the user who triggered the action.
Default: `False`
#### AUTO_P
For multiline TODOs, format each line as a new paragraph when creating the issue.
Default: `True`
#### CLOSE_ISSUES
Whether to close an issue when a TODO is removed. If enabling this, also enabling `INSERT_ISSUE_URLS` is recommended
for improved accuracy.
Default: `False`
#### ESCAPE
Escape all special Markdown characters.
Default: `True`
#### GITHUB_URL
Base URL of GitHub API. In most cases you will not need to change this.
Default: `${{ github.api_url }}`
#### IDENTIFIERS
List of custom identifier dictionaries. Use this to add support for `FIXME` and other identifiers, and assign default
labels.
Default: `[{"name": "TODO", "labels": []}]`
#### INSERT_ISSUE_URLS
Whether to insert the URL for a new issue back into the associated TODO.
See [URL Insertion](#url-insertion).
Default: `False`
#### IGNORE
A collection of comma-delimited regular expressions that match files that should be ignored when searching for TODOs.
#### ISSUE_TEMPLATE
Custom template used to format new issues. This is a string that accepts Markdown, linebreaks and the following
placeholders:
* `{{ title }}`: issue title
* `{{ body }}`: issue body
* `{{ url }}`: URL to the line
* `{{ snippet }}`: code snippet of the relevant section
If not specified the standard template is used, containing the issue body (if a multiline TODO), URL and snippet.
#### LANGUAGES
A collection of comma-delimited URLs or local paths (starting from the current working directory of the action)
for custom languages.
See [Custom Languages](#custom-languages).
#### NO_STANDARD
Exclude loading the default `syntax.json` and `languages.yml` files.
Default: `False`
#### PROJECT
A string specifying a v2 project where issues should be added.
Use the format `account_type/owner/project_name`. Valid values for `account_type` are `user` or `organization`.
See [Projects](#projects).
#### PROJECTS_SECRET
A Personal Access Token with the `repo` and `project` scopes, required for enabling support for projects.
It should be of the form `${{ secrets.PROJECTS_SECRET }}`. Do not enter actual secret.
See [Projects](#projects).
## Running the action manually ## Running the action manually
@ -365,44 +428,57 @@ jobs:
build: build:
runs-on: "ubuntu-latest" runs-on: "ubuntu-latest"
steps: steps:
- uses: "actions/checkout@v3" - uses: "actions/checkout@v4"
- name: "TODO to Issue" - name: "TODO to Issue"
uses: "alstr/todo-to-issue-action@master" uses: "alstr/todo-to-issue-action@v5"
env: env:
MANUAL_COMMIT_REF: ${{ inputs.MANUAL_COMMIT_REF }} MANUAL_COMMIT_REF: ${{ inputs.MANUAL_COMMIT_REF }}
MANUAL_BASE_REF: ${{ inputs.MANUAL_BASE_REF }} MANUAL_BASE_REF: ${{ inputs.MANUAL_BASE_REF }}
``` ```
Head to the Actions section of your repo, select the workflow and then 'Run workflow'. Head to the actions section of your repo, select the workflow and then 'Run workflow'.
You can run the workflow for a single commit by entering the commit SHA in the first box. In this case, the action will You can run the workflow for a single commit by entering the commit SHA in the first box. In this case, the action will
compare the commit to the one directly before it. compare the commit to the one directly before it.
You can also compare a broader range of commits. For that, also enter the 'from'/base commit SHA in the second box. You can also compare a broader range of commits. For that, also enter the 'from' or base commit SHA in the second box.
## Upgrading
If upgrading from v4 to v5, please note the following:
* Milestones are now specified by name, not ID.
* Support for classic projects has been removed, together with the `user_projects:` and `org_projects:` options,
and `USER_PROJECTS` and `ORG_PROJECTS` workflow settings.
* The `todo` label is no longer set on created issues.
## Troubleshooting ## Troubleshooting
### No issues have been created ### No issues have been created
- Make sure your file language is in `syntax.json`. - Make sure your file language is in `syntax.json`.
- The action will not recognise existing TODOs that have already been pushed, unless - TODOs are found by analysing the difference between the new commit and its previous one (i.e., the diff). This means
you [run the action manually](#running-the-action-manually). that if this action is implemented during development, any existing TODOs will not be detected. For them to be
- If a similar TODO appears in the diff as both an addition and deletion, it is assumed to have been moved, so is detected, you would have to re-commit them, or [run the action manually](#running-the-action-manually).
ignored. - If your workflow is executed but no issue is generated, check your repo permissions by navigating to
- If your workflow is executed but no issue is generated, check your repo permissions by navigating `Settings -> Actions (General) -> Workflow permissions` and enable "Read and write permissions".
to `Settings -> Actions (General) -> Workflow permissions` and enable "Read and write permissions".
### Multiple issues have been created ### Multiple issues have been created
Issues are created whenever the action runs and finds a newly added TODO in the diff. Rebasing may cause a TODO to show Issues are created whenever the action runs and finds a newly added TODO in the diff. This can lead to duplicate
up in a diff multiple times. This is an acknowledged issue, but you may have some luck by adjusting your workflow file. issues if a diff is processed multiple times.
Enabling [URL Insertion](#url-insertion) can help with the detection of existing issues.
## Contributing & Issues ## Contributing & Issues
If you do encounter any problems, please file an issue or submit a PR. Everyone is welcome and encouraged to contribute. If encounter any problems, please file an issue or submit a PR. Everyone is welcome and encouraged to contribute.
**If submitting a request to add a new language, please ensure you add the appropriate tests covering your language. In **If submitting a request to add a new language, please ensure you add the appropriate tests covering your language.
the interests of stability, PRs without tests cannot be considered.** In the interests of stability, PRs without tests cannot be considered.**
When adding languages, follow the structure of existing entries, and use the language name defined by
[GitHub's `languages.yml`](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml) file.
## Running tests locally ## Running tests locally
@ -423,15 +499,10 @@ run:
## Thanks ## Thanks
The action was developed for the GitHub Hackathon. Whilst every effort is made to ensure it works, it comes with no The action was originally developed for the GitHub Hackathon in 2020. Whilst every effort is made to ensure it works,
guarantee. it comes with no guarantee.
Thanks to Jacob Tomlinson Thanks to GitHub's [linguist repo](https://github.com/github/linguist/) for the [`languages.yml`](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml) file used by the app to look up file extensions
for [his handy overview of GitHub Actions](https://www.jacobtomlinson.co.uk/posts/2019/creating-github-actions-in-python/). and determine the correct highlighting to apply to code snippets.
Thanks to GitHub's [linguist repo](https://github.com/github/linguist/) for Thanks to all those who have [contributed](https://github.com/alstr/todo-to-issue-action/graphs/contributors) to the further development of this action.
the [`languages.yml`](https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml) file used by
the app to look up file extensions and determine the correct highlighting to apply to code snippets.
Thanks to all those who have [contributed](https://github.com/alstr/todo-to-issue-action/graphs/contributors) to the
further development of this action.

30
action.yml
View File

@ -17,7 +17,7 @@ inputs:
required: false required: false
default: '${{ github.event.before || github.base_ref }}' default: '${{ github.event.before || github.base_ref }}'
COMMITS: COMMITS:
description: 'An array of commit objects describing the pushed commits' description: 'An array of commit objects describing the pushed commits (automatically set)'
required: false required: false
default: '${{ toJSON(github.event.commits) }}' default: '${{ toJSON(github.event.commits) }}'
DIFF_URL: DIFF_URL:
@ -32,29 +32,20 @@ inputs:
description: 'The GitHub access token to allow us to retrieve, create and update issues (automatically set)' description: 'The GitHub access token to allow us to retrieve, create and update issues (automatically set)'
required: false required: false
default: ${{ github.token }} default: ${{ github.token }}
LABEL:
description: 'The label that will be used to identify TODO comments (deprecated)'
required: false
COMMENT_MARKER:
description: 'The marker used to signify a line comment in your code (deprecated)'
required: false
CLOSE_ISSUES: CLOSE_ISSUES:
description: 'Optional input that specifies whether to attempt to close an issue when a TODO is removed' description: 'Optional input specifying whether to attempt to close an issue when a TODO is removed'
required: false required: false
default: true default: true
AUTO_P: AUTO_P:
description: 'For multiline TODOs, format each line as a new paragraph when creating the issue' description: 'For multiline TODOs, format each line as a new paragraph when creating the issue'
required: false required: false
default: true default: true
PROJECT:
description: "User or organization project to link issues to, format 'project_type/owner/project_name'"
required: false
PROJECTS_SECRET: PROJECTS_SECRET:
description: 'Encrypted secret corresponding to your personal access token (do not enter the actual secret)' description: 'Encrypted secret corresponding to your personal access token (do not enter the actual secret)'
required: false required: false
USER_PROJECTS:
description: 'Default user projects'
required: false
ORG_PROJECTS:
description: 'Default organisation projects'
required: false
IGNORE: IGNORE:
description: 'A collection of comma-delimited regular expression that matches files that should be ignored when searching for TODOs' description: 'A collection of comma-delimited regular expression that matches files that should be ignored when searching for TODOs'
required: false required: false
@ -63,7 +54,7 @@ inputs:
required: false required: false
default: false default: false
ACTOR: ACTOR:
description: 'The username of the person who triggered the action' description: 'The username of the person who triggered the action (automatically set)'
required: false required: false
default: '${{ github.actor }}' default: '${{ github.actor }}'
ISSUE_TEMPLATE: ISSUE_TEMPLATE:
@ -81,10 +72,13 @@ inputs:
required: false required: false
default: true default: true
LANGUAGES: LANGUAGES:
description: 'A collection of comma-delimited URLs or local paths starting from the current working directory of the action for custom languages' description: 'A collection of comma-delimited URLs or local paths for custom language files'
required: false required: false
default: ''
NO_STANDARD: NO_STANDARD:
description: 'Exclude loading the default ''syntax.json'' and ''language.yml'' files from the repository' description: "Exclude loading the default 'syntax.json' and 'languages.yml' files from the repository"
required: false
default: false
INSERT_ISSUE_URLS:
description: 'Whether the action should insert the URL for a newly-created issue into the associated TODO comment'
required: false required: false
default: false default: false

BIN
diagram.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 KiB

668
main.py
View File

@ -11,6 +11,8 @@ from ruamel.yaml import YAML
from enum import Enum from enum import Enum
import itertools import itertools
import operator import operator
from collections import defaultdict
from urllib.parse import urlparse
class LineStatus(Enum): class LineStatus(Enum):
@ -23,26 +25,29 @@ class LineStatus(Enum):
class Issue(object): class Issue(object):
"""Basic Issue model for collecting the necessary info to send to GitHub.""" """Basic Issue model for collecting the necessary info to send to GitHub."""
def __init__(self, title, labels, assignees, milestone, user_projects, org_projects, body, hunk, file_name, def __init__(self, title, labels, assignees, milestone, body, hunk, file_name,
start_line, markdown_language, status, identifier): start_line, num_lines, markdown_language, status, identifier, ref, issue_url, issue_number):
self.title = title self.title = title
self.labels = labels self.labels = labels
self.assignees = assignees self.assignees = assignees
self.milestone = milestone self.milestone = milestone
self.user_projects = user_projects
self.org_projects = org_projects
self.body = body self.body = body
self.hunk = hunk self.hunk = hunk
self.file_name = file_name self.file_name = file_name
self.start_line = start_line self.start_line = start_line
self.num_lines = num_lines
self.markdown_language = markdown_language self.markdown_language = markdown_language
self.status = status self.status = status
self.identifier = identifier self.identifier = identifier
self.ref = ref
self.issue_url = issue_url
self.issue_number = issue_number
class GitHubClient(object): class GitHubClient(object):
"""Basic client for getting the last diff and creating/closing issues.""" """Basic client for getting the last diff and managing issues."""
existing_issues = [] existing_issues = []
milestones = []
def __init__(self): def __init__(self):
self.github_url = os.getenv('INPUT_GITHUB_URL') self.github_url = os.getenv('INPUT_GITHUB_URL')
@ -55,52 +60,98 @@ class GitHubClient(object):
self.diff_url = os.getenv('INPUT_DIFF_URL') self.diff_url = os.getenv('INPUT_DIFF_URL')
self.token = os.getenv('INPUT_TOKEN') self.token = os.getenv('INPUT_TOKEN')
self.issues_url = f'{self.repos_url}{self.repo}/issues' self.issues_url = f'{self.repos_url}{self.repo}/issues'
self.milestones_url = f'{self.repos_url}{self.repo}/milestones'
self.issue_headers = { self.issue_headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Authorization': f'token {self.token}' 'Authorization': f'token {self.token}',
'X-GitHub-Api-Version': '2022-11-28'
}
self.graphql_headers = {
'Authorization': f'Bearer {os.getenv("INPUT_PROJECTS_SECRET", "")}',
'Accept': 'application/vnd.github.v4+json'
} }
auto_p = os.getenv('INPUT_AUTO_P', 'true') == 'true' auto_p = os.getenv('INPUT_AUTO_P', 'true') == 'true'
self.line_break = '\n\n' if auto_p else '\n' self.line_break = '\n\n' if auto_p else '\n'
# Retrieve the existing repo issues now so we can easily check them later.
self._get_existing_issues()
self.auto_assign = os.getenv('INPUT_AUTO_ASSIGN', 'false') == 'true' self.auto_assign = os.getenv('INPUT_AUTO_ASSIGN', 'false') == 'true'
self.actor = os.getenv('INPUT_ACTOR') self.actor = os.getenv('INPUT_ACTOR')
self.insert_issue_urls = os.getenv('INPUT_INSERT_ISSUE_URLS', 'false') == 'true'
def get_timestamp(self, commit): if self.base_url == 'https://api.github.com/':
return commit.get('timestamp') self.line_base_url = 'https://github.com/'
else:
self.line_base_url = self.base_url
self.project = os.getenv('INPUT_PROJECT', None)
# Retrieve the existing repo issues now so we can easily check them later.
self._get_existing_issues()
# Populate milestones so we can perform a lookup if one is specified.
self._get_milestones()
def get_last_diff(self): def get_last_diff(self):
"""Get the last diff.""" """Get the last diff."""
if self.diff_url: if self.diff_url:
# Diff url was directly passed in config, likely due to this being a PR # Diff url was directly passed in config, likely due to this being a PR.
diff_url = self.diff_url diff_url = self.diff_url
elif self.before != '0000000000000000000000000000000000000000': elif self.before != '0000000000000000000000000000000000000000':
# There is a valid before SHA to compare with, or this is a release being created # There is a valid before SHA to compare with, or this is a release being created.
diff_url = f'{self.repos_url}{self.repo}/compare/{self.before}...{self.sha}' diff_url = f'{self.repos_url}{self.repo}/compare/{self.before}...{self.sha}'
elif len(self.commits) == 1: elif len(self.commits) == 1:
# There is only one commit # There is only one commit.
diff_url = f'{self.repos_url}{self.repo}/commits/{self.sha}' diff_url = f'{self.repos_url}{self.repo}/commits/{self.sha}'
else: else:
# There are several commits: compare with the oldest one # There are several commits: compare with the oldest one.
oldest = sorted(self.commits, key=self.get_timestamp)[0]['id'] oldest = sorted(self.commits, key=self._get_timestamp)[0]['id']
diff_url = f'{self.repos_url}{self.repo}/compare/{oldest}...{self.sha}' diff_url = f'{self.repos_url}{self.repo}/compare/{oldest}...{self.sha}'
diff_headers = { diff_headers = {
'Accept': 'application/vnd.github.v3.diff', 'Accept': 'application/vnd.github.v3.diff',
'Authorization': f'token {self.token}' 'Authorization': f'token {self.token}',
'X-GitHub-Api-Version': '2022-11-28'
} }
diff_request = requests.get(url=diff_url, headers=diff_headers) diff_request = requests.get(url=diff_url, headers=diff_headers)
if diff_request.status_code == 200: if diff_request.status_code == 200:
return diff_request.text return diff_request.text
raise Exception('Could not retrieve diff. Operation will abort.') raise Exception('Could not retrieve diff. Operation will abort.')
# noinspection PyMethodMayBeStatic
def _get_timestamp(self, commit):
"""Get a commit timestamp."""
return commit.get('timestamp')
def _get_milestones(self, page=1):
"""Get all the milestones."""
params = {
'per_page': 100,
'page': page,
'state': 'open'
}
milestones_request = requests.get(self.milestones_url, headers=self.issue_headers, params=params)
if milestones_request.status_code == 200:
self.milestones.extend(milestones_request.json())
links = milestones_request.links
if 'next' in links:
self._get_milestones(page + 1)
def _get_milestone(self, title):
"""Get the milestone number for the one with this title (creating one if it doesn't exist)."""
for m in self.milestones:
if m['title'] == title:
return m['number']
else:
return self._create_milestone(title)
def _create_milestone(self, title):
"""Create a new milestone with this title."""
milestone_data = {
'title': title
}
milestone_request = requests.post(self.milestones_url, headers=self.issue_headers, json=milestone_data)
return milestone_request.json()['number'] if milestone_request.status_code == 201 else None
def _get_existing_issues(self, page=1): def _get_existing_issues(self, page=1):
"""Populate the existing issues list.""" """Populate the existing issues list."""
params = { params = {
'per_page': 100, 'per_page': 100,
'page': page, 'page': page,
'state': 'open', 'state': 'open'
'labels': 'todo'
} }
list_issues_request = requests.get(self.issues_url, headers=self.issue_headers, params=params) list_issues_request = requests.get(self.issues_url, headers=self.issue_headers, params=params)
if list_issues_request.status_code == 200: if list_issues_request.status_code == 200:
@ -109,18 +160,110 @@ class GitHubClient(object):
if 'next' in links: if 'next' in links:
self._get_existing_issues(page + 1) self._get_existing_issues(page + 1)
def _get_project_id(self, project):
"""Get the project ID."""
project_type, owner, project_name = project.split('/')
if project_type == 'user':
query = """
query($owner: String!) {
user(login: $owner) {
projectsV2(first: 10) {
nodes {
id
title
}
}
}
}
"""
elif project_type == 'organization':
query = """
query($owner: String!) {
organization(login: $owner) {
projectsV2(first: 10) {
nodes {
id
title
}
}
}
}
"""
else:
print("Invalid project type")
return None
variables = {
'owner': owner,
}
project_request = requests.post('https://api.github.com/graphql',
json={'query': query, 'variables': variables},
headers=self.graphql_headers)
if project_request.status_code == 200:
projects = (project_request.json().get('data', {}).get(project_type, {}).get('projectsV2', {})
.get('nodes', []))
for project in projects:
if project['title'] == project_name:
return project['id']
return None
def _get_issue_global_id(self, owner, repo, issue_number):
"""Get the global ID for a given issue."""
query = """
query($owner: String!, $repo: String!, $issue_number: Int!) {
repository(owner: $owner, name: $repo) {
issue(number: $issue_number) {
id
}
}
}
"""
variables = {
'owner': owner,
'repo': repo,
'issue_number': issue_number
}
project_request = requests.post('https://api.github.com/graphql',
json={'query': query, 'variables': variables},
headers=self.graphql_headers)
if project_request.status_code == 200:
return project_request.json()['data']['repository']['issue']['id']
return None
def _add_issue_to_project(self, issue_id, project_id):
"""Attempt to add this issue to a project."""
mutation = """
mutation($projectId: ID!, $contentId: ID!) {
addProjectV2ItemById(input: {projectId: $projectId, contentId: $contentId}) {
item {
id
}
}
}
"""
variables = {
"projectId": project_id,
"contentId": issue_id
}
project_request = requests.post('https://api.github.com/graphql',
json={'query': mutation, 'variables': variables},
headers=self.graphql_headers)
return project_request.status_code
def _comment_issue(self, issue_number, comment):
"""Post a comment on an issue."""
issue_comment_url = f'{self.repos_url}{self.repo}/issues/{issue_number}/comments'
body = {'body': comment}
update_issue_request = requests.post(issue_comment_url, headers=self.issue_headers, json=body)
return update_issue_request.status_code
def create_issue(self, issue): def create_issue(self, issue):
"""Create a dict containing the issue details and send it to GitHub.""" """Create a dict containing the issue details and send it to GitHub."""
title = issue.title
if len(title) > 80:
# Title is too long.
title = title[:80] + '...'
formatted_issue_body = self.line_break.join(issue.body) formatted_issue_body = self.line_break.join(issue.body)
if self.base_url == 'https://api.github.com/': line_num_anchor = f'#L{issue.start_line}'
line_base_url = 'https://github.com/' if issue.num_lines > 1:
else: line_num_anchor += f'-L{issue.start_line + issue.num_lines - 1}'
line_base_url = self.base_url url_to_line = f'{self.line_base_url}{self.repo}/blob/{self.sha}/{issue.file_name}{line_num_anchor}'
url_to_line = f'{line_base_url}{self.repo}/blob/{self.sha}/{issue.file_name}#L{issue.start_line}'
snippet = '```' + issue.markdown_language + '\n' + issue.hunk + '\n' + '```' snippet = '```' + issue.markdown_language + '\n' + issue.hunk + '\n' + '```'
issue_template = os.getenv('INPUT_ISSUE_TEMPLATE', None) issue_template = os.getenv('INPUT_ISSUE_TEMPLATE', None)
@ -134,13 +277,32 @@ class GitHubClient(object):
issue_contents = formatted_issue_body + '\n\n' + url_to_line + '\n\n' + snippet issue_contents = formatted_issue_body + '\n\n' + url_to_line + '\n\n' + snippet
else: else:
issue_contents = url_to_line + '\n\n' + snippet issue_contents = url_to_line + '\n\n' + snippet
# Check if the current issue already exists - if so, skip it.
# The below is a simple and imperfect check based on the issue title.
for existing_issue in self.existing_issues:
if issue.title == existing_issue['title']:
print(f'Skipping issue (already exists).')
return
endpoint = self.issues_url
if issue.issue_url:
# Issue already exists, update existing rather than create new.
endpoint += f'/{issue.issue_number}'
title = issue.title
if issue.ref:
if issue.ref.startswith('@'):
# Ref = assignee.
issue.assignees.append(issue.ref.lstrip('@'))
elif issue.ref.startswith('!'):
# Ref = label.
issue.labels.append(issue.ref.lstrip('!'))
elif issue.ref.startswith('#'):
# Ref = issue number (indicating this is a comment on that issue).
issue_number = issue.ref.lstrip('#')
if issue_number.isdigit():
# Create the comment now.
return self._comment_issue(issue_number, f'{issue.title}\n\n{issue_contents}'), None
else:
# Just prepend the ref to the title.
title = f'[{issue.ref}] {issue.title}'
title = title + '...' if len(title) > 80 else title
new_issue_body = {'title': title, 'body': issue_contents, 'labels': issue.labels} new_issue_body = {'title': title, 'body': issue_contents, 'labels': issue.labels}
# We need to check if any assignees/milestone specified exist, otherwise issue creation will fail. # We need to check if any assignees/milestone specified exist, otherwise issue creation will fail.
@ -157,34 +319,43 @@ class GitHubClient(object):
new_issue_body['assignees'] = valid_assignees new_issue_body['assignees'] = valid_assignees
if issue.milestone: if issue.milestone:
milestone_url = f'{self.repos_url}{self.repo}/milestones/{issue.milestone}' milestone_number = self._get_milestone(issue.milestone)
milestone_request = requests.get(url=milestone_url, headers=self.issue_headers) if milestone_number:
if milestone_request.status_code == 200: new_issue_body['milestone'] = milestone_number
new_issue_body['milestone'] = issue.milestone
else: else:
print(f'Milestone {issue.milestone} does not exist! Dropping this parameter!') print(f'Milestone {issue.milestone} could not be set. Dropping this milestone!')
new_issue_request = requests.post(url=self.issues_url, headers=self.issue_headers, if issue.issue_url:
data=json.dumps(new_issue_body)) # Update existing issue.
issue_request = requests.patch(url=endpoint, headers=self.issue_headers, json=new_issue_body)
else:
# Create new issue.
issue_request = requests.post(url=endpoint, headers=self.issue_headers, json=new_issue_body)
# Check if we should assign this issue to any projects. request_status = issue_request.status_code
if new_issue_request.status_code == 201 and (len(issue.user_projects) > 0 or len(issue.org_projects) > 0): issue_number = issue_request.json()['number'] if request_status in [200, 201] else None
issue_json = new_issue_request.json()
issue_id = issue_json['id']
if len(issue.user_projects) > 0: # Check if issue should be added to a project now it exists.
self.add_issue_to_projects(issue_id, issue.user_projects, 'user') if issue_number and self.project:
if len(issue.org_projects) > 0: project_id = self._get_project_id(self.project)
self.add_issue_to_projects(issue_id, issue.org_projects, 'org') if project_id:
owner, repo = self.repo.split('/')
issue_id = self._get_issue_global_id(owner, repo, issue_number)
if issue_id:
self._add_issue_to_project(issue_id, project_id)
return new_issue_request.status_code return request_status, issue_number
def close_issue(self, issue): def close_issue(self, issue):
"""Check to see if this issue can be found on GitHub and if so close it.""" """Check to see if this issue can be found on GitHub and if so close it."""
matched = 0
issue_number = None issue_number = None
if issue.issue_number:
# If URL insertion is enabled.
issue_number = issue.issue_number
else:
# Try simple matching.
matched = 0
for existing_issue in self.existing_issues: for existing_issue in self.existing_issues:
# This is admittedly a simple check that may not work in complex scenarios, but we can't deal with them yet.
if existing_issue['title'] == issue.title: if existing_issue['title'] == issue.title:
matched += 1 matched += 1
# If there are multiple issues with similar titles, don't try and close any. # If there are multiple issues with similar titles, don't try and close any.
@ -192,93 +363,33 @@ class GitHubClient(object):
print(f'Skipping issue (multiple matches)') print(f'Skipping issue (multiple matches)')
break break
issue_number = existing_issue['number'] issue_number = existing_issue['number']
else: if issue_number:
# The titles match, so we will try and close the issue. update_issue_url = f'{self.issues_url}/{issue_number}'
update_issue_url = f'{self.repos_url}{self.repo}/issues/{issue_number}'
body = {'state': 'closed'} body = {'state': 'closed'}
requests.patch(update_issue_url, headers=self.issue_headers, data=json.dumps(body)) requests.patch(update_issue_url, headers=self.issue_headers, json=body)
request_status = self._comment_issue(issue_number, f'Closed in {self.sha}.')
issue_comment_url = f'{self.repos_url}{self.repo}/issues/{issue_number}/comments' # Update the description if this is a PR.
body = {'body': f'Closed in {self.sha}'} if os.getenv('GITHUB_EVENT_NAME') == 'pull_request':
update_issue_request = requests.post(issue_comment_url, headers=self.issue_headers, pr_number = os.getenv('PR_NUMBER')
data=json.dumps(body)) if pr_number:
return update_issue_request.status_code request_status = self._update_pr_body(pr_number, body)
return request_status
return None return None
def add_issue_to_projects(self, issue_id, projects, projects_type): def _update_pr_body(self, pr_number, issue_number):
"""Attempt to add this issue to the specified user or organisation projects.""" """Add a close message for an issue to a PR."""
projects_secret = os.getenv('INPUT_PROJECTS_SECRET', None) pr_url = f'{self.repos_url}{self.repo}/pulls/{pr_number}'
if not projects_secret: pr_request = requests.get(pr_url, headers=self.issue_headers)
print('You need to create and set PROJECTS_SECRET to use projects') if pr_request.status_code == 200:
return pr_body = pr_request.json()['body']
projects_headers = { close_message = f'Closes #{issue_number}'
'Accept': 'application/vnd.github.inertia-preview+json', if close_message not in pr_body:
'Authorization': f'token {projects_secret}' updated_pr_body = f'{pr_body}\n\n{close_message}' if pr_body.strip() else close_message
} body = {'body': updated_pr_body}
pr_update_request = requests.patch(pr_url, headers=self.issue_headers, json=body)
# Loop through all the projects that we should assign this issue to. return pr_update_request.status_code
for i, project in enumerate(projects): return pr_request.status_code
print(f'Adding issue to {projects_type} project {i + 1} of {len(projects)}')
project = project.replace(' / ', '/')
try:
entity_name, project_name, column_name = project.split('/')
except ValueError:
print('Invalid project syntax')
continue
entity_name = entity_name.strip()
project_name = project_name.strip()
column_name = column_name.strip()
if projects_type == 'user':
projects_url = f'{self.base_url}users/{entity_name}/projects'
elif projects_type == 'org':
projects_url = f'{self.base_url}orgs/{entity_name}/projects'
else:
return
# We need to use the project name to get its ID.
projects_request = requests.get(url=projects_url, headers=projects_headers)
if projects_request.status_code == 200:
projects_json = projects_request.json()
for project_dict in projects_json:
if project_dict['name'].lower() == project_name.lower():
project_id = project_dict['id']
break
else:
print('Project does not exist, skipping')
continue
else:
print('An error occurred, skipping')
continue
# Use the project ID and column name to get the column ID.
columns_url = f'{self.base_url}projects/{project_id}/columns'
columns_request = requests.get(url=columns_url, headers=projects_headers)
if columns_request.status_code == 200:
columns_json = columns_request.json()
for column_dict in columns_json:
if column_dict['name'].lower() == column_name.lower():
column_id = column_dict['id']
break
else:
print('Column does not exist, skipping')
continue
else:
print('An error occurred, skipping')
continue
# Use the column ID to assign the issue to the project.
new_card_url = f'{self.base_url}projects/columns/{column_id}/cards'
new_card_body = {
'content_id': int(issue_id),
'content_type': 'Issue'
}
new_card_request = requests.post(url=new_card_url, headers=projects_headers,
data=json.dumps(new_card_body))
if new_card_request.status_code == 201:
print('Issue card added to project')
else:
print('Issue card could not be added to project')
class TodoParser(object): class TodoParser(object):
@ -295,11 +406,11 @@ class TodoParser(object):
LABELS_PATTERN = re.compile(r'(?<=labels:\s).+', re.IGNORECASE) LABELS_PATTERN = re.compile(r'(?<=labels:\s).+', re.IGNORECASE)
ASSIGNEES_PATTERN = re.compile(r'(?<=assignees:\s).+', re.IGNORECASE) ASSIGNEES_PATTERN = re.compile(r'(?<=assignees:\s).+', re.IGNORECASE)
MILESTONE_PATTERN = re.compile(r'(?<=milestone:\s).+', re.IGNORECASE) MILESTONE_PATTERN = re.compile(r'(?<=milestone:\s).+', re.IGNORECASE)
USER_PROJECTS_PATTERN = re.compile(r'(?<=user projects:\s).+', re.IGNORECASE) ISSUE_URL_PATTERN = re.compile(r'(?<=Issue URL:\s).+', re.IGNORECASE)
ORG_PROJECTS_PATTERN = re.compile(r'(?<=org projects:\s).+', re.IGNORECASE) ISSUE_NUMBER_PATTERN = re.compile(r'/issues/(\d+)', re.IGNORECASE)
def __init__(self): def __init__(self):
# Determine if the Issues should be escaped. # Determine if the issues should be escaped.
self.should_escape = os.getenv('INPUT_ESCAPE', 'true') == 'true' self.should_escape = os.getenv('INPUT_ESCAPE', 'true') == 'true'
# Load any custom identifiers, otherwise use the default. # Load any custom identifiers, otherwise use the default.
custom_identifiers = os.getenv('INPUT_IDENTIFIERS') custom_identifiers = os.getenv('INPUT_IDENTIFIERS')
@ -309,7 +420,7 @@ class TodoParser(object):
try: try:
custom_identifiers_dict = json.loads(custom_identifiers) custom_identifiers_dict = json.loads(custom_identifiers)
for identifier_dict in custom_identifiers_dict: for identifier_dict in custom_identifiers_dict:
if type(identifier_dict['name']) != str or type(identifier_dict['labels']) != list: if type(identifier_dict['name']) is not str or type(identifier_dict['labels']) is not list:
raise TypeError raise TypeError
self.identifiers = [identifier['name'] for identifier in custom_identifiers_dict] self.identifiers = [identifier['name'] for identifier in custom_identifiers_dict]
self.identifiers_dict = custom_identifiers_dict self.identifiers_dict = custom_identifiers_dict
@ -317,8 +428,7 @@ class TodoParser(object):
print('Invalid identifiers dict, ignoring.') print('Invalid identifiers dict, ignoring.')
self.languages_dict = None self.languages_dict = None
# Check if the standard collections should be loaded.
# Check if the standard collections should be loaded
if os.getenv('INPUT_NO_STANDARD', 'false') != 'true': if os.getenv('INPUT_NO_STANDARD', 'false') != 'true':
# Load the languages data for ascertaining file types. # Load the languages data for ascertaining file types.
languages_url = 'https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml' languages_url = 'https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml'
@ -343,27 +453,28 @@ class TodoParser(object):
custom_languages = os.getenv('INPUT_LANGUAGES', '') custom_languages = os.getenv('INPUT_LANGUAGES', '')
if custom_languages != '': if custom_languages != '':
# Load all custom languages # Load all custom languages.
for path in custom_languages.split(','): for path in custom_languages.split(','):
# noinspection PyBroadException
try: try:
# Decide if the path is a url or local file # Decide if the path is a url or local file.
if path.startswith('http'): if path.startswith('http'):
languages_request = requests.get(path) languages_request = requests.get(path)
if languages_request.status_code != 200: if languages_request.status_code != 200:
print('Cannot retrieve custom language file. (\''+path+'\')') print(f'Cannot retrieve custom language file "{path}".')
continue continue
data = languages_request.json() data = languages_request.json()
else: else:
path = os.path.join(os.getcwd(), path) path = os.path.join(os.getcwd(), path)
if not os.path.exists(path) or not os.path.isfile(path): if not os.path.exists(path) or not os.path.isfile(path):
print('Cannot retrieve custom language file. (\''+path+'\')') print(f'Cannot retrieve custom language file "{path}".')
continue continue
f = open(path) f = open(path)
data = json.load(f) data = json.load(f)
# Iterate through the definitions # Iterate through the definitions.
for lang in data: for lang in data:
# Add/Replace the language definition # Add/replace the language definition.
self.languages_dict[lang['language']] = {} self.languages_dict[lang['language']] = {}
self.languages_dict[lang['language']]['type'] = '' self.languages_dict[lang['language']]['type'] = ''
self.languages_dict[lang['language']]['color'] = '' self.languages_dict[lang['language']]['color'] = ''
@ -372,7 +483,7 @@ class TodoParser(object):
self.languages_dict[lang['language']]['ace_mode'] = 'text' self.languages_dict[lang['language']]['ace_mode'] = 'text'
self.languages_dict[lang['language']]['language_id'] = 0 self.languages_dict[lang['language']]['language_id'] = 0
# Check if a syntax with the language name already exists # Check if comment syntax for the language name already exists.
counter = 0 counter = 0
exists = False exists = False
for syntax in self.syntax_dict: for syntax in self.syntax_dict:
@ -383,17 +494,18 @@ class TodoParser(object):
counter = counter + 1 counter = counter + 1
if exists: if exists:
# When the syntax exists it will be popped out of the list # When the syntax exists it will be popped out of the list.
self.syntax_dict.pop(counter) self.syntax_dict.pop(counter)
# And be replaced with the new syntax definition # And be replaced with the new syntax definition.
self.syntax_dict.append({ self.syntax_dict.append({
'language': lang['language'], 'language': lang['language'],
'markers': lang['markers'] 'markers': lang['markers']
}) })
except: except Exception:
print('An error occurred in the custom language file (\''+path+'\')') print(f'An error occurred in the custom language file "{path}".')
print('Please check the file, or if it represents undefined behavior, create an issue at \'https://github.com/alstr/todo-to-issue-action/issues\'') print('Please check the file, or if it represents undefined behavior, '
'create an issue at https://github.com/alstr/todo-to-issue-action/issues.')
# noinspection PyTypeChecker # noinspection PyTypeChecker
def parse(self, diff_file): def parse(self, diff_file):
@ -431,12 +543,12 @@ class TodoParser(object):
continue continue
curr_markers, curr_markdown_language = self._get_file_details(curr_file) curr_markers, curr_markdown_language = self._get_file_details(curr_file)
if not curr_markers or not curr_markdown_language: if not curr_markers or not curr_markdown_language:
print(f'Could not check {curr_file} for TODOs as this language is not yet supported by default.') print(f'Could not check "{curr_file}" for TODOs as this language is not yet supported by default.')
continue continue
# Break this section down into individual changed code blocks. # Break this section down into individual changed code blocks.
line_numbers = re.finditer(self.LINE_NUMBERS_PATTERN, hunk) line_numbers_iterator = re.finditer(self.LINE_NUMBERS_PATTERN, hunk)
for i, line_numbers in enumerate(line_numbers): for i, line_numbers in enumerate(line_numbers_iterator):
line_numbers_inner_search = re.search(self.LINE_NUMBERS_INNER_PATTERN, line_numbers.group(0)) line_numbers_inner_search = re.search(self.LINE_NUMBERS_INNER_PATTERN, line_numbers.group(0))
line_numbers_str = line_numbers_inner_search.group(0).strip('@@ -') line_numbers_str = line_numbers_inner_search.group(0).strip('@@ -')
start_line = line_numbers_str.split(' ')[1].strip('+') start_line = line_numbers_str.split(' ')[1].strip('+')
@ -456,6 +568,7 @@ class TodoParser(object):
prev_index = len(code_blocks) - 1 prev_index = len(code_blocks) - 1
# Set the end of the last code block based on the start of this one. # Set the end of the last code block based on the start of this one.
if prev_block and prev_block['file'] == block['file']: if prev_block and prev_block['file'] == block['file']:
# noinspection PyTypedDict
code_blocks[prev_index]['hunk_end'] = line_numbers.start() code_blocks[prev_index]['hunk_end'] = line_numbers.start()
code_blocks[prev_index]['hunk'] = (prev_block['hunk'] code_blocks[prev_index]['hunk'] = (prev_block['hunk']
[prev_block['hunk_start']:line_numbers.start()]) [prev_block['hunk_start']:line_numbers.start()])
@ -475,7 +588,7 @@ class TodoParser(object):
for marker in block['markers']: for marker in block['markers']:
# Check if there are line or block comments. # Check if there are line or block comments.
if marker['type'] == 'line': if marker['type'] == 'line':
# Add a negative lookup include the second character from alternative comment patterns # Add a negative lookup to include the second character from alternative comment patterns.
# This step is essential to handle cases like in Julia, where '#' and '#=' are comment patterns. # This step is essential to handle cases like in Julia, where '#' and '#=' are comment patterns.
# It ensures that when a space after the comment is optional ('\s' => '\s*'), # It ensures that when a space after the comment is optional ('\s' => '\s*'),
# the second character would be matched because of the any character expression ('.+'). # the second character would be matched because of the any character expression ('.+').
@ -489,32 +602,34 @@ class TodoParser(object):
suff_escape_list.append(self._extract_character(to_escape['pattern'], 1)) suff_escape_list.append(self._extract_character(to_escape['pattern'], 1))
else: else:
# Block comments and line comments cannot have the same comment pattern, # Block comments and line comments cannot have the same comment pattern,
# so a check if the string is the same is unnecessary # so a check if the string is the same is unnecessary.
if to_escape['pattern']['start'][0] == marker['pattern'][0]: if to_escape['pattern']['start'][0] == marker['pattern'][0]:
suff_escape_list.append(self._extract_character(to_escape['pattern']['start'], 1)) suff_escape_list.append(self._extract_character(to_escape['pattern']['start'], 1))
search = to_escape['pattern']['end'].find(marker['pattern']) search = to_escape['pattern']['end'].find(marker['pattern'])
if search != -1: if search != -1:
pref_escape_list.append(self._extract_character(to_escape['pattern']['end'], search - 1)) pref_escape_list.append(self._extract_character(to_escape['pattern']['end'],
search - 1))
comment_pattern = (r'(^[+\-\s].*' + comment_pattern = (r'(^.*'
(r'(?<!(' + '|'.join(pref_escape_list) + r'))' if len(pref_escape_list) > 0 else '') + + (r'(?<!(' + '|'.join(pref_escape_list) + r'))' if len(pref_escape_list) > 0
marker['pattern'] + else '')
(r'(?!(' + '|'.join(suff_escape_list) + r'))' if len(suff_escape_list) > 0 else '') + + marker['pattern']
r'\s*.+$)') + (r'(?!(' + '|'.join(suff_escape_list) + r'))' if len(suff_escape_list) > 0
else '')
+ r'\s*.+$)')
comments = re.finditer(comment_pattern, block['hunk'], re.MULTILINE) comments = re.finditer(comment_pattern, block['hunk'], re.MULTILINE)
extracted_comments = [] extracted_comments = []
prev_comment = None prev_comment = None
for i, comment in enumerate(comments): for i, comment in enumerate(comments):
if i == 0 or re.search('|'.join(self.identifiers), comment.group(0)): if prev_comment and comment.start() == prev_comment.end() + 1:
extracted_comments.append([comment])
else:
if comment.start() == prev_comment.end() + 1:
extracted_comments[len(extracted_comments) - 1].append(comment) extracted_comments[len(extracted_comments) - 1].append(comment)
else:
extracted_comments.append([comment])
prev_comment = comment prev_comment = comment
for comment in extracted_comments: for comment in extracted_comments:
issue = self._extract_issue_if_exists(comment, marker, block) extracted_issues = self._extract_issue_if_exists(comment, marker, block)
if issue: if extracted_issues:
issues.append(issue) issues.extend(extracted_issues)
else: else:
comment_pattern = (r'(?:[+\-\s]\s*' + marker['pattern']['start'] + r'.*?' comment_pattern = (r'(?:[+\-\s]\s*' + marker['pattern']['start'] + r'.*?'
+ marker['pattern']['end'] + ')') + marker['pattern']['end'] + ')')
@ -525,12 +640,10 @@ class TodoParser(object):
extracted_comments.append([comment]) extracted_comments.append([comment])
for comment in extracted_comments: for comment in extracted_comments:
issue = self._extract_issue_if_exists(comment, marker, block) extracted_issues = self._extract_issue_if_exists(comment, marker, block)
if issue: if extracted_issues:
issues.append(issue) issues.extend(extracted_issues)
default_user_projects = os.getenv('INPUT_USER_PROJECTS', None)
default_org_projects = os.getenv('INPUT_ORG_PROJECTS', None)
for i, issue in enumerate(issues): for i, issue in enumerate(issues):
# Strip some of the diff symbols so it can be included as a code snippet in the issue body. # Strip some of the diff symbols so it can be included as a code snippet in the issue body.
# Strip removed lines. # Strip removed lines.
@ -541,18 +654,10 @@ class TodoParser(object):
cleaned_hunk = re.sub(r'\n\sNo newline at end of file', '', cleaned_hunk, 0, re.MULTILINE) cleaned_hunk = re.sub(r'\n\sNo newline at end of file', '', cleaned_hunk, 0, re.MULTILINE)
issue.hunk = cleaned_hunk issue.hunk = cleaned_hunk
# If no projects have been specified for this issue, assign any default projects that exist.
if len(issue.user_projects) == 0 and default_user_projects is not None:
separated_user_projects = self._get_projects(f'user projects: {default_user_projects}', 'user')
issue.user_projects = separated_user_projects
if len(issue.org_projects) == 0 and default_org_projects is not None:
separated_org_projects = self._get_projects(f'org projects: {default_org_projects}', 'org')
issue.org_projects = separated_org_projects
return issues return issues
def _get_language_details(self, language_name, attribute, value): def _get_language_details(self, language_name, attribute, value):
"""Try and get the Markdown language and comment syntax """Try and get the Markdown language and comment syntax data based on a specified attribute of the language."""
data based on a specified attribute of the language."""
attributes = [at.lower() for at in self.languages_dict[language_name][attribute]] attributes = [at.lower() for at in self.languages_dict[language_name][attribute]]
if value.lower() in attributes: if value.lower() in attributes:
for syntax_details in self.syntax_dict: for syntax_details in self.syntax_dict:
@ -565,7 +670,7 @@ class TodoParser(object):
file_name, extension = os.path.splitext(os.path.basename(file)) file_name, extension = os.path.splitext(os.path.basename(file))
for language_name in self.languages_dict: for language_name in self.languages_dict:
# Check if the file extension matches the language's extensions. # Check if the file extension matches the language's extensions.
if extension != "" and 'extensions' in self.languages_dict[language_name]: if extension != '' and 'extensions' in self.languages_dict[language_name]:
syntax_details, ace_mode = self._get_language_details(language_name, 'extensions', extension) syntax_details, ace_mode = self._get_language_details(language_name, 'extensions', extension)
if syntax_details is not None and ace_mode is not None: if syntax_details is not None and ace_mode is not None:
return syntax_details, ace_mode return syntax_details, ace_mode
@ -578,80 +683,103 @@ class TodoParser(object):
def _extract_issue_if_exists(self, comment, marker, code_block): def _extract_issue_if_exists(self, comment, marker, code_block):
"""Check this comment for TODOs, and if found, build an Issue object.""" """Check this comment for TODOs, and if found, build an Issue object."""
issue = None curr_issue = None
found_issues = []
line_statuses = []
prev_line_title = False
for match in comment: for match in comment:
lines = match.group().split('\n') comment_lines = match.group().split('\n')
for line in lines: for line in comment_lines:
line_status, committed_line = self._get_line_status(line) line_status, committed_line = self._get_line_status(line)
line_statuses.append(line_status)
cleaned_line = self._clean_line(committed_line, marker) cleaned_line = self._clean_line(committed_line, marker)
line_title, ref, identifier = self._get_title(cleaned_line) line_title, ref, identifier = self._get_title(cleaned_line)
if line_title: if line_title:
if ref: if prev_line_title and line_status == line_statuses[-2]:
issue_title = f'[{ref}] {line_title}' # This means that there is a separate one-line TODO directly above this one.
else: # We need to store the previous one.
issue_title = line_title curr_issue.status = line_status
issue = Issue( found_issues.append(curr_issue)
title=issue_title, curr_issue = Issue(
labels=['todo'], title=line_title,
labels=[],
assignees=[], assignees=[],
milestone=None, milestone=None,
user_projects=[],
org_projects=[],
body=[], body=[],
hunk=code_block['hunk'], hunk=code_block['hunk'],
file_name=code_block['file'], file_name=code_block['file'],
start_line=code_block['start_line'], start_line=code_block['start_line'],
num_lines=1,
markdown_language=code_block['markdown_language'], markdown_language=code_block['markdown_language'],
status=line_status, status=line_status,
identifier=identifier identifier=identifier,
ref=ref,
issue_url=None,
issue_number=None
) )
prev_line_title = True
# Calculate the file line number that this issue references. # Calculate the file line number that this issue references.
hunk_lines = re.finditer(self.LINE_PATTERN, code_block['hunk'], re.MULTILINE) hunk_lines = re.finditer(self.LINE_PATTERN, code_block['hunk'], re.MULTILINE)
start_line = code_block['start_line'] start_line = code_block['start_line']
for i, hunk_line in enumerate(hunk_lines): for i, hunk_line in enumerate(hunk_lines):
if hunk_line.group(0) == line: if hunk_line.group(0) == line:
issue.start_line = start_line curr_issue.start_line = start_line
break break
if i != 0 and (hunk_line.group(0).startswith('+') or not hunk_line.group(0).startswith('-')): if i != 0 and (hunk_line.group(0).startswith('+') or not hunk_line.group(0).startswith('-')):
start_line += 1 start_line += 1
elif issue: elif curr_issue:
# Extract other issue information that may exist. # Extract other issue information that may exist below the title.
line_labels = self._get_labels(cleaned_line) line_labels = self._get_labels(cleaned_line)
line_assignees = self._get_assignees(cleaned_line) line_assignees = self._get_assignees(cleaned_line)
line_milestone = self._get_milestone(cleaned_line) line_milestone = self._get_milestone(cleaned_line)
user_projects = self._get_projects(cleaned_line, 'user') line_url = self._get_issue_url(cleaned_line)
org_projects = self._get_projects(cleaned_line, 'org')
if line_labels: if line_labels:
issue.labels.extend(line_labels) curr_issue.labels.extend(line_labels)
elif line_assignees: elif line_assignees:
issue.assignees.extend(line_assignees) curr_issue.assignees.extend(line_assignees)
elif line_milestone and not issue.milestone: elif line_milestone:
issue.milestone = line_milestone curr_issue.milestone = line_milestone
elif user_projects: elif line_url:
issue.user_projects.extend(user_projects) curr_issue.issue_url = line_url
elif org_projects: issue_number_search = self.ISSUE_NUMBER_PATTERN.search(line_url)
issue.org_projects.extend(org_projects) if issue_number_search:
elif len(cleaned_line): curr_issue.issue_number = issue_number_search.group(1)
elif len(cleaned_line) and line_status != LineStatus.DELETED:
if self.should_escape: if self.should_escape:
issue.body.append(self._escape_markdown(cleaned_line)) curr_issue.body.append(self._escape_markdown(cleaned_line))
else: else:
issue.body.append(cleaned_line) curr_issue.body.append(cleaned_line)
if not line.startswith('-'):
if issue is not None and issue.identifier is not None and self.identifiers_dict is not None: curr_issue.num_lines += 1
if not line_title:
prev_line_title = False
if curr_issue is not None and curr_issue.identifier is not None and self.identifiers_dict is not None:
for identifier_dict in self.identifiers_dict: for identifier_dict in self.identifiers_dict:
if identifier_dict['name'] == issue.identifier: if identifier_dict['name'] == curr_issue.identifier:
for label in identifier_dict['labels']: for label in identifier_dict['labels']:
if label not in issue.labels: if label not in curr_issue.labels:
issue.labels.append(label) curr_issue.labels.append(label)
return issue if curr_issue is not None:
# If all the lines are unchanged, don't do anything.
if all(s == LineStatus.UNCHANGED for s in line_statuses):
return None
# If the title line hasn't changed, but the info below has, we need to mark it as an update (addition).
if (curr_issue.status == LineStatus.UNCHANGED
and (LineStatus.ADDED in line_statuses or LineStatus.DELETED in line_statuses)):
curr_issue.status = LineStatus.ADDED
found_issues.append(curr_issue)
return found_issues
@staticmethod @staticmethod
def _escape_markdown(comment): def _escape_markdown(comment):
# All basic characters according to: https://www.markdownguide.org/basic-syntax # All basic characters according to: https://www.markdownguide.org/basic-syntax
must_escaped = ['\\', '<', '>', '#', '`', '*', '_', '[', ']', '(', ')', '!', '+', '-', '.', '|', '{', '}', '~', '='] must_escape = ['\\', '<', '>', '#', '`', '*', '_', '[', ']', '(', ')', '!', '+', '-', '.', '|', '{', '}', '~',
'=']
escaped = '' escaped = ''
@ -659,7 +787,7 @@ class TodoParser(object):
# which tries to replace all backslashes with duplicate backslashes, i.e. also the already other escaped # which tries to replace all backslashes with duplicate backslashes, i.e. also the already other escaped
# characters. # characters.
for c in comment: for c in comment:
if c in must_escaped: if c in must_escape:
escaped += '\\' + c escaped += '\\' + c
else: else:
escaped += c escaped += c
@ -720,13 +848,13 @@ class TodoParser(object):
title_identifier = None title_identifier = None
for identifier in self.identifiers: for identifier in self.identifiers:
title_identifier = identifier title_identifier = identifier
title_pattern = re.compile(r'(?<=' + identifier + r'[\s:]).+', re.IGNORECASE) title_pattern = re.compile(fr'(?<={identifier}[\s:]).+', re.IGNORECASE)
title_search = title_pattern.search(comment, re.IGNORECASE) title_search = title_pattern.search(comment, re.IGNORECASE)
if title_search: if title_search:
title = title_search.group(0).strip() title = title_search.group(0).strip(': ')
break break
else: else:
title_ref_pattern = re.compile(r'(?<=' + identifier + r'\().+', re.IGNORECASE) title_ref_pattern = re.compile(fr'(?<={identifier}\().+', re.IGNORECASE)
title_ref_search = title_ref_pattern.search(comment, re.IGNORECASE) title_ref_search = title_ref_pattern.search(comment, re.IGNORECASE)
if title_ref_search: if title_ref_search:
title = title_ref_search.group(0).strip() title = title_ref_search.group(0).strip()
@ -737,6 +865,16 @@ class TodoParser(object):
break break
return title, ref, title_identifier return title, ref, title_identifier
def _get_issue_url(self, comment):
"""Check the passed comment for a GitHub issue URL."""
url_search = self.ISSUE_URL_PATTERN.search(comment, re.IGNORECASE)
url = None
if url_search:
url = url_search.group(0)
parsed_url = urlparse(url)
return url if all([parsed_url.scheme, parsed_url.netloc]) else None
return url
def _get_labels(self, comment): def _get_labels(self, comment):
"""Check the passed comment for issue labels.""" """Check the passed comment for issue labels."""
labels_search = self.LABELS_PATTERN.search(comment, re.IGNORECASE) labels_search = self.LABELS_PATTERN.search(comment, re.IGNORECASE)
@ -761,24 +899,9 @@ class TodoParser(object):
milestone = None milestone = None
if milestone_search: if milestone_search:
milestone = milestone_search.group(0) milestone = milestone_search.group(0)
if milestone.isdigit():
milestone = int(milestone)
return milestone return milestone
def _get_projects(self, comment, projects_type): # noinspection PyMethodMayBeStatic
"""Check the passed comment for projects to link the issue to."""
projects = []
if projects_type == 'user':
projects_search = self.USER_PROJECTS_PATTERN.search(comment, re.IGNORECASE)
elif projects_type == 'org':
projects_search = self.ORG_PROJECTS_PATTERN.search(comment, re.IGNORECASE)
else:
return projects
if projects_search:
projects = projects_search.group(0).replace(', ', ',')
projects = list(filter(None, projects.split(',')))
return projects
def _should_ignore(self, file): def _should_ignore(self, file):
ignore_patterns = os.getenv('INPUT_IGNORE', None) ignore_patterns = os.getenv('INPUT_IGNORE', None)
if ignore_patterns: if ignore_patterns:
@ -811,30 +934,79 @@ if __name__ == "__main__":
# This is a simple, non-perfect check to filter out any TODOs that have just been moved. # This is a simple, non-perfect check to filter out any TODOs that have just been moved.
# It looks for items that appear in the diff as both an addition and deletion. # It looks for items that appear in the diff as both an addition and deletion.
# It is based on the assumption that TODOs will not have identical titles in identical files. # It is based on the assumption that TODOs will not have identical titles in identical files.
# That is about as good as we can do for TODOs without issue URLs.
issues_to_process = [] issues_to_process = []
for values, similar_issues in itertools.groupby(raw_issues, key=operator.attrgetter('title', 'file_name', for values, similar_issues in itertools.groupby(raw_issues, key=operator.attrgetter('title', 'file_name',
'markdown_language')): 'markdown_language')):
similar_issues = list(similar_issues) similar_issues = list(similar_issues)
if (len(similar_issues) == 2 and ((similar_issues[0].status == LineStatus.ADDED and if (len(similar_issues) == 2 and all(issue.issue_url is None for issue in similar_issues)
similar_issues[1].status == LineStatus.DELETED) or and ((similar_issues[0].status == LineStatus.ADDED
(similar_issues[1].status == LineStatus.ADDED and and similar_issues[1].status == LineStatus.DELETED)
similar_issues[0].status == LineStatus.DELETED))): or (similar_issues[1].status == LineStatus.ADDED
and similar_issues[0].status == LineStatus.DELETED))):
print(f'Issue "{values[0]}" appears as both addition and deletion. ' print(f'Issue "{values[0]}" appears as both addition and deletion. '
f'Assuming this issue has been moved so skipping.') f'Assuming this issue has been moved so skipping.')
continue continue
issues_to_process.extend(similar_issues) issues_to_process.extend(similar_issues)
# If a TODO with an issue URL is updated, it may appear as both an addition and a deletion.
# We need to ignore the deletion so it doesn't update then immediately close the issue.
# First store TODOs based on their status.
todos_status = defaultdict(lambda: {'added': False, 'deleted': False})
# Populate the status dictionary based on the issue URL.
for raw_issue in issues_to_process:
if raw_issue.issue_url: # Ensuring we're dealing with TODOs that have an issue URL.
if raw_issue.status == LineStatus.ADDED:
todos_status[raw_issue.issue_url]['added'] = True
elif raw_issue.status == LineStatus.DELETED:
todos_status[raw_issue.issue_url]['deleted'] = True
# Determine which issues are both added and deleted.
update_and_close_issues = set()
for _issue_url, _status in todos_status.items():
if _status['added'] and _status['deleted']:
update_and_close_issues.add(_issue_url)
# Remove issues from issues_to_process if they are both to be updated and closed (i.e., ignore deletions).
issues_to_process = [issue for issue in issues_to_process if
not (issue.issue_url in update_and_close_issues and issue.status == LineStatus.DELETED)]
# Cycle through the Issue objects and create or close a corresponding GitHub issue for each. # Cycle through the Issue objects and create or close a corresponding GitHub issue for each.
for j, raw_issue in enumerate(issues_to_process): for j, raw_issue in enumerate(issues_to_process):
print(f'Processing issue {j + 1} of {len(issues_to_process)}') print(f'Processing issue {j + 1} of {len(issues_to_process)}')
if raw_issue.status == LineStatus.ADDED: if raw_issue.status == LineStatus.ADDED:
status_code = client.create_issue(raw_issue) status_code, new_issue_number = client.create_issue(raw_issue)
if status_code == 201: if status_code == 201:
print('Issue created') print('Issue created')
# Check to see if we should insert the issue URL back into the linked TODO.
# Don't insert URLs for comments. Comments do not get updated.
if client.insert_issue_urls and not (raw_issue.ref and raw_issue.ref.startswith('#')):
line_number = raw_issue.start_line - 1
with open(raw_issue.file_name, 'r') as issue_file:
file_lines = issue_file.readlines()
if line_number < len(file_lines):
# Duplicate the line to retain the comment syntax.
new_line = file_lines[line_number]
remove = fr'{raw_issue.identifier}.*{raw_issue.title}'
insert = f'Issue URL: {client.line_base_url}{client.repo}/issues/{new_issue_number}'
new_line = re.sub(remove, insert, new_line)
# Check if the URL line already exists, if so abort.
if line_number == len(file_lines) - 1 or file_lines[line_number + 1] != new_line:
file_lines.insert(line_number + 1, new_line)
with open(raw_issue.file_name, 'w') as issue_file:
issue_file.writelines(file_lines)
elif status_code == 200:
print('Issue updated')
else: else:
print('Issue could not be created') print('Issue could not be created')
elif raw_issue.status == LineStatus.DELETED and os.getenv('INPUT_CLOSE_ISSUES', 'true') == 'true': elif raw_issue.status == LineStatus.DELETED and os.getenv('INPUT_CLOSE_ISSUES', 'true') == 'true':
if raw_issue.ref and raw_issue.ref.startswith('#'):
print('Issue looks like a comment, will not attempt to close.')
continue
status_code = client.close_issue(raw_issue) status_code = client.close_issue(raw_issue)
if status_code == 201: if status_code in [200, 201]:
print('Issue closed') print('Issue closed')
else: else:
print('Issue could not be closed') print('Issue could not be closed')

18
requirements.txt
View File

@ -1,15 +1,3 @@
attrs==22.1.0 requests==2.32.3
certifi==2022.12.07 ruamel.yaml==0.18.6
charset-normalizer==2.0.7 pytest==8.3.3
exceptiongroup==1.0.0
idna==3.3
iniconfig==1.1.1
packaging==21.3
pluggy==1.0.0
pyparsing==3.0.9
pytest==7.2.0
requests==2.31.0
ruamel.yaml==0.17.17
ruamel.yaml.clib==0.2.6
tomli==2.0.1
urllib3==1.26.7

28
tests/test_escape.diff
View File

@ -2,18 +2,18 @@ diff --git a/tests/ExampleFile.java b/tests/ExampleFile.java
index d340f6a..29b54da 100644 index d340f6a..29b54da 100644
--- a/tests/ExampleFile.java --- a/tests/ExampleFile.java
+++ b/tests/ExampleFile.java +++ b/tests/ExampleFile.java
@@ -1,13 +1,5 @@ @@ -0,0 +1,13 @@
package com.mydomain.myapp; +package com.mydomain.myapp;
+
public class JavaTests { +public class JavaTests {
- // TODO: Some Java + // TODO: Some Java
- // # Some title + // # Some title
- // <SomeTag> + // <SomeTag>
+
- /* + /*
- TODO: Definitely some Java + TODO: Definitely some Java
- # Another title + # Another title
- <AnotherTag> + <AnotherTag>
- */ + */
} +}
\ No newline at end of file \ No newline at end of file

2
tests/test_todo_parser.py
View File

@ -245,7 +245,7 @@ class EscapeMarkdownTest(unittest.TestCase):
self.assertEqual(issue.body[1], '\\<AnotherTag\\>') self.assertEqual(issue.body[1], '\\<AnotherTag\\>')
class customLanguageTest(unittest.TestCase): class CustomLanguageTest(unittest.TestCase):
def test_custom_lang_load(self): def test_custom_lang_load(self):
os.environ['INPUT_LANGUAGES'] = 'tests/custom_languages.json' os.environ['INPUT_LANGUAGES'] = 'tests/custom_languages.json'
parser = TodoParser() parser = TodoParser()