Changeset View
Changeset View
Standalone View
Standalone View
src/filescanner.cpp
Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s) | 114 | #if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND | |||
---|---|---|---|---|---|
118 | auto albumProperty = d->mAllProperties.find(KFileMetaData::Property::Album); | 118 | auto albumProperty = d->mAllProperties.find(KFileMetaData::Property::Album); | ||
119 | auto albumArtistProperty = d->mAllProperties.find(KFileMetaData::Property::AlbumArtist); | 119 | auto albumArtistProperty = d->mAllProperties.find(KFileMetaData::Property::AlbumArtist); | ||
120 | auto trackNumberProperty = d->mAllProperties.find(KFileMetaData::Property::TrackNumber); | 120 | auto trackNumberProperty = d->mAllProperties.find(KFileMetaData::Property::TrackNumber); | ||
121 | auto discNumberProperty = d->mAllProperties.find(KFileMetaData::Property::DiscNumber); | 121 | auto discNumberProperty = d->mAllProperties.find(KFileMetaData::Property::DiscNumber); | ||
122 | auto genreProperty = d->mAllProperties.find(KFileMetaData::Property::Genre); | 122 | auto genreProperty = d->mAllProperties.find(KFileMetaData::Property::Genre); | ||
123 | auto yearProperty = d->mAllProperties.find(KFileMetaData::Property::ReleaseYear); | 123 | auto yearProperty = d->mAllProperties.find(KFileMetaData::Property::ReleaseYear); | ||
124 | auto composerProperty = d->mAllProperties.find(KFileMetaData::Property::Composer); | 124 | auto composerProperty = d->mAllProperties.find(KFileMetaData::Property::Composer); | ||
125 | auto lyricistProperty = d->mAllProperties.find(KFileMetaData::Property::Lyricist); | 125 | auto lyricistProperty = d->mAllProperties.find(KFileMetaData::Property::Lyricist); | ||
126 | auto lyricsProperty = d->mAllProperties.find(KFileMetaData::Property::Lyrics); | ||||
126 | auto channelsProperty = d->mAllProperties.find(KFileMetaData::Property::Channels); | 127 | auto channelsProperty = d->mAllProperties.find(KFileMetaData::Property::Channels); | ||
127 | auto bitRateProperty = d->mAllProperties.find(KFileMetaData::Property::BitRate); | 128 | auto bitRateProperty = d->mAllProperties.find(KFileMetaData::Property::BitRate); | ||
128 | auto sampleRateProperty = d->mAllProperties.find(KFileMetaData::Property::SampleRate); | 129 | auto sampleRateProperty = d->mAllProperties.find(KFileMetaData::Property::SampleRate); | ||
129 | auto commentProperty = d->mAllProperties.find(KFileMetaData::Property::Comment); | 130 | auto commentProperty = d->mAllProperties.find(KFileMetaData::Property::Comment); | ||
130 | auto ratingProperty = d->mAllProperties.find(KFileMetaData::Property::Rating); | 131 | auto ratingProperty = d->mAllProperties.find(KFileMetaData::Property::Rating); | ||
131 | #if !defined Q_OS_ANDROID | 132 | #if !defined Q_OS_ANDROID | ||
132 | auto fileData = KFileMetaData::UserMetaData(localFileName); | 133 | auto fileData = KFileMetaData::UserMetaData(localFileName); | ||
133 | #endif | 134 | #endif | ||
Show All 15 Lines | |||||
149 | } | 150 | } | ||
150 | 151 | | |||
151 | if (trackNumberProperty != d->mAllProperties.end()) { | 152 | if (trackNumberProperty != d->mAllProperties.end()) { | ||
152 | trackData.setTrackNumber(trackNumberProperty->toInt()); | 153 | trackData.setTrackNumber(trackNumberProperty->toInt()); | ||
153 | } | 154 | } | ||
154 | 155 | | |||
155 | if (discNumberProperty != d->mAllProperties.end()) { | 156 | if (discNumberProperty != d->mAllProperties.end()) { | ||
156 | trackData.setDiscNumber(discNumberProperty->toInt()); | 157 | trackData.setDiscNumber(discNumberProperty->toInt()); | ||
157 | } else { | | |||
158 | trackData.setDiscNumber(1); | | |||
159 | } | 158 | } | ||
160 | 159 | | |||
161 | if (albumArtistProperty != d->mAllProperties.end()) { | 160 | if (albumArtistProperty != d->mAllProperties.end()) { | ||
162 | trackData.setAlbumArtist(albumArtistProperty->toStringList().join(QStringLiteral(", "))); | 161 | trackData.setAlbumArtist(albumArtistProperty->toStringList().join(QStringLiteral(", "))); | ||
163 | } | 162 | } | ||
164 | 163 | | |||
165 | if (yearProperty != d->mAllProperties.end()) { | 164 | if (yearProperty != d->mAllProperties.end()) { | ||
166 | trackData.setYear(yearProperty->toInt()); | 165 | trackData.setYear(yearProperty->toInt()); | ||
Show All 18 Lines | |||||
185 | if (composerProperty != d->mAllProperties.end()) { | 184 | if (composerProperty != d->mAllProperties.end()) { | ||
186 | trackData.setComposer(composerProperty->toStringList().join(QStringLiteral(", "))); | 185 | trackData.setComposer(composerProperty->toStringList().join(QStringLiteral(", "))); | ||
187 | } | 186 | } | ||
188 | 187 | | |||
189 | if (lyricistProperty != d->mAllProperties.end()) { | 188 | if (lyricistProperty != d->mAllProperties.end()) { | ||
190 | trackData.setLyricist(lyricistProperty->toStringList().join(QStringLiteral(", "))); | 189 | trackData.setLyricist(lyricistProperty->toStringList().join(QStringLiteral(", "))); | ||
191 | } | 190 | } | ||
192 | 191 | | |||
192 | if (lyricsProperty != d->mAllProperties.end()) { | ||||
193 | trackData.setLyrics(lyricsProperty->toString()); | ||||
194 | } | ||||
195 | | ||||
193 | if (trackData.artist().isEmpty()) { | 196 | if (trackData.artist().isEmpty()) { | ||
194 | trackData.setArtist(trackData.albumArtist()); | 197 | trackData.setArtist(trackData.albumArtist()); | ||
195 | } | 198 | } | ||
196 | 199 | | |||
197 | #if !defined Q_OS_ANDROID | 200 | #if !defined Q_OS_ANDROID | ||
198 | QString comment = fileData.userComment(); | 201 | QString comment = fileData.userComment(); | ||
199 | if (!comment.isEmpty()) { | 202 | if (!comment.isEmpty()) { | ||
200 | trackData.setComment(comment); | 203 | trackData.setComment(comment); | ||
Show All 34 Lines |