Skip to content

Fix start issue after finishing splits #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!-- markdownlint-disable-next-line MD033 -->
# <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)

[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_Auto-Split&metric=security_rating)](https://sonarcloud.io/dashboard?id=Avasam_Auto-Split)
[![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)
[![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)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=security_rating)](https://sonarcloud.io/dashboard?id=Avasam_AutoSplit)
[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=Avasam_AutoSplit&metric=code_smells)](https://sonarcloud.io/summary/new_code?id=Avasam_AutoSplit)
[![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)
[![SemVer](https://badgen.net/badge/_/SemVer%20compliant/grey?label)](https://semver.org/)

Easy to use image comparison based auto splitter for speedrunning on console or PC.
Expand Down
2 changes: 1 addition & 1 deletion scripts/compile_resources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ If (-not $GITHUB_REPOSITORY) {
$GITHUB_REPOSITORY = $repo_url.substring(19, $repo_url.length - 19) -replace '\.git', ''
}
If (-not $GITHUB_REPOSITORY) {
$GITHUB_REPOSITORY = 'Toufool/Auto-Split'
$GITHUB_REPOSITORY = 'Toufool/AutoSplit'
}

New-Item $build_vars_path -ItemType File -Force | Out-Null
Expand Down
21 changes: 12 additions & 9 deletions src/AutoSplit.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,19 +513,13 @@ def __auto_splitter(self):
error_messages.split_hotkey()
return

# Set start time before parsing the images as it's a heavy operation that will cause delays
self.run_start_time = time()

if not (validate_before_parsing(self) and parse_and_validate_images(self)):
self.gui_changes_on_reset(True)
return

# Initialize a few attributes
self.run_start_time = time()
self.split_image_number = 0
self.waiting_for_split_delay = False
self.split_below_threshold = False
split_time = 0
number_of_split_images = len(self.split_images_and_loop_number)
dummy_splits_array = [image_loop[0].check_flag(DUMMY_FLAG) for image_loop in self.split_images_and_loop_number]

# Construct a list of images + loop count tuples.
self.split_images_and_loop_number = [
item for flattenlist
Expand Down Expand Up @@ -554,6 +548,14 @@ def __auto_splitter(self):
if self.start_image:
self.__pause_loop(self.start_image.get_pause_time(self), "None (Paused).")

# Initialize a few attributes
self.split_image_number = 0
self.waiting_for_split_delay = False
self.split_below_threshold = False
split_time = 0
number_of_split_images = len(self.split_images_and_loop_number)
dummy_splits_array = [image_loop[0].check_flag(DUMMY_FLAG) for image_loop in self.split_images_and_loop_number]

# First loop: stays in this loop until all of the split images have been split
while self.split_image_number < number_of_split_images:

Expand Down Expand Up @@ -618,6 +620,7 @@ def __auto_splitter(self):
return

# loop breaks to here when the last image splits
self.is_running = False
self.gui_changes_on_reset(True)

def __similarity_threshold_loop(self, number_of_split_images: int, dummy_splits_array: list[bool]):
Expand Down
2 changes: 1 addition & 1 deletion src/capture_method/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ async def get_all_video_capture_devices() -> list[CameraInfo]:
async def get_camera_info(index: int, device_name: str):
backend = ""
# Probing freezes some devices (like GV-USB2 and AverMedia) if already in use
# https://github.com/Toufool/Auto-Split/issues/169
# #169
# FIXME: Maybe offer the option to the user to obtain more info about their devies?
# Off by default. With a tooltip to explain the risk.
# video_capture = cv2.VideoCapture(index)
Expand Down