+wrt-commons (0.2.102) unstable; urgency=low
+
+ * DPL path join for class Path to be introduced
+ * tests - Return value not used
+ * Fix App-control Supports : Registration routine was added
+ * Remove web storage & filesystem usage code
+
+ -- Jihoon Chung <jihoon.chung@samsung.com> Thu, 07 Mar 2013 09:03:04 +0900
+
wrt-commons (0.2.101) unstable; urgency=low
* CSP report only support
${PROJECT_SOURCE_DIR}/modules/core/src/once.cpp
${PROJECT_SOURCE_DIR}/modules/core/src/read_write_mutex.cpp
${PROJECT_SOURCE_DIR}/modules/core/src/recursive_mutex.cpp
+ ${PROJECT_SOURCE_DIR}/modules/core/src/scoped_dir.cpp
${PROJECT_SOURCE_DIR}/modules/core/src/serialization.cpp
${PROJECT_SOURCE_DIR}/modules/core/src/single_instance.cpp
${PROJECT_SOURCE_DIR}/modules/core/src/singleton.cpp
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_resource.h
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_array.h
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_close.h
+ ${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_dir.h
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_fclose.h
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_free.h
${PROJECT_SOURCE_DIR}/modules/core/include/dpl/scoped_ptr.h
--- /dev/null
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*!
+ * @file scoped_dir.h
+ * @author Iwanek Tomasz (t.iwanek@smasung.com)
+ * @version 1.0
+ * @brief This file is the implementation file of scoped directory existence
+ */
+
+#ifndef DPL_SCOPED_DIR_H
+#define DPL_SCOPED_DIR_H
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <string>
+#include <dpl/scoped_resource.h>
+
+namespace DPL {
+
+struct ScopedDirPolicy
+{
+ typedef std::string Type;
+ static Type NullValue();
+ static void Destroy(Type ptr);
+};
+
+class ScopedDir : public ScopedResource<ScopedDirPolicy>
+{
+ typedef ScopedDirPolicy Policy;
+ typedef ScopedResource<Policy> BaseType;
+
+ public:
+ explicit ScopedDir(const std::string & str = Policy::NullValue(), mode_t mode = S_IRWXU|S_IRGRP|S_IXGRP);
+};
+} // namespace DPL
+
+#endif // DPL_SCOPED_DIR_H
#include <dpl/char_traits.h>
#include <string>
#include <ostream>
+#include <numeric>
namespace DPL {
// @brief DPL string
nextSearchStart = pos + 1;
}
}
+
+namespace Utils {
+
+template<typename T> class ConcatFunc : public std::binary_function<T, T, T>
+{
+public:
+ explicit ConcatFunc(const T & val) : m_delim(val) {}
+ T operator()(const T & arg1, const T & arg2) const
+ {
+ return arg1 + m_delim + arg2;
+ }
+private:
+ T m_delim;
+};
+
+}
+
+template<typename ForwardIterator>
+typename ForwardIterator::value_type Join(ForwardIterator begin, ForwardIterator end, typename ForwardIterator::value_type delim)
+{
+ typedef typename ForwardIterator::value_type value;
+ if(begin == end) return value();
+ Utils::ConcatFunc<value> func(delim);
+ ForwardIterator init = begin;
+ return std::accumulate(++begin, end, *init, func);
+}
+
} //namespace DPL
std::ostream& operator<<(std::ostream& aStream, const DPL::String& aString);
--- /dev/null
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * @file scoped_dir.cpp
+ * @author Iwanek Tomasz (t.iwanek@samsung.com)
+ * @version 1.0
+ * @brief This file is the implementation scoped directory
+ */
+#include <dpl/scoped_dir.h>
+#include <dpl/log/log.h>
+
+#include <fts.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+namespace {
+
+bool removeRecusive(const char * path)
+{
+ FTS *fts;
+ FTSENT *ftsent;
+ bool rv = true;
+ char * const paths[] = { const_cast<char * const>(path), NULL };
+ if ((fts = fts_open(paths, FTS_PHYSICAL | FTS_NOCHDIR, NULL)) == NULL) {
+ return false;
+ }
+ while ((ftsent = fts_read(fts)) != NULL) {
+ switch (ftsent->fts_info) {
+ case FTS_D:
+ break;
+ case FTS_DP:
+ if (rmdir(ftsent->fts_accpath) != 0) {
+ rv = false;
+ }
+ break;
+ case FTS_DC:
+ case FTS_F:
+ case FTS_NSOK:
+ case FTS_SL:
+ case FTS_SLNONE:
+ case FTS_DEFAULT:
+ if (unlink(ftsent->fts_accpath) != 0) {
+ rv = false;
+ }
+ break;
+ case FTS_NS:
+ rv = false;
+ break;
+ case FTS_DOT:
+ case FTS_DNR:
+ case FTS_ERR:
+ default:
+ rv = false;
+ break;
+ }
+ }
+ if (fts_close(fts) == -1) {
+ rv = false;
+ }
+ return rv;
+}
+
+}
+
+namespace DPL {
+
+ScopedDirPolicy::Type ScopedDirPolicy::NullValue()
+{
+ return std::string();
+}
+
+void ScopedDirPolicy::Destroy(Type str)
+{
+ if(!str.empty())
+ {
+ bool status = removeRecusive(str.c_str());
+ if(!status)
+ {
+ LogError("Error while removing recursively: " << str);
+ }
+ }
+}
+
+ScopedDir::ScopedDir(const std::string & str, mode_t mode) : BaseType(str)
+{
+ if(!str.empty())
+ {
+ mkdir(str.c_str(), mode);
+ }
+}
+
+} // namespace DPL
+
namespace SecurityOriginDB {
const std::map<std::string, Feature> g_W3CPrivilegeTextMap = {
{"http://tizen.org/privilege/location", FEATURE_GEOLOCATION},
- {"http://tizen.org/privilege/notification", FEATURE_WEB_NOTIFICATION},
- {"http://tizen.org/privilege/unlimitedstorage", FEATURE_WEB_DATABASE},
- {"http://tizen.org/privilege/filesystem.write", FEATURE_FILE_SYSTEM_ACCESS}
+ {"http://tizen.org/privilege/notification", FEATURE_WEB_NOTIFICATION}
};
} // namespace SecurityOriginDB
FEATURE_START = 0,
FEATURE_GEOLOCATION = 0,
FEATURE_WEB_NOTIFICATION,
- FEATURE_WEB_DATABASE,
- FEATURE_FILE_SYSTEM_ACCESS,
- FEATURE_END = FEATURE_FILE_SYSTEM_ACCESS
+ FEATURE_END = FEATURE_WEB_NOTIFICATION
};
enum Result
PARENT_SCOPE
)
-
SET(DPL_UTILS_HEADERS
${PROJECT_SOURCE_DIR}/modules/utils/include/dpl/utils/bash_utils.h
${PROJECT_SOURCE_DIR}/modules/utils/include/dpl/utils/folder_size.h
}
}
+void WidgetDAO::insertApplicationServiceInfo(DbWidgetHandle handle,
+ DPL::String src,
+ DPL::String operation,
+ DPL::String scheme,
+ DPL::String mime)
+{
+ using namespace DPL::DB::ORM;
+ using namespace DPL::DB::ORM::wrt;
+
+ ApplicationServiceInfo::Row row;
+
+ row.Set_app_id(handle);
+ row.Set_src(src);
+ row.Set_operation(operation);
+ row.Set_scheme(scheme);
+ row.Set_mime(mime);
+
+ DO_INSERT(row, ApplicationServiceInfo);
+}
+
void WidgetDAO::registerAppService(DbWidgetHandle widgetHandle,
const WidgetRegisterInfo ®Info)
{
using namespace DPL::DB::ORM::wrt;
const ConfigParserData& widgetConfigurationInfo = regInfo.configInfo;
+ // appServiceList
FOREACH(ASIt, widgetConfigurationInfo.appServiceList)
{
ApplicationServiceInfo::Row row;
DO_INSERT(row, ApplicationServiceInfo)
}
+
+ // appControlList
+ FOREACH(appControl_it, widgetConfigurationInfo.appControlList)
+ {
+ DPL::String src = appControl_it->m_src;
+ DPL::String operation = appControl_it->m_operation;
+
+ if (!appControl_it->m_uriList.empty())
+ {
+ FOREACH(uri_it, appControl_it->m_uriList)
+ {
+ DPL::String scheme = *uri_it;
+
+ if (!appControl_it->m_mimeList.empty())
+ {
+ FOREACH(mime_it, appControl_it->m_mimeList)
+ {
+ DPL::String mime = *mime_it;
+
+ insertApplicationServiceInfo(widgetHandle, src, operation, scheme, mime);
+ }
+ }
+ else
+ {
+ DPL::String mime = L"";
+
+ insertApplicationServiceInfo(widgetHandle, src, operation, scheme, mime);
+ }
+ }
+ }
+ else
+ {
+ DPL::String scheme = L"";
+
+ if (!appControl_it->m_mimeList.empty())
+ {
+ FOREACH(mime_it, appControl_it->m_mimeList)
+ {
+ DPL::String mime = *mime_it;
+
+ insertApplicationServiceInfo(widgetHandle, src, operation, scheme, mime);
+ }
+ }
+ else
+ {
+ DPL::String mime = L"";
+
+ insertApplicationServiceInfo(widgetHandle, src, operation, scheme, mime);
+ }
+ }
+ }
}
void WidgetDAO::registerEncryptedResouceInfo(DbWidgetHandle widgetHandle,
.GetFullPath();
}
-inline std::string GetVconfKeyWebDatabaseUsage(DPL::String tzPkgId)
-{
- return PathBuilder()
- .Append(GlobalConfig::GetVconfKeyPrefixPath())
- .Append(DPL::ToUTF8String(tzPkgId))
- .Concat(GlobalConfig::GetVconfKeyWebDatabaseUsagePath())
- .GetFullPath();
-}
-
-inline std::string GetVconfKeyFilesystemUsage(DPL::String tzPkgId)
-{
- return PathBuilder()
- .Append(GlobalConfig::GetVconfKeyPrefixPath())
- .Append(DPL::ToUTF8String(tzPkgId))
- .Concat(GlobalConfig::GetVconfKeyFilesystemUsagePath())
- .GetFullPath();
-}
-
inline std::string GetVconfKeyMemorySavingMode(DPL::String tzPkgId)
{
return PathBuilder()
DPL::Optional<DbWidgetHandle>());
static void unregisterWidgetInternal(
const TizenAppId & tzAppId);
+
+ static void insertApplicationServiceInfo(DbWidgetHandle handle,
+ DPL::String src,
+ DPL::String operation,
+ DPL::String scheme,
+ DPL::String mime);
};
} // namespace WrtDB
-#git:framework/web/wrt-commons wrt-commons 0.2.101.1
+#git:framework/web/wrt-commons wrt-commons 0.2.102
Name: wrt-commons
Summary: Wrt common library
-Version: 0.2.101.1
+Version: 0.2.102
Release: 1
Group: Development/Libraries
License: Apache License, Version 2.0
${TESTS_DIR}/core/test_serialization.cpp
${TESTS_DIR}/core/test_scoped_array.cpp
${TESTS_DIR}/core/test_scoped_close.cpp
+ ${TESTS_DIR}/core/test_scoped_dir.cpp
${TESTS_DIR}/core/test_scoped_fclose.cpp
${TESTS_DIR}/core/test_scoped_free.cpp
${TESTS_DIR}/core/test_scoped_ptr.cpp
--- /dev/null
+/*
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * @file test_scoped_dir.cpp
+ * @author Iwanek Tomasz (t.iwanek@smasung.com)
+ * @version 1.0
+ * @brief Scoped directory test
+ */
+#include <dpl/test/test_runner.h>
+#include <dpl/scoped_dir.h>
+
+#include <cstdio>
+#include <sstream>
+#include <cstdlib>
+
+#include <unistd.h>
+
+RUNNER_TEST_GROUP_INIT(DPL)
+
+/*
+Name: ScopedDir_Basic
+Description: tests if scoped directory is working
+Expected: directory created and removed
+*/
+RUNNER_TEST(ScopedDir_Basic)
+{
+ const char * path = "/tmp/wrttest123456";
+ if(access(path, F_OK) == 0)
+ {
+ RUNNER_ASSERT_MSG(!remove(path), "Cannot remove test directory");
+ }
+
+ {
+ DPL::ScopedDir dir(path, S_IRUSR | S_IWUSR);
+ std::ostringstream command;
+ command << "touch " << path << "/" << "file.txt";
+ (void)system(command.str().c_str());
+ RUNNER_ASSERT_MSG(access(path, R_OK) == 0, "Directory should be accessible");
+ RUNNER_ASSERT_MSG(access(path, W_OK) == 0, "Directory should be writable");
+ }
+ RUNNER_ASSERT_MSG(access(path, F_OK) != 0, "Directory should not exists");
+}
ok_class = true;
}
};
-STATIC_BLOCK_CLASS( A, init );
+STATIC_BLOCK_CLASS( A, init )
}
/*
#include <cmath>
#include <cstring>
#include <vector>
+#include <string>
#include <dpl/test/test_runner.h>
#include <dpl/string.h>
#include <dpl/sstream.h>
true) == 0);
}
+/*
+Name: String_Join
+Description: tests joining strings algorithm
+Expected: join should take place correctly
+*/
+RUNNER_TEST(String_Join)
+{
+ std::vector<std::string> strings;
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "/") == "");
+ strings.push_back("one");
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "/") == "one");
+ strings.push_back("two");
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "/") == "one/two");
+ strings.push_back("three");
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "/") == "one/two/three");
+ strings.push_back("four");
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "/") == "one/two/three/four");
+ RUNNER_ASSERT(DPL::Join(++strings.begin(), --strings.end(), "/") == "two/three");
+
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "+") == "one+two+three+four");
+ RUNNER_ASSERT(DPL::Join(strings.begin(), strings.end(), "delim") == "onedelimtwodelimthreedelimfour");
+}
+
projects / platform / framework / web / wrt-commons.git / commitdiff