fix ios demo projects bundling

MerginMaps · Jan 14, 2021 · f856e61 · f856e61 · inputapp-bot · Jan 14, 2021
1 parent 831d3fc
commit f856e61
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/app/inpututils.cpp b/app/inpututils.cpp
@@ -398,12 +398,13 @@ bool InputUtils::cpDir( const QString &srcPath, const QString &dstPath, bool onl
   QDir parentDstDir( QFileInfo( dstPath ).path() );
   if ( !parentDstDir.mkpath( dstPath ) )
   {
-    qDebug() << "Cannot make path " << dstPath;
+    log( "cpDir", QString( "Cannot make path %1" ).arg( dstPath ) );
     return false;
   }
 
   QDir srcDir( srcPath );
-  foreach ( const QFileInfo &info, srcDir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden ) )
+  const QFileInfoList fileInfoList = srcDir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden );
+  foreach ( const QFileInfo &info, fileInfoList )
   {
     QString srcItemPath = srcPath + "/" + info.fileName();
     QString dstItemPath = dstPath + "/" + info.fileName();

diff --git a/app/ios.pri b/app/ios.pri
@@ -69,12 +69,12 @@ ios {
     QMAKE_RPATHDIR += @executable_path/../Frameworks
     QMAKE_INFO_PLIST = ios/Info.plist
 
-    # https://doc.qt.io/qt-5.9/platform-notes-ios.html
-    demoFiles.files = $$files(android/assets/qgis-data/demo-projects/*)
-    demoFiles.path = qgis-data/demo-projects
+    # demo projects
+    demoFiles.files = $$files(android/assets/demo-projects/*)
+    demoFiles.path = demo-projects
     QMAKE_BUNDLE_DATA += demoFiles
 
-
+    # qgis resources
     crsFiles.files = $$files(android/assets/qgis-data/resources/*)
     crsFiles.path = qgis-data/resources
     QMAKE_BUNDLE_DATA += crsFiles

diff --git a/app/localprojectsmanager.cpp b/app/localprojectsmanager.cpp
@@ -46,6 +46,7 @@ void LocalProjectsManager::reloadProjectDir()
 
     mProjects << info;
   }
+  qDebug() << "LocalProjectsManager: found" << mProjects.size() << "projects";
 }
 
 LocalProjectInfo LocalProjectsManager::projectFromDirectory( const QString &projectDir ) const

diff --git a/app/main.cpp b/app/main.cpp
@@ -173,15 +173,16 @@ static void setEnvironmentQgisPrefixPath()
 }
 
 
-static void copy_demo_projects( const QString &projectDir )
+static void copy_demo_projects( const QString &demoDir, const QString &projectDir )
 {
-#if defined (ANDROID) || defined (Q_OS_IOS)
-  InputUtils::cpDir( "assets:/demo-projects", projectDir );
-#elif defined (Q_OS_WIN32)
-  InputUtils::cpDir( QCoreApplication::applicationDirPath() + "/demo-projects", projectDir );
-#else
-  Q_UNUSED( projectDir );
-#endif
+  if (!demoDir.isEmpty())
+    InputUtils::cpDir( demoDir, projectDir );
+
+  QFile demoFile( projectDir + "/Start here!/qgis-project.qgz" );
+  if ( demoFile.exists() )
+    qDebug() << "DEMO projects initialized";
+  else
+    InputUtils::log( QStringLiteral( "DEMO" ), QStringLiteral( "The Input has failed to initialize demo projects" ) );
 }
 
 static void init_qgis( const QString &pkgPath )
@@ -361,19 +362,24 @@ int main( int argc, char *argv[] )
   setEnvironmentQgisPrefixPath();
 
   QString appBundleDir;
+  QString demoDir;
+
 #ifdef ANDROID
   appBundleDir = dataDir + "/qgis-data";
+  demoDir = "assets:/demo-projects";
 #endif
 #ifdef Q_OS_IOS
   appBundleDir = QCoreApplication::applicationDirPath() + "/qgis-data";
+  demoDir = QCoreApplication::applicationDirPath() + "/demo-projects";
 #endif
 #ifdef Q_OS_WIN32
   appBundleDir = QCoreApplication::applicationDirPath() + "\\qgis-data";
+  //TODO win32 package demo projects
 #endif
 
   init_proj( appBundleDir );
   init_qgis( appBundleDir );
-  copy_demo_projects( projectDir );
+  copy_demo_projects( demoDir, projectDir );
 
   // Create Input classes
   AndroidUtils au;