Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit 07beac2

Browse files
amamic1803amamic1803
committed
restructure
1 parent ce307b4 commit 07beac2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1112
-1137
lines changed

‎.github/workflows/lint.yml

+3-68
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
name: Lint
22

3-
on: push
4-
5-
permissions:
6-
actions: write
7-
contents: read
8-
packages: read
3+
on:
4+
push:
5+
pull_request:
96

107
jobs:
118
lint-ruff:
@@ -23,65 +20,3 @@ jobs:
2320
--ignore E101
2421
--ignore E501
2522
--ignore E722
26-
27-
call-release:
28-
name: Call release (opt)
29-
runs-on: ubuntu-latest
30-
needs: lint-ruff
31-
32-
steps:
33-
- uses: actions/checkout@v3
34-
name: Checkout repository
35-
36-
- uses: actions/setup-python@v4
37-
name: Install Python
38-
with:
39-
python-version: '3.11'
40-
41-
- name: Install requirements
42-
run: pip install -r requirements.txt
43-
44-
- name: Get version
45-
id: get_version
46-
run: |
47-
VERSION_NUM=$(python build.py --version)
48-
echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT
49-
50-
- name: Check commit message
51-
id: check_commit_message
52-
run: |
53-
commit_message="${{ github.event.head_commit.message }}"
54-
word1_found=false
55-
word2_found=false
56-
if echo "$commit_message" | grep -q -i "release"; then
57-
word1_found=true
58-
fi
59-
if echo "$commit_message" | grep -q -i "v${{ steps.get_version.outputs.VERSION_NUM }}"; then
60-
word2_found=true
61-
fi
62-
if [[ $word1_found == true && $word2_found == true ]]; then
63-
echo "words_found=true" >> $GITHUB_OUTPUT
64-
else
65-
echo "words_found=false" >> $GITHUB_OUTPUT
66-
fi
67-
68-
- name: Call release workflow
69-
uses: actions/github-script@v6
70-
if: steps.check_commit_message.outputs.words_found == 'true'
71-
with:
72-
script: |
73-
const owner = context.repo.owner;
74-
const repo = context.repo.repo;
75-
const workflow_id = 'release.yml';
76-
const ref = context.ref;
77-
const sha = context.sha;
78-
79-
github.rest.actions.createWorkflowDispatch({
80-
owner: owner,
81-
repo: repo,
82-
workflow_id: 'release.yml',
83-
ref: ref,
84-
inputs: {
85-
sha: sha
86-
},
87-
});

‎.github/workflows/release.yml

+16-53
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ name: Release
22

33
on:
44
workflow_dispatch:
5-
inputs:
6-
sha:
7-
description: 'SHA of the commit to release'
8-
required: false
9-
default: ""
105

116
permissions:
127
contents: write
@@ -15,35 +10,20 @@ permissions:
1510

1611
jobs:
1712
build-windows:
18-
name: Build Windows binary
13+
name: Build (Windows)
1914
runs-on: windows-latest
15+
defaults:
16+
run:
17+
shell: bash
2018

2119
steps:
22-
- name: Get current SHA
23-
id: current_sha
24-
shell: bash
25-
run: |
26-
supplied_sha=${{ github.event.inputs.sha }}
27-
28-
if [ -z "$supplied_sha" ]; then
29-
echo "No SHA supplied, using caller commit SHA:"
30-
echo "$GITHUB_SHA"
31-
echo "SHA=$GITHUB_SHA" >> $GITHUB_OUTPUT
32-
else
33-
echo "SHA supplied, using:"
34-
echo "$supplied_sha"
35-
echo "SHA=$supplied_sha" >> $GITHUB_OUTPUT
36-
fi
37-
38-
- uses: actions/checkout@v3
39-
name: Checkout repository
40-
with:
41-
ref: ${{ steps.current_sha.outputs.SHA }}
20+
- name: Checkout repository
21+
uses: actions/checkout@v3
4222

43-
- uses: actions/setup-python@v4
44-
name: Install Python
23+
- name: Install Python
24+
uses: actions/setup-python@v4
4525
with:
46-
python-version: '3.11'
26+
python-version: '3.12'
4727

4828
- name: Install requirements
4929
run: pip install -r requirements.txt
@@ -54,7 +34,6 @@ jobs:
5434
install-only: true
5535

5636
- name: Get name and version
57-
shell: bash
5837
id: get_info
5938
run: |
6039
NAME=$(python build.py --name)
@@ -66,52 +45,36 @@ jobs:
6645
run: python build.py
6746

6847
- name: Rename binary
69-
shell: bash
70-
run: mv "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}.exe" "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-windows-x86_64.exe"
48+
run: mv "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}.exe" "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-win-x86_64.exe"
7149

7250
- uses: actions/upload-artifact@v3
7351
name: Upload binary artifact
7452
with:
7553
name: windows-binary
7654
retention-days: 3
77-
path: "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-windows-x86_64.exe"
55+
path: "${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-win-x86_64.exe"
7856

7957
publish-release:
8058
name: Publish GitHub release
8159
runs-on: ubuntu-latest
8260
needs: build-windows
61+
defaults:
62+
run:
63+
shell: bash
8364

