Whole album matching and fingerprinting (#592)

* Cache result of GetAllArtists * Fixed: Manual import not respecting album import notifications * Fixed: partial album imports stay in queue, prompting manual import * Fixed: Allow release if tracks are missing * Fixed: Be tolerant of missing/extra "The" at start of artist name * Improve manual import UI * Omit video tracks from DB entirely * Revert "faster test packaging in build.sh" This reverts commit 2723e2a7b8. -u and -T are not supported on macOS * Fix tests on linux and macOS * Actually lint on linux On linux yarn runs scripts with sh not bash so ** doesn't recursively glob * Match whole albums * Option to disable fingerprinting * Rip out MediaInfo * Don't split up things that have the same album selected in manual import * Try to speed up IndentificationService * More speedups * Some fixes and increase power of recording id * Fix NRE when no tags * Fix NRE when some (but not all) files in a directory have missing tags * Bump taglib, tidy up tag parsing * Add a health check * Remove media info setting * Tags -> audioTags * Add some tests where tags are null * Rename history events * Add missing method to interface * Reinstate MediaInfo tags and update info with artist scan Also adds migration to remove old format media info * This file no longer exists * Don't penalise year if missing from tags * Formatting improvements * Use correct system newline * Switch to the netstandard2.0 library to support net 461 * TagLib.File is IDisposable so should be in a using * Improve filename matching and add tests * Neater logging of parsed tags * Fix disk scan tests for new media info update * Fix quality detection source * Fix Inexact Artist/Album match * Add button to clear track mapping * Fix warning * Pacify eslint * Use \ not / * Fix UI updates * Fix media covers Prevent localizing URL propaging back to the metadata object * Reduce database overhead broadcasting UI updates * Relax timings a bit to make test pass * Remove irrelevant tests * Test framework for identification service * Fix PreferMissingToBadMatch test case * Make fingerprinting more robust * More logging * Penalize unknown media format and country * Prefer USA to UK * Allow Data CD * Fix exception if fingerprinting fails for all files * Fix tests * Fix NRE * Allow apostrophes and remove accents in filename aggregation * Address codacy issues * Cope with old versions of fpcalc and suggest upgrade * fpcalc health check passes if fingerprinting disabled * Get the Artist meta with the artist * Fix the mapper so that lazy loaded lists will be populated on Join And therefore we can join TrackFiles on Tracks by default and avoid an extra query * Rename subtitle -> lyric * Tidy up MediaInfoFormatter
2026-04-23 22:25:09 -04:00 · 2019-02-16 14:49:24 +00:00
parent 8bf364945f
commit bb02d73c42
174 changed files with 11577 additions and 3490 deletions
@@ -19,12 +19,13 @@
 .centerButtons,
 .rightButtons {
  display: flex;
-  flex: 1 0 33%;
+  flex: 1 2 25%;
  flex-wrap: wrap;
 }

 .centerButtons {
  justify-content: center;
+  flex: 2 1 50%;
 }

 .rightButtons {
@@ -155,6 +155,18 @@ class InteractiveImportModalContent extends Component {
    this.setState({ isSelectAlbumModalOpen: true });
  }

+  onClearTrackMappingPress = () => {
+    const selectedIds = this.getSelectedIds();
+
+    selectedIds.forEach((id) => {
+      this.props.updateInteractiveImportItem({
+        id,
+        tracks: [],
+        rejections: []
+      });
+    });
+  }
+
  onSelectArtistModalClose = () => {
    this.setState({ isSelectArtistModalOpen: false });
  }
@@ -328,6 +340,10 @@ class InteractiveImportModalContent extends Component {
            >
              Select Album
            </Button>
+
+            <Button onPress={this.onClearTrackMappingPress}>
+              Clear Track Mapping
+            </Button>
          </div>

          <div className={styles.rightButtons}>
@@ -362,6 +378,7 @@ class InteractiveImportModalContent extends Component {
          artistId={selectedItem && selectedItem.artist && selectedItem.artist.id}
          onModalClose={this.onSelectAlbumModalClose}
        />
+
      </ModalContent>
    );
  }
@@ -387,6 +404,7 @@ InteractiveImportModalContent.propTypes = {
  onFilterExistingFilesChange: PropTypes.func.isRequired,
  onImportModeChange: PropTypes.func.isRequired,
  onImportSelectedPress: PropTypes.func.isRequired,
+  updateInteractiveImportItem: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { fetchInteractiveImportItems, setInteractiveImportSort, clearInteractiveImport, setInteractiveImportMode } from 'Store/Actions/interactiveImportActions';
+import { fetchInteractiveImportItems, setInteractiveImportSort, clearInteractiveImport, setInteractiveImportMode, updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
 import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
 import { executeCommand } from 'Store/Actions/commandActions';
 import * as commandNames from 'Commands/commandNames';
@@ -23,6 +23,7 @@ const mapDispatchToProps = {
  setInteractiveImportSort,
  setInteractiveImportMode,
  clearInteractiveImport,
+  updateInteractiveImportItem,
  executeCommand
 };

@@ -195,6 +196,7 @@ InteractiveImportModalContentConnector.propTypes = {
  setInteractiveImportSort: PropTypes.func.isRequired,
  clearInteractiveImport: PropTypes.func.isRequired,
  setInteractiveImportMode: PropTypes.func.isRequired,
+  updateInteractiveImportItem: PropTypes.func.isRequired,
  executeCommand: PropTypes.func.isRequired,
  onModalClose: PropTypes.func.isRequired
 };
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import formatBytes from 'Utilities/Number/formatBytes';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
-import { icons, kinds, tooltipPositions } from 'Helpers/Props';
+import { icons, kinds, tooltipPositions, sortDirections } from 'Helpers/Props';
 import Icon from 'Components/Icon';
 import TableRow from 'Components/Table/TableRow';
 import TableRowCell from 'Components/Table/Cells/TableRowCell';
@@ -167,11 +167,13 @@ class InteractiveImportRow extends Component {
      relativePath,
      artist,
      album,
+      albumReleaseId,
      tracks,
      quality,
      language,
      size,
      rejections,
+      audioTags,
      isSelected,
      onSelectedChange
    } = this.props;
@@ -327,6 +329,11 @@ class InteractiveImportRow extends Component {
          id={id}
          artistId={artist && artist.id}
          albumId={album && album.id}
+          albumReleaseId={albumReleaseId}
+          rejections={rejections}
+          audioTags={audioTags}
+          sortKey='mediumNumber'
+          sortDirection={sortDirections.ASCENDING}
          filename={relativePath}
          onModalClose={this.onSelectTrackModalClose}
        />
@@ -358,11 +365,13 @@ InteractiveImportRow.propTypes = {
  relativePath: PropTypes.string.isRequired,
  artist: PropTypes.object,
  album: PropTypes.object,
+  albumReleaseId: PropTypes.number,
  tracks: PropTypes.arrayOf(PropTypes.object).isRequired,
  quality: PropTypes.object,
  language: PropTypes.object,
  size: PropTypes.number.isRequired,
  rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
+  audioTags: PropTypes.object.isRequired,
  isSelected: PropTypes.bool,
  onSelectedChange: PropTypes.func.isRequired,
  onValidRowChange: PropTypes.func.isRequired