-
Notifications
You must be signed in to change notification settings - Fork 40
MPEG Audio Scanner (aka MP3 Scanner) #120
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
Closed
NebularNerd
wants to merge
2
commits into
cdgriffith:develop
from
NebularNerd:2025-11-15_2x_MPEG_Audio_Scanner
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,3 +143,7 @@ media | |
| static | ||
|
|
||
| .idea/ | ||
|
|
||
| # Ignore VS Code related files and folders | ||
| .vscode | ||
| *.code-workspace | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,7 +22,15 @@ | |||||
| import puremagic | ||||||
|
|
||||||
| if os.getenv("PUREMAGIC_DEEPSCAN") != "0": | ||||||
| from puremagic.scanners import zip_scanner, pdf_scanner, text_scanner, json_scanner, python_scanner, sndhdr_scanner | ||||||
| from puremagic.scanners import ( | ||||||
| zip_scanner, | ||||||
| pdf_scanner, | ||||||
| text_scanner, | ||||||
| json_scanner, | ||||||
| python_scanner, | ||||||
| sndhdr_scanner, | ||||||
| mpeg_audio_scanner, | ||||||
| ) | ||||||
|
|
||||||
| __author__ = "Chris Griffith" | ||||||
| __version__ = "2.0.0b5" | ||||||
|
|
@@ -398,10 +406,34 @@ def single_deep_scan( | |||||
| result = sndhdr_scanner.main(filename, head, foot) | ||||||
| if result and result.confidence > confidence: | ||||||
| return result | ||||||
| case ( | ||||||
| mpeg_audio_scanner.mp3_id3_match_bytes | ||||||
| | mpeg_audio_scanner.raw_mp3_match_bytes | ||||||
| | mpeg_audio_scanner.fffe_match_bytes | ||||||
| | mpeg_audio_scanner.ffff_match_bytes | ||||||
| | mpeg_audio_scanner.fffc_match_bytes | ||||||
| | mpeg_audio_scanner.fffd_match_bytes | ||||||
| | mpeg_audio_scanner.fffa_match_bytes | ||||||
| | mpeg_audio_scanner.fff6_match_bytes | ||||||
| | mpeg_audio_scanner.fff7_match_bytes | ||||||
| | mpeg_audio_scanner.fff4_match_bytes | ||||||
| | mpeg_audio_scanner.fff5_match_bytes | ||||||
| | mpeg_audio_scanner.fff2_match_bytes | ||||||
| | mpeg_audio_scanner.fff3_match_bytes | ||||||
| | mpeg_audio_scanner.ffe6_match_bytes | ||||||
| | mpeg_audio_scanner.ffe7_match_bytes | ||||||
| | mpeg_audio_scanner.ffe4_match_bytes | ||||||
| | mpeg_audio_scanner.ffe5_match_bytes | ||||||
| | mpeg_audio_scanner.ffe2_match_bytes | ||||||
| | mpeg_audio_scanner.ffe3_match_bytes | ||||||
| ): | ||||||
| result = mpeg_audio_scanner.main(filename, head) | ||||||
| if result and result.confidence > confidence: | ||||||
| return result | ||||||
|
|
||||||
| # The first match wins | ||||||
| for scanner in (pdf_scanner, python_scanner, json_scanner): | ||||||
| result = scanner.main(filename, head, foot) | ||||||
| result = scanner.main(filename, head) | ||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Need to pass in all three of these. Some other scanners may use foot or expect exactly 3 inputs
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @NebularNerd this may be testing issue |
||||||
| if result: | ||||||
| return result | ||||||
| return None | ||||||
|
|
@@ -519,7 +551,7 @@ def command_line_entry(*args): | |||||
| print(f"Total Possible Matches: {len(matches)}") | ||||||
| for i, result in enumerate(matches): | ||||||
| if i == 0: | ||||||
| print("\n\tBest Match") | ||||||
| print("\n\tDeepscan Match" if int(result.confidence == 1) else "\n\tBest Match") | ||||||
| else: | ||||||
| print(f"\tAlternative Match #{i}") | ||||||
| print(f"\tName: {result.name}") | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would just put those all in a single array