Sky 1.6.0

Author: 3unjee

Sky.pro

@@ -37,4 +37,4 @@ OTHER_FILES += 3rdparty.sh \
                dist/changes/1.3.0.md \
                dist/changes/1.4.0.md \
                dist/changes/1.5.0.md \
-               dist/changes/1.5.1.md \
+               dist/changes/1.6.0.md \

dist/changes/1.5.0.md

@@ -2,7 +2,7 @@
 
 ### Previous: [Changelog 1.4.0](1.4.0.html)
 
-### Next: [Changelog 1.5.1](1.5.1.html)
+### Next: [Changelog 1.6.0](1.6.0.html)
 
 # [Sky kit](http://omega.gg/Sky)
 ---

dist/changes/1.5.1.md dist/changes/1.6.0.md

@@ -1,4 +1,4 @@
-# [Changelog 1.5.1](http://omega.gg/Sky/changes/1.5.1.html)
+# [Changelog 1.6.0](http://omega.gg/Sky/changes/1.6.0.html)
 
 ### Previous: [Changelog 1.5.0](1.5.0.html)
 

src/SkCore/src/controllers/WControllerFile.cpp

@@ -42,7 +42,7 @@ W_INIT_CONTROLLER(WControllerFile)
 //-------------------------------------------------------------------------------------------------
 // Static variables
 
-static const int CONTROLLERFILE_TIMEOUT = 60000; // 1 minute
+static const int CONTROLLERFILE_TIMEOUT = 10000; // 10 seconds
 
 //=================================================================================================
 // WControllerFileAction
@@ -950,13 +950,20 @@ WControllerFileReply * WControllerFile::startCreatePath(const QString & path)
 {
     QtLockedFile file(fileName);
 
-    if (WControllerFilePrivate::tryOpen(file))
+    if (WControllerFilePrivate::tryOpen(file) == false)
     {
         qWarning("WControllerFile::writeFile: File is locked %s.", fileName.C_STR);
 
         return false;
     }
 
+    if (file.open(QIODevice::WriteOnly) == false)
+    {
+        qWarning("WControllerFile::writeFile: Cannot open file %s.", fileName.C_STR);
+
+        return false;
+    }
+
     file.write(data);
 
     return true;

src/SkCore/src/io/WCache.cpp

@@ -891,9 +891,9 @@ bool WCacheThread::writeFile(QNetworkReply * reply, WCacheJob * job)
 
     if (file.open(QIODevice::WriteOnly) == false)
     {
-        qWarning("WCacheThread::writeFile: Cannot write file %s.", urlCache.C_STR);
+        qWarning("WCacheThread::writeFile: Cannot open file %s.", urlCache.C_STR);
 
-        QCoreApplication::postEvent(cache, new WCacheEventFailed(url, "Cannot write file"));
+        QCoreApplication::postEvent(cache, new WCacheEventFailed(url, "Cannot open file"));
 
         return false;
     }
@@ -949,11 +949,11 @@ void WCacheThread::writeData(const QString & url,
 
     if (file.open(QIODevice::WriteOnly) == false)
     {
-        qWarning("WCacheThread::writeData: Cannot write file %s.", urlCache.C_STR);
+        qWarning("WCacheThread::writeData: Cannot open file %s.", urlCache.C_STR);
 
         ids.removeOne(id);
 
-        QCoreApplication::postEvent(cache, new WCacheEventFailed(url, "Cannot write file"));
+        QCoreApplication::postEvent(cache, new WCacheEventFailed(url, "Cannot open file"));
 
         return;
     }