diff --git a/mythtv/libs/libmythmetadata/metadatadownload.cpp b/mythtv/libs/libmythmetadata/metadatadownload.cpp
index a2cca15..d2a2f93 100644
a
|
b
|
void MetadataDownload::run() |
94 | 94 | // Go go gadget Metadata Lookup |
95 | 95 | if (lookup->GetType() == kMetadataVideo) |
96 | 96 | { |
97 | | if (lookup->GetSubtype() == kProbableTelevision) |
98 | | list = handleTelevision(lookup); |
99 | | else if (lookup->GetSubtype() == kProbableMovie) |
100 | | list = handleMovie(lookup); |
101 | | else |
102 | | list = handleVideoUndetermined(lookup); |
| 97 | QString mxml; |
| 98 | QString nfo; |
103 | 99 | |
104 | | if (list.isEmpty() && |
105 | | lookup->GetSubtype() == kUnknownVideo) |
| 100 | if (!lookup->GetFilename().isEmpty()) |
106 | 101 | { |
107 | | list = handleMovie(lookup); |
| 102 | mxml = getMXMLPath(lookup->GetFilename()); |
| 103 | nfo = getNFOPath(lookup->GetFilename()); |
108 | 104 | } |
| 105 | //if mxml or nfo file found use that instead of searching |
| 106 | if (!mxml.isEmpty()) |
| 107 | list = readMXML(mxml, lookup, false); |
| 108 | else if (!nfo.isEmpty()) |
| 109 | list = readNFO(nfo, lookup); |
| 110 | else |
| 111 | { |
| 112 | if (lookup->GetSubtype() == kProbableTelevision) |
| 113 | list = handleTelevision(lookup); |
| 114 | else if (lookup->GetSubtype() == kProbableMovie) |
| 115 | list = handleMovie(lookup); |
| 116 | else |
| 117 | list = handleVideoUndetermined(lookup); |
| 118 | |
| 119 | if (list.isEmpty() && |
| 120 | lookup->GetSubtype() == kUnknownVideo) |
| 121 | { |
| 122 | list = handleMovie(lookup); |
| 123 | } |
| 124 | } |
109 | 125 | } |
110 | 126 | else if (lookup->GetType() == kMetadataRecording) |
111 | 127 | { |
… |
… |
MetadataLookupList MetadataDownload::handleMovie(MetadataLookup *lookup) |
511 | 527 | { |
512 | 528 | MetadataLookupList list; |
513 | 529 | |
514 | | QString mxml; |
515 | | QString nfo; |
516 | | |
517 | | if (!lookup->GetFilename().isEmpty()) |
518 | | { |
519 | | mxml = getMXMLPath(lookup->GetFilename()); |
520 | | nfo = getNFOPath(lookup->GetFilename()); |
521 | | } |
522 | | |
523 | | if (!mxml.isEmpty()) |
524 | | list = readMXML(mxml, lookup); |
525 | | else if (!nfo.isEmpty()) |
526 | | list = readNFO(nfo, lookup); |
527 | | |
528 | 530 | if (list.isEmpty()) |
529 | 531 | { |
530 | 532 | QString cmd = GetMovieGrabber(); |