Dev/file filter

.github/workflows/gource-dev.yml

@@ -6,7 +6,38 @@ on:
       - 'dev/**'
 
 jobs:
-  dev-action:
+  local-images:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 'Current folder'
+        run: ls -al
+
+      - name: 'Gource Action'
+        uses: ./
+        with:
+          git_url: ./
+          avatars_url: ./avatars/
+          gource_title: 'Gource Action Development'
+          logo_url: ./logo.png
+
+      - name: 'Check output'
+        run: |
+          ls -al ./
+          ls -al ./gource
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: gource-local
+          path: ./gource
+          retention-days: 1
+
+  external-images:
     runs-on: ubuntu-latest
 
     steps:
@@ -25,10 +56,6 @@ jobs:
           avatars_url: ./avatars/
           gource_title: 'Gource Action Development'
           logo_url: 'https://user-images.githubusercontent.com/24683383/92398226-79a40680-f128-11ea-9f54-6ccbaca4a6a5.png'
-          gource_resolution: '1080p'
-          gource_fps: 60
-          gource_font_size: 40
-          gource_file_filter: ^.+\.(png|md)$
 
       - name: 'Check output'
         run: |
@@ -37,5 +64,36 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: gource
+          name: gource-external
+          path: ./gource
+          retention-days: 1
+
+  no-images:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 'Current folder'
+        run: ls -al
+
+      - name: 'Gource Action'
+        uses: ./
+        with:
+          git_url: ./
+          avatars_url: ./avatars/
+          gource_title: 'Gource Action Development'
+
+      - name: 'Check output'
+        run: |
+          ls -al ./
+          ls -al ./gource
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: gource-no
           path: ./gource
+          retention-days: 1

README.md

@@ -73,7 +73,7 @@ Keys can be added directly to your .yml config file or referenced from your proj
 |---------------------------	|-----------	|----------------------	|------------------------------------------------------------------------------------------------------------	|
 | git_url     	              | false     	| ./      	            | Location of git repository. Can also be an remote repository e.g.: https://github.com/acaudwell/Gource.git 	|
 | git_token   	              | false     	|         	            | If the provided repository is private, the action need an token with read scope.                           	|
-| logo_url    	              | false     	|         	            | Displayed icon on bottom right corner.                                                                     	|
+| logo_url    	              | false     	|         	            | Displayed icon on bottom right corner. Can be local "./logo.png" or Url. For Url it must be png or jgp      |
 | avatars_url 	              | false       |         	            | Path of local directory containing user avatars.                                                           	|
 | gource_resolution         	| false     	| 1080p                	| Used gource resolution (2160p, 1440p, 1080p, 720p).             	                                          |
 
@@ -150,4 +150,4 @@ A full list of all available options can be found [here][gource-docs].
 <!-- Links -->
 [docker-cli]: https://github.com/docker/cli
 [gource-homepage]: https://gource.io/
-[gource-docs]: https://github.com/acaudwell/Gource/blob/master/README
+[gource-docs]: https://github.com/acaudwell/Gource/blob/master/README.md

entrypoint.sh

@@ -82,10 +82,15 @@ fi
 
 # Set proper env variables if we have a logo.
 printf "\n>\n> Logo check"
-if [ "${INPUT_LOGO_URL}" != "" ]; then
-  # // TODO: Add support for local logo
-  printf "\n> \tDownloading logo"
-	wget -O ./logo.image ${INPUT_LOGO_URL} >/dev/null 2>&1
+if [ "$INPUT_LOGO_URL" != "" ]; then
+  if [[ $INPUT_LOGO_URL =~ ^https?:\/\/.+(png|jpg)$ ]]; then
+    printf "\n> \tDownloading file"
+    wget -O ./logo.image $INPUT_LOGO_URL >/dev/null 2>&1
+  else
+    printf "\n> \tUsing local file"
+    mv "./git_repo/$INPUT_LOGO_URL" ./logo.image
+  fi
+
   convert -geometry x160 ./logo.image ./logo.image
 
   printf "\n> \tUsing logo from: ${INPUT_LOGO_URL} \n"

gource.sh

@@ -67,6 +67,9 @@ fi
 if [[ $INPUT_GOURCE_START_DATE == *[!\ ]* ]]; then # Temporyry fix, check if it's a date
     OPTIONAL_PARAMS+="--start-date ${INPUT_GOURCE_START_DATE} "
 fi
+if [[ -z "$INPUT_GOURCE_FILE_FILTER" ]]; then
+    OPTIONAL_PARAMS+="--file-filter \"$INPUT_GOURCE_FILE_FILTER\" "
+fi
 
 printf "\n> \t\tUsing optional params: ${OPTIONAL_PARAMS}"
 
@@ -85,7 +88,6 @@ gource --seconds-per-day ${INPUT_GOURCE_SECONDS_PER_DAY} \
 	--font-size ${INPUT_GOURCE_FONT_SIZE} \
 	--dir-name-depth ${INPUT_GOURCE_DIR_DEPTH} \
 	--filename-time ${INPUT_GOURCE_FILENAME_TIME} \
-	--file-filter "${INPUT_GOURCE_FILE_FILTER}" \
 	--max-user-speed ${INPUT_GOURCE_MAX_USER_SPEED} \
 	--bloom-multiplier 1.2 \
 	--${GOURCE_RES} ${OPTIONAL_PARAMS} \