From 3e0eb759999c7cbb9c36ebfeee85942544f2047a Mon Sep 17 00:00:00 2001
From: Lynne <lynne@bune.city>
Date: Wed, 28 Oct 2020 01:57:49 +1000
Subject: [PATCH] remove unneeded file extension

---
 .idea/workspace.xml | 63 ++++++++++++++++++++++++++-------------------
 bcao.py             |  4 +--
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4195006..a927dcb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -61,7 +61,7 @@
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RunManager" selected="Python.bcao (ceres)">
     <configuration default="true" type="PythonConfigurationType" factoryName="Python">
@@ -104,7 +104,7 @@
       <workItem from="1602850978698" duration="7902000" />
       <workItem from="1602908398925" duration="34104000" />
       <workItem from="1603714609431" duration="5637000" />
-      <workItem from="1603720261881" duration="2152000" />
+      <workItem from="1603720261881" duration="4847000" />
     </task>
     <task id="LOCAL-00001" summary="mp3 support! more helpful interface! better code! yahoo!!">
       <created>1602927759343</created>
@@ -169,7 +169,14 @@
       <option name="project" value="LOCAL" />
       <updated>1603720506558</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="turns out i didn't need to do anything to add alac support - they work the same as aac m4a files do. although i did find and fix a bug in the m4a handling so that's good at least 0uo">
+      <created>1603723480563</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1603723480563</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -197,7 +204,8 @@
     <MESSAGE value="wav support!" />
     <MESSAGE value="my py dot ini" />
     <MESSAGE value="added project files, aiff support" />
-    <option name="LAST_COMMIT_MESSAGE" value="added project files, aiff support" />
+    <MESSAGE value="turns out i didn't need to do anything to add alac support - they work the same as aac m4a files do. although i did find and fix a bug in the m4a handling so that's good at least 0uo" />
+    <option name="LAST_COMMIT_MESSAGE" value="turns out i didn't need to do anything to add alac support - they work the same as aac m4a files do. although i did find and fix a bug in the m4a handling so that's good at least 0uo" />
   </component>
   <component name="WindowStateProjectService">
     <state x="555" y="188" width="800" height="672" key="#Deployment" timestamp="1602927147820">
@@ -220,10 +228,10 @@
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
     <state x="719" y="227" key="#Python/0.0.1920.1054@0.0.1920.1054" timestamp="1603720399983" />
-    <state x="418" y="185" width="1084" height="709" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1603720315136">
+    <state x="418" y="185" width="1084" height="709" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1603723412351">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state x="418" y="185" width="1084" height="709" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1054@0.0.1920.1054" timestamp="1603720315136" />
+    <state x="418" y="185" width="1084" height="709" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1054@0.0.1920.1054" timestamp="1603723412351" />
     <state x="418" y="185" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1055@0.0.1920.1055" timestamp="1602931259631" />
     <state x="888" y="193" width="424" height="721" key="#com.intellij.ide.macro.MacrosDialog" timestamp="1602931237546">
       <screen x="0" y="0" width="1920" height="1055" />
@@ -237,50 +245,51 @@
       <screen x="0" y="0" width="1920" height="1055" />
     </state>
     <state x="549" y="98" width="1059" height="853" key="CommitChangelistDialog2/0.0.1920.1055@0.0.1920.1055" timestamp="1602927110754" />
-    <state x="100" y="99" width="1720" height="856" key="DiffContextDialog" timestamp="1602915909590">
-      <screen x="0" y="0" width="1920" height="1055" />
+    <state x="100" y="99" width="1720" height="856" key="DiffContextDialog" timestamp="1603814233028">
+      <screen x="0" y="0" width="1920" height="1054" />
     </state>
+    <state x="100" y="99" width="1720" height="856" key="DiffContextDialog/0.0.1920.1054@0.0.1920.1054" timestamp="1603814233028" />
     <state x="100" y="99" width="1720" height="856" key="DiffContextDialog/0.0.1920.1055@0.0.1920.1055" timestamp="1602915909590" />
     <state x="743" y="285" width="424" height="479" key="FileChooserDialogImpl" timestamp="1602850965686">
       <screen x="0" y="0" width="1920" height="1055" />
     </state>
     <state x="743" y="285" width="424" height="479" key="FileChooserDialogImpl/0.0.1920.1055@0.0.1920.1055" timestamp="1602850965686" />
