papki -> fsif

igagis · igagis · commit b8e5ae29d1d8 · 2025-11-03T14:38:17.000+02:00
diff --git a/build/android/svgdom-$(version).pom.in b/build/android/svgdom-$(version).pom.in
@@ -16,7 +16,7 @@
 	  </dependency>
 	  <dependency>
 		  <groupId>io.github.cppfw</groupId>
-		  <artifactId>papki</artifactId>
+		  <artifactId>fsif</artifactId>
 		  <version>[1.0.93,)</version>
 		  <type>aar</type>
 		  <scope>compile</scope>
diff --git a/build/android/svgdom/build.gradle b/build/android/svgdom/build.gradle
@@ -50,7 +50,7 @@ repositories {
 }
 dependencies {
     implementation 'io.github.cppfw:utki:+'
-    implementation 'io.github.cppfw:papki:+'
+    implementation 'io.github.cppfw:fsif:+'
     implementation 'io.github.cppfw:mikroxml:+'
     implementation 'io.github.cppfw:cssom:+'
     implementation 'io.github.cppfw:r4:+'
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt
@@ -23,7 +23,7 @@ myci_declare_library(${name}
         ../../src/${name}
     DEPENDENCIES
         utki
-        papki
+        fsif
         r4
         mikroxml
         cssom
diff --git a/build/debian/control.in b/build/debian/control.in
@@ -11,7 +11,7 @@ Build-Depends:
 	clang-format,
 	libc6-dev,
 	libutki-dev (>= 1.1.150),
-	libpapki-dev,
+	libfsif-dev,
 	libmikroxml-dev,
 	libcssom-dev (>= 0.1.19),
 	libr4-dev,
@@ -54,7 +54,7 @@ Depends:
 	libsvgdom-dbg$(soname) (= ${binary:Version}),
 	${misc:Depends},
 	libutki-dev,
-	libpapki-dev,
+	libfsif-dev,
 	libcssom-dev,
 	libr4-dev
 Suggests: libsvgdom-doc
diff --git a/build/homebrew/libsvgdom.rb.in b/build/homebrew/libsvgdom.rb.in
@@ -11,7 +11,7 @@ class Libsvgdom < Formula
   depends_on "libtst" => :build
   depends_on "libmikroxml"
   depends_on "libcssom"
-  depends_on "libpapki"
+  depends_on "libfsif"
   depends_on "libutki"
   depends_on "libr4"
 
diff --git a/build/vcpkg/test/vcpkg-configuration.json b/build/vcpkg/test/vcpkg-configuration.json
@@ -13,7 +13,7 @@
         "packages": [
           "myci",
           "utki",
-          "papki",
+          "fsif",
           "mikroxml",
           "cssom",
           "r4"
diff --git a/build/vcpkg/vcpkg.json.in b/build/vcpkg/vcpkg.json.in
@@ -18,7 +18,7 @@
         "host" : false
       },
       "utki",
-      "papki",
+      "fsif",
       "mikroxml",
       "cssom",
       "r4"
diff --git a/src/makefile b/src/makefile
@@ -14,7 +14,7 @@ this_soname := $(shell cat $(d)soname.txt)
 this_srcs := $(call prorab-src-dir, $(this_src_dir))
 
 this_ldlibs += -l cssom$(this_dbg)
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 this_ldlibs += -l mikroxml$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
 this_ldlibs += -l m
diff --git a/src/svgdom/dom.cpp b/src/svgdom/dom.cpp
@@ -32,12 +32,12 @@ SOFTWARE.
 
 using namespace svgdom;
 
-std::unique_ptr<svg_element> svgdom::load(const papki::file& f)
+std::unique_ptr<svg_element> svgdom::load(const fsif::file& f)
 {
 	svgdom::parser parser;
 
 	{
-		papki::file::guard file_guard(f);
+		fsif::file::guard file_guard(f);
 
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)
 		std::array<uint8_t, size_t(utki::kilobyte) * 4> buf;
diff --git a/src/svgdom/dom.hpp b/src/svgdom/dom.hpp
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #pragma once
 
-#include <papki/file.hpp>
+#include <fsif/file.hpp>
 #include <utki/config.hpp>
 
 #include "elements/structurals.hpp"
@@ -40,7 +40,7 @@ namespace svgdom {
  * @param f - file interface to load SVG from.
  * @return unique pointer to the root of SVG document tree.
  */
-std::unique_ptr<svg_element> load(const papki::file& f);
+std::unique_ptr<svg_element> load(const fsif::file& f);
 
 /**
  * @brief Load SVG document.
diff --git a/src/svgdom/parser.cpp b/src/svgdom/parser.cpp
@@ -30,7 +30,7 @@ SOFTWARE.
 #include <ratio>
 #include <string_view>
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 #include <utki/debug.hpp>
 #include <utki/string.hpp>
 #include <utki/util.hpp>
@@ -1027,7 +1027,7 @@ class parse_content_visitor : public visitor
 	void visit(style_element& e) override
 	{
 		e.css.append(cssom::read(
-			papki::span_file(this->content),
+			fsif::span_file(this->content),
 			[](std::string_view name) -> uint32_t {
 				return uint32_t(styleable::string_to_property(name));
 			},
diff --git a/src/svgdom/util/stream_writer.cpp b/src/svgdom/util/stream_writer.cpp
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "stream_writer.hpp"
 
-#include <papki/vector_file.hpp>
+#include <fsif/vector_file.hpp>
 #include <utki/string.hpp>
 #include <utki/util.hpp>
 
@@ -504,7 +504,7 @@ void stream_writer::visit(const style_element& e)
 	auto ind = this->indent_str();
 	--this->indent;
 
-	papki::vector_file fi;
+	fsif::vector_file fi;
 	e.css.write(
 		fi,
 		[](uint32_t id) -> std::string {
diff --git a/tests/unit/finders.cpp b/tests/unit/finders.cpp
@@ -1,7 +1,7 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include "../../src/svgdom/dom.hpp"
 #include "../../src/svgdom/util/finder_by_id.hpp"
@@ -13,7 +13,7 @@ struct fixture{
 	std::unique_ptr<svgdom::svg_element> dom;
 	fixture(){
 		// NOLINTNEXTLINE(bugprone-unused-return-value, "false positive")
-		this->dom = svgdom::load(papki::fs_file("samples_data/finders.svg"));
+		this->dom = svgdom::load(fsif::native_file("samples_data/finders.svg"));
 		tst::check(this->dom != nullptr, SL);
 		tst::check(this->dom->children.size() != 0, SL);
 	}
diff --git a/tests/unit/makefile b/tests/unit/makefile
@@ -11,7 +11,7 @@ this_srcs := $(call prorab-src-dir, .)
 
 this_ldlibs += -l tst$(this_dbg)
 this_ldlibs += -l utki$(this_dbg)
-this_ldlibs += -l papki$(this_dbg)
+this_ldlibs += -l fsif$(this_dbg)
 
 this_ldlibs += ../../src/out/$(c)/libsvgdom$(this_dbg)$(dot_so)
 
diff --git a/tests/unit/misc.cpp b/tests/unit/misc.cpp
@@ -3,7 +3,7 @@
 
 #include <fstream>
 
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include <svgdom/dom.hpp>
 #include <svgdom/util/style_stack.hpp>
@@ -27,9 +27,9 @@ const tst::set set("misc", [](tst::suite& suite){
     );
 
     suite.add(
-        "read_from_fs_file",
+        "read_from_native_file",
         [](){
-            auto dom = svgdom::load(papki::fs_file("samples_data/tiger.svg"));
+            auto dom = svgdom::load(fsif::native_file("samples_data/tiger.svg"));
             tst::check(dom, SL);
         }
     );
diff --git a/tests/unit/performance.cpp b/tests/unit/performance.cpp
@@ -2,7 +2,7 @@
 #include <tst/check.hpp>
 
 #include <utki/time.hpp>
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include "../../src/svgdom/dom.hpp"
 
@@ -11,7 +11,7 @@ const tst::set set("performance", [](auto& suite){
 	suite.add("basic_test", [](){
 		auto load_start = utki::get_ticks_ms();
 	
-		auto buf = papki::fs_file("samples_data/back.svg").load();
+		auto buf = fsif::native_file("samples_data/back.svg").load();
 		
 		utki::log([&](auto&o){o << "SVG loaded in " << float(utki::get_ticks_ms() - load_start) / 1000.0f << " sec." << std::endl;});
 		
diff --git a/tests/unit/samples.cpp b/tests/unit/samples.cpp
@@ -5,8 +5,8 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/fs_file.hpp>
-#include <papki/vector_file.hpp>
+#include <fsif/native_file.hpp>
+#include <fsif/vector_file.hpp>
 
 #include <utki/linq.hpp>
 
@@ -28,7 +28,7 @@ const tst::set set("samples", [](tst::suite& suite){
 		utki::log([](auto& o){o << "WARNING: failed to set locale de_DE.UTF-8, perhaps the locale is not installed. Testing that locale does not affect parsing will not be done." << std::endl;});
 	}
 
-    std::vector<std::string> files = utki::linq(papki::fs_file(data_dir).list_dir())
+    std::vector<std::string> files = utki::linq(fsif::native_file(data_dir).list_dir())
             .where(
                     [&](const auto& f){
                         static const std::regex suffix_regex("^.*\\.svg$");
@@ -43,20 +43,20 @@ const tst::set set("samples", [](tst::suite& suite){
         [](auto& p){
             auto in_file_name = data_dir + p;
 
-            auto dom = svgdom::load(papki::fs_file(in_file_name));
+            auto dom = svgdom::load(fsif::native_file(in_file_name));
             tst::check(dom, SL);
             
             auto str = dom->to_string();
             
-            papki::vector_file out_file;
+            fsif::vector_file out_file;
             {
-                papki::file::guard file_guard(out_file, papki::mode::create);
+                fsif::file::guard file_guard(out_file, fsif::mode::create);
                 out_file.write(utki::make_span(str));
             }
             
             auto out_data = out_file.reset_data();
 
-            papki::fs_file cmp_file(in_file_name + ".cmp");
+            fsif::native_file cmp_file(in_file_name + ".cmp");
 
             decltype(out_data) cmp_data;
 
@@ -67,10 +67,10 @@ const tst::set set("samples", [](tst::suite& suite){
             }
 
             if(out_data != cmp_data){
-                papki::fs_file failed_file(in_file_name + ".out");
+                fsif::native_file failed_file(in_file_name + ".out");
 
                 {
-                    papki::file::guard file_guard(failed_file, papki::mode::create);
+                    fsif::file::guard file_guard(failed_file, fsif::mode::create);
                     failed_file.write(out_data);
                 }
 
diff --git a/tests/unit/style_stack.cpp b/tests/unit/style_stack.cpp
@@ -1,7 +1,7 @@
 #include <tst/set.hpp>
 #include <tst/check.hpp>
 
-#include <papki/span_file.hpp>
+#include <fsif/span_file.hpp>
 
 #include "../../src/svgdom/visitor.hpp"
 #include "../../src/svgdom/util/style_stack.hpp"
@@ -142,7 +142,7 @@ class traverse_visitor : public svgdom::const_visitor{
 namespace{
 const tst::set set("style_stack", [](auto& suite){
 	suite.add("basic_test", [](){
-		auto dom = svgdom::load(papki::span_file(utki::make_span(svg)));
+		auto dom = svgdom::load(fsif::span_file(utki::make_span(svg)));
 		utki::assert(dom, SL);
 		utki::assert(dom->children.size() != 0, SL);
 		
diff --git a/tests/unit/style_stack_cache.cpp b/tests/unit/style_stack_cache.cpp
@@ -2,7 +2,7 @@
 #include <tst/check.hpp>
 
 #include <utki/time.hpp>
-#include <papki/fs_file.hpp>
+#include <fsif/native_file.hpp>
 
 #include "../../src/svgdom/dom.hpp"
 #include "../../src/svgdom/visitor.hpp"
@@ -15,7 +15,7 @@ const tst::set set("style_stack_cache", [](auto& suite){
 			[](){
 				auto load_start = utki::get_ticks_ms();
 	
-				auto dom = svgdom::load(papki::fs_file("samples_data/back.svg"));
+				auto dom = svgdom::load(fsif::native_file("samples_data/back.svg"));
 
 				tst::check(dom != nullptr, SL);
 				tst::check(dom->children.size() != 0, SL);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ repositories {`
`50`	`50`	`}`
`51`	`51`	`dependencies {`
`52`	`52`	`implementation 'io.github.cppfw:utki:+'`
`53`		`- implementation 'io.github.cppfw:papki:+'`
	`53`	`+ implementation 'io.github.cppfw:fsif:+'`
`54`	`54`	`implementation 'io.github.cppfw:mikroxml:+'`
`55`	`55`	`implementation 'io.github.cppfw:cssom:+'`
`56`	`56`	`implementation 'io.github.cppfw:r4:+'`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ SOFTWARE.`
`32`	`32`
`33`	`33`	`using namespace svgdom;`
`34`	`34`
`35`		`-std::unique_ptr<svg_element> svgdom::load(const papki::file& f)`
	`35`	`+std::unique_ptr<svg_element> svgdom::load(const fsif::file& f)`
`36`	`36`	`{`
`37`	`37`	`svgdom::parser parser;`
`38`	`38`
`39`	`39`	`{`
`40`		`- papki::file::guard file_guard(f);`
	`40`	`+ fsif::file::guard file_guard(f);`
`41`	`41`
`42`	`42`	`// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init)`
`43`	`43`	`std::array<uint8_t, size_t(utki::kilobyte) * 4> buf;`