8465
steps:
85-
- name: Get current SHA
86-
id: current_sha
87-
run: |
88-
supplied_sha=${{ github.event.inputs.sha }}
89-
90-
if [ -z "$supplied_sha" ]; then
91-
echo "No SHA supplied, using caller commit SHA:"
92-
echo "$GITHUB_SHA"
93-
echo "SHA=$GITHUB_SHA" >> $GITHUB_OUTPUT
94-
else
95-
echo "SHA supplied, using:"
96-
echo "$supplied_sha"
97-
echo "SHA=$supplied_sha" >> $GITHUB_OUTPUT
98-
fi
99-
10066
- name: Checkout repository
10167
uses: actions/checkout@v3
102-
with:
103-
ref: ${{ steps.current_sha.outputs.SHA }}
10468

10569
- name: Install Python
10670
uses: actions/setup-python@v4
10771
with:
108-
python-version: '3.11'
72+
python-version: '3.12'
10973

11074
- name: Install requirements
11175
run: pip install -r requirements.txt
11276

11377
- name: Get name and version
114-
shell: bash
11578
id: get_info
11679
run: |
11780
NAME=$(python build.py --name)
@@ -148,7 +111,7 @@ jobs:
148111
draft: false
149112
prerelease: false
150113
files: |
151-
windows-binary/${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-windows-x86_64.exe
114+
windows-binary/${{ steps.get_info.outputs.NAME }}-v${{ steps.get_info.outputs.VERSION }}-win-x86_64.exe
152115
name: v${{ steps.get_info.outputs.VERSION }}
153116
tag_name: v${{ steps.get_info.outputs.VERSION }}
154117
fail_on_unmatched_files: true

‎autofish/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from runner import run

‎autofish/load_data.py

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
import json
2+
import os
3+
import sys
4+
5+
import cv2
6+
7+
8+
def get_filenames(path: str) -> list:
9+
""" Returns list of filenames in given path """
10+
11+
filenames = [os.path.join(path, f) for f in os.listdir(path) if os.path.isfile(f)]
12+
filenames.sort()
13+
14+
return filenames
15+
16+
def resource_path(relative_path: str) -> str:
17+
""" Get absolute path to resource, works for dev and for PyInstaller """
18+
try:
19+
# PyInstaller creates a temp folder and stores path in _MEIPASS
20+
base_path = sys._MEIPASS
21+
except AttributeError:
22+
base_path = os.path.abspath(".")
23+
return os.path.join(base_path, relative_path)
24+
25+
26+
# Path to resources folder
27+
RESOURCES_PATH = resource_path("resources")
28+
29+
30+
def load_values() -> dict:
31+
""" Loads values used by bot process """
32+
33+
with open(os.path.join(RESOURCES_PATH, "values.json"), "r") as file:
34+
values = json.loads(file.read())
35+
36+
return values
37+
38+
def load_templates() -> dict:
39+
""" Loads cv templates used by bot process """
40+
41+
templates = dict()
42+
43+
templates["digits"] = load_digits()
44+
templates["popups"] = load_popups()
45+
templates["offers"] = load_offers()
46+
templates["fish"] = load_fish()
47+
templates["warp"] = load_warp()
48+
49+
return templates
50+
51+
def load_digits() -> list:
52+
""" Loads digits used by bot process """
53+
54+
digits_path = os.path.join(RESOURCES_PATH, "cv_templates", "digits")
55+
digits_files = get_filenames(digits_path)
56+
57+
digits = []
58+
for digit_file in digits_files:
59+
digits.append(cv2.imread(digit_file, cv2.IMREAD_GRAYSCALE))
60+
61+
return digits
62+
63+
def load_popups() -> list:
64+
""" Loads popups used by bot process """
65+
66+
popups_path = os.path.join(RESOURCES_PATH, "cv_templates", "popups")
67+
popups_files = get_filenames(popups_path)
68+
69+
popups = []
70+
for popup_file in popups_files:
71+
popups.append(cv2.imread(popup_file, cv2.IMREAD_GRAYSCALE))
72+
73+
return popups
74+
75+
def load_offers() -> tuple:
76+
""" Loads offers used by bot process.
77+
Returns tuple of (buy, x) templates.
78+
Buy template is used to check if there is a purchase offer.
79+
X template is used to find the location of sign X to close the offer window. """
80+
81+
offers_path = os.path.join(RESOURCES_PATH, "cv_templates", "offers")
82+
offers_files = get_filenames(offers_path)
83+
84+
assert len(offers_files) == 2, "There should be exactly 2 templates for purchase offers, buy and x templates."
85+
86+
offers = []
87+
for offer_file in offers_files:
88+
offers.append(cv2.imread(offer_file, cv2.IMREAD_GRAYSCALE))
89+
offers = tuple(offers)
90+
91+
return offers
92+
93+
def load_fish() -> dict:
94+
""" Loads templates for keeping/releasing/discarding the fish """
95+
96+
fish_path = os.path.join(RESOURCES_PATH, "cv_templates", "fish")
97+
fish_files = get_filenames(fish_path)
98+
99+
fish = dict()
100+
for fish_file in fish_files:
101+
fish[os.path.splitext(fish_file)[0]] = cv2.imread(fish_file, cv2.IMREAD_GRAYSCALE)
102+
103+
return fish
104+
105+
def load_warp() -> dict:
106+
""" Loads templates for time warp """
107+
108+
warp_path = os.path.join(RESOURCES_PATH, "cv_templates", "time_warp")
109+
warp_files = get_filenames(warp_path)
110+
111+
warp = dict()
112+
for warp_file in warp_files:
113+
warp[os.path.splitext(warp_file)[0]] = cv2.imread(warp_file, cv2.IMREAD_GRAYSCALE)
114+
115+
return warp

0 commit comments

Comments
 (0)