-    <state width="1878" height="281" key="GridCell.Tab.0.bottom" timestamp="1603723116149">
+    <state width="1878" height="281" key="GridCell.Tab.0.bottom" timestamp="1603723362538">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="281" key="GridCell.Tab.0.bottom/0.0.1920.1054@0.0.1920.1054" timestamp="1603723116149" />
+    <state width="1878" height="281" key="GridCell.Tab.0.bottom/0.0.1920.1054@0.0.1920.1054" timestamp="1603723362538" />
     <state width="1878" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1055@0.0.1920.1055" timestamp="1602942953878" />
-    <state width="1878" height="281" key="GridCell.Tab.0.center" timestamp="1603723116148">
+    <state width="1878" height="281" key="GridCell.Tab.0.center" timestamp="1603723362538">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="281" key="GridCell.Tab.0.center/0.0.1920.1054@0.0.1920.1054" timestamp="1603723116148" />
+    <state width="1878" height="281" key="GridCell.Tab.0.center/0.0.1920.1054@0.0.1920.1054" timestamp="1603723362538" />
     <state width="1878" height="282" key="GridCell.Tab.0.center/0.0.1920.1055@0.0.1920.1055" timestamp="1602942953877" />
-    <state width="1878" height="281" key="GridCell.Tab.0.left" timestamp="1603723116148">
+    <state width="1878" height="281" key="GridCell.Tab.0.left" timestamp="1603723362537">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="281" key="GridCell.Tab.0.left/0.0.1920.1054@0.0.1920.1054" timestamp="1603723116148" />
+    <state width="1878" height="281" key="GridCell.Tab.0.left/0.0.1920.1054@0.0.1920.1054" timestamp="1603723362537" />
     <state width="1878" height="282" key="GridCell.Tab.0.left/0.0.1920.1055@0.0.1920.1055" timestamp="1602942953877" />
-    <state width="1878" height="281" key="GridCell.Tab.0.right" timestamp="1603723116148">
+    <state width="1878" height="281" key="GridCell.Tab.0.right" timestamp="1603723362538">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="281" key="GridCell.Tab.0.right/0.0.1920.1054@0.0.1920.1054" timestamp="1603723116148" />
+    <state width="1878" height="281" key="GridCell.Tab.0.right/0.0.1920.1054@0.0.1920.1054" timestamp="1603723362538" />
     <state width="1878" height="282" key="GridCell.Tab.0.right/0.0.1920.1055@0.0.1920.1055" timestamp="1602942953877" />
-    <state width="1878" height="347" key="GridCell.Tab.1.bottom" timestamp="1603720247733">
+    <state width="1878" height="347" key="GridCell.Tab.1.bottom" timestamp="1603723347647">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="347" key="GridCell.Tab.1.bottom/0.0.1920.1054@0.0.1920.1054" timestamp="1603720247733" />
-    <state width="1878" height="347" key="GridCell.Tab.1.center" timestamp="1603720247733">
+    <state width="1878" height="347" key="GridCell.Tab.1.bottom/0.0.1920.1054@0.0.1920.1054" timestamp="1603723347647" />
+    <state width="1878" height="347" key="GridCell.Tab.1.center" timestamp="1603723347647">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="347" key="GridCell.Tab.1.center/0.0.1920.1054@0.0.1920.1054" timestamp="1603720247733" />
-    <state width="1878" height="347" key="GridCell.Tab.1.left" timestamp="1603720247733">
+    <state width="1878" height="347" key="GridCell.Tab.1.center/0.0.1920.1054@0.0.1920.1054" timestamp="1603723347647" />
+    <state width="1878" height="347" key="GridCell.Tab.1.left" timestamp="1603723347647">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="347" key="GridCell.Tab.1.left/0.0.1920.1054@0.0.1920.1054" timestamp="1603720247733" />
-    <state width="1878" height="347" key="GridCell.Tab.1.right" timestamp="1603720247733">
+    <state width="1878" height="347" key="GridCell.Tab.1.left/0.0.1920.1054@0.0.1920.1054" timestamp="1603723347647" />
+    <state width="1878" height="347" key="GridCell.Tab.1.right" timestamp="1603723347647">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state width="1878" height="347" key="GridCell.Tab.1.right/0.0.1920.1054@0.0.1920.1054" timestamp="1603720247733" />
+    <state width="1878" height="347" key="GridCell.Tab.1.right/0.0.1920.1054@0.0.1920.1054" timestamp="1603723347647" />
     <state x="182" y="88" width="1536" height="869" key="MergeDialog" timestamp="1602851077617">
       <screen x="0" y="0" width="1920" height="1055" />
     </state>
