Differential D18813 Diff 51099 src/attica/atticaprovider.cpp

Changeset View

Standalone View

View Options

src/attica/atticaprovider.cpp

Context not available.
273 EntryInternal::List entries; 273​ EntryInternal::List entries;
274 TagsFilterChecker checker(tagFilter()); 274​ TagsFilterChecker checker(tagFilter());
275 TagsFilterChecker downloadschecker(downloadTagFilter()); 275​ TagsFilterChecker downloadschecker(downloadTagFilter());
276 Q_FOREACH (const Content &content, contents) { 276​ for (const Content &content : contents) {
277 if (checker.filterAccepts(content.tags())) { 277​ if (content.isValid()) {
apolUnsubmitted
Done

Maybe it would be easier to read if we had a if (!content.isValid()) continue; ....

apol: Maybe it would be easier to read if we had a `if (!content.isValid()) continue; ...`.
leinirAuthorUnsubmitted
Not Done

Hmm... the patch certainly would, i'll swap that around a bit. Generally don't like negations too much if i can avoid them, hunting exclamation marks just gets tiring after a while, but yeah, smaller patch is good anyway :)

leinir: Hmm... the patch certainly would, i'll swap that around a bit. Generally don't like negations…
278 bool filterAcceptsDownloads = true; 278​ if (checker.filterAccepts(content.tags())) {
279 if (content.downloads() > 0) { 279​ bool filterAcceptsDownloads = true;
280 filterAcceptsDownloads = false; 280​ if (content.downloads() > 0) {
281 for (const Attica::DownloadDescription &dli : content.downloadUrlDescriptions()) { 281​ filterAcceptsDownloads = false;
282 if (downloadschecker.filterAccepts(dli.tags())) { 282​ for (const Attica::DownloadDescription &dli : content.downloadUrlDescriptions()) {
283 filterAcceptsDownloads = true; 283​ if (downloadschecker.filterAccepts(dli.tags())) {
284 break; 284​ filterAcceptsDownloads = true;
285​ break;
286​ }
285 } 287​ }
286 } 288​ }
287 } 289​ if (filterAcceptsDownloads) {
288 if (filterAcceptsDownloads) { 290​ mCachedContent.insert(content.id(), content);
289 mCachedContent.insert(content.id(), content); 291​ entries.append(entryFromAtticaContent(content));
290 entries.append(entryFromAtticaContent(content)); 292​ } else {
293​ qCDebug(KNEWSTUFFCORE) << "Filter has excluded" << content.name() << "on download filter" << downloadTagFilter();
294​ }
291 } else { 295​ } else {
292 qCDebug(KNEWSTUFFCORE) << "Filter has excluded" << content.name() << "on download filter" << downloadTagFilter(); 296​ qCDebug(KNEWSTUFFCORE) << "Filter has excluded" << content.name() << "on entry filter" << tagFilter();
293 } 297​ }
294 } else { 298​ } else {
295 qCDebug(KNEWSTUFFCORE) << "Filter has excluded" << content.name() << "on entry filter" << tagFilter(); 299​ qCDebug(KNEWSTUFFCORE) << "Filtered out an invalid entry. This suggests something is not right on the originating server. Please contact the administrators of" << name() << "and inform them there is an issue with content in the category or categories" << mCurrentRequest.categories;
296 } 300​ }
297 } 301​ }
298 302​
Context not available.