[delimitertext] fix watcher check ignored and harmful watcher created for iterator

nirvn · nyalldawson · commit 3dbf97f03e9b · 2016-09-14T09:15:14.000+10:00
(fixes #15558) (cherry-picked from b3e3108)
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -502,8 +502,16 @@ QgsDelimitedTextFeatureSource::QgsDelimitedTextFeatureSource( const QgsDelimited
     , mXyDms( p->mXyDms )
     , attributeColumns( p->attributeColumns )
 {
+  QUrl url = p->mFile->url();
+
+  // make sure watcher not created when using iterator (e.g. for rendering, see issue #15558)
+  if ( url.hasQueryItem( "watchFile" ) )
+  {
+    url.removeQueryItem( "watchFile" );
+  }
+
   mFile = new QgsDelimitedTextFile();
-  mFile->setFromUrl( p->mFile->url() );
+  mFile->setFromUrl( url );
 
   mExpressionContext << QgsExpressionContextUtils::globalScope()
   << QgsExpressionContextUtils::projectScope();
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp
@@ -35,7 +35,7 @@ QgsDelimitedTextFile::QgsDelimitedTextFile( const QString& url )
     , mEncoding( "UTF-8" )
     , mFile( nullptr )
     , mStream( nullptr )
-    , mUseWatcher( true )
+    , mUseWatcher( false )
     , mWatcher( nullptr )
     , mDefinitionValid( false )
     , mUseHeader( true )
@@ -158,9 +158,9 @@ bool QgsDelimitedTextFile::setFromUrl( const QUrl &url )
   }
 
   //
-  if ( url.hasQueryItem( "useWatcher" ) )
+  if ( url.hasQueryItem( "watchFile" ) )
   {
-    mUseWatcher = ! url.queryItemValue( "useWatcher" ).toUpper().startsWith( 'N' );
+    mUseWatcher = url.queryItemValue( "watchFile" ).toUpper().startsWith( 'Y' );
   }
 
   // The default type is csv, to be consistent with the
@@ -269,9 +269,9 @@ QUrl QgsDelimitedTextFile::url()
     url.addQueryItem( "encoding", mEncoding );
   }
 
-  if ( !mUseWatcher )
+  if ( mUseWatcher )
   {
-    url.addQueryItem( "useWatcher", "no" );
+    url.addQueryItem( "watchFile", "yes" );
   }
 
   url.addQueryItem( "type", type() );

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ QgsDelimitedTextFile::QgsDelimitedTextFile( const QString& url )`
`35`	`35`	`, mEncoding( "UTF-8" )`
`36`	`36`	`, mFile( nullptr )`
`37`	`37`	`, mStream( nullptr )`
`38`		`- , mUseWatcher( true )`
	`38`	`+ , mUseWatcher( false )`
`39`	`39`	`, mWatcher( nullptr )`
`40`	`40`	`, mDefinitionValid( false )`
`41`	`41`	`, mUseHeader( true )`
`@@ -158,9 +158,9 @@ bool QgsDelimitedTextFile::setFromUrl( const QUrl &url )`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`//`
`161`		`- if ( url.hasQueryItem( "useWatcher" ) )`
	`161`	`+ if ( url.hasQueryItem( "watchFile" ) )`
`162`	`162`	`{`
`163`		`- mUseWatcher = ! url.queryItemValue( "useWatcher" ).toUpper().startsWith( 'N' );`
	`163`	`+ mUseWatcher = url.queryItemValue( "watchFile" ).toUpper().startsWith( 'Y' );`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`// The default type is csv, to be consistent with the`
`@@ -269,9 +269,9 @@ QUrl QgsDelimitedTextFile::url()`
`269`	`269`	`url.addQueryItem( "encoding", mEncoding );`
`270`	`270`	`}`
`271`	`271`
`272`		`- if ( !mUseWatcher )`
	`272`	`+ if ( mUseWatcher )`
`273`	`273`	`{`
`274`		`- url.addQueryItem( "useWatcher", "no" );`
	`274`	`+ url.addQueryItem( "watchFile", "yes" );`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`url.addQueryItem( "type", type() );`