Skip to content

Commit 26f5e6e

Browse files
authored
Fix start issue after finishing splits (#199)
* Fix start issue after finishing splits - `self.is_running = False` at the end of `__auto_splitter` - Revert moving initialization of some values - Move `self.run_start_time = time()` before parsing images * Update hardcoded references to repo name
1 parent 0e05151 commit 26f5e6e

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!-- markdownlint-disable-next-line MD033 -->
22
# <img src="res/icon.ico" alt="LiveSplit" height="42" width="42" align="top"/> AutoSplit [![CodeQL](/../../actions/workflows/codeql-analysis.yml/badge.svg)](/../../actions/workflows/codeql-analysis.yml) [![Lint and build](/../../actions/workflows/lint-and-build.yml/badge.svg)](/../../actions/workflows/lint-and-build.yml)
33

4-
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
5-
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
6-
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=security_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
7-
[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=Avasam_Auto-Split)
8-
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Avasam_Auto-Split)
4+
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
5+
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
6+
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=security_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
7+
[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=Avasam_AutoSplit)
8+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Avasam_AutoSplit)
99
[![SemVer](https://badgen.net/badge/_/SemVer%20compliant/grey?label)](https://semver.org/)
1010

1111
Easy to use image comparison based auto splitter for speedrunning on console or PC.

scripts/compile_resources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If (-not $GITHUB_REPOSITORY) {
1717
$GITHUB_REPOSITORY = $repo_url.substring(19, $repo_url.length - 19) -replace '\.git', ''
1818
}
1919
If (-not $GITHUB_REPOSITORY) {
20-
$GITHUB_REPOSITORY = 'Toufool/Auto-Split'
20+
$GITHUB_REPOSITORY = 'Toufool/AutoSplit'
2121
}
2222

2323
New-Item $build_vars_path -ItemType File -Force | Out-Null

src/AutoSplit.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -513,19 +513,13 @@ def __auto_splitter(self):
513513
error_messages.split_hotkey()
514514
return
515515

516+
# Set start time before parsing the images as it's a heavy operation that will cause delays
517+
self.run_start_time = time()
518+
516519
if not (validate_before_parsing(self) and parse_and_validate_images(self)):
517520
self.gui_changes_on_reset(True)
518521
return
519522

520-
# Initialize a few attributes
521-
self.run_start_time = time()
522-
self.split_image_number = 0
523-
self.waiting_for_split_delay = False
524-
self.split_below_threshold = False
525-
split_time = 0
526-
number_of_split_images = len(self.split_images_and_loop_number)
527-
dummy_splits_array = [image_loop[0].check_flag(DUMMY_FLAG) for image_loop in self.split_images_and_loop_number]
528-
529523
# Construct a list of images + loop count tuples.
530524
self.split_images_and_loop_number = [
531525
item for flattenlist
@@ -554,6 +548,14 @@ def __auto_splitter(self):
554548
if self.start_image:
555549
self.__pause_loop(self.start_image.get_pause_time(self), "None (Paused).")
556550

551+
# Initialize a few attributes
552+
self.split_image_number = 0
553+
self.waiting_for_split_delay = False
554+
self.split_below_threshold = False
555+
split_time = 0
556+
number_of_split_images = len(self.split_images_and_loop_number)
557+
dummy_splits_array = [image_loop[0].check_flag(DUMMY_FLAG) for image_loop in self.split_images_and_loop_number]
558+
557559
# First loop: stays in this loop until all of the split images have been split
558560
while self.split_image_number < number_of_split_images:
559561

@@ -618,6 +620,7 @@ def __auto_splitter(self):
618620
return
619621

620622
# loop breaks to here when the last image splits
623+
self.is_running = False
621624
self.gui_changes_on_reset(True)
622625

623626
def __similarity_threshold_loop(self, number_of_split_images: int, dummy_splits_array: list[bool]):

src/capture_method/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ async def get_all_video_capture_devices() -> list[CameraInfo]:
217217
async def get_camera_info(index: int, device_name: str):
218218
backend = ""
219219
# Probing freezes some devices (like GV-USB2 and AverMedia) if already in use
220-
# https://github.com/Toufool/Auto-Split/issues/169
220+
# #169
221221
# FIXME: Maybe offer the option to the user to obtain more info about their devies?
222222
# Off by default. With a tooltip to explain the risk.
223223
# video_capture = cv2.VideoCapture(index)

0 commit comments

Comments
 (0)