@@ -289,10 +298,10 @@
       <screen x="0" y="0" width="1920" height="1055" />
     </state>
     <state x="596" y="306" width="718" height="437" key="MultipleFileMergeDialog/0.0.1920.1055@0.0.1920.1055" timestamp="1602851077619" />
-    <state x="334" y="44" width="1315" height="941" key="SettingsEditor" timestamp="1603720180344">
+    <state x="334" y="44" width="1315" height="941" key="SettingsEditor" timestamp="1603776383135">
       <screen x="0" y="0" width="1920" height="1054" />
     </state>
-    <state x="334" y="44" key="SettingsEditor/0.0.1920.1054@0.0.1920.1054" timestamp="1603720180344" />
+    <state x="334" y="44" key="SettingsEditor/0.0.1920.1054@0.0.1920.1054" timestamp="1603776383135" />
     <state x="334" y="44" width="1315" height="941" key="SettingsEditor/0.0.1920.1055@0.0.1920.1055" timestamp="1602927410438" />
     <state x="100" y="99" width="1720" height="856" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1602937117208">
       <screen x="0" y="0" width="1920" height="1055" />
@@ -306,6 +315,6 @@
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/bcao$mypy.coverage" NAME="mypy Coverage Results" MODIFIED="1603717428705" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/bcao$bcao.coverage" NAME="bcao Coverage Results" MODIFIED="1603719196915" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/bcao$bcao__ceres_.coverage" NAME="bcao (ceres) Coverage Results" MODIFIED="1603723116117" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/bcao$bcao__ceres_.coverage" NAME="bcao (ceres) Coverage Results" MODIFIED="1603723362525" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
 </project>
\ No newline at end of file
diff --git a/bcao.py b/bcao.py
index bc775c5..cb9e471 100755
--- a/bcao.py
+++ b/bcao.py
@@ -66,7 +66,7 @@ class SongInfo:
 		self.fallback = False
 
 		fallbacks = re.match(
-			r"^(?P<artist>.+) - (?P<album>.+) - (?P<track>\d{2,}) (?P<title>.+)\.(?:ogg|flac|alac|aiff|wav|mp3|m4a)$",
+			r"^(?P<artist>.+) - (?P<album>.+) - (?P<track>\d{2,}) (?P<title>.+)\.(?:ogg|flac|aiff|wav|mp3|m4a)$",
 			self.file_name
 		)
 
@@ -240,7 +240,7 @@ def main() -> None:
 
 	with ZipFile(args.zip, 'r') as zip_file:
 		for file in zip_file.namelist():
-			if re.match(r"^(.+ - ){2}\d{2,} .+\.(ogg|flac|alac|aiff|wav|mp3|m4a)$", file):
+			if re.match(r"^(.+ - ){2}\d{2,} .+\.(ogg|flac|aiff|wav|mp3|m4a)$", file):
 				# bandcamp zips contains songs with names formatted like "Album - Artist - 01 Song.mp3"
 				# for example, "King Crimson - In the Wake of Poseidon - 02 Pictures of a City.ogg"
 				# this regex should match only on those, and cut out (hopefully) all of the bonus material stuff, which shouldn't