diff -pruN 2.6.1-1/data/meson.build 2.7.1-1/data/meson.build
--- 2.6.1-1/data/meson.build 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/data/meson.build 2019-02-01 19:30:50.000000000 +0000
@@ -26,7 +26,7 @@ i18n.merge_file(
output: 'org.gnome.FeedReader.appdata.xml',
po_dir: PO_DIR,
install: true,
- install_dir: join_paths(SHARE_DIR, 'appdata')
+ install_dir: join_paths(SHARE_DIR, 'metainfo')
)
diff -pruN 2.6.1-1/data/org.gnome.FeedReader.appdata.xml.in 2.7.1-1/data/org.gnome.FeedReader.appdata.xml.in
--- 2.6.1-1/data/org.gnome.FeedReader.appdata.xml.in 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/data/org.gnome.FeedReader.appdata.xml.in 2019-02-01 19:30:50.000000000 +0000
@@ -51,6 +51,36 @@
feedreader
+
+
+
+ - Fix bugs when adding, deleting and renaming article tags
+
+
+
+
+
+
+ - Fix thread safety issues, hopefully fix a lot of crashes
+
+
+
+
+
+
+ - Fix version number
+ - Fix crash in article list
+ - More translations
+
+
+
+
+
+
+ - Fix release tarballs to contain all necessary code
+
+
+
diff -pruN 2.6.1-1/debian/changelog 2.7.1-1/debian/changelog
--- 2.6.1-1/debian/changelog 2019-01-04 12:23:27.000000000 +0000
+++ 2.7.1-1/debian/changelog 2019-02-08 14:37:47.000000000 +0000
@@ -1,3 +1,17 @@
+feedreader (2.7.1-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Fix bugs when adding, renaming or deleting article tags.
+ - Change db logic to fix thread safety issues, prevent a bunch of crashes.
+ - Fix version numbers.
+ - Fix a crash in the article list.
+ - More translations.
+ * Remove local patch place_appdata_on_proper_metadata_info_dir.patch,
+ addopted upstream.
+ * Bump up standard versions (no changes required).
+
+ -- Ulises Vitulli Fri, 08 Feb 2019 11:37:47 -0300
+
feedreader (2.6.1-1) unstable; urgency=medium
* New upstream release (Closes: #915502).
diff -pruN 2.6.1-1/debian/control 2.7.1-1/debian/control
--- 2.6.1-1/debian/control 2019-01-04 12:23:27.000000000 +0000
+++ 2.7.1-1/debian/control 2019-02-08 14:37:47.000000000 +0000
@@ -24,7 +24,7 @@ Build-Depends:
libwebkit2gtk-4.0-dev,
meson,
valac (>= 0.26),
-Standards-Version: 4.3.0
+Standards-Version: 4.3.0.1
Homepage: https://jangernert.github.io/FeedReader/
Vcs-Git: https://salsa.debian.org/debian/FeedReader.git
Vcs-Browser: https://salsa.debian.org/debian/FeedReader
diff -pruN 2.6.1-1/debian/patches/fix_some_spelling_errors.patch 2.7.1-1/debian/patches/fix_some_spelling_errors.patch
--- 2.6.1-1/debian/patches/fix_some_spelling_errors.patch 2019-01-04 12:23:27.000000000 +0000
+++ 2.7.1-1/debian/patches/fix_some_spelling_errors.patch 2019-02-08 14:37:47.000000000 +0000
@@ -1,24 +1,54 @@
Author: Dererk
Description: Fix several typos on source
-
-Index: FeedReader/libraries/libIvy/Printer.vala
-===================================================================
---- FeedReader.orig/libraries/libIvy/Printer.vala
-+++ FeedReader/libraries/libIvy/Printer.vala
-@@ -110,7 +110,7 @@ namespace Ivy {
- c,
- get_reset_style ());
- else
-- result = "%sAn error occured %s(%s)%s".printf (
-+ result = "%sAn error occurred %s(%s)%s".printf (
- c,
- color,
- get_signal_name (),
-Index: FeedReader/libraries/libgtkimageview/gtkimageview.c
-===================================================================
---- FeedReader.orig/libraries/libgtkimageview/gtkimageview.c
-+++ FeedReader/libraries/libgtkimageview/gtkimageview.c
-@@ -2020,7 +2020,7 @@ gtk_image_view_class_init (GtkImageViewC
+diff --git a/libraries/libIvy/Printer.vala b/libraries/libIvy/Printer.vala
+index 1786f89..5ff5a7d 100644
+--- a/libraries/libIvy/Printer.vala
++++ b/libraries/libIvy/Printer.vala
+@@ -110,7 +110,7 @@ private string get_printable_title () {
+ c,
+ get_reset_style ());
+ else
+- result = "%sAn error occured %s(%s)%s".printf (
++ result = "%sAn error occurred %s(%s)%s".printf (
+ c,
+ color,
+ get_signal_name (),
+diff --git a/libraries/libIvy/Stacktrace.vala b/libraries/libIvy/Stacktrace.vala
+index 1c43ffb..aafc198 100644
+--- a/libraries/libIvy/Stacktrace.vala
++++ b/libraries/libIvy/Stacktrace.vala
+@@ -74,7 +74,7 @@ public enum Color {
+ *
+ * Here's a sample of a printed stacktrace:
+ * {{{
+- * An error occured (SIGSEGV) in samples/vala_file.vala, line 21 in 'this_will_crash_harder'
++ * An error occurred (SIGSEGV) in samples/vala_file.vala, line 21 in 'this_will_crash_harder'
+ * The reason is likely a null reference being used.
+ *
+ * #1 in 'strlen'
+@@ -138,7 +138,7 @@ public static bool enabled { get; set; default = true;}
+ *
+ * Before
+ * {{{
+- * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
++ * An error occurred (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
+ * The reason is likely an uncaught error.
+ *
+ * #1 in 'g_signal_handlers_disconnect_matched'
+@@ -218,7 +218,7 @@ public static bool enabled { get; set; default = true;}
+ *
+ * After :
+ * {{{
+- * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
++ * An error occurred (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
+ * The reason is likely an uncaught error.
+ *
+ * #1 in 'g_signal_handlers_disconnect_matched'
+diff --git a/libraries/libgtkimageview/gtkimageview.c b/libraries/libgtkimageview/gtkimageview.c
+index 30ab733..0b0621e 100644
+--- a/libraries/libgtkimageview/gtkimageview.c
++++ b/libraries/libgtkimageview/gtkimageview.c
+@@ -2020,7 +2020,7 @@ gtk_image_view_class_init (GtkImageViewClass *view_class)
*/
widget_props[PROP_SCALE_SET] = g_param_spec_boolean ("scale-set",
"Scale Set",
@@ -27,58 +57,6 @@ Index: FeedReader/libraries/libgtkimagev
FALSE,
_PARAM_READABLE|G_PARAM_EXPLICIT_NOTIFY);
/**
-Index: FeedReader/plugins/backend/demo/demoInterface.vala
-===================================================================
---- FeedReader.orig/plugins/backend/demo/demoInterface.vala
-+++ FeedReader/plugins/backend/demo/demoInterface.vala
-@@ -552,7 +552,7 @@ public class FeedReader.demoInterface :
-
- //--------------------------------------------------------------------------------------
- // Get all feeds, categories and tags from the service
-- // Fill up the emtpy LinkedList's that are provided with instances of the
-+ // Fill up the empty LinkedList's that are provided with instances of the
- // model-classes category, feed and article
- //--------------------------------------------------------------------------------------
- public bool getFeedsAndCats(Gee.List feeds, Gee.List categories, Gee.List tags, GLib.Cancellable? cancellable = null)
-Index: FeedReader/src/Widgets/ArticleList/ArticleList.vala
-===================================================================
---- FeedReader.orig/src/Widgets/ArticleList/ArticleList.vala
-+++ FeedReader/src/Widgets/ArticleList/ArticleList.vala
-@@ -346,7 +346,7 @@ public class FeedReader.ArticleList : Gt
- if(m_stack.get_visible_child_name() == "empty"
- || m_stack.get_visible_child_name() == "syncing")
- {
-- Logger.debug("ArticleList: updateArticleList(): emtpy list -> create newList()");
-+ Logger.debug("ArticleList: updateArticleList(): empty list -> create newList()");
- newList.begin(Gtk.StackTransitionType.CROSSFADE, (obj, res) => {
- newList.end(res);
- });
-Index: FeedReader/src/Widgets/MainWindow.vala
-===================================================================
---- FeedReader.orig/src/Widgets/MainWindow.vala
-+++ FeedReader/src/Widgets/MainWindow.vala
-@@ -449,7 +449,7 @@ public class FeedReader.MainWindow : Gtk
- case LoginResponse.SUCCESS:
- case LoginResponse.FIRST_TRY:
- default:
-- Logger.debug("MainWindow: dont show error bar");
-+ Logger.debug("MainWindow: don't show error bar");
- m_error_bar.set_visible(false);
- return;
- }
-diff --git a/plugins/backend/decsync/decsyncListeners.vala b/plugins/backend/decsync/decsyncListeners.vala
-index 6519380..673af0e 100644
---- a/plugins/backend/decsync/decsyncListeners.vala
-+++ b/plugins/backend/decsync/decsyncListeners.vala
-@@ -53,7 +53,7 @@ public class FeedReader.DecsyncListeners : GLib.Object {
- Article? article = m_plugin.m_db.read_article(articleID);
- if (article == null)
- {
-- Logger.info("Unkown article " + articleID);
-+ Logger.info("Unknown article " + articleID);
- return;
- }
- if (m_is_read_entry)
diff --git a/libraries/libnxml/nxml_parser.c b/libraries/libnxml/nxml_parser.c
index 8379aa0..5c7c5b9 100644
--- a/libraries/libnxml/nxml_parser.c
@@ -92,3 +70,42 @@ index 8379aa0..5c7c5b9 100644
nxml->priv.line);
if (freed)
+diff --git a/plugins/backend/decsync/decsyncListeners.vala b/plugins/backend/decsync/decsyncListeners.vala
+index c907d24..c03f309 100644
+--- a/plugins/backend/decsync/decsyncListeners.vala
++++ b/plugins/backend/decsync/decsyncListeners.vala
+@@ -54,7 +54,7 @@ public override void onSubdirEntryUpdate(Gee.List path, Decsync.Entry en
+ Article? article = db.read_article(articleID);
+ if (article == null)
+ {
+- Logger.info("Unkown article " + articleID);
++ Logger.info("Unknown article " + articleID);
+ return;
+ }
+ if (m_is_read_entry)
+diff --git a/src/Widgets/ArticleList/ArticleList.vala b/src/Widgets/ArticleList/ArticleList.vala
+index fa2ae03..cb28e47 100644
+--- a/src/Widgets/ArticleList/ArticleList.vala
++++ b/src/Widgets/ArticleList/ArticleList.vala
+@@ -296,7 +296,7 @@ public void updateArticleList()
+ if(m_stack.get_visible_child_name() == "empty"
+ || m_stack.get_visible_child_name() == "syncing")
+ {
+- Logger.debug("ArticleList: updateArticleList(): emtpy list -> create newList()");
++ Logger.debug("ArticleList: updateArticleList(): empty list -> create newList()");
+ newList(Gtk.StackTransitionType.CROSSFADE);
+ return;
+ }
+diff --git a/src/Widgets/MainWindow.vala b/src/Widgets/MainWindow.vala
+index 7690197..6d0fe93 100644
+--- a/src/Widgets/MainWindow.vala
++++ b/src/Widgets/MainWindow.vala
+@@ -449,7 +449,7 @@ private void showErrorBar(int ErrorCode)
+ case LoginResponse.SUCCESS:
+ case LoginResponse.FIRST_TRY:
+ default:
+- Logger.debug("MainWindow: dont show error bar");
++ Logger.debug("MainWindow: don't show error bar");
+ m_error_bar.set_visible(false);
+ return;
+ }
diff -pruN 2.6.1-1/debian/patches/place_appdata_on_proper_metadata_info_dir.patch 2.7.1-1/debian/patches/place_appdata_on_proper_metadata_info_dir.patch
--- 2.6.1-1/debian/patches/place_appdata_on_proper_metadata_info_dir.patch 2019-01-04 12:23:27.000000000 +0000
+++ 2.7.1-1/debian/patches/place_appdata_on_proper_metadata_info_dir.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-Author: Dererk
-Description: Point appdata to a proper location
-
-diff --git a/data/meson.build b/data/meson.build
-index d26334f..9f28f95 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -26,7 +26,7 @@ i18n.merge_file(
- output: 'org.gnome.FeedReader.appdata.xml',
- po_dir: PO_DIR,
- install: true,
-- install_dir: join_paths(SHARE_DIR, 'appdata')
-+ install_dir: join_paths(SHARE_DIR, 'metainfo')
- )
-
-
diff -pruN 2.6.1-1/debian/patches/series 2.7.1-1/debian/patches/series
--- 2.6.1-1/debian/patches/series 2019-01-04 12:23:27.000000000 +0000
+++ 2.7.1-1/debian/patches/series 2019-02-08 14:37:47.000000000 +0000
@@ -1,2 +1 @@
-place_appdata_on_proper_metadata_info_dir.patch
fix_some_spelling_errors.patch
diff -pruN 2.6.1-1/libraries/libIvy/Extractor.vala 2.7.1-1/libraries/libIvy/Extractor.vala
--- 2.6.1-1/libraries/libIvy/Extractor.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/libraries/libIvy/Extractor.vala 2019-02-01 19:30:50.000000000 +0000
@@ -16,407 +16,407 @@
namespace Ivy {
- /**
- * Extracts frames and builds a {@link Stacktrace}
- *
- */
- public class Extractor {
-
- private bool show_debug_frames = false;
-
- private string func = "";
- private string file_path = "";
- private string short_file_path = "";
- private string l = "";
- private string file_line = "";
- private string func_line = "";
- private string lib_address ="";
-
- private static Gee.List libraries_with_no_info = new Gee.ArrayList();
-
- private string get_module_name () {
- var path = new char[1024];
- Posix.readlink ("/proc/self/exe", path);
- string result = (string) path;
- return result;
- }
-
- // TODO CARL convert this piece of code to vala conventions
- private static string get_relative_path (string p_fullDestinationPath, string p_startPath) {
-
- string[] l_startPathParts = p_startPath.split ("/");
- string[] l_destinationPathParts = p_fullDestinationPath.split ("/");
-
- int l_sameCounter = 0;
- while ((l_sameCounter < l_startPathParts.length) &&
- (l_sameCounter < l_destinationPathParts.length) &&
- l_startPathParts[l_sameCounter] == l_destinationPathParts[l_sameCounter]) {
- l_sameCounter++;
- }
+/**
+ * Extracts frames and builds a {@link Stacktrace}
+ *
+ */
+public class Extractor {
+
+private bool show_debug_frames = false;
+
+private string func = "";
+private string file_path = "";
+private string short_file_path = "";
+private string l = "";
+private string file_line = "";
+private string func_line = "";
+private string lib_address ="";
+
+private static Gee.List libraries_with_no_info = new Gee.ArrayList();
+
+private string get_module_name () {
+ var path = new char[1024];
+ Posix.readlink ("/proc/self/exe", path);
+ string result = (string) path;
+ return result;
+}
- if (l_sameCounter == 0) {
- return p_fullDestinationPath; // There is no relative link.
- }
+// TODO CARL convert this piece of code to vala conventions
+private static string get_relative_path (string p_fullDestinationPath, string p_startPath) {
- StringBuilder l_builder = new StringBuilder ();
- for (int i = l_sameCounter ; i < l_startPathParts.length ; i++) {
- l_builder.append ("../");
- }
+ string[] l_startPathParts = p_startPath.split ("/");
+ string[] l_destinationPathParts = p_fullDestinationPath.split ("/");
- for (int i = l_sameCounter ; i < l_destinationPathParts.length ; i++) {
- l_builder.append (l_destinationPathParts[i] + "/");
- }
+ int l_sameCounter = 0;
+ while ((l_sameCounter < l_startPathParts.length) &&
+ (l_sameCounter < l_destinationPathParts.length) &&
+ l_startPathParts[l_sameCounter] == l_destinationPathParts[l_sameCounter]) {
+ l_sameCounter++;
+ }
- // CARL l_builder.Length--;
- // Remove the last /
- var result = l_builder.str;
- result = result.substring (0, result.length - 1);
- return result;
- }
-
- private string extract_short_file_path (string file_path) {
- var path = Environment.get_current_dir ();
- /*var i = file_path.index_of ( path );
- if( i>=0 )
- return file_path.substring ( path.length, file_path.length - path.length );
- return file_path; */
- var result = get_relative_path (file_path, path);
- return result;
- }
-
- // input : '/home/cran/Documents/Projects/elementary/noise/instant-beta/build/core/libnoise-core.so.0(noise_job_repository_create_job+0x309) [0x7ff60a021e69]'
- // ouput: 0x309
- private int extract_base_address (string line) {
- int result = 0;
- var start = line.last_index_of ("+");
- if (start >= 0) {
- var end = line.last_index_of (")");
- if( end > start ) {
- var text = line.substring (start+3,end-start-3);
- text.scanf("%x", &result);
- }
- }
- return result;
- }
+ if (l_sameCounter == 0) {
+ return p_fullDestinationPath; // There is no relative link.
+ }
- private void process_info_for_file (string full_line, string str ) {
- func = "";
- file_path = "";
- short_file_path = "";
- l = "";
- file_line = "";
- func_line = "";
- if (full_line == "")
- return;
-
- var lines = full_line.split ("\n");
-
- if (lines.length > 0)
- func_line = lines[0];
-
- if (lines.length > 1)
- file_line = lines[1];
- if (file_line == "??:0" || file_line == "??:?")
- file_line = "";
- func = extract_function_name (str);
-
- file_path = "";
- short_file_path = "";
- l = "";
- if (file_line != "") {
- if (func == "")
- func = extract_function_name_from_line (func_line);
- file_path = extract_file_path (file_line);
- short_file_path = extract_short_file_path (file_path);
- l = extract_line (file_line);
- }
+ StringBuilder l_builder = new StringBuilder ();
+ for (int i = l_sameCounter; i < l_startPathParts.length; i++) {
+ l_builder.append ("../");
+ }
+
+ for (int i = l_sameCounter; i < l_destinationPathParts.length; i++) {
+ l_builder.append (l_destinationPathParts[i] + "/");
+ }
+
+ // CARL l_builder.Length--;
+ // Remove the last /
+ var result = l_builder.str;
+ result = result.substring (0, result.length - 1);
+ return result;
+}
+
+private string extract_short_file_path (string file_path) {
+ var path = Environment.get_current_dir ();
+ /*var i = file_path.index_of ( path );
+ if( i>=0 )
+ return file_path.substring ( path.length, file_path.length - path.length );
+ return file_path; */
+ var result = get_relative_path (file_path, path);
+ return result;
+}
+
+// input : '/home/cran/Documents/Projects/elementary/noise/instant-beta/build/core/libnoise-core.so.0(noise_job_repository_create_job+0x309) [0x7ff60a021e69]'
+// ouput: 0x309
+private int extract_base_address (string line) {
+ int result = 0;
+ var start = line.last_index_of ("+");
+ if (start >= 0) {
+ var end = line.last_index_of (")");
+ if( end > start ) {
+ var text = line.substring (start+3,end-start-3);
+ text.scanf("%x", &result);
}
+ }
+ return result;
+}
- private void process_info_from_lib (string file_path, string str) {
- //stdout.printf( "process_info_from_lib('%s', '%s') func: '%s'\n", file_path, str, func);
- var has_info = true;
- var addr1_s = "";
- var lib_addr = "";
- var cmd2 = "";
- lib_address ="";
- lock( libraries_with_no_info)
- {
- if( libraries_with_no_info.index_of (file_path) == -1 ){
- // The library is not on the black list
- cmd2 = "nm %s".printf(file_path);
-
- addr1_s = execute_command_sync_get_output (cmd2);
- if( addr1_s == null || addr1_s == "" )
- {
- // stdout.printf( "ADDED TO NO INFO: '%s'\n", file_path);
- libraries_with_no_info.add (file_path);
- has_info = false;
+private void process_info_for_file (string full_line, string str ) {
+ func = "";
+ file_path = "";
+ short_file_path = "";
+ l = "";
+ file_line = "";
+ func_line = "";
+ if (full_line == "")
+ return;
+
+ var lines = full_line.split ("\n");
+
+ if (lines.length > 0)
+ func_line = lines[0];
+
+ if (lines.length > 1)
+ file_line = lines[1];
+ if (file_line == "??:0" || file_line == "??:?")
+ file_line = "";
+ func = extract_function_name (str);
+
+ file_path = "";
+ short_file_path = "";
+ l = "";
+ if (file_line != "") {
+ if (func == "")
+ func = extract_function_name_from_line (func_line);
+ file_path = extract_file_path (file_line);
+ short_file_path = extract_short_file_path (file_path);
+ l = extract_line (file_line);
+ }
+}
- }
- }
- else
- has_info = false;
- }
- if( has_info && func != "" )
+private void process_info_from_lib (string file_path, string str) {
+ //stdout.printf( "process_info_from_lib('%s', '%s') func: '%s'\n", file_path, str, func);
+ var has_info = true;
+ var addr1_s = "";
+ var lib_addr = "";
+ var cmd2 = "";
+ lib_address ="";
+ lock( libraries_with_no_info)
+ {
+ if( libraries_with_no_info.index_of (file_path) == -1 ) {
+ // The library is not on the black list
+ cmd2 = "nm %s".printf(file_path);
+
+ addr1_s = execute_command_sync_get_output (cmd2);
+ if( addr1_s == null || addr1_s == "" )
{
- MatchInfo info;
- var expression = "\\n[^ ]* T "+func;
- try {
-
- Regex regex = new Regex (expression);
- int count = 0;
- string matches = "";
- if( regex.match (addr1_s, 0, out info) )
- {
- while( info.matches() ){
- var lll = info.fetch(0);
- // stdout.printf ( "lll '%s'\n", lll );
- lib_addr = lll.substring(0, lll.index_of(" "));
- matches += lib_addr + "\n";
- info.next();
- count++;
- }
- if( count >1 )
- {
- stdout.printf (" XX %d matches for '%s'. Command: '%s'. Matches: '%s'\n", count, func, cmd2, matches);
- }
- // stdout.printf (" YY %d matches for '%s'. Command: '%s'. Matches: '%s'\n", count, func, cmd2, matches);
- }
+ // stdout.printf( "ADDED TO NO INFO: '%s'\n", file_path);
+ libraries_with_no_info.add (file_path);
+ has_info = false;
- } catch (RegexError e)
- {
- critical( "Error while processing regex '%s. Err: '%s", expression, e.message );
+ }
+ }
+ else
+ has_info = false;
+ }
+ if( has_info && func != "" )
+ {
+ MatchInfo info;
+ var expression = "\\n[^ ]* T "+func;
+ try {
+
+ Regex regex = new Regex (expression);
+ int count = 0;
+ string matches = "";
+ if( regex.match (addr1_s, 0, out info) )
+ {
+ while( info.matches() ) {
+ var lll = info.fetch(0);
+ // stdout.printf ( "lll '%s'\n", lll );
+ lib_addr = lll.substring(0, lll.index_of(" "));
+ matches += lib_addr + "\n";
+ info.next();
+ count++;
}
- //stdout.printf ("addr1_s %s\n", addr1_s);
- int addr1 = 0;
- lib_addr.scanf("%x", &addr1);
- if( addr1 != 0 ) {
- int addr2 = extract_base_address (str);
- string addr3 = "%#08x".printf (addr1+addr2);
- lib_address = addr3;
- // stdout.printf ("lib_address : %s\n", lib_address);
- var new_full_line = process_line (file_path, addr3);
- //stdout.printf ("STR : %s\n", str);
- // stdout.printf ("AD1 : %s\n", addr1_s);
- //stdout.printf ("AD2 : %#08x\n", addr2);
- //stdout.printf ("AD3 : %s\n", addr3);
- //stdout.printf ("LIB : %s\n", file_path);
- //stdout.printf ("RES : %s\n", new_full_line);
-
- process_info_for_file (new_full_line, str );
+ if( count >1 )
+ {
+ stdout.printf (" XX %d matches for '%s'. Command: '%s'. Matches: '%s'\n", count, func, cmd2, matches);
}
- else
- stdout.printf ("NULL\n");
+ // stdout.printf (" YY %d matches for '%s'. Command: '%s'. Matches: '%s'\n", count, func, cmd2, matches);
}
- }
+ } catch (RegexError e)
+ {
+ critical( "Error while processing regex '%s. Err: '%s", expression, e.message );
+ }
+ //stdout.printf ("addr1_s %s\n", addr1_s);
+ int addr1 = 0;
+ lib_addr.scanf("%x", &addr1);
+ if( addr1 != 0 ) {
+ int addr2 = extract_base_address (str);
+ string addr3 = "%#08x".printf (addr1+addr2);
+ lib_address = addr3;
+ // stdout.printf ("lib_address : %s\n", lib_address);
+ var new_full_line = process_line (file_path, addr3);
+ //stdout.printf ("STR : %s\n", str);
+ // stdout.printf ("AD1 : %s\n", addr1_s);
+ //stdout.printf ("AD2 : %#08x\n", addr2);
+ //stdout.printf ("AD3 : %s\n", addr3);
+ //stdout.printf ("LIB : %s\n", file_path);
+ //stdout.printf ("RES : %s\n", new_full_line);
- private string extract_function_name (string line) {
- if (line == "")
- return "";
- var start = line.index_of ("(");
- if (start >= 0) {
- var end = line.index_of ("+", start);
- if (end >= 0) {
- var result = line.substring (start + 1, end - start - 1);
- return result.strip ();
- }
- }
- return "";
+ process_info_for_file (new_full_line, str );
}
+ else
+ stdout.printf ("NULL\n");
+ }
- private string extract_function_name_from_line (string line) {
- return line.strip ();
- }
+}
- private string extract_file_path_from (string str) {
- if (str == "")
- return "";
- /*if( str.index_of("??") >= 0)
- //result = result.substring (4, line.length - 4 );
- stdout.printf ("ERR2?? : %s\n", str ) ; */
- var start = str.index_of ("(");
- if (start >= 0) {
- return str.substring (0, start).strip ();
- }
- return str.strip ();
+private string extract_function_name (string line) {
+ if (line == "")
+ return "";
+ var start = line.index_of ("(");
+ if (start >= 0) {
+ var end = line.index_of ("+", start);
+ if (end >= 0) {
+ var result = line.substring (start + 1, end - start - 1);
+ return result.strip ();
}
+ }
+ return "";
+}
- private string extract_file_path (string line) {
- var result = line;
- if (result == "")
- return "";
- if (result == "??:0??:0")
- return "";
- // For some reason, the file name can starts with ??:0
- if (result.has_prefix ("??:0"))
- result = result.substring (4, line.length - 4);
- // stdout.printf ("ERR1?? : %s\n", line );
- var start = result.index_of (":");
- if (start >= 0) {
- result = result.substring (0, start);
- return result.strip ();
- }
- return "";
- }
+private string extract_function_name_from_line (string line) {
+ return line.strip ();
+}
- private static string extract_line (string line) {
- var result = line;
- if (result == "")
- return "";
- if (result.has_prefix ("??:0"))
- result = result.substring (4, line.length - 4);
- var start = result.index_of (":");
- if (start >= 0) {
- result = result.substring (start + 1, line.length - start - 1);
- var end = result.index_of ("(");
- if (end >= 0) {
- result = result.substring (0, end);
- }
- return result.strip ();
- }
- return "";
+private string extract_file_path_from (string str) {
+ if (str == "")
+ return "";
+ /*if( str.index_of("??") >= 0)
+ //result = result.substring (4, line.length - 4 );
+ stdout.printf ("ERR2?? : %s\n", str ) ; */
+ var start = str.index_of ("(");
+ if (start >= 0) {
+ return str.substring (0, start).strip ();
+ }
+ return str.strip ();
+}
+
+private string extract_file_path (string line) {
+ var result = line;
+ if (result == "")
+ return "";
+ if (result == "??:0??:0")
+ return "";
+ // For some reason, the file name can starts with ??:0
+ if (result.has_prefix ("??:0"))
+ result = result.substring (4, line.length - 4);
+ // stdout.printf ("ERR1?? : %s\n", line );
+ var start = result.index_of (":");
+ if (start >= 0) {
+ result = result.substring (0, start);
+ return result.strip ();
+ }
+ return "";
+}
+
+private static string extract_line (string line) {
+ var result = line;
+ if (result == "")
+ return "";
+ if (result.has_prefix ("??:0"))
+ result = result.substring (4, line.length - 4);
+ var start = result.index_of (":");
+ if (start >= 0) {
+ result = result.substring (start + 1, line.length - start - 1);
+ var end = result.index_of ("(");
+ if (end >= 0) {
+ result = result.substring (0, end);
}
+ return result.strip ();
+ }
+ return "";
+}
- private string extract_address (string line) {
- if (line == "")
- return "";
- var start = line.index_of ("[");
- if (start >= 0) {
- var end = line.index_of ("]", start);
- if (end >= 0) {
- var result = line.substring (start + 1, end - start - 1);
- return result.strip ();
- }
- }
- return "";
+private string extract_address (string line) {
+ if (line == "")
+ return "";
+ var start = line.index_of ("[");
+ if (start >= 0) {
+ var end = line.index_of ("]", start);
+ if (end >= 0) {
+ var result = line.substring (start + 1, end - start - 1);
+ return result.strip ();
}
+ }
+ return "";
+}
- private string execute_command_sync_get_output (string cmd) {
- try {
- int exitCode;
- string std_out;
- string std_err;
- Process.spawn_command_line_sync (cmd, out std_out, out std_err, out exitCode);
- if( exitCode == 0)
- return std_out;
- else
- print ("Error while executing '%s'. Exit code '%d'\n".printf(cmd, exitCode));
+private string execute_command_sync_get_output (string cmd) {
+ try {
+ int exitCode;
+ string std_out;
+ string std_err;
+ Process.spawn_command_line_sync (cmd, out std_out, out std_err, out exitCode);
+ if( exitCode == 0)
+ return std_out;
+ else
+ print ("Error while executing '%s'. Exit code '%d'\n".printf(cmd, exitCode));
- }
- catch (Error e) {
- print ("Error while executing '%s': %s\n".printf(cmd,e.message));
- }
- return "";
- }
+ }
+ catch (Error e) {
+ print ("Error while executing '%s': %s\n".printf(cmd,e.message));
+ }
+ return "";
+}
+
+// Poor's man demangler. libunwind is another dep
+// TODO : Optimize this
+// module : app
+// address : 0x007f80
+// output : /home/cran/Projects/noise/noise-perf-instant-search/tests/errors.vala:87
+private string process_line (string module, string address) {
+ var cmd = "addr2line -f -e %s %s".printf (module, address);
+ var result = execute_command_sync_get_output (cmd);
+ //stdout.printf( "CMD %s\n", cmd);
+ return result;
+}
- // Poor's man demangler. libunwind is another dep
- // TODO : Optimize this
- // module : app
- // address : 0x007f80
- // output : /home/cran/Projects/noise/noise-perf-instant-search/tests/errors.vala:87
- private string process_line (string module, string address) {
- var cmd = "addr2line -f -e %s %s".printf (module, address);
- var result = execute_command_sync_get_output (cmd);
- //stdout.printf( "CMD %s\n", cmd);
- return result;
- }
-
- /**
- * Populates the stacktrace with frames
- *
- * The frames are extracted from ``Linux.Backtrace`` and enriched
- * via calls to unix tools ``nm`` and ``addr2line``.
- *
- * ''Warning:'' because this methods calls synchronously other applications (nm and addr2line), it
- * can have a significant impact on performance.
- *
- * @param trace the stacktrace
- */
- public void create_stacktrace (Stacktrace trace) {
- int frame_count = 100;
- int skipped_frames_count = 5;
- // Stacktrace not due to a crash
- if (trace.is_custom)
- skipped_frames_count = 3;
-
- void *[] array = new void *[frame_count];
-
- trace.frames.clear ();
- trace.first_vala = null;
- trace.max_file_name_length = 0;
- trace.is_all_function_name_blank = true;
- trace.is_all_file_name_blank = true;
+/**
+ * Populates the stacktrace with frames
+ *
+ * The frames are extracted from ``Linux.Backtrace`` and enriched
+ * via calls to unix tools ``nm`` and ``addr2line``.
+ *
+ * ''Warning:'' because this methods calls synchronously other applications (nm and addr2line), it
+ * can have a significant impact on performance.
+ *
+ * @param trace the stacktrace
+ */
+public void create_stacktrace (Stacktrace trace) {
+ int frame_count = 100;
+ int skipped_frames_count = 5;
+ // Stacktrace not due to a crash
+ if (trace.is_custom)
+ skipped_frames_count = 3;
+
+ void *[] array = new void *[frame_count];
+
+ trace.frames.clear ();
+ trace.first_vala = null;
+ trace.max_file_name_length = 0;
+ trace.is_all_function_name_blank = true;
+ trace.is_all_file_name_blank = true;
- // TODO fix that > 0.26
+ // TODO fix that > 0.26
#if VALA_0_26 || VALA_0_28
- var size = Linux.Backtrace.@get (array);
- var strings = Linux.Backtrace.symbols (array);
+ var size = Linux.Backtrace.@get (array);
+ var strings = Linux.Backtrace.symbols (array);
#else
- int size = Linux.backtrace (array, frame_count);
- unowned string[] strings = Linux.backtrace_symbols (array, size);
- // Needed because of some weird bug
- strings.length = size;
+ int size = Linux.backtrace (array, frame_count);
+ unowned string[] strings = Linux.backtrace_symbols (array, size);
+ // Needed because of some weird bug
+ strings.length = size;
#endif
- int[] addresses = (int[])array;
- string module = get_module_name ();
- // First ones are the handler
- for (int i = skipped_frames_count ; i < size ; i++) {
- int address = addresses[i];
- string str = strings[i];
- var addr = extract_address (str);
- lib_address ="";
- //stdout.printf ("9 '%s'. Addr: '%s' \n", func, addr);
- var full_line = process_line (module, addr);
- //stdout.printf ("10 '%s'\n", func);
- if( full_line == "" ) {
- // Happens when the process memory is going up and up
- // Likely a memory leak
- // Like in the test suite for echo
- // ** (/home/cran/Documents/Projects/i-hate-farms/ide/echo/build/test:2859):
- // CRITICAL **: vala_data_type_copy: assertion 'self != NULL' failed
- // Error while executing 'addr2line -f -e /home/cran/Documents/Projects/i-
- // hate-farms/ide/echo/build/test 0x2afe3b5beb32': Failed to fork (Cannot allocate memory)
-
- print ("Something went very wrong. Your stacktrace cannot be displayed\n");
- break;
- }
- process_info_for_file( full_line, str);
- //stdout.printf ("11 '%s'\n", func);
- if (file_line == "") {
- file_path = extract_file_path_from (str);
-
- }
- //stdout.printf ("12 '%s'\n", func);
- // The file name may ends with .so or .so.0 ...
- if( ".so" in file_path ) {
- process_info_from_lib (file_path, str);
- }
- //stdout.printf ("14 '%s'\n", func);
- if( show_debug_frames )
- {
- stdout.printf ("\nFrame %d \n--------\n . addr: [%s]\n . full_line: '%s'\n . file_line: '%s'\n . func_line: '%s'\n . str : '%s'\n . func: '%s'\n . file: '%s'\n . line: '%s'\n . address: '%#08x'\n . lib_address: '%s'\n",
- i, addr, full_line, file_line, func_line, str, func, file_path, l, address, lib_address);
- }
- if (func != "" && file_path.has_suffix (".vala") && trace.is_all_function_name_blank)
- trace.is_all_function_name_blank = false;
-
- if (short_file_path != "" && trace.is_all_file_name_blank)
- trace.is_all_file_name_blank = false;
-
- var line_number = extract_line (file_line);
- var frame = new Frame (addr, file_line, func, file_path, short_file_path, line_number);
-
- if (trace.first_vala == null && file_path.has_suffix (".vala"))
- trace.first_vala = frame;
-
- if (short_file_path.length > trace.max_file_name_length)
- trace.max_file_name_length = short_file_path.length;
- if (l.length > trace.max_line_number_length)
- trace.max_line_number_length = l.length;
- trace.frames.add (frame);
- }
- }
+ int[] addresses = (int[])array;
+ string module = get_module_name ();
+ // First ones are the handler
+ for (int i = skipped_frames_count; i < size; i++) {
+ int address = addresses[i];
+ string str = strings[i];
+ var addr = extract_address (str);
+ lib_address ="";
+ //stdout.printf ("9 '%s'. Addr: '%s' \n", func, addr);
+ var full_line = process_line (module, addr);
+ //stdout.printf ("10 '%s'\n", func);
+ if( full_line == "" ) {
+ // Happens when the process memory is going up and up
+ // Likely a memory leak
+ // Like in the test suite for echo
+ // ** (/home/cran/Documents/Projects/i-hate-farms/ide/echo/build/test:2859):
+ // CRITICAL **: vala_data_type_copy: assertion 'self != NULL' failed
+ // Error while executing 'addr2line -f -e /home/cran/Documents/Projects/i-
+ // hate-farms/ide/echo/build/test 0x2afe3b5beb32': Failed to fork (Cannot allocate memory)
+
+ print ("Something went very wrong. Your stacktrace cannot be displayed\n");
+ break;
+ }
+ process_info_for_file( full_line, str);
+ //stdout.printf ("11 '%s'\n", func);
+ if (file_line == "") {
+ file_path = extract_file_path_from (str);
+
+ }
+ //stdout.printf ("12 '%s'\n", func);
+ // The file name may ends with .so or .so.0 ...
+ if( ".so" in file_path ) {
+ process_info_from_lib (file_path, str);
+ }
+ //stdout.printf ("14 '%s'\n", func);
+ if( show_debug_frames )
+ {
+ stdout.printf ("\nFrame %d \n--------\n . addr: [%s]\n . full_line: '%s'\n . file_line: '%s'\n . func_line: '%s'\n . str : '%s'\n . func: '%s'\n . file: '%s'\n . line: '%s'\n . address: '%#08x'\n . lib_address: '%s'\n",
+ i, addr, full_line, file_line, func_line, str, func, file_path, l, address, lib_address);
+ }
+ if (func != "" && file_path.has_suffix (".vala") && trace.is_all_function_name_blank)
+ trace.is_all_function_name_blank = false;
+
+ if (short_file_path != "" && trace.is_all_file_name_blank)
+ trace.is_all_file_name_blank = false;
+
+ var line_number = extract_line (file_line);
+ var frame = new Frame (addr, file_line, func, file_path, short_file_path, line_number);
+
+ if (trace.first_vala == null && file_path.has_suffix (".vala"))
+ trace.first_vala = frame;
+
+ if (short_file_path.length > trace.max_file_name_length)
+ trace.max_file_name_length = short_file_path.length;
+ if (l.length > trace.max_line_number_length)
+ trace.max_line_number_length = l.length;
+ trace.frames.add (frame);
}
}
+}
+}
diff -pruN 2.6.1-1/libraries/libIvy/Frame.vala 2.7.1-1/libraries/libIvy/Frame.vala
--- 2.6.1-1/libraries/libIvy/Frame.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/libraries/libIvy/Frame.vala 2019-02-01 19:30:50.000000000 +0000
@@ -16,87 +16,87 @@
namespace Ivy {
- /**
- * A part of a stacktrace
- *
- * This class represent on instance of a frame, ie a particular location
- * in a binary (application or library) on the system called by the application
- *
- * ''Note:'' frames from system libraries without code information available are
- * not displayed by default. See {@link Stacktrace.hide_installed_libraries} for how to
- * display them.
- **/
- public class Frame {
-
- /**
- * Address of the stack in hexadecimal
- *
- * Ex: ``0x309``
- **/
- public string address { get;private set;default = "";}
-
- /**
- * Line of code of the frame
- *
- * Can point to C code, Vala code or be blank if
- * no symbol is available (or if -rdynamic has not been set during the
- * compilation of the binary)
- *
- * Ex:
- **/
- public string line { get;private set;default = "";}
-
- /**
- * Line number in the code file.
- *
- * May be blank if no code information is available
- *
- * Ex: ``25``
- **/
- public string line_number { get;private set;default = "";}
-
- /**
- * Full path to the code file as it was stored on the building machine
- *
- * Returns the path to the installed binary if no code information is available
- *
- * Ex: ``/home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala``
- *
- * Ex: ``/lib/x86_64-linux-gnu/libc.so.6`` if no code information is available
- **/
- public string file_path { get;private set;default = "";}
-
- /**
- * Path the code file relative to the current path
- *
- * Returns the path to the installed binary if no code information is available
- *
- * Ex: ``/stuff/to/stuff/``
- **/
- public string file_short_path { get;private set;default = "";}
-
- /**
- * C function name
- *
- * Because only the C function name is avaialable,
- * the name mixes the vala class and vala method name (by default separated by ``_``).
- *
- * For more information about getting full vala names see [[https://bugzilla.gnome.org/show_bug.cgi?id=738784|vala bug #738784]]
- *
- * Ex: ``namespace_someclass_method``
- **/
- public string function { get;private set;default = "";}
-
- public Frame (string address, string line, string function, string file_path, string file_short_path, string line_number) {
- this._address = address;
- this._line = line;
-
- this._file_path = file_path;
- this._file_short_path = file_short_path;
- this._function = function;
- this.line_number = line_number;
- }
+/**
+ * A part of a stacktrace
+ *
+ * This class represent on instance of a frame, ie a particular location
+ * in a binary (application or library) on the system called by the application
+ *
+ * ''Note:'' frames from system libraries without code information available are
+ * not displayed by default. See {@link Stacktrace.hide_installed_libraries} for how to
+ * display them.
+ **/
+public class Frame {
+
+/**
+ * Address of the stack in hexadecimal
+ *
+ * Ex: ``0x309``
+ **/
+public string address { get; private set; default = "";}
+
+/**
+ * Line of code of the frame
+ *
+ * Can point to C code, Vala code or be blank if
+ * no symbol is available (or if -rdynamic has not been set during the
+ * compilation of the binary)
+ *
+ * Ex:
+ **/
+public string line { get; private set; default = "";}
+
+/**
+ * Line number in the code file.
+ *
+ * May be blank if no code information is available
+ *
+ * Ex: ``25``
+ **/
+public string line_number { get; private set; default = "";}
+
+/**
+ * Full path to the code file as it was stored on the building machine
+ *
+ * Returns the path to the installed binary if no code information is available
+ *
+ * Ex: ``/home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala``
+ *
+ * Ex: ``/lib/x86_64-linux-gnu/libc.so.6`` if no code information is available
+ **/
+public string file_path { get; private set; default = "";}
+
+/**
+ * Path the code file relative to the current path
+ *
+ * Returns the path to the installed binary if no code information is available
+ *
+ * Ex: ``/stuff/to/stuff/``
+ **/
+public string file_short_path { get; private set; default = "";}
+
+/**
+ * C function name
+ *
+ * Because only the C function name is avaialable,
+ * the name mixes the vala class and vala method name (by default separated by ``_``).
+ *
+ * For more information about getting full vala names see [[https://bugzilla.gnome.org/show_bug.cgi?id=738784|vala bug #738784]]
+ *
+ * Ex: ``namespace_someclass_method``
+ **/
+public string function { get; private set; default = "";}
+
+public Frame (string address, string line, string function, string file_path, string file_short_path, string line_number) {
+ this._address = address;
+ this._line = line;
+
+ this._file_path = file_path;
+ this._file_short_path = file_short_path;
+ this._function = function;
+ this.line_number = line_number;
+}
- }
+}
}
diff -pruN 2.6.1-1/libraries/libIvy/Printer.vala 2.7.1-1/libraries/libIvy/Printer.vala
--- 2.6.1-1/libraries/libIvy/Printer.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/libraries/libIvy/Printer.vala 2019-02-01 19:30:50.000000000 +0000
@@ -16,227 +16,227 @@
namespace Ivy {
- /**
- * Prints the stacktrace to ``stdout`` in colors
- *
- */
- public class Printer {
-
- private Color background_color = Color.BLACK;
- private int title_length = 0;
-
- private Stacktrace stacktrace;
-
- private string get_reset_code () {
- // return get_color_code (Style.RESET, Colors.WHITE, Colors.BLACK);
- return "\x1b[0m";
- }
+/**
+ * Prints the stacktrace to ``stdout`` in colors
+ *
+ */
+public class Printer {
+
+private Color background_color = Color.BLACK;
+private int title_length = 0;
+
+private Stacktrace stacktrace;
+
+private string get_reset_code () {
+ // return get_color_code (Style.RESET, Colors.WHITE, Colors.BLACK);
+ return "\x1b[0m";
+}
- private string get_reset_style () {
- return get_color_code (Style.DIM, stacktrace.highlight_color, background_color);
- }
+private string get_reset_style () {
+ return get_color_code (Style.DIM, stacktrace.highlight_color, background_color);
+}
- private string get_color_code (Style attr, Color fg, Color bg = background_color) {
- /* Command is the control command to the terminal */
- if (bg == Color.BLACK)
- return "%c[%d;%dm".printf (0x1B, (int) attr, (int) fg + 30);
- else
- return "%c[%d;%d;%dm".printf (0x1B, (int) attr, (int) fg + 30, (int) bg + 40);
- }
+private string get_color_code (Style attr, Color fg, Color bg = background_color) {
+ /* Command is the control command to the terminal */
+ if (bg == Color.BLACK)
+ return "%c[%d;%dm".printf (0x1B, (int) attr, (int) fg + 30);
+ else
+ return "%c[%d;%d;%dm".printf (0x1B, (int) attr, (int) fg + 30, (int) bg + 40);
+}
- private string get_signal_name () {
- return stacktrace.sig.to_string ();
- }
+private string get_signal_name () {
+ return stacktrace.sig.to_string ();
+}
- private string get_highlight_code () {
- return get_color_code (Style.BRIGHT, stacktrace.highlight_color);
- }
+private string get_highlight_code () {
+ return get_color_code (Style.BRIGHT, stacktrace.highlight_color);
+}
- private string get_printable_function (Frame frame, int padding = 0) {
- var result = "";
- var is_unknown = false;
- if (frame.function == "") {
- result = " " + frame.address;
- is_unknown = true;
- } else {
- var s = "";
- int count = padding - get_signal_name ().length;
- if (padding != 0 && count > 0)
- s = string.nfill (count, ' ');
- result = "'" + frame.function + "'" + s;
- }
- if (is_unknown)
- return result + get_reset_code ();
- else
- return get_highlight_code () + result + get_reset_code ();
- }
+private string get_printable_function (Frame frame, int padding = 0) {
+ var result = "";
+ var is_unknown = false;
+ if (frame.function == "") {
+ result = " " + frame.address;
+ is_unknown = true;
+ } else {
+ var s = "";
+ int count = padding - get_signal_name ().length;
+ if (padding != 0 && count > 0)
+ s = string.nfill (count, ' ');
+ result = "'" + frame.function + "'" + s;
+ }
+ if (is_unknown)
+ return result + get_reset_code ();
+ else
+ return get_highlight_code () + result + get_reset_code ();
+}
- private string get_printable_line_number (Frame frame, bool pad = true) {
- var path = frame.line_number;
- var max_line_number_length = stacktrace.max_line_number_length;
- var result = "";
- var color = get_highlight_code ();
- if (path.length >= max_line_number_length || !pad)
- result = color + path + get_reset_style ();
- else {
- result = color + path + get_reset_style ();
- result = string.nfill (max_line_number_length - path.length, ' ') + result;
- }
- return result;
- }
+private string get_printable_line_number (Frame frame, bool pad = true) {
+ var path = frame.line_number;
+ var max_line_number_length = stacktrace.max_line_number_length;
+ var result = "";
+ var color = get_highlight_code ();
+ if (path.length >= max_line_number_length || !pad)
+ result = color + path + get_reset_style ();
+ else {
+ result = color + path + get_reset_style ();
+ result = string.nfill (max_line_number_length - path.length, ' ') + result;
+ }
+ return result;
+}
- private string get_printable_file_short_path (Frame frame, bool pad = true) {
- var path = frame.file_short_path;
- var max_file_name_length = stacktrace.max_file_name_length;
- var result = "";
- var color = get_highlight_code ();
- if (path.length >= max_file_name_length || !pad)
- result = color + path + get_reset_style ();
- else {
- result = color + path + get_reset_style ();
- result = result + string.nfill (max_file_name_length - path.length, ' ');
- }
- return result;
- }
+private string get_printable_file_short_path (Frame frame, bool pad = true) {
+ var path = frame.file_short_path;
+ var max_file_name_length = stacktrace.max_file_name_length;
+ var result = "";
+ var color = get_highlight_code ();
+ if (path.length >= max_file_name_length || !pad)
+ result = color + path + get_reset_style ();
+ else {
+ result = color + path + get_reset_style ();
+ result = result + string.nfill (max_file_name_length - path.length, ' ');
+ }
+ return result;
+}
- private string get_printable_title () {
- var c = get_color_code (Style.DIM, stacktrace.highlight_color, background_color);
- var color = get_highlight_code ();
-
- var result = "";
-
- if( stacktrace.is_custom)
- result = "%sA function was called in %s".printf (
- c,
- get_reset_style ());
- else
- result = "%sAn error occured %s(%s)%s".printf (
- c,
- color,
- get_signal_name (),
- get_reset_style ());
+private string get_printable_title () {
+ var c = get_color_code (Style.DIM, stacktrace.highlight_color, background_color);
+ var color = get_highlight_code ();
+
+ var result = "";
+
+ if( stacktrace.is_custom)
+ result = "%sA function was called in %s".printf (
+ c,
+ get_reset_style ());
+ else
+ result = "%sAn error occured %s(%s)%s".printf (
+ c,
+ color,
+ get_signal_name (),
+ get_reset_style ());
- title_length = get_signal_name ().length;
- return result;
- }
+ title_length = get_signal_name ().length;
+ return result;
+}
- private string get_reason () {
- // var c = get_reset_code();
- var sig = stacktrace.sig;
-
- var color = get_highlight_code ();
- if (sig == ProcessSignal.TRAP) {
- return "The reason is likely %san uncaught error%s".printf (
- color, get_reset_code ());
- }
- if (sig == ProcessSignal.ABRT) {
- return "The reason is likely %sa failed assertion (assert...)%s".printf (
- color, get_reset_code ());
- }
- if (sig == ProcessSignal.SEGV) {
- return "The reason is likely %sa null reference being used%s".printf (
- color, get_reset_code ());
- }
- return "Unknown reason";
- }
+private string get_reason () {
+ // var c = get_reset_code();
+ var sig = stacktrace.sig;
+
+ var color = get_highlight_code ();
+ if (sig == ProcessSignal.TRAP) {
+ return "The reason is likely %san uncaught error%s".printf (
+ color, get_reset_code ());
+ }
+ if (sig == ProcessSignal.ABRT) {
+ return "The reason is likely %sa failed assertion (assert...)%s".printf (
+ color, get_reset_code ());
+ }
+ if (sig == ProcessSignal.SEGV) {
+ return "The reason is likely %sa null reference being used%s".printf (
+ color, get_reset_code ());
+ }
+ return "Unknown reason";
+}
- /**
- * Print the stacktrace to ``stdout``
- *
- * @param trace the stacktrace
- *
- */
- public virtual void print (Stacktrace trace) {
- this.stacktrace = trace;
- background_color = stacktrace.error_background;
- var header = "%s%s\n".printf (get_printable_title (),
- get_reset_code ());
- var first_vala = trace.first_vala;
-
- if (trace.first_vala != null) {
- header = "%s in %s, line %s in %s\n".printf (
- get_printable_title (),
- get_printable_file_short_path (first_vala, false),
- get_printable_line_number (first_vala, false),
- get_printable_function (first_vala) + get_reset_code ());
- title_length += first_vala.line_number.length +
- first_vala.function.length +
- first_vala.file_short_path.length;
- }
- stdout.printf (header);
- background_color = Color.BLACK;
- if( !stacktrace.is_custom) {
- var reason = get_reason ();
- stdout.printf (" %s.\n", reason);
- }
- var is_all_file_name_blank = stacktrace.is_all_file_name_blank;
+/**
+ * Print the stacktrace to ``stdout``
+ *
+ * @param trace the stacktrace
+ *
+ */
+public virtual void print (Stacktrace trace) {
+ this.stacktrace = trace;
+ background_color = stacktrace.error_background;
+ var header = "%s%s\n".printf (get_printable_title (),
+ get_reset_code ());
+ var first_vala = trace.first_vala;
+
+ if (trace.first_vala != null) {
+ header = "%s in %s, line %s in %s\n".printf (
+ get_printable_title (),
+ get_printable_file_short_path (first_vala, false),
+ get_printable_line_number (first_vala, false),
+ get_printable_function (first_vala) + get_reset_code ());
+ title_length += first_vala.line_number.length +
+ first_vala.function.length +
+ first_vala.file_short_path.length;
+ }
+ stdout.printf (header);
+ background_color = Color.BLACK;
+ if( !stacktrace.is_custom) {
+ var reason = get_reason ();
+ stdout.printf (" %s.\n", reason);
+ }
+ var is_all_file_name_blank = stacktrace.is_all_file_name_blank;
- // Has the user forgot to compile with -g -X -rdynamic flag ?
- if (is_all_file_name_blank) {
- var advice = " %sNote%s: no file path and line numbers can be retrieved. Are you sure %syou added -g -X -rdynamic%s to valac command line?\n";
- var color = get_highlight_code ();
- stdout.printf (advice, color, get_reset_code (), color, get_reset_code ());
- }
+ // Has the user forgot to compile with -g -X -rdynamic flag ?
+ if (is_all_file_name_blank) {
+ var advice = " %sNote%s: no file path and line numbers can be retrieved. Are you sure %syou added -g -X -rdynamic%s to valac command line?\n";
+ var color = get_highlight_code ();
+ stdout.printf (advice, color, get_reset_code (), color, get_reset_code ());
+ }
- // Has the user forgot to compile with rdynamic flag ?
- if (stacktrace.is_all_function_name_blank && !is_all_file_name_blank) {
- var advice = " %sNote%s: no vala function name can be retrieved. Are you sure %syou added -X -rdynamic%s to valac command line?\n";
- var color = get_highlight_code ();
- stdout.printf (advice, color, get_reset_code (), color, get_reset_code ());
- }
+ // Has the user forgot to compile with rdynamic flag ?
+ if (stacktrace.is_all_function_name_blank && !is_all_file_name_blank) {
+ var advice = " %sNote%s: no vala function name can be retrieved. Are you sure %syou added -X -rdynamic%s to valac command line?\n";
+ var color = get_highlight_code ();
+ stdout.printf (advice, color, get_reset_code (), color, get_reset_code ());
+ }
- stdout.printf ("\n");
- int i = 1;
- bool has_displayed_first_vala = false;
- foreach (var frame in trace.frames) {
- var show_frame = frame.function != "" || frame.file_path.has_suffix (".vala") || frame.file_path.has_suffix (".c");
- if (Stacktrace.hide_installed_libraries && has_displayed_first_vala)
- show_frame = show_frame && frame.file_short_path != "";
-
- // Ignore glib tracing code if displayed before the first vala frame
- if ((frame.function == "g_logv" || frame.function == "g_log") && !has_displayed_first_vala)
- show_frame = false;
- if (show_frame) {
- // #2 ./OtherModule.c line 80 in 'other_module_do_it'
- // at /home/cran/Projects/noise/noise-perf-instant-search/tests/errors/module/OtherModule.vala:10
- var str = " %s #%d %s line %s in %s\n";
- background_color = Color.BLACK;
- var lead = " ";
- var function_padding = 0;
- if (frame == first_vala) {
- has_displayed_first_vala = true;
- lead = "*";
- background_color = stacktrace.error_background;
- function_padding = 22;
- }
- var l_number = "";
- if (frame.line_number == "") {
- str = " %s #%d %s in %s\n";
- var func_name = get_printable_function (frame);
- var fill_len = int.max (stacktrace.max_file_name_length + stacktrace.max_line_number_length - 1, 0);
- str = str.printf (
- lead,
- i,
- string.nfill (fill_len, ' '),
- func_name);
- } else {
- str = str.printf (
- lead,
- i,
- get_printable_file_short_path (frame),
- get_printable_line_number (frame),
- get_printable_function (frame, function_padding));
- l_number = ":" + frame.line_number;
- }
- stdout.printf (str);
- str = " at %s%s\n".printf (
- frame.file_path, l_number);
- stdout.printf (str);
+ stdout.printf ("\n");
+ int i = 1;
+ bool has_displayed_first_vala = false;
+ foreach (var frame in trace.frames) {
+ var show_frame = frame.function != "" || frame.file_path.has_suffix (".vala") || frame.file_path.has_suffix (".c");
+ if (Stacktrace.hide_installed_libraries && has_displayed_first_vala)
+ show_frame = show_frame && frame.file_short_path != "";
+
+ // Ignore glib tracing code if displayed before the first vala frame
+ if ((frame.function == "g_logv" || frame.function == "g_log") && !has_displayed_first_vala)
+ show_frame = false;
+ if (show_frame) {
+ // #2 ./OtherModule.c line 80 in 'other_module_do_it'
+ // at /home/cran/Projects/noise/noise-perf-instant-search/tests/errors/module/OtherModule.vala:10
+ var str = " %s #%d %s line %s in %s\n";
+ background_color = Color.BLACK;
+ var lead = " ";
+ var function_padding = 0;
+ if (frame == first_vala) {
+ has_displayed_first_vala = true;
+ lead = "*";
+ background_color = stacktrace.error_background;
+ function_padding = 22;
+ }
+ var l_number = "";
+ if (frame.line_number == "") {
+ str = " %s #%d %s in %s\n";
+ var func_name = get_printable_function (frame);
+ var fill_len = int.max (stacktrace.max_file_name_length + stacktrace.max_line_number_length - 1, 0);
+ str = str.printf (
+ lead,
+ i,
+ string.nfill (fill_len, ' '),
+ func_name);
+ } else {
+ str = str.printf (
+ lead,
+ i,
+ get_printable_file_short_path (frame),
+ get_printable_line_number (frame),
+ get_printable_function (frame, function_padding));
+ l_number = ":" + frame.line_number;
+ }
+ stdout.printf (str);
+ str = " at %s%s\n".printf (
+ frame.file_path, l_number);
+ stdout.printf (str);
- i++;
- }
- }
+ i++;
}
-
}
}
+
+}
+}
diff -pruN 2.6.1-1/libraries/libIvy/Stacktrace.vala 2.7.1-1/libraries/libIvy/Stacktrace.vala
--- 2.6.1-1/libraries/libIvy/Stacktrace.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/libraries/libIvy/Stacktrace.vala 2019-02-01 19:30:50.000000000 +0000
@@ -14,388 +14,388 @@
* limitations under the License.
*/
- /**
- * Provides services to display vala stacktraces
- */
+/**
+ * Provides services to display vala stacktraces
+ */
namespace Ivy {
- internal enum Style {
- RESET = 0,
- BRIGHT = 1,
- DIM = 2,
- UNDERLINE = 3,
- BLINK = 4,
- REVERSE = 7,
- HIDDEN = 8
- }
+internal enum Style {
+ RESET = 0,
+ BRIGHT = 1,
+ DIM = 2,
+ UNDERLINE = 3,
+ BLINK = 4,
+ REVERSE = 7,
+ HIDDEN = 8
+}
+/**
+ * Defines how Unix signals are processed
+ */
+public enum CriticalHandler {
/**
- * Defines how Unix signals are processed
+ * Unix signals are ignored
*/
- public enum CriticalHandler {
- /**
- * Unix signals are ignored
- */
- IGNORE,
- /**
- * When a signal is intercepted, a stacktrace is displayed
- * to ``stdout`` and the execution of the application is
- * resumed
- */
- PRINT_STACKTRACE,
- /**
- * When a signal is intercepted, a stacktrace is displayed
- * to ``stdout`` and the application is stopped
- */
- CRASH
- }
-
+ IGNORE,
/**
- * Colors used for displaying stacktraces
+ * When a signal is intercepted, a stacktrace is displayed
+ * to ``stdout`` and the execution of the application is
+ * resumed
*/
- public enum Color {
- BLACK = 0,
- RED = 1,
- GREEN = 2,
- YELLOW = 3,
- BLUE = 4,
- MAGENTA = 5,
- CYAN = 6,
- WHITE = 7
- }
-
+ PRINT_STACKTRACE,
/**
- * A complete execution stacktrace
- *
- * Holds a collection of {@link Frame} and the basic methods to intercept Unix signals
- * and prints the complete stacktrace to ``stdout`` in colors.
- *
- * For more information, refer to the [[https://github.com/I-hate-farms/stacktrace|official website]].
- *
- * Here's a sample of a printed stacktrace:
- * {{{
- * An error occured (SIGSEGV) in samples/vala_file.vala, line 21 in 'this_will_crash_harder'
- * The reason is likely a null reference being used.
- *
- * #1 in 'strlen'
- * at /lib/x86_64-linux-gnu/libc.so.6
- * * #2 samples/vala_file.vala line 21 in 'this_will_crash_harder'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/vala_file.vala:21
- * #3 samples/module/OtherModule.vala line 11 in 'other_module_do_it'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/module/OtherModule.vala:11
- * #4 samples/error_sigsegv.vala line 19 in 'namespace_someclass_exec'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:19
- * #5 samples/error_sigsegv.vala line 29 in 'this_will_crash'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:29
- * #6 samples/error_sigsegv.vala line 39 in '_vala_main'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:39
- * #7 error_sigsegv.vala.c line 421 in 'main'
- * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/error_sigsegv.vala.c:421
- * #8 in '__libc_start_main'
- * at /lib/x86_64-linux-gnu/libc.so.6
- * }}}
+ * When a signal is intercepted, a stacktrace is displayed
+ * to ``stdout`` and the application is stopped
*/
- public class Stacktrace {
+ CRASH
+}
+
+/**
+ * Colors used for displaying stacktraces
+ */
+public enum Color {
+ BLACK = 0,
+ RED = 1,
+ GREEN = 2,
+ YELLOW = 3,
+ BLUE = 4,
+ MAGENTA = 5,
+ CYAN = 6,
+ WHITE = 7
+}
+
+/**
+ * A complete execution stacktrace
+ *
+ * Holds a collection of {@link Frame} and the basic methods to intercept Unix signals
+ * and prints the complete stacktrace to ``stdout`` in colors.
+ *
+ * For more information, refer to the [[https://github.com/I-hate-farms/stacktrace|official website]].
+ *
+ * Here's a sample of a printed stacktrace:
+ * {{{
+ * An error occured (SIGSEGV) in samples/vala_file.vala, line 21 in 'this_will_crash_harder'
+ * The reason is likely a null reference being used.
+ *
+ * #1 in 'strlen'
+ * at /lib/x86_64-linux-gnu/libc.so.6
+ * * #2 samples/vala_file.vala line 21 in 'this_will_crash_harder'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/vala_file.vala:21
+ * #3 samples/module/OtherModule.vala line 11 in 'other_module_do_it'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/module/OtherModule.vala:11
+ * #4 samples/error_sigsegv.vala line 19 in 'namespace_someclass_exec'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:19
+ * #5 samples/error_sigsegv.vala line 29 in 'this_will_crash'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:29
+ * #6 samples/error_sigsegv.vala line 39 in '_vala_main'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/samples/error_sigsegv.vala:39
+ * #7 error_sigsegv.vala.c line 421 in 'main'
+ * at /home/cran/Documents/Projects/i-hate-farms/stacktrace/error_sigsegv.vala.c:421
+ * #8 in '__libc_start_main'
+ * at /lib/x86_64-linux-gnu/libc.so.6
+ * }}}
+ */
+public class Stacktrace {
+
+internal Frame first_vala = null;
+
+internal int max_file_name_length = 0;
+
+internal int max_line_number_length = 0;
+
+internal bool is_all_function_name_blank = true;
+
+internal bool is_all_file_name_blank = true;
+
+private Gee.List _frames = new Gee.ArrayList();
+
+/**
+ * Unix signal being intercepted
+ *
+ */
+public ProcessSignal sig;
+
+/**
+ * Enables the Unix signals interception
+ *
+ * Setting it to false and preventing signals interception and the collection
+ * of the complete stacktrace (that might a significant effect on performance)
+ * is useful when the application uses a library that emits a ``SIGTRAP``
+ * signal for unknown reasons.
+ *
+ * Such a case would cripple the application performance and clutter the
+ * ``stdout`` ouput for no benefit.
+ *
+ * Default is ``true``
+ */
+public static bool enabled { get; set; default = true;}
+
+/**
+ * Hides frames located in external system libraries (like ``libgc``) without
+ * code information
+ *
+ * * Default is ``true``
+ *
+ * Before
+ * {{{
+ * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
+ * The reason is likely an uncaught error.
+ *
+ * #1 in 'g_signal_handlers_disconnect_matched'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * * #2 ../src/Database/Core/QueryResult.vala line 26 in 'app_center_core_query_result_finalize'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/QueryResult.vala:26
+ * #3 in 'g_object_unref'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #4 ../src/Database/Core/Dao.vala line 88 in 'app_center_core_dao_insert'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/Dao.vala:88
+ * #5 ../src/Database/PackageKitSource.vala line 18 in 'app_center_core_package_kit_source_fetch'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/PackageKitSource.vala:18
+ * #6 ../src/MainPanel.vala line 68 in '__lambda19_'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/MainPanel.vala:68
+ * #7 src/MainPanel.c line 297 in '___lambda19__app_center_views_browse_view_show_app_info'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/MainPanel.c:297
+ * #8 in 'g_cclosure_marshal_VOID__STRINGv'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #9 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #10 in 'g_signal_emit_by_name'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #11 src/BrowseView.c line 871 in '__lambda16_'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:871
+ * #12 src/BrowseView.c line 878 in '___lambda16__gtk_button_clicked'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:878
+ * #13 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #14 in 'g_signal_emit'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #15 in 'g_closure_invoke'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #16 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #17 in 'g_signal_emit'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #18 in 'ffi_call_unix64'
+ * at /usr/lib/x86_64-linux-gnu/libffi.so.6
+ * #19 in 'ffi_call'
+ * at /usr/lib/x86_64-linux-gnu/libffi.so.6
+ * #20 in 'g_cclosure_marshal_generic_va'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #21 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #22 in 'g_signal_emit'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #23 in 'g_cclosure_marshal_VOID__BOXEDv'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #24 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #25 in 'g_signal_emit'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #26 in 'gtk_event_controller_handle_event'
+ * at /usr/lib/x86_64-linux-gnu/libgtk-3.so.0
+ * #27 in 'g_signal_emit_valist'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #28 in 'g_signal_emit'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * #29 in 'gtk_main_do_event'
+ * at /usr/lib/x86_64-linux-gnu/libgtk-3.so.0
+ * #30 in 'g_main_context_dispatch'
+ * at /lib/x86_64-linux-gnu/libglib-2.0.so.0
+ * #31 in 'g_main_context_iteration'
+ * at /lib/x86_64-linux-gnu/libglib-2.0.so.0
+ * #32 in 'g_application_run'
+ * at /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
+ * #33 in 'granite_application_run'
+ * at /usr/lib/x86_64-linux-gnu/libgranite.so.2
+ * #34 ../src/Application.vala line 54 in 'app_center_main'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Application.vala:54
+ * #35 src/Application.c line 296 in 'main'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/Application.c:296
+ * #36 in '__libc_start_main'
+ * at /lib/x86_64-linux-gnu/libc.so.6
+ *
+ * }}}
+ *
+ * After :
+ * {{{
+ * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
+ * The reason is likely an uncaught error.
+ *
+ * #1 in 'g_signal_handlers_disconnect_matched'
+ * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
+ * * #2 ../src/Database/Core/QueryResult.vala line 26 in 'app_center_core_query_result_finalize'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/QueryResult.vala:26
+ * #3 ../src/Database/Core/Dao.vala line 88 in 'app_center_core_dao_insert'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/Dao.vala:88
+ * #4 ../src/Database/PackageKitSource.vala line 18 in 'app_center_core_package_kit_source_fetch'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/PackageKitSource.vala:18
+ * #5 ../src/MainPanel.vala line 68 in '__lambda19_'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/MainPanel.vala:68
+ * #6 src/MainPanel.c line 297 in '___lambda19__app_center_views_browse_view_show_app_info'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/MainPanel.c:297
+ * #7 src/BrowseView.c line 871 in '__lambda16_'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:871
+ * #8 src/BrowseView.c line 878 in '___lambda16__gtk_button_clicked'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:878
+ * #9 ../src/Application.vala line 55 in 'app_center_main'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Application.vala:55
+ * #10 src/Application.c line 304 in 'main'
+ * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/Application.c:304
+ * }}}
+ */
+public static bool hide_installed_libraries { get; set; default = true;}
- internal Frame first_vala = null;
+/**
+ * Sets the default higlighted text color for stacktrace that are created
+ * via Unix signals interception
+ *
+ * Default is ``Color.WHITE``
+ */
+public static Color default_highlight_color { get; set; default = Color.WHITE;}
- internal int max_file_name_length = 0;
+/**
+ * Sets the default background color for stacktrace that are created
+ * via Unix signals interception
+ *
+ * Default is ``Color.RED``
+ */
+public static Color default_error_background { get; set; default = Color.RED;}
- internal int max_line_number_length = 0;
+/**
+ * Sets the stacktrace higlighted text color when printed on ``stdout``
+ *
+ * Default is ``Color.WHITE``
+ */
+public Color highlight_color { get; set; default = Color.WHITE;}
- internal bool is_all_function_name_blank = true;
-
- internal bool is_all_file_name_blank = true;
-
- private Gee.List _frames = new Gee.ArrayList();
-
- /**
- * Unix signal being intercepted
- *
- */
- public ProcessSignal sig;
-
- /**
- * Enables the Unix signals interception
- *
- * Setting it to false and preventing signals interception and the collection
- * of the complete stacktrace (that might a significant effect on performance)
- * is useful when the application uses a library that emits a ``SIGTRAP``
- * signal for unknown reasons.
- *
- * Such a case would cripple the application performance and clutter the
- * ``stdout`` ouput for no benefit.
- *
- * Default is ``true``
- */
- public static bool enabled { get;set;default = true;}
-
- /**
- * Hides frames located in external system libraries (like ``libgc``) without
- * code information
- *
- * * Default is ``true``
- *
- * Before
- * {{{
- * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
- * The reason is likely an uncaught error.
- *
- * #1 in 'g_signal_handlers_disconnect_matched'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * * #2 ../src/Database/Core/QueryResult.vala line 26 in 'app_center_core_query_result_finalize'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/QueryResult.vala:26
- * #3 in 'g_object_unref'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #4 ../src/Database/Core/Dao.vala line 88 in 'app_center_core_dao_insert'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/Dao.vala:88
- * #5 ../src/Database/PackageKitSource.vala line 18 in 'app_center_core_package_kit_source_fetch'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/PackageKitSource.vala:18
- * #6 ../src/MainPanel.vala line 68 in '__lambda19_'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/MainPanel.vala:68
- * #7 src/MainPanel.c line 297 in '___lambda19__app_center_views_browse_view_show_app_info'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/MainPanel.c:297
- * #8 in 'g_cclosure_marshal_VOID__STRINGv'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #9 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #10 in 'g_signal_emit_by_name'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #11 src/BrowseView.c line 871 in '__lambda16_'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:871
- * #12 src/BrowseView.c line 878 in '___lambda16__gtk_button_clicked'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:878
- * #13 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #14 in 'g_signal_emit'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #15 in 'g_closure_invoke'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #16 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #17 in 'g_signal_emit'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #18 in 'ffi_call_unix64'
- * at /usr/lib/x86_64-linux-gnu/libffi.so.6
- * #19 in 'ffi_call'
- * at /usr/lib/x86_64-linux-gnu/libffi.so.6
- * #20 in 'g_cclosure_marshal_generic_va'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #21 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #22 in 'g_signal_emit'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #23 in 'g_cclosure_marshal_VOID__BOXEDv'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #24 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #25 in 'g_signal_emit'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #26 in 'gtk_event_controller_handle_event'
- * at /usr/lib/x86_64-linux-gnu/libgtk-3.so.0
- * #27 in 'g_signal_emit_valist'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #28 in 'g_signal_emit'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * #29 in 'gtk_main_do_event'
- * at /usr/lib/x86_64-linux-gnu/libgtk-3.so.0
- * #30 in 'g_main_context_dispatch'
- * at /lib/x86_64-linux-gnu/libglib-2.0.so.0
- * #31 in 'g_main_context_iteration'
- * at /lib/x86_64-linux-gnu/libglib-2.0.so.0
- * #32 in 'g_application_run'
- * at /usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
- * #33 in 'granite_application_run'
- * at /usr/lib/x86_64-linux-gnu/libgranite.so.2
- * #34 ../src/Application.vala line 54 in 'app_center_main'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Application.vala:54
- * #35 src/Application.c line 296 in 'main'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/Application.c:296
- * #36 in '__libc_start_main'
- * at /lib/x86_64-linux-gnu/libc.so.6
- *
- * }}}
- *
- * After :
- * {{{
- * An error occured (SIGTRAP) in ../src/Database/Core/QueryResult.vala, line 26 in 'app_center_core_query_result_finalize'
- * The reason is likely an uncaught error.
- *
- * #1 in 'g_signal_handlers_disconnect_matched'
- * at /usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
- * * #2 ../src/Database/Core/QueryResult.vala line 26 in 'app_center_core_query_result_finalize'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/QueryResult.vala:26
- * #3 ../src/Database/Core/Dao.vala line 88 in 'app_center_core_dao_insert'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/Core/Dao.vala:88
- * #4 ../src/Database/PackageKitSource.vala line 18 in 'app_center_core_package_kit_source_fetch'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Database/PackageKitSource.vala:18
- * #5 ../src/MainPanel.vala line 68 in '__lambda19_'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/MainPanel.vala:68
- * #6 src/MainPanel.c line 297 in '___lambda19__app_center_views_browse_view_show_app_info'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/MainPanel.c:297
- * #7 src/BrowseView.c line 871 in '__lambda16_'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:871
- * #8 src/BrowseView.c line 878 in '___lambda16__gtk_button_clicked'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/BrowseView.c:878
- * #9 ../src/Application.vala line 55 in 'app_center_main'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/src/Application.vala:55
- * #10 src/Application.c line 304 in 'main'
- * at /home/cran/Documents/Projects/i-hate-farms/app/exocron/build/src/Application.c:304
- * }}}
- */
- public static bool hide_installed_libraries { get;set;default = true;}
-
- /**
- * Sets the default higlighted text color for stacktrace that are created
- * via Unix signals interception
- *
- * Default is ``Color.WHITE``
- */
- public static Color default_highlight_color { get;set;default = Color.WHITE;}
-
- /**
- * Sets the default background color for stacktrace that are created
- * via Unix signals interception
- *
- * Default is ``Color.RED``
- */
- public static Color default_error_background { get;set;default = Color.RED;}
-
- /**
- * Sets the stacktrace higlighted text color when printed on ``stdout``
- *
- * Default is ``Color.WHITE``
- */
- public Color highlight_color { get;set;default = Color.WHITE;}
-
- /**
- * Sets the stacktrace background color when printed on ``stdout``
- *
- * Default is ``Color.RED``
- */
- public Color error_background { get;set;default = Color.RED;}
-
- /**
- * Collection of frames
- *
- */
- public Gee.List frames {
- get {
- return _frames;
- }
- }
-
- private Printer printer = new Printer ();
- private Extractor extractor = new Extractor ();
-
- public Stacktrace (GLib.ProcessSignal sig = GLib.ProcessSignal.TTOU) {
- this.sig = sig;
- // The stacktrace is used likely to understand the inner
- // working of the app so we displays everything.
- if (is_custom) {
- hide_installed_libraries = false;
- error_background = Color.BLUE;
- } else {
- error_background = default_error_background;
- highlight_color = default_highlight_color;
- }
- extractor.create_stacktrace (this);
- }
-
- /**
- * Returns true if the stacktrace is "custom"
- *
- * A custom stacktrace has been created via code as
- * opposed to created via Unix signal interception.
- *
- * Custom stacktrace are displayed with a different color scheme (default ``Color.GREEN``) that
- * can be set via {@link highlight_color} and {@link error_background}
- *
- * Here's how to create a custom stacktrace:
- * {{{
- *
- * int my_function (string arg) {
- * var custom_stracktrace = new Stacktrace ();
- * custom_stracktrace.print ();
- * return 0;
- * }
- * }}}
- */
- public bool is_custom {
- get {
- return sig == ProcessSignal.TTOU;
- }
- }
-
- /**
- * Prints the stacktrace to ``stdout`` with colors
- *
- */
- public void print () {
- printer.print (this);
- }
-
- /**
- * Registers handlers to intercept Unix signals
- *
- * Calling ``register_handlers`` is required for the
- * library to display a stacktrace when the application encounters an error (ie raises a ``SIGABRT``,
- * a ``SIGSEV`` or a ``SIGTRAP`` signal).
- *
- * ''Note:'' calling ``register_handlers`` is not needed to be able to display custom stacktraces. <
>
- * (See {@link is_custom} for more information about custom stacktraces).
- *
- * How to initialize the library so it can intercept Unix signals:
- * {{{
- *
- * static int main (string[] arg) {
- * Stacktrace.register_handlers ();
- * // Start your application
- * ...
- * return 0;
- * }
- * }}}
- *
- */
- public static void register_handlers () {
- //Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL);
- Log.set_always_fatal (LogLevelFlags.LEVEL_ERROR);
-
- Process.@signal (ProcessSignal.SEGV, handler);
- Process.@signal (ProcessSignal.TRAP, handler);
- if (critical_handling != CriticalHandler.IGNORE)
- Process.@signal (ProcessSignal.ABRT, handler);
- }
-
- /**
- * Defines how Unix signals are processed
- *
- * Default is ``CriticalHandler.PRINT_STACKTRACE``.
- */
- public static CriticalHandler critical_handling { get;set;default = CriticalHandler.PRINT_STACKTRACE;}
-
- /*{
- set {
- _critical_handling = value;
- if( value == CriticalHandler.CRASH )
- //var variables = Environ.get ();
- //Environ.set_variable (variables, "G_DEBUG", "fatal-criticals" );
- Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL);
- }
- get {
- }
-
- }*/
-
- private static void handler (int sig) {
- if( !enabled)
- return;
- Stacktrace stack = new Stacktrace ((ProcessSignal) sig);
- stack.print ();
- if (sig != ProcessSignal.TRAP ||
- (sig == ProcessSignal.TRAP && critical_handling == CriticalHandler.CRASH))
- Process.exit (1);
- }
+/**
+ * Sets the stacktrace background color when printed on ``stdout``
+ *
+ * Default is ``Color.RED``
+ */
+public Color error_background { get; set; default = Color.RED;}
+/**
+ * Collection of frames
+ *
+ */
+public Gee.List frames {
+ get {
+ return _frames;
+ }
+}
+
+private Printer printer = new Printer ();
+private Extractor extractor = new Extractor ();
+
+public Stacktrace (GLib.ProcessSignal sig = GLib.ProcessSignal.TTOU) {
+ this.sig = sig;
+ // The stacktrace is used likely to understand the inner
+ // working of the app so we displays everything.
+ if (is_custom) {
+ hide_installed_libraries = false;
+ error_background = Color.BLUE;
+ } else {
+ error_background = default_error_background;
+ highlight_color = default_highlight_color;
+ }
+ extractor.create_stacktrace (this);
+}
+
+/**
+ * Returns true if the stacktrace is "custom"
+ *
+ * A custom stacktrace has been created via code as
+ * opposed to created via Unix signal interception.
+ *
+ * Custom stacktrace are displayed with a different color scheme (default ``Color.GREEN``) that
+ * can be set via {@link highlight_color} and {@link error_background}
+ *
+ * Here's how to create a custom stacktrace:
+ * {{{
+ *
+ * int my_function (string arg) {
+ * var custom_stracktrace = new Stacktrace ();
+ * custom_stracktrace.print ();
+ * return 0;
+ * }
+ * }}}
+ */
+public bool is_custom {
+ get {
+ return sig == ProcessSignal.TTOU;
}
}
+
+/**
+ * Prints the stacktrace to ``stdout`` with colors
+ *
+ */
+public void print () {
+ printer.print (this);
+}
+
+/**
+ * Registers handlers to intercept Unix signals
+ *
+ * Calling ``register_handlers`` is required for the
+ * library to display a stacktrace when the application encounters an error (ie raises a ``SIGABRT``,
+ * a ``SIGSEV`` or a ``SIGTRAP`` signal).
+ *
+ * ''Note:'' calling ``register_handlers`` is not needed to be able to display custom stacktraces. <
>
+ * (See {@link is_custom} for more information about custom stacktraces).
+ *
+ * How to initialize the library so it can intercept Unix signals:
+ * {{{
+ *
+ * static int main (string[] arg) {
+ * Stacktrace.register_handlers ();
+ * // Start your application
+ * ...
+ * return 0;
+ * }
+ * }}}
+ *
+ */
+public static void register_handlers () {
+ //Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL);
+ Log.set_always_fatal (LogLevelFlags.LEVEL_ERROR);
+
+ Process.@signal (ProcessSignal.SEGV, handler);
+ Process.@signal (ProcessSignal.TRAP, handler);
+ if (critical_handling != CriticalHandler.IGNORE)
+ Process.@signal (ProcessSignal.ABRT, handler);
+}
+
+/**
+ * Defines how Unix signals are processed
+ *
+ * Default is ``CriticalHandler.PRINT_STACKTRACE``.
+ */
+public static CriticalHandler critical_handling { get; set; default = CriticalHandler.PRINT_STACKTRACE;}
+
+/*{
+ set {
+ _critical_handling = value;
+ if( value == CriticalHandler.CRASH )
+ //var variables = Environ.get ();
+ //Environ.set_variable (variables, "G_DEBUG", "fatal-criticals" );
+ Log.set_always_fatal (LogLevelFlags.LEVEL_CRITICAL);
+ }
+ get {
+ }
+
+ }*/
+
+private static void handler (int sig) {
+ if( !enabled)
+ return;
+ Stacktrace stack = new Stacktrace ((ProcessSignal) sig);
+ stack.print ();
+ if (sig != ProcessSignal.TRAP ||
+ (sig == ProcessSignal.TRAP && critical_handling == CriticalHandler.CRASH))
+ Process.exit (1);
+}
+
+}
+}
diff -pruN 2.6.1-1/libraries/WebExtension/webextension.vala 2.7.1-1/libraries/WebExtension/webextension.vala
--- 2.6.1-1/libraries/WebExtension/webextension.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/libraries/WebExtension/webextension.vala 2019-02-01 19:30:50.000000000 +0000
@@ -1,175 +1,175 @@
[DBus (name = "org.gnome.FeedReader.ArticleView")]
public class FeedReaderWebExtension : Object {
- private WebKit.DOM.Document m_doc;
- public signal void onClick(string path, int width, int height, string url);
- public signal void message(string message);
+private WebKit.DOM.Document m_doc;
+public signal void onClick(string path, int width, int height, string url);
+public signal void message(string message);
- [DBus (visible = false)]
- public void on_bus_aquired(DBusConnection connection)
+[DBus (visible = false)]
+public void on_bus_aquired(DBusConnection connection)
+{
+ try
{
- try
- {
- connection.register_object("/org/gnome/FeedReader/ArticleView", this);
- }
- catch(GLib.IOError e)
- {
- warning("Could not register object");
- }
+ connection.register_object("/org/gnome/FeedReader/ArticleView", this);
}
-
- [DBus (visible = false)]
- public void on_page_created(WebKit.WebExtension extension, WebKit.WebPage page)
+ catch(GLib.IOError e)
{
- page.document_loaded.connect(() => {
+ warning("Could not register object");
+ }
+}
+
+[DBus (visible = false)]
+public void on_page_created(WebKit.WebExtension extension, WebKit.WebPage page)
+{
+ page.document_loaded.connect(() => {
onDocLoaded(page);
});
- message("on_page_created");
- }
+ message("on_page_created");
+}
- private void onDocLoaded(WebKit.WebPage page)
- {
- m_doc = page.get_dom_document();
- message("onDocLoaded");
- }
+private void onDocLoaded(WebKit.WebPage page)
+{
+ m_doc = page.get_dom_document();
+ message("onDocLoaded");
+}
+
+public void recalculate()
+{
+ message("recalculate");
+ var images = m_doc.get_images();
+ ulong count = images.get_length();
- public void recalculate()
+ for(ulong i = 0; i < count; i++)
{
- message("recalculate");
- var images = m_doc.get_images();
- ulong count = images.get_length();
+ var image = (WebKit.DOM.HTMLImageElement)images.item(i);
- for(ulong i = 0; i < count; i++)
+ // don't offer imageviewer if image isn't local
+ if(image.src.has_prefix("http"))
+ continue;
+
+ // if image was so huge it had to be replaced with a downscaled version
+ if(image.has_attribute("FR_huge"))
+ {
+ addListener(image, image.get_attribute("FR_huge"));
+ continue;
+ }
+ else if(image.has_attribute("FR_parent"))
{
- var image = (WebKit.DOM.HTMLImageElement)images.item(i);
+ addListener(image, image.get_attribute("FR_parent"));
+ continue;
+ }
- // don't offer imageviewer if image isn't local
- if(image.src.has_prefix("http"))
- continue;
-
- // if image was so huge it had to be replaced with a downscaled version
- if(image.has_attribute("FR_huge"))
- {
- addListener(image, image.get_attribute("FR_huge"));
- continue;
- }
- else if(image.has_attribute("FR_parent"))
- {
- addListener(image, image.get_attribute("FR_parent"));
- continue;
- }
-
- long nHeight = image.get_natural_height();
- long nWidth = image.get_natural_width();
- long height = image.get_height();
- long width = image.get_width();
-
- if(nHeight > 250 || nWidth > 250)
- {
- double hRatio = (double)height / (double)nHeight;
- double wRatio = (double)width / (double)nWidth;
- double threshold = 0.8;
-
- if(hRatio <= threshold
- || wRatio <= threshold)
- addListener(image, image.src);
- else
- removeListener(image);
- }
+ long nHeight = image.get_natural_height();
+ long nWidth = image.get_natural_width();
+ long height = image.get_height();
+ long width = image.get_width();
+
+ if(nHeight > 250 || nWidth > 250)
+ {
+ double hRatio = (double)height / (double)nHeight;
+ double wRatio = (double)width / (double)nWidth;
+ double threshold = 0.8;
+
+ if(hRatio <= threshold
+ || wRatio <= threshold)
+ addListener(image, image.src);
+ else
+ removeListener(image);
}
}
+}
- [DBus (visible = false)]
- private void addListener(WebKit.DOM.HTMLImageElement image, string url)
+[DBus (visible = false)]
+private void addListener(WebKit.DOM.HTMLImageElement image, string url)
+{
+ // check if url exists
+ if(GLib.FileUtils.test(url, GLib.FileTest.EXISTS))
{
- // check if url exists
- if(GLib.FileUtils.test(url, GLib.FileTest.EXISTS))
- {
- ((WebKit.DOM.EventTarget) image).add_event_listener_with_closure("mouseover", on_enter, false);
- ((WebKit.DOM.EventTarget) image).add_event_listener_with_closure("mousemove", on_enter, false);
- ((WebKit.DOM.EventTarget) image).add_event_listener_with_closure("mouseout", on_leave, false);
- ((WebKit.DOM.EventTarget) image).add_event_listener_with_closure("click", on_click, false);
- }
+ ((WebKit.DOM.EventTarget)image).add_event_listener_with_closure("mouseover", on_enter, false);
+ ((WebKit.DOM.EventTarget)image).add_event_listener_with_closure("mousemove", on_enter, false);
+ ((WebKit.DOM.EventTarget)image).add_event_listener_with_closure("mouseout", on_leave, false);
+ ((WebKit.DOM.EventTarget)image).add_event_listener_with_closure("click", on_click, false);
}
+}
- [DBus (visible = false)]
- private void removeListener(WebKit.DOM.HTMLImageElement image)
- {
- ((WebKit.DOM.EventTarget) image).remove_event_listener_with_closure("mouseover", on_enter, false);
- ((WebKit.DOM.EventTarget) image).remove_event_listener_with_closure("mousemove", on_enter, false);
- ((WebKit.DOM.EventTarget) image).remove_event_listener_with_closure("mouseout", on_leave, false);
- ((WebKit.DOM.EventTarget) image).remove_event_listener_with_closure("click", on_click, false);
+[DBus (visible = false)]
+private void removeListener(WebKit.DOM.HTMLImageElement image)
+{
+ ((WebKit.DOM.EventTarget)image).remove_event_listener_with_closure("mouseover", on_enter, false);
+ ((WebKit.DOM.EventTarget)image).remove_event_listener_with_closure("mousemove", on_enter, false);
+ ((WebKit.DOM.EventTarget)image).remove_event_listener_with_closure("mouseout", on_leave, false);
+ ((WebKit.DOM.EventTarget)image).remove_event_listener_with_closure("click", on_click, false);
- try
- {
- image.set_attribute("class", "");
- }
- catch(GLib.Error e)
- {
- stderr.printf("WebExtension.recalculate: %s", e.message);
- }
+ try
+ {
+ image.set_attribute("class", "");
}
-
- [DBus (visible = false)]
- private void on_enter(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+ catch(GLib.Error e)
{
- try
- {
- var image = (WebKit.DOM.HTMLImageElement)target;
- image.set_attribute("class", "clickable-img-hover");
- }
- catch(GLib.Error e)
- {
-
- }
+ stderr.printf("WebExtension.recalculate: %s", e.message);
}
+}
- [DBus (visible = false)]
- private void on_leave(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+[DBus (visible = false)]
+private void on_enter(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+{
+ try
+ {
+ var image = (WebKit.DOM.HTMLImageElement)target;
+ image.set_attribute("class", "clickable-img-hover");
+ }
+ catch(GLib.Error e)
{
- try
- {
- var image = (WebKit.DOM.HTMLImageElement)target;
- image.set_attribute("class", "");
- }
- catch(GLib.Error e)
- {
- }
}
+}
- [DBus (visible = false)]
- public void on_click(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+[DBus (visible = false)]
+private void on_leave(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+{
+ try
{
- event.prevent_default();
var image = (WebKit.DOM.HTMLImageElement)target;
+ image.set_attribute("class", "");
+ }
+ catch(GLib.Error e)
+ {
- string url = "";
- var parent = image.get_parent_element();
- if(parent.tag_name == "A")
- url = parent.get_attribute("href");
+ }
+}
+[DBus (visible = false)]
+public void on_click(WebKit.DOM.EventTarget target, WebKit.DOM.Event event)
+{
+ event.prevent_default();
+ var image = (WebKit.DOM.HTMLImageElement)target;
- int height = (int)image.natural_height;
- int width = (int)image.natural_width;
- string src = image.src;
- string pref = "file://";
- if(src.has_prefix(pref))
- src = src.substring(pref.length);
+ string url = "";
+ var parent = image.get_parent_element();
+ if(parent.tag_name == "A")
+ url = parent.get_attribute("href");
- if(image.has_attribute("FR_huge"))
- {
- src = image.get_attribute("FR_huge");
- Gdk.Pixbuf.get_file_info(src, out width, out height);
- }
- else if(image.has_attribute("FR_parent"))
- {
- src = image.get_attribute("FR_parent");
- Gdk.Pixbuf.get_file_info(src, out width, out height);
- }
- onClick(src, width, height, url);
+ int height = (int)image.natural_height;
+ int width = (int)image.natural_width;
+ string src = image.src;
+ string pref = "file://";
+ if(src.has_prefix(pref))
+ src = src.substring(pref.length);
+
+ if(image.has_attribute("FR_huge"))
+ {
+ src = image.get_attribute("FR_huge");
+ Gdk.Pixbuf.get_file_info(src, out width, out height);
}
+ else if(image.has_attribute("FR_parent"))
+ {
+ src = image.get_attribute("FR_parent");
+ Gdk.Pixbuf.get_file_info(src, out width, out height);
+ }
+
+ onClick(src, width, height, url);
+}
}
[DBus (name = "org.gnome.FeedReader.ArticleView")]
@@ -184,5 +184,5 @@ public void webkit_web_extension_initial
var server = new FeedReaderWebExtension();
extension.page_created.connect(server.on_page_created);
Bus.own_name(BusType.SESSION, "org.gnome.FeedReader.ArticleView", BusNameOwnerFlags.NONE,
- server.on_bus_aquired, null, () => { warning("Could not aquire name"); });
+ server.on_bus_aquired, null, () => { warning("Could not aquire name"); });
}
diff -pruN 2.6.1-1/meson.build 2.7.1-1/meson.build
--- 2.6.1-1/meson.build 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/meson.build 2019-02-01 19:30:50.000000000 +0000
@@ -1,5 +1,5 @@
project('feedreader', ['vala', 'c'],
- version: '2.6.0',
+ version: '2.7.1',
meson_version: '>= 0.44.1',
license: 'GPL-3.0',
default_options: ['prefix=/usr']
@@ -46,7 +46,7 @@ gstreamer_pbutils = dependency('gstrea
gtk = dependency('gtk+-3.0', version: '>=3.22')
gumbo = dependency('gumbo')
json_glib = dependency('json-glib-1.0')
-libcurl = c_compiler.find_library('libcurl')
+libcurl = c_compiler.find_library('curl')
libnotify = dependency('libnotify')
libpeas = dependency('libpeas-1.0')
libsecret = dependency('libsecret-1')
diff -pruN 2.6.1-1/org.gnome.FeedReader.json 2.7.1-1/org.gnome.FeedReader.json
--- 2.6.1-1/org.gnome.FeedReader.json 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/org.gnome.FeedReader.json 2019-02-01 19:30:50.000000000 +0000
@@ -22,7 +22,10 @@
"--talk-name=org.gnome.OnlineAccounts",
"--own-name=org.gnome.FeedReader.ArticleView",
"--talk-name=org.freedesktop.Notifications",
- "--talk-name=org.freedesktop.secrets"
+ "--talk-name=org.freedesktop.secrets",
+ /* Access to DecSync directory */
+ "--env=DECSYNC_DIR=.local/share/decsync",
+ "--filesystem=~/.local/share/decsync"
],
"modules": [{
"name": "libgee",
diff -pruN 2.6.1-1/plugins/backend/bazqux/bazquxAPI.vala 2.7.1-1/plugins/backend/bazqux/bazquxAPI.vala
--- 2.6.1-1/plugins/backend/bazqux/bazquxAPI.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/bazqux/bazquxAPI.vala 2019-02-01 19:30:50.000000000 +0000
@@ -15,460 +15,460 @@
public class FeedReader.bazquxAPI : GLib.Object {
- public enum bazquxSubscriptionAction {
- EDIT,
- SUBSCRIBE,
- UNSUBSCRIBE
- }
+public enum bazquxSubscriptionAction {
+ EDIT,
+ SUBSCRIBE,
+ UNSUBSCRIBE
+}
- private bazquxConnection m_connection;
- private bazquxUtils m_utils;
- private string m_userID;
- private DataBaseReadOnly m_db;
+private bazquxConnection m_connection;
+private bazquxUtils m_utils;
+private string m_userID;
+
+public bazquxAPI(bazquxUtils utils)
+{
+ m_utils = utils;
+ m_connection = new bazquxConnection(utils);
+}
- public bazquxAPI(bazquxUtils utils, DataBaseReadOnly db)
- {
- m_db = db;
- m_utils = utils;
- m_connection = new bazquxConnection(utils);
+public LoginResponse login()
+{
+ if(m_utils.getAccessToken() == "")
+ {
+ var result = m_connection.getToken();
+ if(getUserID())
+ return result;
}
+ else if(getUserID())
+ return LoginResponse.SUCCESS;
- public LoginResponse login()
- {
- if(m_utils.getAccessToken() == "")
- {
- var result = m_connection.getToken();
- if(getUserID())
- return result;
- }
- else if(getUserID())
- return LoginResponse.SUCCESS;
+ return LoginResponse.UNKNOWN_ERROR;
+}
- return LoginResponse.UNKNOWN_ERROR;
- }
+public bool ping()
+{
+ return m_connection.ping();
+}
+
+private bool getUserID()
+{
+ Logger.debug("getUserID: getting user info");
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ var response = m_connection.send_get_request("user-info", msg.get());
+
+ if(response.status != 200)
+ return false;
- public bool ping()
+ var parser = new Json.Parser();
+ try
{
- return m_connection.ping();
+ parser.load_from_data(response.data, -1);
}
-
- private bool getUserID()
+ catch(Error e)
+ {
+ Logger.error("getUserID: Could not load message response");
+ Logger.error(e.message);
+ return false;
+ }
+ var root = parser.get_root().get_object();
+ if(root.has_member("userId"))
{
- Logger.debug("getUserID: getting user info");
- var msg = new bazquxMessage();
- msg.add("output", "json");
- var response = m_connection.send_get_request("user-info", msg.get());
+ m_userID = root.get_string_member("userId");
+ m_utils.setUserID(m_userID);
+ Logger.info("bazqux: userID = " + m_userID);
- if(response.status != 200)
- return false;
+ return true;
+ }
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
- {
- Logger.error("getUserID: Could not load message response");
- Logger.error(e.message);
- return false;
- }
- var root = parser.get_root().get_object();
- if(root.has_member("userId"))
- {
- m_userID = root.get_string_member("userId");
- m_utils.setUserID(m_userID);
- Logger.info("bazqux: userID = " + m_userID);
+ return false;
+}
- return true;
- }
+public bool getFeeds(Gee.List feeds)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ var response = m_connection.send_get_request("subscription/list", msg.get());
+ if(response.status != 200)
return false;
- }
- public bool getFeeds(Gee.List feeds)
+ Logger.debug(response.data);
+ var parser = new Json.Parser();
+ try
{
- var msg = new bazquxMessage();
- msg.add("output", "json");
- var response = m_connection.send_get_request("subscription/list", msg.get());
-
- if(response.status != 200)
- return false;
-
- Logger.debug(response.data);
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
- {
- Logger.error("getFeeds: Could not load message response");
- Logger.error(e.message);
- return false;
- }
- var root = parser.get_root().get_object();
- var array = root.get_array_member("subscriptions");
- uint length = array.get_length();
-
- for (uint i = 0; i < length; i++)
- {
- Json.Object object = array.get_object_element(i);
-
- string feedID = object.get_string_member("id");
- string url = object.has_member("htmlUrl") ? object.get_string_member("htmlUrl") : object.get_string_member("url");
- string? icon_url = object.get_string_member("iconUrl");
-
- uint catCount = object.get_array_member("categories").get_length();
- var categories = new Gee.ArrayList();
- for(uint j = 0; j < catCount; ++j)
- {
- categories.add(object.get_array_member("categories").get_object_element(j).get_string_member("id"));
- }
- feeds.add(
- new Feed(
- feedID,
- object.get_string_member("title"),
- url,
- 0,
- categories,
- icon_url
- )
+ parser.load_from_data(response.data, -1);
+ }
+ catch(Error e)
+ {
+ Logger.error("getFeeds: Could not load message response");
+ Logger.error(e.message);
+ return false;
+ }
+ var root = parser.get_root().get_object();
+ var array = root.get_array_member("subscriptions");
+ uint length = array.get_length();
+
+ for (uint i = 0; i < length; i++)
+ {
+ Json.Object object = array.get_object_element(i);
+
+ string feedID = object.get_string_member("id");
+ string url = object.has_member("htmlUrl") ? object.get_string_member("htmlUrl") : object.get_string_member("url");
+ string? icon_url = object.get_string_member("iconUrl");
+
+ uint catCount = object.get_array_member("categories").get_length();
+ var categories = new Gee.ArrayList();
+ for(uint j = 0; j < catCount; ++j)
+ {
+ categories.add(object.get_array_member("categories").get_object_element(j).get_string_member("id"));
+ }
+ feeds.add(
+ new Feed(
+ feedID,
+ object.get_string_member("title"),
+ url,
+ 0,
+ categories,
+ icon_url
+ )
);
- }
- return true;
}
+ return true;
+}
- public bool getCategoriesAndTags(Gee.List feeds, Gee.List categories, Gee.List tags)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
- var response = m_connection.send_get_request("tag/list", msg.get());
+public bool getCategoriesAndTags(Gee.List feeds, Gee.List categories, Gee.List tags)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ var response = m_connection.send_get_request("tag/list", msg.get());
- if(response.status != 200)
- return false;
+ if(response.status != 200)
+ return false;
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
- {
- Logger.error("getCategoriesAndTags: Could not load message response");
- Logger.error(e.message);
- return false;
- }
- var root = parser.get_root().get_object();
- var array = root.get_array_member("tags");
- uint length = array.get_length();
- int orderID = 0;
+ var parser = new Json.Parser();
+ try
+ {
+ parser.load_from_data(response.data, -1);
+ }
+ catch(Error e)
+ {
+ Logger.error("getCategoriesAndTags: Could not load message response");
+ Logger.error(e.message);
+ return false;
+ }
+ var root = parser.get_root().get_object();
+ var array = root.get_array_member("tags");
+ uint length = array.get_length();
+ int orderID = 0;
+
+ var db = DataBase.readOnly();
+ for (uint i = 0; i < length; i++)
+ {
+ Json.Object object = array.get_object_element(i);
+ string id = object.get_string_member("id");
+ int start = id.last_index_of_char('/') + 1;
+ string title = id.substring(start);
- for (uint i = 0; i < length; i++)
+ if(id.contains("/label/"))
{
- Json.Object object = array.get_object_element(i);
- string id = object.get_string_member("id");
- int start = id.last_index_of_char('/') + 1;
- string title = id.substring(start);
-
- if(id.contains("/label/"))
+ if(m_utils.tagIsCat(id, feeds))
{
- if(m_utils.tagIsCat(id, feeds))
- {
- categories.add(
- new Category(
- id,
- title,
- 0,
- orderID,
- CategoryID.MASTER.to_string(),
- 1
+ categories.add(
+ new Category(
+ id,
+ title,
+ 0,
+ orderID,
+ CategoryID.MASTER.to_string(),
+ 1
)
);
- ++orderID;
- }
- else
- {
- tags.add(
- new Tag(
- id,
- title,
- m_db.getTagColor()
+ ++orderID;
+ }
+ else
+ {
+ tags.add(
+ new Tag(
+ id,
+ title,
+ db.getTagColor()
)
);
- }
}
}
- return true;
}
+ return true;
+}
- public int getTotalUnread()
+public int getTotalUnread()
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ var response = m_connection.send_get_request("unread-count", msg.get());
+
+ if(response.status != 200)
+ return 0;
+
+ var parser = new Json.Parser();
+ try
+ {
+ parser.load_from_data(response.data, -1);
+ }
+ catch(Error e)
{
- var msg = new bazquxMessage();
- msg.add("output", "json");
- var response = m_connection.send_get_request("unread-count", msg.get());
+ Logger.error("getTotalUnread: Could not load message response");
+ Logger.error(e.message);
+ }
- if(response.status != 200)
- return 0;
+ var root = parser.get_root().get_object();
+ var array = root.get_array_member("unreadcounts");
+ uint length = array.get_length();
+ int count = 0;
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
+ for (uint i = 0; i < length; i++)
+ {
+ Json.Object object = array.get_object_element(i);
+ if(object.get_string_member("id").has_prefix("feed/"))
{
- Logger.error("getTotalUnread: Could not load message response");
- Logger.error(e.message);
+ count += (int)object.get_int_member("count");
}
- var root = parser.get_root().get_object();
- var array = root.get_array_member("unreadcounts");
- uint length = array.get_length();
- int count = 0;
+ }
- for (uint i = 0; i < length; i++)
- {
- Json.Object object = array.get_object_element(i);
- if(object.get_string_member("id").has_prefix("feed/"))
- {
- count += (int)object.get_int_member("count");
- }
+ Logger.debug("getTotalUnread %i".printf(count));
+ return count;
+}
- }
- Logger.debug("getTotalUnread %i".printf(count));
- return count;
- }
+public string? updateArticles(Gee.List ids, int count, string? continuation = null)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ msg.add("n", count.to_string());
+ msg.add("xt", "user/-/state/com.google/read");
+ if(continuation != null)
+ msg.add("c", continuation);
+ var response = m_connection.send_get_request("stream/items/ids", msg.get());
+
+ if(response.status != 200)
+ return null;
- public string? updateArticles(Gee.List ids, int count, string? continuation = null)
+ var parser = new Json.Parser();
+ try
{
- var msg = new bazquxMessage();
- msg.add("output", "json");
- msg.add("n", count.to_string());
- msg.add("xt", "user/-/state/com.google/read");
- if(continuation != null)
- msg.add("c", continuation);
+ parser.load_from_data(response.data, -1);
+ }
+ catch(Error e)
+ {
+ Logger.error("updateArticles: Could not load message response");
+ Logger.error(e.message);
+ }
- var response = m_connection.send_get_request("stream/items/ids", msg.get());
+ var root = parser.get_root().get_object();
+ var array = root.get_array_member("itemRefs");
+ uint length = array.get_length();
- if(response.status != 200)
- return null;
+ for (uint i = 0; i < length; i++)
+ {
+ Json.Object object = array.get_object_element(i);
+ ids.add(object.get_string_member("id"));
+ }
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
- {
- Logger.error("updateArticles: Could not load message response");
- Logger.error(e.message);
- }
+ if(root.has_member("continuation") && root.get_string_member("continuation") != "")
+ return root.get_string_member("continuation");
- var root = parser.get_root().get_object();
- var array = root.get_array_member("itemRefs");
- uint length = array.get_length();
+ return null;
+}
- for (uint i = 0; i < length; i++)
- {
- Json.Object object = array.get_object_element(i);
- ids.add(object.get_string_member("id"));
- }
+public string? getArticles(Gee.List articles, int count, ArticleStatus whatToGet = ArticleStatus.ALL, string? continuation = null, string? tagID = null, string? feed_id = null)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ msg.add("n", count.to_string());
- if(root.has_member("continuation") && root.get_string_member("continuation") != "")
- return root.get_string_member("continuation");
+ if(whatToGet == ArticleStatus.UNREAD)
+ msg.add("xt", "user/-/state/com.google/read");
+ if(whatToGet == ArticleStatus.READ)
+ msg.add("s", "user/-/state/com.google/read");
+ else if(whatToGet == ArticleStatus.MARKED)
+ msg.add("s", "user/-/state/com.google/starred");
+
+ if( continuation != null )
+ msg.add("c", continuation);
+
+ string api_endpoint = "stream/contents";
+ if(feed_id != null)
+ api_endpoint += "/" + feed_id;
+ else if(tagID != null)
+ api_endpoint += "/" + tagID;
+ var response = m_connection.send_get_request(api_endpoint, msg.get());
+ if(response.status != 200)
return null;
- }
- public string? getArticles(Gee.List articles, int count, ArticleStatus whatToGet = ArticleStatus.ALL, string? continuation = null, string? tagID = null, string? feed_id = null)
+ var parser = new Json.Parser();
+ try
+ {
+ parser.load_from_data(response.data, -1);
+ }
+ catch(Error e)
{
- var msg = new bazquxMessage();
- msg.add("output", "json");
- msg.add("n", count.to_string());
-
- if(whatToGet == ArticleStatus.UNREAD)
- msg.add("xt", "user/-/state/com.google/read");
- if(whatToGet == ArticleStatus.READ)
- msg.add("s", "user/-/state/com.google/read");
- else if(whatToGet == ArticleStatus.MARKED)
- msg.add("s", "user/-/state/com.google/starred");
-
- if( continuation != null )
- msg.add("c", continuation);
-
- string api_endpoint = "stream/contents";
- if(feed_id != null)
- api_endpoint += "/" + feed_id;
- else if(tagID != null)
- api_endpoint += "/" + tagID;
- var response = m_connection.send_get_request(api_endpoint, msg.get());
+ Logger.error("getArticles: Could not load message response");
+ Logger.error(e.message);
+ }
- if(response.status != 200)
- return null;
+ var root = parser.get_root().get_object();
+ var array = root.get_array_member("items");
+ uint length = array.get_length();
- var parser = new Json.Parser();
- try
- {
- parser.load_from_data(response.data, -1);
- }
- catch(Error e)
+ var db = DataBase.readOnly();
+ for (uint i = 0; i < length; i++)
+ {
+ Json.Object object = array.get_object_element(i);
+ string id = object.get_string_member("id");
+ id = id.substring(id.last_index_of_char('/') + 1);
+ bool marked = false;
+ bool read = false;
+ var cats = object.get_array_member("categories");
+ uint cat_length = cats.get_length();
+
+ var tags = new Gee.ArrayList();
+ for (uint j = 0; j < cat_length; j++)
{
- Logger.error("getArticles: Could not load message response");
- Logger.error(e.message);
+ string cat = cats.get_string_element(j);
+ if(cat.has_suffix("com.google/starred"))
+ marked = true;
+ else if(cat.has_suffix("com.google/read"))
+ read = true;
+ else if(cat.contains("/label/") && db.getTagName(cat) != null)
+ tags.add(cat);
}
- var root = parser.get_root().get_object();
- var array = root.get_array_member("items");
- uint length = array.get_length();
-
- for (uint i = 0; i < length; i++)
+ var enclosures = new Gee.ArrayList();
+ if(object.has_member("enclosure"))
{
- Json.Object object = array.get_object_element(i);
- string id = object.get_string_member("id");
- id = id.substring(id.last_index_of_char('/') + 1);
- bool marked = false;
- bool read = false;
- var cats = object.get_array_member("categories");
- uint cat_length = cats.get_length();
+ var attachments = object.get_array_member("enclosure");
- var tags = new Gee.ArrayList();
- for (uint j = 0; j < cat_length; j++)
- {
- string cat = cats.get_string_element(j);
- if(cat.has_suffix("com.google/starred"))
- marked = true;
- else if(cat.has_suffix("com.google/read"))
- read = true;
- else if(cat.contains("/label/") && m_db.getTagName(cat) != null)
- tags.add(cat);
- }
+ uint mediaCount = 0;
+ if(attachments != null)
+ mediaCount = attachments.get_length();
- var enclosures = new Gee.ArrayList();
- if(object.has_member("enclosure"))
+ for(int j = 0; j < mediaCount; ++j)
{
- var attachments = object.get_array_member("enclosure");
+ var attachment = attachments.get_object_element(j);
- uint mediaCount = 0;
- if(attachments != null)
- mediaCount = attachments.get_length();
-
- for(int j = 0; j < mediaCount; ++j)
- {
- var attachment = attachments.get_object_element(j);
-
- enclosures.add(
- new Enclosure(id, attachment.get_string_member("href"),
- EnclosureType.from_string(attachment.get_string_member("type")))
+ enclosures.add(
+ new Enclosure(id, attachment.get_string_member("href"),
+ EnclosureType.from_string(attachment.get_string_member("type")))
);
- }
}
-
- articles.add(new Article(
- id,
- object.get_string_member("title"),
- object.get_array_member("alternate").get_object_element(0).get_string_member("href"),
- object.get_object_member("origin").get_string_member("streamId"),
- read ? ArticleStatus.READ : ArticleStatus.UNREAD,
- marked ? ArticleStatus.MARKED : ArticleStatus.UNMARKED,
- object.get_object_member("summary").get_string_member("content"),
- "",
- object.get_string_member("author"),
- new DateTime.from_unix_local(object.get_int_member("published")),
- -1,
- tags,
- enclosures
- )
- );
}
- if(root.has_member("continuation") && root.get_string_member("continuation") != "")
- return root.get_string_member("continuation");
-
- return null;
+ articles.add(new Article(
+ id,
+ object.get_string_member("title"),
+ object.get_array_member("alternate").get_object_element(0).get_string_member("href"),
+ object.get_object_member("origin").get_string_member("streamId"),
+ read ? ArticleStatus.READ : ArticleStatus.UNREAD,
+ marked ? ArticleStatus.MARKED : ArticleStatus.UNMARKED,
+ object.get_object_member("summary").get_string_member("content"),
+ "",
+ object.get_string_member("author"),
+ new DateTime.from_unix_local(object.get_int_member("published")),
+ -1,
+ tags,
+ enclosures
+ )
+ );
}
+ if(root.has_member("continuation") && root.get_string_member("continuation") != "")
+ return root.get_string_member("continuation");
- public void edidTag(string articleID, string tagID, bool add = true)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
+ return null;
+}
- if(add)
- msg.add("a", tagID);
- else
- msg.add("r", tagID);
- msg.add("i", "tag:google.com,2005:reader/item/" + articleID);
- m_connection.send_post_request("edit-tag", msg.get());
- }
+public void edidTag(string articleID, string tagID, bool add = true)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+
+ if(add)
+ msg.add("a", tagID);
+ else
+ msg.add("r", tagID);
- public void markAsRead(string? streamID = null)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
- msg.add("s", streamID);
- msg.add("ts", "%i000000".printf(Settings.state().get_int("last-sync")));
- m_connection.send_post_request("mark-all-as-read", msg.get());
- }
+ msg.add("i", "tag:google.com,2005:reader/item/" + articleID);
+ m_connection.send_post_request("edit-tag", msg.get());
+}
- public string composeTagID(string tagName)
- {
- return "user/%s/label/%s".printf(m_userID, tagName);
- }
+public void markAsRead(string? streamID = null)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ msg.add("s", streamID);
+ msg.add("ts", "%i000000".printf(Settings.state().get_int("last-sync")));
+ m_connection.send_post_request("mark-all-as-read", msg.get());
+}
- public void deleteTag(string tagID)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
- msg.add("s", tagID);
- m_connection.send_post_request("disable-tag", msg.get());
- }
+public string composeTagID(string tagName)
+{
+ return "user/%s/label/%s".printf(m_userID, tagName);
+}
- public void renameTag(string tagID, string title)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
- msg.add("s", tagID);
- msg.add("dest", composeTagID(title));
- m_connection.send_post_request("rename-tag", msg.get());
- }
+public void deleteTag(string tagID)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ msg.add("s", tagID);
+ m_connection.send_post_request("disable-tag", msg.get());
+}
- public bool editSubscription(bazquxSubscriptionAction action, string feedID, string? title = null, string? add = null, string? remove = null)
- {
- var msg = new bazquxMessage();
- msg.add("output", "json");
+public void renameTag(string tagID, string title)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+ msg.add("s", tagID);
+ msg.add("dest", composeTagID(title));
+ m_connection.send_post_request("rename-tag", msg.get());
+}
- switch(action)
- {
- case bazquxSubscriptionAction.EDIT:
- msg.add("ac", "edit");
- break;
- case bazquxSubscriptionAction.SUBSCRIBE:
- msg.add("ac", "subscribe");
- break;
- case bazquxSubscriptionAction.UNSUBSCRIBE:
- msg.add("ac", "unsubscribe");
- break;
- }
+public bool editSubscription(bazquxSubscriptionAction action, string feedID, string? title = null, string? add = null, string? remove = null)
+{
+ var msg = new bazquxMessage();
+ msg.add("output", "json");
+
+ switch(action)
+ {
+ case bazquxSubscriptionAction.EDIT:
+ msg.add("ac", "edit");
+ break;
+ case bazquxSubscriptionAction.SUBSCRIBE:
+ msg.add("ac", "subscribe");
+ break;
+ case bazquxSubscriptionAction.UNSUBSCRIBE:
+ msg.add("ac", "unsubscribe");
+ break;
+ }
- msg.add("s", feedID);
+ msg.add("s", feedID);
- if(title != null)
- msg.add("t", title);
+ if(title != null)
+ msg.add("t", title);
- if(add != null)
- msg.add("a", add);
+ if(add != null)
+ msg.add("a", add);
- if(remove != null)
- msg.add("r", remove);
+ if(remove != null)
+ msg.add("r", remove);
- var response = m_connection.send_post_request("subscription/edit", msg.get());
+ var response = m_connection.send_post_request("subscription/edit", msg.get());
- return response.status == 200;
- }
+ return response.status == 200;
+}
}
diff -pruN 2.6.1-1/plugins/backend/bazqux/bazquxConnection.vala 2.7.1-1/plugins/backend/bazqux/bazquxConnection.vala
--- 2.6.1-1/plugins/backend/bazqux/bazquxConnection.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/bazqux/bazquxConnection.vala 2019-02-01 19:30:50.000000000 +0000
@@ -14,129 +14,129 @@
// along with FeedReader. If not, see .
public class FeedReader.bazquxConnection {
- private string m_username;
- private string m_api_code;
- private string m_passwd;
- private bazquxUtils m_utils;
- private Soup.Session m_session;
-
- public bazquxConnection(bazquxUtils utils)
- {
- m_utils = utils;
- m_username = m_utils.getUser();
- m_api_code = m_utils.getAccessToken();
- m_passwd = m_utils.getPasswd();
- m_session = new Soup.Session();
- m_session.user_agent = Constants.USER_AGENT;
- }
-
- public LoginResponse getToken()
- {
- Logger.debug("bazqux Connection: getToken()");
+private string m_username;
+private string m_api_code;
+private string m_passwd;
+private bazquxUtils m_utils;
+private Soup.Session m_session;
+
+public bazquxConnection(bazquxUtils utils)
+{
+ m_utils = utils;
+ m_username = m_utils.getUser();
+ m_api_code = m_utils.getAccessToken();
+ m_passwd = m_utils.getPasswd();
+ m_session = new Soup.Session();
+ m_session.user_agent = Constants.USER_AGENT;
+}
- if(m_username == "" && m_passwd == "")
- return LoginResponse.ALL_EMPTY;
- if(m_username == "")
- return LoginResponse.MISSING_USER;
- if(m_passwd == "")
- return LoginResponse.MISSING_PASSWD;
+public LoginResponse getToken()
+{
+ Logger.debug("bazqux Connection: getToken()");
+
+ if(m_username == "" && m_passwd == "")
+ return LoginResponse.ALL_EMPTY;
+ if(m_username == "")
+ return LoginResponse.MISSING_USER;
+ if(m_passwd == "")
+ return LoginResponse.MISSING_PASSWD;
+
+ var message = new Soup.Message("POST", "https://bazqux.com/accounts/ClientLogin/");
+ string message_string = "Email=" + m_username + "&Passwd=" + m_passwd;
+ message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, message_string.data);
+ m_session.send_message(message);
+ string response = (string)message.response_body.flatten().data;
+ try{
- var message = new Soup.Message("POST", "https://bazqux.com/accounts/ClientLogin/");
- string message_string = "Email=" + m_username + "&Passwd=" + m_passwd;
- message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, message_string.data);
- m_session.send_message(message);
- string response = (string)message.response_body.flatten().data;
- try{
-
- var regex = new Regex(".*\\w\\s.*\\w\\sAuth=");
- if(regex.match(response))
- {
- Logger.error("Regex bazqux - %s".printf(response));
- string split = regex.replace( response, -1,0,"");
- Logger.error("authcode"+split);
- m_utils.setAccessToken(split.strip());
- return LoginResponse.SUCCESS;
- }
- else
- {
- Logger.debug(response);
- return LoginResponse.WRONG_LOGIN;
- }
+ var regex = new Regex(".*\\w\\s.*\\w\\sAuth=");
+ if(regex.match(response))
+ {
+ Logger.error("Regex bazqux - %s".printf(response));
+ string split = regex.replace( response, -1,0,"");
+ Logger.error("authcode"+split);
+ m_utils.setAccessToken(split.strip());
+ return LoginResponse.SUCCESS;
}
- catch(Error e)
+ else
{
- Logger.error("bazquxConnection - getToken: Could not load message response");
- Logger.error(e.message);
- return LoginResponse.UNKNOWN_ERROR;
+ Logger.debug(response);
+ return LoginResponse.WRONG_LOGIN;
}
}
-
- public Response send_get_request(string path, string? message_string = null)
+ catch(Error e)
{
- return send_request(path, "GET", message_string);
+ Logger.error("bazquxConnection - getToken: Could not load message response");
+ Logger.error(e.message);
+ return LoginResponse.UNKNOWN_ERROR;
}
+}
- public Response send_post_request(string path, string? message_string = null)
- {
- return send_request(path, "POST", message_string);
- }
+public Response send_get_request(string path, string? message_string = null)
+{
+ return send_request(path, "GET", message_string);
+}
- private Response send_request(string path, string type, string? message_string = null)
- {
+public Response send_post_request(string path, string? message_string = null)
+{
+ return send_request(path, "POST", message_string);
+}
- var message = new Soup.Message(type, bazquxSecret.base_uri + path);
+private Response send_request(string path, string type, string? message_string = null)
+{
- string oldauth = "GoogleLogin auth=" + m_utils.getAccessToken();
- message.request_headers.append("Authorization", oldauth);
+ var message = new Soup.Message(type, bazquxSecret.base_uri + path);
- if(message_string != null)
- message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, message_string.data);
+ string oldauth = "GoogleLogin auth=" + m_utils.getAccessToken();
+ message.request_headers.append("Authorization", oldauth);
- m_session.send_message(message);
+ if(message_string != null)
+ message.set_request("application/x-www-form-urlencoded", Soup.MemoryUse.COPY, message_string.data);
- return Response() {
- status = message.status_code,
- data = (string)message.response_body.flatten().data
- };
- }
+ m_session.send_message(message);
- public bool ping()
- {
- var message = new Soup.Message("GET", "https://www.bazqux.com/reader/ping");
+ return Response() {
+ status = message.status_code,
+ data = (string)message.response_body.flatten().data
+ };
+}
- string oldauth = "GoogleLogin auth=" + m_utils.getAccessToken();
- message.request_headers.append("Authorization", oldauth);
- m_session.send_message(message);
+public bool ping()
+{
+ var message = new Soup.Message("GET", "https://www.bazqux.com/reader/ping");
+
+ string oldauth = "GoogleLogin auth=" + m_utils.getAccessToken();
+ message.request_headers.append("Authorization", oldauth);
+ m_session.send_message(message);
- if((string)message.response_body.data == "OK")
- return true;
+ if((string)message.response_body.data == "OK")
+ return true;
- return false;
- }
+ return false;
+}
}
public class FeedReader.bazquxMessage {
- string request = "";
-
- public bazquxMessage()
- {
+string request = "";
- }
+public bazquxMessage()
+{
- public void add(string parameter, string val)
- {
- if(request != "")
- request += "&";
+}
- request += parameter;
- request += "=";
- request += GLib.Uri.escape_string(val);
- }
+public void add(string parameter, string val)
+{
+ if(request != "")
+ request += "&";
+
+ request += parameter;
+ request += "=";
+ request += GLib.Uri.escape_string(val);
+}
- public string get()
- {
- return request;
- }
+public string get()
+{
+ return request;
+}
}
diff -pruN 2.6.1-1/plugins/backend/bazqux/bazquxInterface.vala 2.7.1-1/plugins/backend/bazqux/bazquxInterface.vala
--- 2.6.1-1/plugins/backend/bazqux/bazquxInterface.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/bazqux/bazquxInterface.vala 2019-02-01 19:30:50.000000000 +0000
@@ -15,423 +15,395 @@
public class FeedReader.bazquxInterface : Peas.ExtensionBase, FeedServerInterface {
- private bazquxAPI m_api;
- private bazquxUtils m_utils;
- private Gtk.Entry m_userEntry;
- private Gtk.Entry m_passwordEntry;
- private DataBaseReadOnly m_db;
- private DataBase m_db_write;
-
- public void init(GLib.SettingsBackend? settings_backend, Secret.Collection secrets, DataBaseReadOnly db, DataBase db_write)
- {
- m_db = db;
- m_db_write = db_write;
- m_utils = new bazquxUtils(settings_backend, secrets);
- m_api = new bazquxAPI(m_utils, db);
- }
+private bazquxAPI m_api;
+private bazquxUtils m_utils;
+private Gtk.Entry m_userEntry;
+private Gtk.Entry m_passwordEntry;
+
+public void init(GLib.SettingsBackend? settings_backend, Secret.Collection secrets)
+{
+ m_utils = new bazquxUtils(settings_backend, secrets);
+ m_api = new bazquxAPI(m_utils);
+}
- public string getWebsite()
- {
- return "https://bazqux.com/";
- }
+public string getWebsite()
+{
+ return "https://bazqux.com/";
+}
- public BackendFlags getFlags()
- {
- return (BackendFlags.HOSTED | BackendFlags.PROPRIETARY | BackendFlags.PAID);
- }
+public BackendFlags getFlags()
+{
+ return (BackendFlags.HOSTED | BackendFlags.PROPRIETARY | BackendFlags.PAID);
+}
- public string getID()
- {
- return "bazqux";
- }
+public string getID()
+{
+ return "bazqux";
+}
- public string iconName()
- {
- return "feed-service-bazqux";
- }
+public string iconName()
+{
+ return "feed-service-bazqux";
+}
- public string serviceName()
- {
- return "BazQux";
- }
+public string serviceName()
+{
+ return "BazQux";
+}
- public bool needWebLogin()
- {
- return false;
- }
+public bool needWebLogin()
+{
+ return false;
+}
- public Gtk.Box? getWidget()
- {
- var user_label = new Gtk.Label(_("Username:"));
- var password_label = new Gtk.Label(_("Password:"));
+public Gtk.Box? getWidget()
+{
+ var user_label = new Gtk.Label(_("Username:"));
+ var password_label = new Gtk.Label(_("Password:"));
+
+ user_label.set_alignment(1.0f, 0.5f);
+ password_label.set_alignment(1.0f, 0.5f);
+
+ user_label.set_hexpand(true);
+ password_label.set_hexpand(true);
+
+ m_userEntry = new Gtk.Entry();
+ m_passwordEntry = new Gtk.Entry();
+
+ m_userEntry.activate.connect(() => { tryLogin(); });
+ m_passwordEntry.activate.connect(() => { tryLogin(); });
+
+ m_passwordEntry.set_invisible_char('*');
+ m_passwordEntry.set_visibility(false);
+
+ var grid = new Gtk.Grid();
+ grid.set_column_spacing(10);
+ grid.set_row_spacing(10);
+ grid.set_valign(Gtk.Align.CENTER);
+ grid.set_halign(Gtk.Align.CENTER);
+
+ grid.attach(user_label, 0, 0, 1, 1);
+ grid.attach(m_userEntry, 1, 0, 1, 1);
+ grid.attach(password_label, 0, 1, 1, 1);
+ grid.attach(m_passwordEntry, 1, 1, 1, 1);
+
+ var logo = new Gtk.Image.from_icon_name("feed-service-bazqux", Gtk.IconSize.MENU);
+
+ var loginLabel = new Gtk.Label(_("Please log in to FeedHQ and enjoy using FeedReader"));
+ loginLabel.get_style_context().add_class("h2");
+ loginLabel.set_justify(Gtk.Justification.CENTER);
+ loginLabel.set_lines(3);
+
+ var loginButton = new Gtk.Button.with_label(_("Login"));
+ loginButton.halign = Gtk.Align.END;
+ loginButton.set_size_request(80, 30);
+ loginButton.get_style_context().add_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+ loginButton.clicked.connect(() => { tryLogin(); });
+
+ var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 10);
+ box.valign = Gtk.Align.CENTER;
+ box.halign = Gtk.Align.CENTER;
+ box.pack_start(loginLabel, false, false, 10);
+ box.pack_start(logo, false, false, 10);
+ box.pack_start(grid, true, true, 10);
+ box.pack_end(loginButton, false, false, 20);
- user_label.set_alignment(1.0f, 0.5f);
- password_label.set_alignment(1.0f, 0.5f);
+ m_userEntry.set_text(m_utils.getUser());
+ m_passwordEntry.set_text(m_utils.getPasswd());
- user_label.set_hexpand(true);
- password_label.set_hexpand(true);
+ return box;
+}
- m_userEntry = new Gtk.Entry();
- m_passwordEntry = new Gtk.Entry();
-
- m_userEntry.activate.connect(() => { tryLogin(); });
- m_passwordEntry.activate.connect(() => { tryLogin(); });
-
- m_passwordEntry.set_invisible_char('*');
- m_passwordEntry.set_visibility(false);
-
- var grid = new Gtk.Grid();
- grid.set_column_spacing(10);
- grid.set_row_spacing(10);
- grid.set_valign(Gtk.Align.CENTER);
- grid.set_halign(Gtk.Align.CENTER);
-
- grid.attach(user_label, 0, 0, 1, 1);
- grid.attach(m_userEntry, 1, 0, 1, 1);
- grid.attach(password_label, 0, 1, 1, 1);
- grid.attach(m_passwordEntry, 1, 1, 1, 1);
-
- var logo = new Gtk.Image.from_icon_name("feed-service-bazqux", Gtk.IconSize.MENU);
-
- var loginLabel = new Gtk.Label(_("Please log in to FeedHQ and enjoy using FeedReader"));
- loginLabel.get_style_context().add_class("h2");
- loginLabel.set_justify(Gtk.Justification.CENTER);
- loginLabel.set_lines(3);
-
- var loginButton = new Gtk.Button.with_label(_("Login"));
- loginButton.halign = Gtk.Align.END;
- loginButton.set_size_request(80, 30);
- loginButton.get_style_context().add_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
- loginButton.clicked.connect(() => { tryLogin(); });
-
- var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 10);
- box.valign = Gtk.Align.CENTER;
- box.halign = Gtk.Align.CENTER;
- box.pack_start(loginLabel, false, false, 10);
- box.pack_start(logo, false, false, 10);
- box.pack_start(grid, true, true, 10);
- box.pack_end(loginButton, false, false, 20);
+public void showHtAccess()
+{
- m_userEntry.set_text(m_utils.getUser());
- m_passwordEntry.set_text(m_utils.getPasswd());
+}
- return box;
- }
+public void writeData()
+{
+ m_utils.setUser(m_userEntry.get_text());
+ m_utils.setPassword(m_passwordEntry.get_text());
+}
- public void showHtAccess()
- {
+public string buildLoginURL()
+{
+ return "";
+}
- }
+public async void postLoginAction()
+{
+ return;
+}
- public void writeData()
- {
- m_utils.setUser(m_userEntry.get_text());
- m_utils.setPassword(m_passwordEntry.get_text());
- }
+public bool extractCode(string redirectURL)
+{
+ return false;
+}
- public string buildLoginURL()
- {
- return "";
- }
+public bool supportTags()
+{
+ return true;
+}
- public async void postLoginAction()
- {
- return;
- }
+public bool supportFeedManipulation()
+{
+ return true;
+}
- public bool extractCode(string redirectURL)
- {
- return false;
- }
+public bool doInitSync()
+{
+ return true;
+}
- public bool supportTags()
- {
- return true;
- }
+public string symbolicIcon()
+{
+ return "feed-service-bazqux-symbolic";
+}
- public bool supportFeedManipulation()
- {
- return true;
- }
+public string accountName()
+{
+ return m_utils.getUser();
+}
- public bool doInitSync()
- {
- return true;
- }
+public string getServerURL()
+{
+ return "https://bazqux.com/";
+}
- public string symbolicIcon()
- {
- return "feed-service-bazqux-symbolic";
- }
+public string uncategorizedID()
+{
+ return "";
+}
- public string accountName()
- {
- return m_utils.getUser();
- }
+public bool supportCategories()
+{
+ return true;
+}
+public bool hideCategoryWhenEmpty(string cadID)
+{
+ return false;
+}
- public string getServerURL()
- {
- return "https://bazqux.com/";
- }
+public bool supportMultiLevelCategories()
+{
+ return false;
+}
- public string uncategorizedID()
- {
- return "";
- }
+public bool supportMultiCategoriesPerFeed()
+{
+ return false;
+}
- public bool supportCategories()
- {
- return true;
- }
- public bool hideCategoryWhenEmpty(string cadID)
- {
- return false;
- }
+public bool syncFeedsAndCategories()
+{
+ return true;
+}
- public bool supportMultiLevelCategories()
- {
- return false;
- }
+public bool tagIDaffectedByNameChange()
+{
+ return true;
+}
- public bool supportMultiCategoriesPerFeed()
- {
- return false;
- }
+public void resetAccount()
+{
+ m_utils.resetAccount();
+}
- public bool syncFeedsAndCategories()
- {
- return true;
- }
+public bool useMaxArticles()
+{
+ return true;
+}
- public bool tagIDaffectedByNameChange()
- {
- return true;
- }
+public LoginResponse login()
+{
+ return m_api.login();
+}
- public void resetAccount()
- {
- m_utils.resetAccount();
- }
+public bool logout()
+{
+ return true;
+}
- public bool useMaxArticles()
- {
- return true;
- }
+public void setArticleIsRead(string articleIDs, ArticleStatus read)
+{
+ if(read == ArticleStatus.READ)
+ m_api.edidTag(articleIDs, "user/-/state/com.google/read");
+ else
+ m_api.edidTag(articleIDs, "user/-/state/com.google/read", false);
+}
- public LoginResponse login()
- {
- return m_api.login();
- }
+public void setArticleIsMarked(string articleID, ArticleStatus marked)
+{
+ if(marked == ArticleStatus.MARKED)
+ m_api.edidTag(articleID, "user/-/state/com.google/starred");
+ else
+ m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
+}
- public bool logout()
- {
- return true;
- }
+public bool alwaysSetReadByID()
+{
+ return false;
+}
- public void setArticleIsRead(string articleIDs, ArticleStatus read)
- {
- if(read == ArticleStatus.READ)
- m_api.edidTag(articleIDs, "user/-/state/com.google/read");
- else
- m_api.edidTag(articleIDs, "user/-/state/com.google/read", false);
- }
+public void setFeedRead(string feedID)
+{
+ m_api.markAsRead(feedID);
+}
- public void setArticleIsMarked(string articleID, ArticleStatus marked)
- {
- if(marked == ArticleStatus.MARKED)
- m_api.edidTag(articleID, "user/-/state/com.google/starred");
- else
- m_api.edidTag(articleID, "user/-/state/com.google/starred", false);
- }
+public void setCategoryRead(string catID)
+{
+ m_api.markAsRead(catID);
+}
- public bool alwaysSetReadByID()
+public void markAllItemsRead()
+{
+ var db = DataBase.readOnly();
+ var categories = db.read_categories();
+ foreach(Category cat in categories)
{
- return false;
+ m_api.markAsRead(cat.getCatID());
}
- public void setFeedRead(string feedID)
+ var feeds = db.read_feeds_without_cat();
+ foreach(Feed feed in feeds)
{
- m_api.markAsRead(feedID);
+ m_api.markAsRead(feed.getFeedID());
}
+ m_api.markAsRead();
+}
- public void setCategoryRead(string catID)
- {
- m_api.markAsRead(catID);
- }
+public void tagArticle(string articleID, string tagID)
+{
+ m_api.edidTag(articleID, tagID, true);
+}
- public void markAllItemsRead()
- {
- var categories = m_db.read_categories();
- foreach(Category cat in categories)
- {
- m_api.markAsRead(cat.getCatID());
- }
+public void removeArticleTag(string articleID, string tagID)
+{
+ m_api.edidTag(articleID, tagID, false);
+}
- var feeds = m_db.read_feeds_without_cat();
- foreach(Feed feed in feeds)
- {
- m_api.markAsRead(feed.getFeedID());
- }
- m_api.markAsRead();
- }
+public string createTag(string caption)
+{
+ return m_api.composeTagID(caption);
+}
- public void tagArticle(string articleID, string tagID)
- {
- m_api.edidTag(articleID, tagID, true);
- }
+public void deleteTag(string tagID)
+{
+ m_api.deleteTag(tagID);
+}
- public void removeArticleTag(string articleID, string tagID)
- {
- m_api.edidTag(articleID, tagID, false);
- }
+public void renameTag(string tagID, string title)
+{
+ m_api.renameTag(tagID, title);
+}
- public string createTag(string caption)
- {
- return m_api.composeTagID(caption);
- }
+public bool serverAvailable()
+{
+ return m_api.ping();
+}
- public void deleteTag(string tagID)
- {
- m_api.deleteTag(tagID);
- }
+public bool addFeed(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg)
+{
+ feedID = "feed/" + feedURL;
+ bool success = false;
+ errmsg = "";
- public void renameTag(string tagID, string title)
+ if(catID == null && newCatName != null)
{
- m_api.renameTag(tagID, title);
+ string newCatID = m_api.composeTagID(newCatName);
+ success = m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.SUBSCRIBE, "feed/"+feedURL, null, newCatID);
}
-
- public bool serverAvailable()
+ else
{
- return m_api.ping();
+ success = m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.SUBSCRIBE, "feed/"+feedURL, null, catID);
}
- public bool addFeed(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg)
- {
- feedID = "feed/" + feedURL;
- bool success = false;
- errmsg = "";
+ if(!success)
+ errmsg = @"bazqux could not subscribe to $feedURL";
- if(catID == null && newCatName != null)
- {
- string newCatID = m_api.composeTagID(newCatName);
- success = m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.SUBSCRIBE, "feed/"+feedURL, null, newCatID);
- }
- else
- {
- success = m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.SUBSCRIBE, "feed/"+feedURL, null, catID);
- }
+ return success;
+}
- if(!success)
- errmsg = @"bazqux could not subscribe to $feedURL";
+public void addFeeds(Gee.List feeds)
+{
+ //FIXME
+}
- return success;
- }
+public void removeFeed(string feedID)
+{
+ m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.UNSUBSCRIBE, feedID);
+}
- public void addFeeds(Gee.List feeds)
- {
- //FIXME
- }
+public void renameFeed(string feedID, string title)
+{
+ m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.EDIT, feedID, title);
+}
- public void removeFeed(string feedID)
- {
- m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.UNSUBSCRIBE, feedID);
- }
+public void moveFeed(string feedID, string newCatID, string? currentCatID)
+{
+ m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.EDIT, feedID, null, newCatID, currentCatID);
+}
- public void renameFeed(string feedID, string title)
- {
- m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.EDIT, feedID, title);
- }
+public string createCategory(string title, string? parentID)
+{
+ return m_api.composeTagID(title);
+}
- public void moveFeed(string feedID, string newCatID, string? currentCatID)
- {
- m_api.editSubscription(bazquxAPI.bazquxSubscriptionAction.EDIT, feedID, null, newCatID, currentCatID);
- }
+public void renameCategory(string catID, string title)
+{
+ m_api.renameTag(catID, title);
+}
- public string createCategory(string title, string? parentID)
- {
- return m_api.composeTagID(title);
- }
+public void moveCategory(string catID, string newParentID)
+{
+ return;
+}
- public void renameCategory(string catID, string title)
- {
- m_api.renameTag(catID, title);
- }
+public void deleteCategory(string catID)
+{
+ m_api.deleteTag(catID);
+}
- public void moveCategory(string catID, string newParentID)
- {
- return;
- }
+public void removeCatFromFeed(string feedID, string catID)
+{
+ return;
+}
- public void deleteCategory(string catID)
- {
- m_api.deleteTag(catID);
- }
+public void importOPML(string opml)
+{
+ var parser = new OPMLparser(opml);
+ parser.parse();
+}
- public void removeCatFromFeed(string feedID, string catID)
+public bool getFeedsAndCats(Gee.List feeds, Gee.List categories, Gee.List tags, GLib.Cancellable? cancellable = null)
+{
+ if(m_api.getFeeds(feeds))
{
- return;
- }
+ if(cancellable != null && cancellable.is_cancelled())
+ return false;
- public void importOPML(string opml)
- {
- var parser = new OPMLparser(opml);
- parser.parse();
+ if(m_api.getCategoriesAndTags(feeds, categories, tags))
+ return true;
}
+ return false;
+}
- public bool getFeedsAndCats(Gee.List feeds, Gee.List categories, Gee.List tags, GLib.Cancellable? cancellable = null)
- {
- if(m_api.getFeeds(feeds))
- {
- if(cancellable != null && cancellable.is_cancelled())
- return false;
-
- if(m_api.getCategoriesAndTags(feeds, categories, tags))
- return true;
- }
- return false;
- }
+public int getUnreadCount()
+{
+ return m_api.getTotalUnread();
+}
- public int getUnreadCount()
+public void getArticles(int count, ArticleStatus whatToGet, DateTime? since, string? feedID, bool isTagID, GLib.Cancellable? cancellable = null)
+{
+ if(whatToGet == ArticleStatus.READ)
{
- return m_api.getTotalUnread();
+ return;
}
-
- public void getArticles(int count, ArticleStatus whatToGet, DateTime? since, string? feedID, bool isTagID, GLib.Cancellable? cancellable = null)
+ else if(whatToGet == ArticleStatus.ALL)
{
- if(whatToGet == ArticleStatus.READ)
- {
- return;
- }
- else if(whatToGet == ArticleStatus.ALL)
- {
- var unreadIDs = new Gee.LinkedList();
- string? continuation = null;
- int left = 4*count;
-
- while(left > 0)
- {
- if(cancellable != null && cancellable.is_cancelled())
- return;
-
- if(left > 1000)
- {
- continuation = m_api.updateArticles(unreadIDs, 1000, continuation);
- left -= 1000;
- }
- else
- {
- m_api.updateArticles(unreadIDs, left, continuation);
- left = 0;
- }
- }
- m_db_write.updateArticlesByID(unreadIDs, "unread");
- }
-
- var articles = new Gee.LinkedList();
+ var unreadIDs = new Gee.LinkedList();
string? continuation = null;
- int left = count;
- string? bazqux_feedID = (isTagID) ? null : feedID;
- string? bazqux_tagID = (isTagID) ? feedID : null;
+ int left = 4*count;
while(left > 0)
{
@@ -440,18 +412,43 @@ public class FeedReader.bazquxInterface
if(left > 1000)
{
- continuation = m_api.getArticles(articles, 1000, whatToGet, continuation, bazqux_tagID, bazqux_feedID);
+ continuation = m_api.updateArticles(unreadIDs, 1000, continuation);
left -= 1000;
}
else
{
- continuation = m_api.getArticles(articles, left, whatToGet, continuation, bazqux_tagID, bazqux_feedID);
+ m_api.updateArticles(unreadIDs, left, continuation);
left = 0;
}
}
- writeArticles(articles);
+ DataBase.writeAccess().updateArticlesByID(unreadIDs, "unread");
}
+ var articles = new Gee.LinkedList();
+ string? continuation = null;
+ int left = count;
+ string? bazqux_feedID = (isTagID) ? null : feedID;
+ string? bazqux_tagID = (isTagID) ? feedID : null;
+
+ while(left > 0)
+ {
+ if(cancellable != null && cancellable.is_cancelled())
+ return;
+
+ if(left > 1000)
+ {
+ continuation = m_api.getArticles(articles, 1000, whatToGet, continuation, bazqux_tagID, bazqux_feedID);
+ left -= 1000;
+ }
+ else
+ {
+ continuation = m_api.getArticles(articles, left, whatToGet, continuation, bazqux_tagID, bazqux_feedID);
+ left = 0;
+ }
+ }
+ writeArticles(articles);
+}
+
}
[ModuleInit]
diff -pruN 2.6.1-1/plugins/backend/bazqux/bazquxUtils.vala 2.7.1-1/plugins/backend/bazqux/bazquxUtils.vala
--- 2.6.1-1/plugins/backend/bazqux/bazquxUtils.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/bazqux/bazquxUtils.vala 2019-02-01 19:30:50.000000000 +0000
@@ -14,87 +14,87 @@
// along with FeedReader. If not, see .
namespace FeedReader.bazquxSecret {
- const string base_uri = "https://www.bazqux.com/reader/api/0/";
+const string base_uri = "https://www.bazqux.com/reader/api/0/";
}
public class FeedReader.bazquxUtils : GLib.Object {
- private GLib.Settings m_settings;
- private Password m_password;
+private GLib.Settings m_settings;
+private Password m_password;
- public bazquxUtils(GLib.SettingsBackend? settings_backend, Secret.Collection secrets)
- {
- if(settings_backend != null)
- m_settings = new GLib.Settings.with_backend("org.gnome.feedreader.bazqux", settings_backend);
- else
- m_settings = new GLib.Settings("org.gnome.feedreader.bazqux");
-
- var password_schema = new Secret.Schema ("org.gnome.feedreader.bazqux", Secret.SchemaFlags.NONE,
- "type", Secret.SchemaAttributeType.STRING,
- "Username", Secret.SchemaAttributeType.STRING);
- m_password = new Password(secrets, password_schema, "Feedserver login", () => {
+public bazquxUtils(GLib.SettingsBackend? settings_backend, Secret.Collection secrets)
+{
+ if(settings_backend != null)
+ m_settings = new GLib.Settings.with_backend("org.gnome.feedreader.bazqux", settings_backend);
+ else
+ m_settings = new GLib.Settings("org.gnome.feedreader.bazqux");
+
+ var password_schema = new Secret.Schema ("org.gnome.feedreader.bazqux", Secret.SchemaFlags.NONE,
+ "type", Secret.SchemaAttributeType.STRING,
+ "Username", Secret.SchemaAttributeType.STRING);
+ m_password = new Password(secrets, password_schema, "Feedserver login", () => {
var attributes = new GLib.HashTable(str_hash, str_equal);
attributes["type"] = "BazQux";
attributes["Username"] = getUser();
return attributes;
});
- }
+}
- public string getUser()
- {
- return Utils.gsettingReadString(m_settings, "username");
- }
+public string getUser()
+{
+ return Utils.gsettingReadString(m_settings, "username");
+}
- public void setUser(string user)
- {
- Utils.gsettingWriteString(m_settings, "username", user);
- }
+public void setUser(string user)
+{
+ Utils.gsettingWriteString(m_settings, "username", user);
+}
- public string getAccessToken()
- {
- return Utils.gsettingReadString(m_settings, "access-token");
- }
+public string getAccessToken()
+{
+ return Utils.gsettingReadString(m_settings, "access-token");
+}
- public void setAccessToken(string token)
- {
- Utils.gsettingWriteString(m_settings, "access-token", token);
- }
+public void setAccessToken(string token)
+{
+ Utils.gsettingWriteString(m_settings, "access-token", token);
+}
- public string getUserID()
- {
- return Utils.gsettingReadString(m_settings, "user-id");
- }
+public string getUserID()
+{
+ return Utils.gsettingReadString(m_settings, "user-id");
+}
- public void setUserID(string id)
- {
- Utils.gsettingWriteString(m_settings, "user-id", id);
- }
+public void setUserID(string id)
+{
+ Utils.gsettingWriteString(m_settings, "user-id", id);
+}
- public void resetAccount()
- {
- Utils.resetSettings(m_settings);
- m_password.delete_password();
- }
+public void resetAccount()
+{
+ Utils.resetSettings(m_settings);
+ m_password.delete_password();
+}
- public string getPasswd()
- {
- return m_password.get_password();
- }
+public string getPasswd()
+{
+ return m_password.get_password();
+}
- public void setPassword(string passwd)
- {
- m_password.set_password(passwd);
- }
+public void setPassword(string passwd)
+{
+ m_password.set_password(passwd);
+}
- public bool tagIsCat(string tagID, Gee.List feeds)
+public bool tagIsCat(string tagID, Gee.List feeds)
+{
+ foreach(Feed feed in feeds)
{
- foreach(Feed feed in feeds)
+ if(feed.hasCat(tagID))
{
- if(feed.hasCat(tagID))
- {
- return true;
- }
+ return true;
}
- return false;
}
+ return false;
+}
}
diff -pruN 2.6.1-1/plugins/backend/decsync/decsyncInterface.vala 2.7.1-1/plugins/backend/decsync/decsyncInterface.vala
--- 2.6.1-1/plugins/backend/decsync/decsyncInterface.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/decsyncInterface.vala 2019-02-01 19:30:50.000000000 +0000
@@ -15,515 +15,514 @@
public class FeedReader.decsyncInterface : Peas.ExtensionBase, FeedServerInterface {
- internal DecsyncUtils m_utils;
- private Soup.Session m_session;
- internal Decsync m_sync;
- private string m_loginDir;
- private Gtk.Button loginButton;
- private Gtk.Spinner waitingSpinner;
- private Gtk.Stack loginStack;
- internal DataBaseReadOnly m_db;
- internal DataBase m_db_write;
-
- public void init(GLib.SettingsBackend? settings_backend, Secret.Collection secrets, DataBaseReadOnly db, DataBase db_write)
- {
- m_db = db;
- m_db_write = db_write;
- m_utils = new DecsyncUtils(settings_backend);
- m_session = new Soup.Session();
- m_session.user_agent = Constants.USER_AGENT;
- m_session.timeout = 5;
- }
+internal DecsyncUtils m_utils;
+private Soup.Session m_session;
+internal Decsync m_sync;
+private string m_loginDir;
+private Gtk.Button loginButton;
+private Gtk.Spinner waitingSpinner;
+private Gtk.Stack loginStack;
+
+public void init(GLib.SettingsBackend? settings_backend, Secret.Collection secrets)
+{
+ m_utils = new DecsyncUtils(settings_backend);
+ m_session = new Soup.Session();
+ m_session.user_agent = Constants.USER_AGENT;
+ m_session.timeout = 5;
+}
- private bool initDecsync()
+private bool initDecsync()
+{
+ var decsyncDir = m_utils.getDecsyncDir();
+ if (decsyncDir == "")
{
- var decsyncDir = m_utils.getDecsyncDir();
- if (decsyncDir == "")
- {
- return false;
- }
- var dir = getDecsyncSubdir(decsyncDir, "rss");
- var ownAppId = getAppId("FeedReader");
- var listeners = new Gee.ArrayList();
- listeners.add(new DecsyncListeners.ReadMarkListener(true, this));
- listeners.add(new DecsyncListeners.ReadMarkListener(false, this));
- listeners.add(new DecsyncListeners.SubscriptionsListener(this));
- listeners.add(new DecsyncListeners.FeedNamesListener(this));
- listeners.add(new DecsyncListeners.CategoriesListener(this));
- listeners.add(new DecsyncListeners.CategoryNamesListener(this));
- listeners.add(new DecsyncListeners.CategoryParentsListener(this));
- m_sync = new Decsync(dir, ownAppId, listeners);
- m_sync.syncComplete.connect((extra) => {
+ return false;
+ }
+ var dir = getDecsyncSubdir(decsyncDir, "rss");
+ var ownAppId = getAppId("FeedReader");
+ var listeners = new Gee.ArrayList();
+ listeners.add(new DecsyncListeners.ReadMarkListener(true, this));
+ listeners.add(new DecsyncListeners.ReadMarkListener(false, this));
+ listeners.add(new DecsyncListeners.SubscriptionsListener(this));
+ listeners.add(new DecsyncListeners.FeedNamesListener(this));
+ listeners.add(new DecsyncListeners.CategoriesListener(this));
+ listeners.add(new DecsyncListeners.CategoryNamesListener(this));
+ listeners.add(new DecsyncListeners.CategoryParentsListener(this));
+ m_sync = new Decsync(dir, ownAppId, listeners);
+ m_sync.syncComplete.connect((extra) => {
FeedReaderBackend.get_default().updateBadge();
refreshFeedListCounter();
newFeedList();
updateArticleList();
});
- m_sync.initMonitor(new Unit());
- return true;
- }
+ m_sync.initMonitor(new Unit());
+ return true;
+}
- public string getWebsite()
- {
- return "https://github.com/39aldo39/DecSync";
- }
+public string getWebsite()
+{
+ return "https://github.com/39aldo39/DecSync";
+}
- public BackendFlags getFlags()
- {
- return (BackendFlags.LOCAL | BackendFlags.FREE_SOFTWARE | BackendFlags.FREE);
- }
+public BackendFlags getFlags()
+{
+ return (BackendFlags.LOCAL | BackendFlags.FREE_SOFTWARE | BackendFlags.FREE);
+}
- public string getID()
- {
- return "decsync";
- }
+public string getID()
+{
+ return "decsync";
+}
- public string iconName()
- {
- return "feed-service-decsync";
- }
+public string iconName()
+{
+ return "feed-service-decsync";
+}
- public string serviceName()
- {
- return "DecSync";
- }
+public string serviceName()
+{
+ return "DecSync";
+}
- public bool needWebLogin()
- {
- return false;
- }
+public bool needWebLogin()
+{
+ return false;
+}
- public Gtk.Box? getWidget()
+public Gtk.Box? getWidget()
+{
+ var doneLabel = new Gtk.Label(_("Done"));
+ var waitingLabel = new Gtk.Label(_("Adding Feeds"));
+ waitingSpinner = new Gtk.Spinner();
+ var waitingBox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
+ waitingBox.pack_start(waitingSpinner, false, false, 0);
+ waitingBox.pack_start(waitingLabel, true, false, 0);
+ loginStack = new Gtk.Stack();
+ loginStack.add_named(doneLabel, "label");
+ loginStack.add_named(waitingBox, "waiting");
+ var dirLabel = new Gtk.Label(_("DecSync directory:"));
+ dirLabel.set_alignment(1.0f, 0.5f);
+ dirLabel.set_hexpand(true);
+ m_loginDir = m_utils.getDecsyncDir();
+ var buttonLabel = m_loginDir;
+ if (buttonLabel == "")
{
- var doneLabel = new Gtk.Label(_("Done"));
- var waitingLabel = new Gtk.Label(_("Adding Feeds"));
- waitingSpinner = new Gtk.Spinner();
- var waitingBox = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 5);
- waitingBox.pack_start(waitingSpinner, false, false, 0);
- waitingBox.pack_start(waitingLabel, true, false, 0);
- loginStack = new Gtk.Stack();
- loginStack.add_named(doneLabel, "label");
- loginStack.add_named(waitingBox, "waiting");
- var dirLabel = new Gtk.Label(_("DecSync directory:"));
- dirLabel.set_alignment(1.0f, 0.5f);
- dirLabel.set_hexpand(true);
- m_loginDir = m_utils.getDecsyncDir();
- var buttonLabel = m_loginDir;
- if (buttonLabel == "")
- {
- buttonLabel = _("Select...");
- }
- var dirButton = new Gtk.Button.with_label(buttonLabel);
- dirButton.clicked.connect(() => {
+ buttonLabel = _("Select...");
+ }
+ var dirButton = new Gtk.Button.with_label(buttonLabel);
+ dirButton.clicked.connect(() => {
var chooser = new Gtk.FileChooserDialog("Select Directory",
- null,
- Gtk.FileChooserAction.SELECT_FOLDER,
- _("_Cancel"),
- Gtk.ResponseType.CANCEL,
- _("_Select"),
- Gtk.ResponseType.ACCEPT);
+ null,
+ Gtk.FileChooserAction.SELECT_FOLDER,
+ _("_Cancel"),
+ Gtk.ResponseType.CANCEL,
+ _("_Select"),
+ Gtk.ResponseType.ACCEPT);
chooser.set_show_hidden(true);
chooser.set_current_folder(m_utils.getDecsyncDir());
if (chooser.run() == Gtk.ResponseType.ACCEPT)
{
- m_loginDir = chooser.get_filename();
- dirButton.set_label(m_loginDir);
+ m_loginDir = chooser.get_filename();
+ dirButton.set_label(m_loginDir);
}
chooser.close();
});
- var grid = new Gtk.Grid();
- grid.set_column_spacing(10);
- grid.set_row_spacing(10);
- grid.set_valign(Gtk.Align.CENTER);
- grid.set_halign(Gtk.Align.CENTER);
-
- grid.attach(dirLabel, 0, 0, 1, 1);
- grid.attach(dirButton, 1, 0, 1, 1);
-
- //---------------------------------------------------------------------
+ var grid = new Gtk.Grid();
+ grid.set_column_spacing(10);
+ grid.set_row_spacing(10);
+ grid.set_valign(Gtk.Align.CENTER);
+ grid.set_halign(Gtk.Align.CENTER);
+
+ grid.attach(dirLabel, 0, 0, 1, 1);
+ grid.attach(dirButton, 1, 0, 1, 1);
+
+ //---------------------------------------------------------------------
+
+ var logo = new Gtk.Image.from_icon_name("feed-service-decsync", Gtk.IconSize.MENU);
+
+ var loginLabel = new Gtk.Label(_("Please select your DecSync directory and enjoy using FeedReader"));
+ loginLabel.get_style_context().add_class("h2");
+ loginLabel.set_justify(Gtk.Justification.CENTER);
+ loginLabel.set_lines(3);
+
+ loginButton = new Gtk.Button();
+ loginButton.add(loginStack);
+ loginButton.halign = Gtk.Align.END;
+ loginButton.set_size_request(80, 30);
+ loginButton.get_style_context().add_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+ loginButton.clicked.connect(() => { tryLogin(); });
+
+ var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 10);
+ box.valign = Gtk.Align.CENTER;
+ box.halign = Gtk.Align.CENTER;
+ box.pack_start(loginLabel, false, false, 10);
+ box.pack_start(logo, false, false, 10);
+ box.pack_start(grid, true, true, 10);
+ box.pack_end(loginButton, false, false, 20);
- var logo = new Gtk.Image.from_icon_name("feed-service-decsync", Gtk.IconSize.MENU);
-
- var loginLabel = new Gtk.Label(_("Please select your DecSync directory and enjoy using FeedReader"));
- loginLabel.get_style_context().add_class("h2");
- loginLabel.set_justify(Gtk.Justification.CENTER);
- loginLabel.set_lines(3);
-
- loginButton = new Gtk.Button();
- loginButton.add(loginStack);
- loginButton.halign = Gtk.Align.END;
- loginButton.set_size_request(80, 30);
- loginButton.get_style_context().add_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
- loginButton.clicked.connect(() => { tryLogin(); });
-
- var box = new Gtk.Box(Gtk.Orientation.VERTICAL, 10);
- box.valign = Gtk.Align.CENTER;
- box.halign = Gtk.Align.CENTER;
- box.pack_start(loginLabel, false, false, 10);
- box.pack_start(logo, false, false, 10);
- box.pack_start(grid, true, true, 10);
- box.pack_end(loginButton, false, false, 20);
-
- return box;
- }
+ return box;
+}
- public void showHtAccess()
- {
- return;
- }
+public void showHtAccess()
+{
+ return;
+}
- public void writeData()
- {
- m_utils.setDecsyncDir(m_loginDir);
- }
+public void writeData()
+{
+ m_utils.setDecsyncDir(m_loginDir);
+}
- public async void postLoginAction()
- {
- loginButton.set_sensitive(false);
- waitingSpinner.start();
- loginButton.get_style_context().remove_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
- loginStack.set_visible_child_name("waiting");
- SourceFunc callback = postLoginAction.callback;
- new GLib.Thread(null, () => {
+public async void postLoginAction()
+{
+ loginButton.set_sensitive(false);
+ waitingSpinner.start();
+ loginButton.get_style_context().remove_class(Gtk.STYLE_CLASS_SUGGESTED_ACTION);
+ loginStack.set_visible_child_name("waiting");
+ SourceFunc callback = postLoginAction.callback;
+ new Thread(null, () => {
m_sync.initStoredEntries();
m_sync.executeStoredEntries({"feeds", "subscriptions"}, new Unit());
Idle.add((owned) callback);
return null;
});
- yield;
- }
+ yield;
+}
- public string buildLoginURL()
- {
- return "";
- }
+public string buildLoginURL()
+{
+ return "";
+}
- public bool extractCode(string redirectURL)
- {
- return false;
- }
+public bool extractCode(string redirectURL)
+{
+ return false;
+}
- public bool supportTags()
- {
- return false;
- }
+public bool supportTags()
+{
+ return false;
+}
- public bool doInitSync()
- {
- return false;
- }
+public bool doInitSync()
+{
+ return false;
+}
- public string symbolicIcon()
- {
- return "feed-service-decsync-symbolic";
- }
+public string symbolicIcon()
+{
+ return "feed-service-decsync-symbolic";
+}
- public string accountName()
- {
- return "DecSync";
- }
+public string accountName()
+{
+ return "DecSync";
+}
- public string getServerURL()
- {
- return "http://localhost/";
- }
+public string getServerURL()
+{
+ return "http://localhost/";
+}
- public string uncategorizedID()
- {
- return "0";
- }
+public string uncategorizedID()
+{
+ return "0";
+}
- public bool hideCategoryWhenEmpty(string catID)
- {
- return false;
- }
+public bool hideCategoryWhenEmpty(string catID)
+{
+ return false;
+}
- public bool supportCategories()
- {
- return true;
- }
+public bool supportCategories()
+{
+ return true;
+}
- public bool supportFeedManipulation()
- {
- return true;
- }
+public bool supportFeedManipulation()
+{
+ return true;
+}
- public bool supportMultiLevelCategories()
- {
- return true;
- }
+public bool supportMultiLevelCategories()
+{
+ return true;
+}
- public bool supportMultiCategoriesPerFeed()
- {
- return false;
- }
+public bool supportMultiCategoriesPerFeed()
+{
+ return false;
+}
- public bool syncFeedsAndCategories()
- {
- return false;
- }
+public bool syncFeedsAndCategories()
+{
+ return false;
+}
- public bool tagIDaffectedByNameChange()
- {
- return false;
- }
+public bool tagIDaffectedByNameChange()
+{
+ return false;
+}
- public void resetAccount()
- {
- return;
- }
+public void resetAccount()
+{
+ return;
+}
- public bool useMaxArticles()
- {
- return true;
- }
+public bool useMaxArticles()
+{
+ return true;
+}
- public LoginResponse login()
+public LoginResponse login()
+{
+ if (initDecsync())
{
- if (initDecsync())
- {
- return LoginResponse.SUCCESS;
- }
- else
- {
- return LoginResponse.ALL_EMPTY;
- }
+ return LoginResponse.SUCCESS;
}
-
- public bool logout()
+ else
{
- return true;
+ return LoginResponse.ALL_EMPTY;
}
+}
- public bool serverAvailable()
- {
- return Utils.ping("https://duckduckgo.com/");
- }
+public bool logout()
+{
+ return true;
+}
- public void setArticleIsRead(string articleIDs, ArticleStatus readStatus)
- {
- var read = readStatus == ArticleStatus.READ;
- Logger.debug("Mark " + articleIDs + " as " + (read ? "read" : "unread"));
- var entries = new Gee.ArrayList();
- foreach (var articleID in articleIDs.split(","))
- {
- Article? article = m_db.read_article(articleID);
- if (article != null)
- {
- var path = articleToPath(article, "read");
- var key = stringToNode(article.getArticleID());
- entries.add(new Decsync.EntryWithPath.now(path, key, boolToNode(read)));
- }
- }
- m_sync.setEntries(entries);
- }
+public bool serverAvailable()
+{
+ return Utils.ping("https://duckduckgo.com/");
+}
- public void setArticleIsMarked(string articleID, ArticleStatus markedStatus)
+public void setArticleIsRead(string articleIDs, ArticleStatus readStatus)
+{
+ var read = readStatus == ArticleStatus.READ;
+ Logger.debug("Mark " + articleIDs + " as " + (read ? "read" : "unread"));
+ var entries = new Gee.ArrayList();
+ var db = DataBase.readOnly();
+ foreach (var articleID in articleIDs.split(","))
{
- var marked = markedStatus == ArticleStatus.MARKED;
- Logger.debug("Mark " + articleID + " as " + (marked ? "marked" : "unmarked"));
- Article? article = m_db.read_article(articleID);
+ Article? article = db.read_article(articleID);
if (article != null)
{
- var path = articleToPath(article, "marked");
+ var path = articleToPath(article, "read");
var key = stringToNode(article.getArticleID());
- m_sync.setEntry(path, key, boolToNode(marked));
+ entries.add(new Decsync.EntryWithPath.now(path, key, boolToNode(read)));
}
}
+ m_sync.setEntries(entries);
+}
- public bool alwaysSetReadByID()
- {
- return true;
+public void setArticleIsMarked(string articleID, ArticleStatus markedStatus)
+{
+ var marked = markedStatus == ArticleStatus.MARKED;
+ Logger.debug("Mark " + articleID + " as " + (marked ? "marked" : "unmarked"));
+ Article? article = DataBase.readOnly().read_article(articleID);
+ if (article != null)
+ {
+ var path = articleToPath(article, "marked");
+ var key = stringToNode(article.getArticleID());
+ m_sync.setEntry(path, key, boolToNode(marked));
}
+}
- public void setFeedRead(string feedID)
- {
- return;
- }
+public bool alwaysSetReadByID()
+{
+ return true;
+}
- public void setCategoryRead(string catID)
- {
- return;
- }
+public void setFeedRead(string feedID)
+{
+ return;
+}
- public void markAllItemsRead()
- {
- return;
- }
+public void setCategoryRead(string catID)
+{
+ return;
+}
- public void tagArticle(string articleID, string tagID)
- {
- return;
- }
+public void markAllItemsRead()
+{
+ return;
+}
- public void removeArticleTag(string articleID, string tagID)
- {
- return;
- }
+public void tagArticle(string articleID, string tagID)
+{
+ return;
+}
- public string createTag(string caption)
- {
- return "";
- }
+public void removeArticleTag(string articleID, string tagID)
+{
+ return;
+}
- public void deleteTag(string tagID)
- {
- return;
- }
+public string createTag(string caption)
+{
+ return "";
+}
+
+public void deleteTag(string tagID)
+{
+ return;
+}
+
+public void renameTag(string tagID, string title)
+{
+ return;
+}
+
+public bool addFeed(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg)
+{
+ return addFeedWithDecsync(feedURL, catID, newCatName, out feedID, out errmsg);
+}
- public void renameTag(string tagID, string title)
+public bool addFeedWithDecsync(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg, bool updateDecsync = true)
+{
+ var db = DataBase.writeAccess();
+ var catIDs = new Gee.ArrayList();
+ if(catID == null && newCatName != null)
{
- return;
+ string cID = createCategory(newCatName, null);
+ var cat = new Category(cID, newCatName, 0, 99, CategoryID.MASTER.to_string(), 1);
+ db.write_categories(ListUtils.single(cat));
+ catIDs.add(cID);
}
-
- public bool addFeed(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg)
+ else if(catID != null && newCatName == null)
{
- return addFeedWithDecsync(feedURL, catID, newCatName, out feedID, out errmsg);
+ catIDs.add(catID);
}
-
- public bool addFeedWithDecsync(string feedURL, string? catID, string? newCatName, out string feedID, out string errmsg, bool updateDecsync = true)
+ else
{
- var catIDs = new Gee.ArrayList();
- if(catID == null && newCatName != null)
- {
- string cID = createCategory(newCatName, null);
- var cat = new Category(cID, newCatName, 0, 99, CategoryID.MASTER.to_string(), 1);
- m_db_write.write_categories(ListUtils.single(cat));
- catIDs.add(cID);
- }
- else if(catID != null && newCatName == null)
- {
- catIDs.add(catID);
- }
- else
- {
- catIDs.add(uncategorizedID());
- }
-
- feedID = feedURL;
+ catIDs.add(uncategorizedID());
+ }
- Logger.info(@"addFeed: ID = $feedID");
- Feed? feed = m_utils.downloadFeed(m_session, feedURL, feedID, catIDs, out errmsg);
+ feedID = feedURL;
- if(feed != null)
- {
- if(!m_db.feed_exists(feed.getURL())) {
- m_db_write.write_feeds(ListUtils.single(feed));
+ Logger.info(@"addFeed: ID = $feedID");
+ Feed? feed = m_utils.downloadFeed(m_session, feedURL, feedID, catIDs, out errmsg);
- if (updateDecsync)
- {
- m_sync.setEntry({"feeds", "subscriptions"}, stringToNode(feedID), boolToNode(true));
- renameFeed(feedID, feed.getTitle());
- moveFeed(feedID, feed.getCatString(), null);
- }
+ if(feed != null)
+ {
+ if(!db.feed_exists(feed.getURL())) {
+ db.write_feeds(ListUtils.single(feed));
- m_sync.executeStoredEntries({"feeds", "names"}, new Unit(),
- stringEquals(feedID)
- );
- m_sync.executeStoredEntries({"feeds", "categories"}, new Unit(),
- stringEquals(feedID)
- );
- return true;
+ if (updateDecsync)
+ {
+ m_sync.setEntry({"feeds", "subscriptions"}, stringToNode(feedID), boolToNode(true));
+ renameFeed(feedID, feed.getTitle());
+ moveFeed(feedID, feed.getCatString(), null);
}
- }
-
- return false;
- }
- public void addFeeds(Gee.List feeds)
- {
- string feedID, errmsg;
- foreach(Feed feed in feeds)
- {
- var catString = feed.getCatString();
- addFeed(feed.getXmlUrl(), catString != "" ? catString : null, null, out feedID, out errmsg);
+ m_sync.executeStoredEntries({"feeds", "names"}, new Unit(),
+ stringEquals(feedID)
+ );
+ m_sync.executeStoredEntries({"feeds", "categories"}, new Unit(),
+ stringEquals(feedID)
+ );
+ return true;
}
}
- public void removeFeed(string feedID)
- {
- m_sync.setEntry({"feeds", "subscriptions"}, stringToNode(feedID), boolToNode(false));
- }
+ return false;
+}
- public void renameFeed(string feedID, string title)
+public void addFeeds(Gee.List feeds)
+{
+ string feedID, errmsg;
+ foreach(Feed feed in feeds)
{
- m_sync.setEntry({"feeds", "names"}, stringToNode(feedID), stringToNode(title));
+ var catString = feed.getCatString();
+ addFeed(feed.getXmlUrl(), catString != "" ? catString : null, null, out feedID, out errmsg);
}
+}
- public void moveFeed(string feedID, string newCatID, string? currentCatID)
- {
- string? value = newCatID == uncategorizedID() ? null : newCatID;
- m_sync.setEntry({"feeds", "categories"}, stringToNode(feedID), stringToNode(value));
- }
+public void removeFeed(string feedID)
+{
+ m_sync.setEntry({"feeds", "subscriptions"}, stringToNode(feedID), boolToNode(false));
+}
- public string createCategory(string title, string? parentID)
- {
- string? catID = m_db.getCategoryID(title);
- while (catID == null || m_db.read_category(catID) != null)
- {
- catID = "catID%05d".printf(Random.int_range(0, 100000));
- }
- renameCategory(catID, title);
- moveCategory(catID, parentID ?? CategoryID.MASTER.to_string());
- Logger.info("createCategory: ID = " + catID);
- return catID;
- }
+public void renameFeed(string feedID, string title)
+{
+ m_sync.setEntry({"feeds", "names"}, stringToNode(feedID), stringToNode(title));
+}
- public void renameCategory(string catID, string title)
- {
- m_sync.setEntry({"categories", "names"}, stringToNode(catID), stringToNode(title));
- }
+public void moveFeed(string feedID, string newCatID, string? currentCatID)
+{
+ string? value = newCatID == uncategorizedID() ? null : newCatID;
+ m_sync.setEntry({"feeds", "categories"}, stringToNode(feedID), stringToNode(value));
+}
- public void moveCategory(string catID, string newParentID)
- {
- string? value = newParentID == CategoryID.MASTER.to_string() ? null : newParentID;
- m_sync.setEntry({"categories", "parents"}, stringToNode(catID), stringToNode(value));
- }
+public string createCategory(string title, string? parentID)
+{
+ var db = DataBase.readOnly();
+ string? catID = db.getCategoryID(title);
+ while (catID == null || db.read_category(catID) != null)
+ {
+ catID = "catID%05d".printf(Random.int_range(0, 100000));
+ }
+ renameCategory(catID, title);
+ moveCategory(catID, parentID ?? CategoryID.MASTER.to_string());
+ Logger.info("createCategory: ID = " + catID);
+ return catID;
+}
- public void deleteCategory(string catID)
- {
- Logger.info("Delete category " + catID);
- var feedIDs = m_db.getFeedIDofCategorie(catID);
- foreach (var feedID in feedIDs)
- {
- moveFeed(feedID, uncategorizedID(), catID);
- }
- }
+public void renameCategory(string catID, string title)
+{
+ m_sync.setEntry({"categories", "names"}, stringToNode(catID), stringToNode(title));
+}
+
+public void moveCategory(string catID, string newParentID)
+{
+ string? value = newParentID == CategoryID.MASTER.to_string() ? null : newParentID;
+ m_sync.setEntry({"categories", "parents"}, stringToNode(catID), stringToNode(value));
+}
- public void removeCatFromFeed(string feedID, string catID)
+public void deleteCategory(string catID)
+{
+ Logger.info("Delete category " + catID);
+ var feedIDs = DataBase.readOnly().getFeedIDofCategorie(catID);
+ foreach (var feedID in feedIDs)
{
moveFeed(feedID, uncategorizedID(), catID);
}
+}
- public void importOPML(string opml)
- {
- var parser = new OPMLparser(opml);
- parser.parse();
- }
+public void removeCatFromFeed(string feedID, string catID)
+{
+ moveFeed(feedID, uncategorizedID(), catID);
+}
- public bool getFeedsAndCats(Gee.List feeds, Gee.List categories, Gee.List tags, GLib.Cancellable? cancellable = null)
- {
- return true;
- }
+public void importOPML(string opml)
+{
+ var parser = new OPMLparser(opml);
+ parser.parse();
+}
- public int getUnreadCount()
- {
- return 0;
- }
+public bool getFeedsAndCats(Gee.List feeds, Gee.List categories, Gee.List tags, GLib.Cancellable? cancellable = null)
+{
+ return true;
+}
- public void getArticles(int count, ArticleStatus whatToGet, DateTime? since, string? feedID, bool isTagID, GLib.Cancellable? cancellable = null)
- {
- var feeds = m_db.read_feeds();
- var articles = new Gee.ArrayList();
- GLib.Mutex mutex = GLib.Mutex();
- var now = new GLib.DateTime.now_local();
- int? weeks = ((DropArticles)Settings.general().get_enum("drop-articles-after")).to_weeks();
- var dropDate = weeks == null ? null : now.add_weeks(-(int)weeks);
+public int getUnreadCount()
+{
+ return 0;
+}
- try
- {
- var threads = new ThreadPool.with_owned_data((feed) => {
+public void getArticles(int count, ArticleStatus whatToGet, DateTime? since, string? feedID, bool isTagID, GLib.Cancellable? cancellable = null)
+{
+ var feeds = DataBase.readOnly().read_feeds();
+ var articles = new Gee.ArrayList();
+ GLib.Mutex mutex = GLib.Mutex();
+ var now = new GLib.DateTime.now_local();
+ int? weeks = ((DropArticles)Settings.general().get_enum("drop-articles-after")).to_weeks();
+ var dropDate = weeks == null ? null : now.add_weeks(-(int)weeks);
+
+ try
+ {
+ var threads = new ThreadPool.with_owned_data((feed) => {
if(cancellable != null && cancellable.is_cancelled())
return;
@@ -532,8 +531,8 @@ public class FeedReader.decsyncInterface
if(url == null || url == "" || GLib.Uri.parse_scheme(url) == null)
{
- Logger.error("no valid URL");
- return;
+ Logger.error("no valid URL");
+ return;
}
var msg = new Soup.Message("GET", url);
@@ -547,177 +546,178 @@ public class FeedReader.decsyncInterface
Rss.Parser parser = new Rss.Parser();
try
{
- parser.load_from_data(xml, xml.length);
+ parser.load_from_data(xml, xml.length);
}
catch(GLib.Error e)
{
- Logger.error("decsyncInterface.getArticles: %s".printf(e.message));
- return;
+ Logger.error("decsyncInterface.getArticles: %s".printf(e.message));
+ return;
}
var doc = parser.get_document();
string? locale = null;
if(doc.encoding != null
- && doc.encoding != "")
+ && doc.encoding != "")
{
- locale = doc.encoding;
+ locale = doc.encoding;
}
Logger.debug("Got %u articles".printf(doc.get_items().length()));
var newArticles = new Gee.ArrayList();
+ var db = DataBase.readOnly();
foreach(Rss.Item item in doc.get_items())
{
- string? articleID = item.guid;
+ string? articleID = item.guid;
- if(articleID == null)
- {
- if(item.link == null)
- {
- Logger.warning("no valid id and no valid URL as well? what the hell man? I'm giving up");
- continue;
+ if(articleID == null)
+ {
+ if(item.link == null)
+ {
+ Logger.warning("no valid id and no valid URL as well? what the hell man? I'm giving up");
+ continue;
}
- articleID = item.link;
+ articleID = item.link;
}
- if (m_db.read_article(articleID) != null)
+ if (db.read_article(articleID) != null)
{
continue;
}
- var date = Rfc822.parseDate(item.pub_date);
- if (date != null)
- {
- Logger.info(@"Parsed $(item.pub_date) as $(date.to_string())");
+ var date = Rfc822.parseDate(item.pub_date);
+ if (date != null)
+ {
+ Logger.info(@"Parsed $(item.pub_date) as $(date.to_string())");
}
- else
- {
- if (item.pub_date != null)
+ else
+ {
+ if (item.pub_date != null)
Logger.warning(@"RFC 822 date parser failed to parse $(item.pub_date). Falling back to DateTime.now()");
- date = new DateTime.now_local();
+ date = new DateTime.now_local();
}
- if (dropDate != null && date.compare(dropDate) == -1)
- {
- continue;
+ if (dropDate != null && date.compare(dropDate) == -1)
+ {
+ continue;
}
- //Logger.info("Got content: " + item.description);
- string? content = m_utils.convert(item.description, locale);
- //Logger.info("Converted to: " + item.description);
- if(content == null)
+ //Logger.info("Got content: " + item.description);
+ string? content = m_utils.convert(item.description, locale);
+ //Logger.info("Converted to: " + item.description);
+ if(content == null)
content = _("Nothing to read here.");
- var enclosures = new Gee.ArrayList();
+ var enclosures = new Gee.ArrayList();
- if(item.enclosure_url != null)
- {
- // FIXME: check what type of media we actually got
- enclosures.add(new Enclosure(articleID, item.enclosure_url, EnclosureType.FILE));
+ if(item.enclosure_url != null)
+ {
+ // FIXME: check what type of media we actually got
+ enclosures.add(new Enclosure(articleID, item.enclosure_url, EnclosureType.FILE));
}
- string articleURL = item.link;
- if(articleURL.has_prefix("/"))
+ string articleURL = item.link;
+ if(articleURL.has_prefix("/"))
articleURL = feed.getURL() + articleURL.substring(1);
- var article = new Article(
- articleID,
- (item.title != null) ? m_utils.convert(item.title, locale) : null,
- articleURL,
- feed.getFeedID(),
- ArticleStatus.UNREAD,
- ArticleStatus.UNMARKED,
- content,
- content,
- m_utils.convert(item.author, locale),
- date,
- 0,
- null,
- enclosures
- );
+ var article = new Article(
+ articleID,
+ (item.title != null) ? m_utils.convert(item.title, locale) : null,
+ articleURL,
+ feed.getFeedID(),
+ ArticleStatus.UNREAD,
+ ArticleStatus.UNMARKED,
+ content,
+ content,
+ m_utils.convert(item.author, locale),
+ date,
+ 0,
+ null,
+ enclosures
+ );
- Logger.debug("Got new article: " + article.getTitle());
+ Logger.debug("Got new article: " + article.getTitle());
- newArticles.add(article);
+ newArticles.add(article);
}
mutex.lock();
articles.add_all(newArticles);
mutex.unlock();
}, (int)GLib.get_num_processors(), true);
- foreach(Feed feed in feeds)
+ foreach(Feed feed in feeds)
+ {
+ try
{
- try
- {
- threads.add(feed);
- }
- catch(GLib.Error e)
- {
- Logger.error("Error creating thread to download Feed %s: %s".printf(feed.getTitle(), e.message));
- }
+ threads.add(feed);
+ }
+ catch(GLib.Error e)
+ {
+ Logger.error("Error creating thread to download Feed %s: %s".printf(feed.getTitle(), e.message));
}
-
- bool immediate = false; // allow to queue up additional tasks
- bool wait = true; // function will block until all tasks are done
- ThreadPool.free((owned)threads, immediate, wait);
- }
- catch(Error e)
- {
- Logger.error("Error creating threads to download Feeds: " + e.message);
}
- articles.sort((a, b) => {
+ bool immediate = false; // allow to queue up additional tasks
+ bool wait = true; // function will block until all tasks are done
+ ThreadPool.free((owned)threads, immediate, wait);
+ }
+ catch(Error e)
+ {
+ Logger.error("Error creating threads to download Feeds: " + e.message);
+ }
+
+ articles.sort((a, b) => {
return strcmp(a.getArticleID(), b.getArticleID());
});
- if(articles.size > 0)
- {
- m_db_write.write_articles(articles);
- Logger.debug("decsyncInterface: %i articles written".printf(articles.size));
+ if(articles.size > 0)
+ {
+ DataBase.writeAccess().write_articles(articles);
+ Logger.debug("decsyncInterface: %i articles written".printf(articles.size));
- var multiMap = groupBy, Article>(
- articles,
- article => { return articleToBasePath(article); }
+ var multiMap = groupBy, Article>(
+ articles,
+ article => { return articleToBasePath(article); }
);
- multiMap.get_keys().@foreach(basePath => {
+ multiMap.get_keys().@foreach(basePath => {
var articleIDs = multiMap.@get(basePath).map(article => {
return stringToNode(article.getArticleID());
});
foreach (var type in toList({"read","marked"}))
{
- m_sync.executeStoredEntries(basePathToPath(basePath, type), new Unit(),
- key => { return articleIDs.any_match(articleID => { return articleID.equal(key); }); }
- );
+ m_sync.executeStoredEntries(basePathToPath(basePath, type), new Unit(),
+ key => { return articleIDs.any_match(articleID => { return articleID.equal(key); }); }
+ );
}
return true;
});
- }
-
- m_sync.executeAllNewEntries(new Unit());
}
- public string[] articleToPath(Article article, string type)
- {
- return basePathToPath(articleToBasePath(article), type);
- }
+ m_sync.executeAllNewEntries(new Unit());
+}
- public string[] basePathToPath(Gee.List basePath, string type)
- {
- var path = new Gee.ArrayList();
- path.add("articles");
- path.add(type);
- path.add_all(basePath);
- return path.to_array();
- }
+public string[] articleToPath(Article article, string type)
+{
+ return basePathToPath(articleToBasePath(article), type);
+}
- public Gee.List articleToBasePath(Article article)
- {
- var datetime = article.getDate().to_utc();
- var year = datetime.format("%Y");
- var month = datetime.format("%m");
- var day = datetime.format("%d");
- return toList({year, month, day});
- }
+public string[] basePathToPath(Gee.List basePath, string type)
+{
+ var path = new Gee.ArrayList();
+ path.add("articles");
+ path.add(type);
+ path.add_all(basePath);
+ return path.to_array();
+}
+
+public Gee.List articleToBasePath(Article article)
+{
+ var datetime = article.getDate().to_utc();
+ var year = datetime.format("%Y");
+ var month = datetime.format("%m");
+ var day = datetime.format("%d");
+ return toList({year, month, day});
+}
}
[ModuleInit]
diff -pruN 2.6.1-1/plugins/backend/decsync/decsyncListeners.vala 2.7.1-1/plugins/backend/decsync/decsyncListeners.vala
--- 2.6.1-1/plugins/backend/decsync/decsyncListeners.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/decsyncListeners.vala 2019-02-01 19:30:50.000000000 +0000
@@ -15,269 +15,271 @@
public class FeedReader.DecsyncListeners : GLib.Object {
- public class ReadMarkListener : OnSubdirEntryUpdateListener {
+public class ReadMarkListener : OnSubdirEntryUpdateListener {
- private Gee.List m_subdir;
- private bool m_is_read_entry;
- private decsyncInterface m_plugin;
-
- public ReadMarkListener(bool is_read_entry, decsyncInterface plugin)
- {
- this.m_subdir = toList({"articles", is_read_entry ? "read" : "marked"});
- this.m_is_read_entry = is_read_entry;
- this.m_plugin = plugin;
- }
-
- public override Gee.List subdir()
- {
- return m_subdir;
- }
-
- public override void onSubdirEntryUpdate(Gee.List path, Decsync.Entry entry, Unit extra)
- {
- var articleID = entry.key.get_string();
- if (articleID == null)
- {
- Logger.warning("Invalid articleID " + Json.to_string(entry.key, false));
- return;
- }
- var added = entry.value.get_boolean();
- if (m_is_read_entry)
- {
- Logger.debug((added ? "read " : "unread ") + articleID);
- }
- else
- {
- Logger.debug((added ? "mark " : "unmark ") + articleID);
- }
- Article? article = m_plugin.m_db.read_article(articleID);
- if (article == null)
- {
- Logger.info("Unkown article " + articleID);
- return;
- }
- if (m_is_read_entry)
- {
- article.setUnread(added ? ArticleStatus.READ : ArticleStatus.UNREAD);
- }
- else
- {
- article.setMarked(added ? ArticleStatus.MARKED : ArticleStatus.UNMARKED);
- }
- m_plugin.m_db_write.update_article(article);
- }
- }
-
- public class SubscriptionsListener : OnSubfileEntryUpdateListener {
-
- private Gee.List m_subfile;
- private decsyncInterface m_plugin;
-
- public SubscriptionsListener(decsyncInterface plugin)
- {
- this.m_subfile = toList({"feeds", "subscriptions"});
- this.m_plugin = plugin;
- }
-
- public override Gee.List subfile()
- {
- return m_subfile;
- }
-
- public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
- {
- var feedID = entry.key.get_string();
- if (feedID == null)
- {
- Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
- return;
- }
- var subscribed = entry.value.get_boolean();
- if (subscribed)
- {
- string outFeedID, errmsg;
- m_plugin.addFeedWithDecsync(feedID, null, null, out outFeedID, out errmsg, false);
- }
- else
- {
- m_plugin.m_db_write.delete_feed(feedID);
- }
- }
- }
-
- public class FeedNamesListener : OnSubfileEntryUpdateListener {
-
- private Gee.List m_subfile;
- private decsyncInterface m_plugin;
-
- public FeedNamesListener(decsyncInterface plugin)
- {
- this.m_subfile = toList({"feeds", "names"});
- this.m_plugin = plugin;
- }
-
- public override Gee.List subfile()
- {
- return m_subfile;
- }
-
- public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
- {
- var feedID = entry.key.get_string();
- if (feedID == null)
- {
- Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
- return;
- }
- var name = entry.value.get_string();
- if (name == null)
- {
- Logger.warning("Invalid name " + Json.to_string(entry.value, false));
- return;
- }
- m_plugin.m_db_write.rename_feed(feedID, name);
- }
- }
-
- public class CategoriesListener : OnSubfileEntryUpdateListener {
-
- private Gee.List m_subfile;
- private decsyncInterface m_plugin;
-
- public CategoriesListener(decsyncInterface plugin)
- {
- this.m_subfile = toList({"feeds", "categories"});
- this.m_plugin = plugin;
- }
-
- public override Gee.List subfile()
- {
- return m_subfile;
- }
-
- public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
- {
- var feedID = entry.key.get_string();
- if (feedID == null)
- {
- Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
- return;
- }
- var feed = m_plugin.m_db.read_feed(feedID);
- if (feed == null) return;
- var currentCatID = feed.getCatString();
- string newCatID;
- if (entry.value.is_null())
- {
- newCatID = m_plugin.uncategorizedID();
- }
- else
- {
- newCatID = entry.value.get_string();
- }
- if (newCatID == null)
- {
- Logger.warning("Invalid catID " + Json.to_string(entry.value, false));
- return;
- }
- addCategory(m_plugin, newCatID);
- m_plugin.m_db_write.move_feed(feedID, currentCatID, newCatID);
- }
- }
-
- public class CategoryNamesListener : OnSubfileEntryUpdateListener {
-
- private Gee.List m_subfile;
- private decsyncInterface m_plugin;
-
- public CategoryNamesListener(decsyncInterface plugin)
- {
- this.m_subfile = toList({"categories", "names"});
- this.m_plugin = plugin;
- }
-
- public override Gee.List subfile()
- {
- return m_subfile;
- }
-
- public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
- {
- var catID = entry.key.get_string();
- if (catID == null)
- {
- Logger.warning("Invalid catID " + Json.to_string(entry.key, false));
- return;
- }
- var name = entry.value.get_string();
- if (name == null)
- {
- Logger.warning("Invalid name " + Json.to_string(entry.value, false));
- return;
- }
- m_plugin.m_db_write.rename_category(catID, name);
- Logger.debug("Renamed category " + catID + " to " + name);
- }
- }
-
- public class CategoryParentsListener : OnSubfileEntryUpdateListener {
-
- private Gee.List m_subfile;
- private decsyncInterface m_plugin;
-
- public CategoryParentsListener(decsyncInterface plugin)
- {
- this.m_subfile = toList({"categories", "parents"});
- this.m_plugin = plugin;
- }
-
- public override Gee.List subfile()
- {
- return m_subfile;
- }
-
- public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
- {
- var catID = entry.key.get_string();
- if (catID == null)
- {
- Logger.warning("Invalid catID " + Json.to_string(entry.key, false));
- return;
- }
- string parentID;
- if (entry.value.is_null())
- {
- parentID = CategoryID.MASTER.to_string();
- }
- else
- {
- parentID = entry.value.get_string();
- }
- if (parentID == null)
- {
- Logger.warning("Invalid parentID " + Json.to_string(entry.value, false));
- return;
- }
- addCategory(m_plugin, parentID);
- m_plugin.m_db_write.move_category(catID, parentID);
- Logger.debug("Moved category " + catID + " to " + parentID);
- }
- }
-
- private static void addCategory(decsyncInterface plugin, string catID)
- {
- if (catID == plugin.uncategorizedID() || catID == CategoryID.MASTER.to_string() || plugin.m_db.read_category(catID) != null)
- {
- return;
- }
- var cat = new Category(catID, catID, 0, 99, CategoryID.MASTER.to_string(), 1);
- plugin.m_db_write.write_categories(ListUtils.single(cat));
- plugin.m_sync.executeStoredEntries({"categories", "names"}, new Unit(),
- stringEquals(catID)
- );
- plugin.m_sync.executeStoredEntries({"categories", "parents"}, new Unit(),
- stringEquals(catID)
- );
- Logger.debug("Added category " + catID);
+private Gee.List m_subdir;
+private bool m_is_read_entry;
+private decsyncInterface m_plugin;
+
+public ReadMarkListener(bool is_read_entry, decsyncInterface plugin)
+{
+ this.m_subdir = toList({"articles", is_read_entry ? "read" : "marked"});
+ this.m_is_read_entry = is_read_entry;
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subdir()
+{
+ return m_subdir;
+}
+
+public override void onSubdirEntryUpdate(Gee.List path, Decsync.Entry entry, Unit extra)
+{
+ var articleID = entry.key.get_string();
+ if (articleID == null)
+ {
+ Logger.warning("Invalid articleID " + Json.to_string(entry.key, false));
+ return;
+ }
+ var added = entry.value.get_boolean();
+ if (m_is_read_entry)
+ {
+ Logger.debug((added ? "read " : "unread ") + articleID);
+ }
+ else
+ {
+ Logger.debug((added ? "mark " : "unmark ") + articleID);
+ }
+ var db = DataBase.writeAccess();
+ Article? article = db.read_article(articleID);
+ if (article == null)
+ {
+ Logger.info("Unkown article " + articleID);
+ return;
+ }
+ if (m_is_read_entry)
+ {
+ article.setUnread(added ? ArticleStatus.READ : ArticleStatus.UNREAD);
+ }
+ else
+ {
+ article.setMarked(added ? ArticleStatus.MARKED : ArticleStatus.UNMARKED);
+ }
+ db.update_article(article);
+}
+}
+
+public class SubscriptionsListener : OnSubfileEntryUpdateListener {
+
+private Gee.List m_subfile;
+private decsyncInterface m_plugin;
+
+public SubscriptionsListener(decsyncInterface plugin)
+{
+ this.m_subfile = toList({"feeds", "subscriptions"});
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subfile()
+{
+ return m_subfile;
+}
+
+public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
+{
+ var feedID = entry.key.get_string();
+ if (feedID == null)
+ {
+ Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
+ return;
+ }
+ var subscribed = entry.value.get_boolean();
+ if (subscribed)
+ {
+ string outFeedID, errmsg;
+ m_plugin.addFeedWithDecsync(feedID, null, null, out outFeedID, out errmsg, false);
+ }
+ else
+ {
+ DataBase.writeAccess().delete_feed(feedID);
+ }
+}
+}
+
+public class FeedNamesListener : OnSubfileEntryUpdateListener {
+
+private Gee.List m_subfile;
+private decsyncInterface m_plugin;
+
+public FeedNamesListener(decsyncInterface plugin)
+{
+ this.m_subfile = toList({"feeds", "names"});
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subfile()
+{
+ return m_subfile;
+}
+
+public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
+{
+ var feedID = entry.key.get_string();
+ if (feedID == null)
+ {
+ Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
+ return;
+ }
+ var name = entry.value.get_string();
+ if (name == null)
+ {
+ Logger.warning("Invalid name " + Json.to_string(entry.value, false));
+ return;
+ }
+ DataBase.writeAccess().rename_feed(feedID, name);
+}
+}
+
+public class CategoriesListener : OnSubfileEntryUpdateListener {
+
+private Gee.List m_subfile;
+private decsyncInterface m_plugin;
+
+public CategoriesListener(decsyncInterface plugin)
+{
+ this.m_subfile = toList({"feeds", "categories"});
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subfile()
+{
+ return m_subfile;
+}
+
+public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
+{
+ var feedID = entry.key.get_string();
+ if (feedID == null)
+ {
+ Logger.warning("Invalid feedID " + Json.to_string(entry.key, false));
+ return;
+ }
+ var db = DataBase.writeAccess();
+ var feed = db.read_feed(feedID);
+ if (feed == null) return;
+ var currentCatID = feed.getCatString();
+ string newCatID;
+ if (entry.value.is_null())
+ {
+ newCatID = m_plugin.uncategorizedID();
+ }
+ else
+ {
+ newCatID = entry.value.get_string();
+ }
+ if (newCatID == null)
+ {
+ Logger.warning("Invalid catID " + Json.to_string(entry.value, false));
+ return;
+ }
+ addCategory(m_plugin, newCatID);
+ db.move_feed(feedID, currentCatID, newCatID);
+}
+}
+
+public class CategoryNamesListener : OnSubfileEntryUpdateListener {
+
+private Gee.List m_subfile;
+private decsyncInterface m_plugin;
+
+public CategoryNamesListener(decsyncInterface plugin)
+{
+ this.m_subfile = toList({"categories", "names"});
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subfile()
+{
+ return m_subfile;
+}
+
+public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
+{
+ var catID = entry.key.get_string();
+ if (catID == null)
+ {
+ Logger.warning("Invalid catID " + Json.to_string(entry.key, false));
+ return;
+ }
+ var name = entry.value.get_string();
+ if (name == null)
+ {
+ Logger.warning("Invalid name " + Json.to_string(entry.value, false));
+ return;
+ }
+ DataBase.writeAccess().rename_category(catID, name);
+ Logger.debug("Renamed category " + catID + " to " + name);
+}
+}
+
+public class CategoryParentsListener : OnSubfileEntryUpdateListener {
+
+private Gee.List m_subfile;
+private decsyncInterface m_plugin;
+
+public CategoryParentsListener(decsyncInterface plugin)
+{
+ this.m_subfile = toList({"categories", "parents"});
+ this.m_plugin = plugin;
+}
+
+public override Gee.List subfile()
+{
+ return m_subfile;
+}
+
+public override void onSubfileEntryUpdate(Decsync.Entry entry, Unit extra)
+{
+ var catID = entry.key.get_string();
+ if (catID == null)
+ {
+ Logger.warning("Invalid catID " + Json.to_string(entry.key, false));
+ return;
}
+ string parentID;
+ if (entry.value.is_null())
+ {
+ parentID = CategoryID.MASTER.to_string();
+ }
+ else
+ {
+ parentID = entry.value.get_string();
+ }
+ if (parentID == null)
+ {
+ Logger.warning("Invalid parentID " + Json.to_string(entry.value, false));
+ return;
+ }
+ addCategory(m_plugin, parentID);
+ DataBase.writeAccess().move_category(catID, parentID);
+ Logger.debug("Moved category " + catID + " to " + parentID);
+}
+}
+
+private static void addCategory(decsyncInterface plugin, string catID)
+{
+ if (catID == plugin.uncategorizedID() || catID == CategoryID.MASTER.to_string() || DataBase.readOnly().read_category(catID) != null)
+ {
+ return;
+ }
+ var cat = new Category(catID, catID, 0, 99, CategoryID.MASTER.to_string(), 1);
+ DataBase.writeAccess().write_categories(ListUtils.single(cat));
+ plugin.m_sync.executeStoredEntries({"categories", "names"}, new Unit(),
+ stringEquals(catID)
+ );
+ plugin.m_sync.executeStoredEntries({"categories", "parents"}, new Unit(),
+ stringEquals(catID)
+ );
+ Logger.debug("Added category " + catID);
+}
}
diff -pruN 2.6.1-1/plugins/backend/decsync/decsyncUtils.vala 2.7.1-1/plugins/backend/decsync/decsyncUtils.vala
--- 2.6.1-1/plugins/backend/decsync/decsyncUtils.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/decsyncUtils.vala 2019-02-01 19:30:50.000000000 +0000
@@ -15,106 +15,106 @@
public class FeedReader.DecsyncUtils : GLib.Object {
- GLib.Settings m_settings;
+GLib.Settings m_settings;
- public DecsyncUtils(GLib.SettingsBackend? settings_backend)
+public DecsyncUtils(GLib.SettingsBackend? settings_backend)
+{
+ if(settings_backend != null)
+ m_settings = new GLib.Settings.with_backend("org.gnome.feedreader.decsync", settings_backend);
+ else
+ m_settings = new GLib.Settings("org.gnome.feedreader.decsync");
+}
+
+public string getDecsyncDir()
+{
+ var dir = Utils.gsettingReadString(m_settings, "decsync-dir");
+ if (dir == "")
+ {
+ return GLib.Environment.get_variable("DECSYNC_DIR") ?? getDefaultDecsyncBaseDir();
+ }
+ else
+ {
+ return dir;
+ }
+}
+
+public void setDecsyncDir(string decsyncDir)
+{
+ Utils.gsettingWriteString(m_settings, "decsync-dir", decsyncDir);
+}
+
+public Feed? downloadFeed(Soup.Session session, string xmlURL, string feedID, Gee.List catIDs, out string errmsg)
+{
+ errmsg = "";
+
+ // download
+ //Logger.debug(@"Requesting: $xmlURL");
+ var msg = new Soup.Message("GET", xmlURL);
+ if (msg == null)
+ {
+ errmsg = @"Couldn't parse feed URL: $xmlURL";
+ Logger.warning(errmsg);
+ return null;
+ }
+ uint status = session.send_message(msg);
+ if(status != 200)
+ {
+ errmsg = "Could not download feed";
+ Logger.warning(errmsg);
+ return null;
+ }
+ string xml = (string)msg.response_body.flatten().data;
+ string? url = null;
+
+ // parse
+ Rss.Parser parser = new Rss.Parser();
+
+ try
+ {
+ parser.load_from_data(xml, xml.length);
+ }
+ catch(Error e)
{
- if(settings_backend != null)
- m_settings = new GLib.Settings.with_backend("org.gnome.feedreader.decsync", settings_backend);
- else
- m_settings = new GLib.Settings("org.gnome.feedreader.decsync");
- }
-
- public string getDecsyncDir()
- {
- var dir = Utils.gsettingReadString(m_settings, "decsync-dir");
- if (dir == "")
- {
- return getDefaultDecsyncBaseDir();
- }
- else
- {
- return dir;
- }
- }
-
- public void setDecsyncDir(string decsyncDir)
- {
- Utils.gsettingWriteString(m_settings, "decsync-dir", decsyncDir);
- }
-
- public Feed? downloadFeed(Soup.Session session, string xmlURL, string feedID, Gee.List catIDs, out string errmsg)
- {
- errmsg = "";
-
- // download
- //Logger.debug(@"Requesting: $xmlURL");
- var msg = new Soup.Message("GET", xmlURL);
- if (msg == null)
- {
- errmsg = @"Couldn't parse feed URL: $xmlURL";
- Logger.warning(errmsg);
- return null;
- }
- uint status = session.send_message(msg);
- if(status != 200)
- {
- errmsg = "Could not download feed";
- Logger.warning(errmsg);
- return null;
- }
- string xml = (string)msg.response_body.flatten().data;
- string? url = null;
-
- // parse
- Rss.Parser parser = new Rss.Parser();
-
- try
- {
- parser.load_from_data(xml, xml.length);
- }
- catch(Error e)
- {
- errmsg = "Could not parse feed";
- Logger.warning(errmsg);
- return null;
- }
-
- var doc = parser.get_document();
-
- if(doc.link != null
- && doc.link != "")
- url = doc.link;
-
- var Feed = new Feed(
- feedID,
- doc.title,
- url,
- 0,
- catIDs,
- doc.image_url,
- xmlURL);
-
- return Feed;
- }
-
- public string? convert(string? text, string? locale)
- {
- if(text == null)
- return null;
-
- if(locale == null)
- return text;
-
- try
- {
- return GLib.convert(text, -1, "utf-8", locale);
- }
- catch(ConvertError e)
- {
- Logger.error(e.message);
- }
+ errmsg = "Could not parse feed";
+ Logger.warning(errmsg);
+ return null;
+ }
+
+ var doc = parser.get_document();
+
+ if(doc.link != null
+ && doc.link != "")
+ url = doc.link;
+
+ var Feed = new Feed(
+ feedID,
+ doc.title,
+ url,
+ 0,
+ catIDs,
+ doc.image_url,
+ xmlURL);
+
+ return Feed;
+}
- return "";
+public string? convert(string? text, string? locale)
+{
+ if(text == null)
+ return null;
+
+ if(locale == null)
+ return text;
+
+ try
+ {
+ return GLib.convert(text, -1, "utf-8", locale);
}
+ catch(ConvertError e)
+ {
+ Logger.error(e.message);
+ }
+
+ return "";
+}
}
diff -pruN 2.6.1-1/plugins/backend/decsync/libdecsync/src/Decsync.vala 2.7.1-1/plugins/backend/decsync/libdecsync/src/Decsync.vala
--- 2.6.1-1/plugins/backend/decsync/libdecsync/src/Decsync.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/libdecsync/src/Decsync.vala 2019-02-01 19:30:50.000000000 +0000
@@ -16,7 +16,9 @@
* along with this library; if not, see .
*/
-public class Unit { public Unit() {} }
+public class Unit { public Unit() {
+ }
+}
/**
* The `DecSync` class represents an interface to synchronized key-value mappings stored on the file
@@ -66,559 +68,559 @@ public class Unit { public Unit() {} }
*/
public class Decsync : GLib.Object {
- string dir;
- string ownAppId;
- string ownAppIdEncoded;
- Gee.Iterable> listeners;
- DirectoryMonitor? monitor = null;
-
- /**
- * Signal which is called when a sync is complete. For example, it can be used to update the UI.
- */
- public signal void syncComplete(T extra);
+string dir;
+string ownAppId;
+string ownAppIdEncoded;
+Gee.Iterable> listeners;
+DirectoryMonitor? monitor = null;
- public Decsync(string dir, string ownAppId, Gee.Iterable> listeners)
- {
- this.dir = dir;
- this.ownAppId = ownAppId;
- this.ownAppIdEncoded = FileUtils.urlencode(ownAppId);
- this.listeners = listeners;
- }
-
- /**
- * Represents an [Entry] with its path.
- */
- public class EntryWithPath {
- public Gee.List path;
- public Entry entry;
-
- public EntryWithPath(string[] path, Entry entry)
- {
- this.path = toList(path);
- this.entry = entry;
- }
-
- public EntryWithPath.now(string[] path, Json.Node key, Json.Node value)
- {
- this.path = toList(path);
- this.entry = new Entry.now(key, value);
- }
- }
+/**
+ * Signal which is called when a sync is complete. For example, it can be used to update the UI.
+ */
+public signal void syncComplete(T extra);
- /**
- * Represents a key/value pair stored by DecSync. Additionally, it has a datetime property
- * indicating the most recent update. It does not store its path, see [EntryWithPath].
- */
- public class Entry {
- internal string datetime;
- public Json.Node key;
- public Json.Node value;
-
- public Entry(string datetime, Json.Node key, Json.Node value)
- {
- this.datetime = datetime;
- this.key = key;
- this.value = value;
- }
-
- public Entry.now(Json.Node key, Json.Node value)
- {
- this.datetime = new GLib.DateTime.now_utc().format("%FT%T");
- this.key = key;
- this.value = value;
- }
-
- internal string toLine()
- {
- var json = new Json.Node(Json.NodeType.ARRAY);
- var array = new Json.Array();
- array.add_string_element(this.datetime);
- array.add_element(this.key);
- array.add_element(this.value);
- json.set_array(array);
- return Json.to_string(json, false);
- }
+public Decsync(string dir, string ownAppId, Gee.Iterable> listeners)
+{
+ this.dir = dir;
+ this.ownAppId = ownAppId;
+ this.ownAppIdEncoded = FileUtils.urlencode(ownAppId);
+ this.listeners = listeners;
+}
- internal static Entry? fromLine(string line)
- {
- try {
- var json = Json.from_string(line);
- var array = json.get_array();
- if (array == null || array.get_length() != 3) {
- Log.w("Invalid entry " + line);
- return null;
- }
- var datetime = array.get_string_element(0);
- if (datetime == null) {
- Log.w("Invalid entry " + line);
- return null;
- }
- var key = array.get_element(1);
- var value = array.get_element(2);
- return new Entry(datetime, key, value);
- } catch (GLib.Error e) {
- Log.w("Invalid JSON: " + line + "\n" + e.message);
- return null;
- }
- }
- }
+/**
+ * Represents an [Entry] with its path.
+ */
+public class EntryWithPath {
+public Gee.List path;
+public Entry entry;
+
+public EntryWithPath(string[] path, Entry entry)
+{
+ this.path = toList(path);
+ this.entry = entry;
+}
- private class EntriesLocation {
- public Gee.List path;
- public File newEntriesFile;
- public File? storedEntriesFile;
- public File? readBytesFile;
+public EntryWithPath.now(string[] path, Json.Node key, Json.Node value)
+{
+ this.path = toList(path);
+ this.entry = new Entry.now(key, value);
+}
+}
- public EntriesLocation.getNewEntriesLocation(Decsync decsync, Gee.List path, string appId)
- {
- var pathString = FileUtils.pathToString(path);
- var appIdEncoded = FileUtils.urlencode(appId);
- this.path = path;
- this.newEntriesFile = File.new_for_path(decsync.dir + "/new-entries/" + appIdEncoded + "/" + pathString);
- this.storedEntriesFile = File.new_for_path(decsync.dir + "/stored-entries/" + decsync.ownAppIdEncoded + "/" + pathString);
- this.readBytesFile = File.new_for_path(decsync.dir + "/read-bytes/" + decsync.ownAppIdEncoded + "/" + appIdEncoded + "/" + pathString);
- }
+/**
+ * Represents a key/value pair stored by DecSync. Additionally, it has a datetime property
+ * indicating the most recent update. It does not store its path, see [EntryWithPath].
+ */
+public class Entry {
+internal string datetime;
+public Json.Node key;
+public Json.Node value;
+
+public Entry(string datetime, Json.Node key, Json.Node value)
+{
+ this.datetime = datetime;
+ this.key = key;
+ this.value = value;
+}
- public EntriesLocation.getStoredEntriesLocation(Decsync decsync, Gee.List path)
- {
- var pathString = FileUtils.pathToString(path);
- this.path = path;
- this.newEntriesFile = File.new_for_path(decsync.dir + "/stored-entries/" + decsync.ownAppIdEncoded + "/" + pathString);
- this.storedEntriesFile = null;
- this.readBytesFile = null;
- }
- }
+public Entry.now(Json.Node key, Json.Node value)
+{
+ this.datetime = new GLib.DateTime.now_utc().format("%FT%T");
+ this.key = key;
+ this.value = value;
+}
- /**
- * Associates the given [value] with the given [key] in the map corresponding to the given
- * [path]. This update is sent to synchronized devices.
- */
- public void setEntry(string[] pathArray, Json.Node key, Json.Node value)
- {
- var entries = new Gee.ArrayList();
- entries.add(new Entry.now(key, value));
- setEntriesForPath(toList(pathArray), entries);
+internal string toLine()
+{
+ var json = new Json.Node(Json.NodeType.ARRAY);
+ var array = new Json.Array();
+ array.add_string_element(this.datetime);
+ array.add_element(this.key);
+ array.add_element(this.value);
+ json.set_array(array);
+ return Json.to_string(json, false);
+}
+
+internal static Entry? fromLine(string line)
+{
+ try {
+ var json = Json.from_string(line);
+ var array = json.get_array();
+ if (array == null || array.get_length() != 3) {
+ Log.w("Invalid entry " + line);
+ return null;
+ }
+ var datetime = array.get_string_element(0);
+ if (datetime == null) {
+ Log.w("Invalid entry " + line);
+ return null;
+ }
+ var key = array.get_element(1);
+ var value = array.get_element(2);
+ return new Entry(datetime, key, value);
+ } catch (GLib.Error e) {
+ Log.w("Invalid JSON: " + line + "\n" + e.message);
+ return null;
}
+}
+}
- /**
- * Like [setEntry], but allows multiple entries to be set. This is more efficient if multiple
- * entries share the same path.
- *
- * @param entriesWithPath entries with path which are inserted.
- */
- public void setEntries(Gee.Collection entriesWithPath)
- {
- var multiMap = groupBy, Entry>(
- entriesWithPath,
- entryWithPath => { return entryWithPath.path; },
- entryWithPath => { return entryWithPath.entry; }
+private class EntriesLocation {
+public Gee.List path;
+public File newEntriesFile;
+public File? storedEntriesFile;
+public File? readBytesFile;
+
+public EntriesLocation.getNewEntriesLocation(Decsync decsync, Gee.List path, string appId)
+{
+ var pathString = FileUtils.pathToString(path);
+ var appIdEncoded = FileUtils.urlencode(appId);
+ this.path = path;
+ this.newEntriesFile = File.new_for_path(decsync.dir + "/new-entries/" + appIdEncoded + "/" + pathString);
+ this.storedEntriesFile = File.new_for_path(decsync.dir + "/stored-entries/" + decsync.ownAppIdEncoded + "/" + pathString);
+ this.readBytesFile = File.new_for_path(decsync.dir + "/read-bytes/" + decsync.ownAppIdEncoded + "/" + appIdEncoded + "/" + pathString);
+}
+
+public EntriesLocation.getStoredEntriesLocation(Decsync decsync, Gee.List path)
+{
+ var pathString = FileUtils.pathToString(path);
+ this.path = path;
+ this.newEntriesFile = File.new_for_path(decsync.dir + "/stored-entries/" + decsync.ownAppIdEncoded + "/" + pathString);
+ this.storedEntriesFile = null;
+ this.readBytesFile = null;
+}
+}
+
+/**
+ * Associates the given [value] with the given [key] in the map corresponding to the given
+ * [path]. This update is sent to synchronized devices.
+ */
+public void setEntry(string[] pathArray, Json.Node key, Json.Node value)
+{
+ var entries = new Gee.ArrayList();
+ entries.add(new Entry.now(key, value));
+ setEntriesForPath(toList(pathArray), entries);
+}
+
+/**
+ * Like [setEntry], but allows multiple entries to be set. This is more efficient if multiple
+ * entries share the same path.
+ *
+ * @param entriesWithPath entries with path which are inserted.
+ */
+public void setEntries(Gee.Collection entriesWithPath)
+{
+ var multiMap = groupBy, Entry>(
+ entriesWithPath,
+ entryWithPath => { return entryWithPath.path; },
+ entryWithPath => { return entryWithPath.entry; }
);
- multiMap.get_keys().@foreach(path => {
+ multiMap.get_keys().@foreach(path => {
setEntriesForPath(path, multiMap.@get(path));
return true;
});
- }
-
- /**
- * Like [setEntries], but only allows the entries to have the same path. Consequently, it can
- * be slightly more convenient since the path has to be specified just once.
- *
- * @param path path to the map in which the entries are inserted.
- * @param entries entries which are inserted.
- */
- public void setEntriesForPath(Gee.List path, Gee.Collection entries)
- {
- Log.d("Write to path " + FileUtils.pathToString(path));
- var entriesLocation = new EntriesLocation.getNewEntriesLocation(this, path, ownAppId);
+}
- // Write new entries
- var builder = new StringBuilder();
- foreach (var entry in entries) {
- builder.append(entry.toLine() + "\n");
+/**
+ * Like [setEntries], but only allows the entries to have the same path. Consequently, it can
+ * be slightly more convenient since the path has to be specified just once.
+ *
+ * @param path path to the map in which the entries are inserted.
+ * @param entries entries which are inserted.
+ */
+public void setEntriesForPath(Gee.List path, Gee.Collection entries)
+{
+ Log.d("Write to path " + FileUtils.pathToString(path));
+ var entriesLocation = new EntriesLocation.getNewEntriesLocation(this, path, ownAppId);
+
+ // Write new entries
+ var builder = new StringBuilder();
+ foreach (var entry in entries) {
+ builder.append(entry.toLine() + "\n");
+ }
+ try {
+ FileUtils.writeFile(entriesLocation.newEntriesFile, builder.str, true);
+ } catch (Error e) {
+ Log.w(e.message);
+ }
+
+ // Update .decsync-sequence files
+ while (!path.is_empty) {
+ path.remove_at(path.size - 1);
+ var dir = new EntriesLocation.getNewEntriesLocation(this, path, ownAppId).newEntriesFile;
+ var file = dir.get_child(".decsync-sequence");
+
+ // Get the old version
+ int64 version = 0;
+ if (file.query_exists()) {
+ try {
+ var stream = new DataInputStream(file.read());
+ version = int64.parse(stream.read_line()); // Defaults to 0
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
}
+
+ // Write the new version
try {
- FileUtils.writeFile(entriesLocation.newEntriesFile, builder.str, true);
+ FileUtils.writeFile(file, (version + 1).to_string());
} catch (Error e) {
Log.w(e.message);
}
+ }
- // Update .decsync-sequence files
- while (!path.is_empty) {
- path.remove_at(path.size - 1);
- var dir = new EntriesLocation.getNewEntriesLocation(this, path, ownAppId).newEntriesFile;
- var file = dir.get_child(".decsync-sequence");
-
- // Get the old version
- int64 version = 0;
- if (file.query_exists()) {
- try {
- var stream = new DataInputStream(file.read());
- version = int64.parse(stream.read_line()); // Defaults to 0
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- }
+ // Update stored entries
+ updateStoredEntries(entriesLocation, entries);
+}
- // Write the new version
- try {
- FileUtils.writeFile(file, (version + 1).to_string());
- } catch (Error e) {
- Log.w(e.message);
- }
+/**
+ * Initializes the monitor which watches the filesystem for updated entries and executes the
+ * corresponding actions.
+ *
+ * @param extra extra data passed to the [listeners].
+ */
+public void initMonitor(T extra)
+{
+ try {
+ var newEntriesDir = File.new_for_path(dir + "/new-entries");
+ var parent = newEntriesDir.get_parent();
+ if (!parent.query_exists()) {
+ parent.make_directory_with_parents();
}
-
- // Update stored entries
- updateStoredEntries(entriesLocation, entries);
- }
-
- /**
- * Initializes the monitor which watches the filesystem for updated entries and executes the
- * corresponding actions.
- *
- * @param extra extra data passed to the [listeners].
- */
- public void initMonitor(T extra)
- {
- try {
- var newEntriesDir = File.new_for_path(dir + "/new-entries");
- var parent = newEntriesDir.get_parent();
- if (!parent.query_exists()) {
- parent.make_directory_with_parents();
- }
- monitor = new DirectoryMonitor(newEntriesDir);
- monitor.changed.connect(pathString => {
+ monitor = new DirectoryMonitor(newEntriesDir);
+ monitor.changed.connect(pathString => {
var pathEncoded = new Gee.ArrayList.wrap(pathString.split("/"));
pathEncoded.remove("");
if (pathEncoded.is_empty || pathEncoded.last()[0] == '.') {
- return;
+ return;
}
var path = new Gee.ArrayList();
path.add_all_iterator(pathEncoded.map(part => { return FileUtils.urldecode(part); }));
if (path.any_match(part => { return part == null; })) {
- Log.w("Cannot decode path " + pathString);
- return;
+ Log.w("Cannot decode path " + pathString);
+ return;
}
var appId = path.first();
path.remove_at(0);
var entriesLocation = new EntriesLocation.getNewEntriesLocation(this, path, appId);
if (appId != ownAppId && entriesLocation.newEntriesFile.query_file_type(FileQueryInfoFlags.NONE) == FileType.REGULAR) {
- executeEntriesLocation(entriesLocation, extra);
- Log.d("Sync complete");
- syncComplete(extra);
+ executeEntriesLocation(entriesLocation, extra);
+ Log.d("Sync complete");
+ syncComplete(extra);
}
});
- Log.d("Initialized folder monitor for " + dir + "/new-entries");
+ Log.d("Initialized folder monitor for " + dir + "/new-entries");
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+}
+
+/**
+ * Gets all updated entries and executes the corresponding actions.
+ *
+ * @param extra extra data passed to the [listeners].
+ */
+public void executeAllNewEntries(T extra)
+{
+ Log.d("Execute all new entries in " + dir);
+ var newEntriesDir = File.new_for_path(dir + "/new-entries");
+ var readBytesDir = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded);
+ Gee.Predicate> pathPred = path => { return path.is_empty || path.first() != ownAppId; };
+ FileUtils.listFilesRecursiveRelative(newEntriesDir, readBytesDir, pathPred)
+ .map(path => { return new EntriesLocation.getNewEntriesLocation(this, path.slice(1, path.size), path.first()); })
+ .@foreach (entriesLocation => {
+ executeEntriesLocation(entriesLocation, extra);
+ return true;
+ });
+ Log.d("Sync complete");
+ syncComplete(extra);
+}
+
+private void executeEntriesLocation(EntriesLocation entriesLocation, T extra, Gee.Predicate? keyPred = null, Gee.Predicate? valuePred = null)
+{
+ // Get the number of read bytes
+ int64 readBytes = 0;
+ if (entriesLocation.readBytesFile != null && entriesLocation.readBytesFile.query_exists()) {
+ try {
+ var stream = new DataInputStream(entriesLocation.readBytesFile.read());
+ readBytes = int64.parse(stream.read_line()); // Defaults to 0
} catch (GLib.Error e) {
Log.w(e.message);
}
}
- /**
- * Gets all updated entries and executes the corresponding actions.
- *
- * @param extra extra data passed to the [listeners].
- */
- public void executeAllNewEntries(T extra)
- {
- Log.d("Execute all new entries in " + dir);
- var newEntriesDir = File.new_for_path(dir + "/new-entries");
- var readBytesDir = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded);
- Gee.Predicate> pathPred = path => { return path.is_empty || path.first() != ownAppId; };
- FileUtils.listFilesRecursiveRelative(newEntriesDir, readBytesDir, pathPred)
- .map(path => { return new EntriesLocation.getNewEntriesLocation(this, path.slice(1, path.size), path.first()); })
- .@foreach (entriesLocation => {
- executeEntriesLocation(entriesLocation, extra);
- return true;
- });
- Log.d("Sync complete");
- syncComplete(extra);
+ // Write the new number of read bytes (= size of the entry file)
+ if (entriesLocation.readBytesFile != null) {
+ try {
+ var size = entriesLocation.newEntriesFile.query_info("standard::size", FileQueryInfoFlags.NONE).get_size();
+ if (readBytes >= size) return;
+ FileUtils.writeFile(entriesLocation.readBytesFile, size.to_string());
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
}
- private void executeEntriesLocation(EntriesLocation entriesLocation, T extra, Gee.Predicate? keyPred = null, Gee.Predicate? valuePred = null)
- {
- // Get the number of read bytes
- int64 readBytes = 0;
- if (entriesLocation.readBytesFile != null && entriesLocation.readBytesFile.query_exists()) {
- try {
- var stream = new DataInputStream(entriesLocation.readBytesFile.read());
- readBytes = int64.parse(stream.read_line()); // Defaults to 0
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- }
+ Log.d("Execute entries of " + entriesLocation.newEntriesFile.get_path());
- // Write the new number of read bytes (= size of the entry file)
- if (entriesLocation.readBytesFile != null) {
- try {
- var size = entriesLocation.newEntriesFile.query_info("standard::size", FileQueryInfoFlags.NONE).get_size();
- if (readBytes >= size) return;
- FileUtils.writeFile(entriesLocation.readBytesFile, size.to_string());
- } catch (GLib.Error e) {
- Log.w(e.message);
+ // Execute the entries
+ var entriesMap = new Gee.HashMap(
+ a => { return a.hash(); },
+ (a, b) => { return a.equal(b); }
+ );
+ try {
+ var stream = new DataInputStream(entriesLocation.newEntriesFile.read());
+ stream.seek(readBytes, SeekType.SET);
+ string line;
+ while ((line = stream.read_line(null)) != null) {
+ var entryLine = Entry.fromLine(line);
+ if (entryLine == null) {
+ continue;
+ }
+ if ((keyPred == null || keyPred(entryLine.key)) &&
+ (valuePred == null || valuePred(entryLine.value))) {
+ var key = entryLine.key;
+ var entry = entriesMap.@get(key);
+ if (entry == null || entryLine.datetime > entry.datetime) {
+ entriesMap.@set(key, entryLine);
+ }
}
}
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+ var entries = new Gee.ArrayList();
+ entries.add_all(entriesMap.values);
+ executeEntries(entriesLocation, entries, extra);
+}
- Log.d("Execute entries of " + entriesLocation.newEntriesFile.get_path());
+private void executeEntries(EntriesLocation entriesLocation, Gee.Collection entries, T extra)
+{
+ updateStoredEntries(entriesLocation, entries);
- // Execute the entries
- var entriesMap = new Gee.HashMap(
- a => { return a.hash(); },
- (a, b) => { return a.equal(b); }
- );
- try {
- var stream = new DataInputStream(entriesLocation.newEntriesFile.read());
- stream.seek(readBytes, SeekType.SET);
+ var listener = getListener(entriesLocation.path);
+ if (listener == null) {
+ Log.e("Unknown action for path " + FileUtils.pathToString(entriesLocation.path));
+ return;
+ }
+
+ listener.onEntriesUpdate(entriesLocation.path, entries, extra);
+}
+
+private void updateStoredEntries(EntriesLocation entriesLocation, Gee.Collection entries)
+{
+ if (entriesLocation.storedEntriesFile == null) {
+ return;
+ }
+
+ try {
+ var haveToFilterFile = false;
+ if (entriesLocation.storedEntriesFile.query_exists()) {
+ var stream = new DataInputStream(entriesLocation.storedEntriesFile.read());
string line;
while ((line = stream.read_line(null)) != null) {
var entryLine = Entry.fromLine(line);
if (entryLine == null) {
continue;
}
- if ((keyPred == null || keyPred(entryLine.key)) &&
- (valuePred == null || valuePred(entryLine.value))) {
- var key = entryLine.key;
- var entry = entriesMap.@get(key);
- if (entry == null || entryLine.datetime > entry.datetime) {
- entriesMap.@set(key, entryLine);
- }
- }
- }
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- var entries = new Gee.ArrayList();
- entries.add_all(entriesMap.values);
- executeEntries(entriesLocation, entries, extra);
- }
-
- private void executeEntries(EntriesLocation entriesLocation, Gee.Collection entries, T extra)
- {
- updateStoredEntries(entriesLocation, entries);
-
- var listener = getListener(entriesLocation.path);
- if (listener == null) {
- Log.e("Unknown action for path " + FileUtils.pathToString(entriesLocation.path));
- return;
- }
-
- listener.onEntriesUpdate(entriesLocation.path, entries, extra);
- }
-
- private void updateStoredEntries(EntriesLocation entriesLocation, Gee.Collection entries)
- {
- if (entriesLocation.storedEntriesFile == null) {
- return;
- }
-
- try {
- var haveToFilterFile = false;
- if (entriesLocation.storedEntriesFile.query_exists()) {
- var stream = new DataInputStream(entriesLocation.storedEntriesFile.read());
- string line;
- while ((line = stream.read_line(null)) != null) {
- var entryLine = Entry.fromLine(line);
- if (entryLine == null) {
- continue;
- }
- var entriesIterator = entries.iterator();
- while (entriesIterator.has_next()) {
- entriesIterator.next();
- var entry = entriesIterator.get();
- if (entry.key.equal(entryLine.key)) {
- if (entry.datetime > entryLine.datetime) {
- haveToFilterFile = true;
- } else {
- entriesIterator.remove();
- }
+ var entriesIterator = entries.iterator();
+ while (entriesIterator.has_next()) {
+ entriesIterator.next();
+ var entry = entriesIterator.get();
+ if (entry.key.equal(entryLine.key)) {
+ if (entry.datetime > entryLine.datetime) {
+ haveToFilterFile = true;
+ } else {
+ entriesIterator.remove();
}
}
}
}
+ }
- if (haveToFilterFile) {
- FileUtils.filterFile(entriesLocation.storedEntriesFile, line => {
+ if (haveToFilterFile) {
+ FileUtils.filterFile(entriesLocation.storedEntriesFile, line => {
var entryLine = Entry.fromLine(line);
if (entryLine == null) {
- return false;
+ return false;
}
return !entries.any_match(entry => { return entry.key.equal(entryLine.key); });
});
- }
+ }
- var builder = new StringBuilder();
- entries.@foreach(entry => {
+ var builder = new StringBuilder();
+ entries.@foreach(entry => {
builder.append(entry.toLine() + "\n");
return true;
});
- FileUtils.writeFile(entriesLocation.storedEntriesFile, builder.str, true);
- }
- catch (GLib.Error e)
- {
- Log.w(e.message);
- }
+ FileUtils.writeFile(entriesLocation.storedEntriesFile, builder.str, true);
}
-
- /**
- * Gets all stored entries satisfying the predicates and executes the corresponding actions.
- *
- * @param executePath path to the entries to executes. This can be either a file or a directory.
- * If it specifies a file, the entries in that file are executed. If it specifies a directory,
- * all entries in all subfiles are executed.
- * @param extra extra data passed to the [listeners].
- * @param keyPred optional predicate on the keys. The key has to satisfy this predicate to be
- * executed.
- * @param valuePred optional predicate on the values. The value has to satisfy this predicate to
- * be executed.
- * @param pathPred optional predicate on the subpaths. Each subpath has to satisfy this
- * predicate to be executed. This holds for directories as well. Furthermore, the path of
- * specified in [executePath] is not part of the argument.
- */
- public void executeStoredEntries(string[] executePathArray, T extra,
- Gee.Predicate? keyPred = null,
- Gee.Predicate? valuePred = null,
- Gee.Predicate>? pathPred = null)
+ catch (GLib.Error e)
{
- var executePath = toList(executePathArray);
- var executePathString = FileUtils.pathToString(executePath);
- var executeDir = File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded + "/" + executePathString);
- FileUtils.listFilesRecursiveRelative(executeDir, null, pathPred)
- .@foreach(path => {
- path.insert_all(0, executePath);
- var entriesLocation = new EntriesLocation.getStoredEntriesLocation(this, path);
- executeEntriesLocation(entriesLocation, extra, keyPred, valuePred);
- return true;
- });
+ Log.w(e.message);
}
+}
- /**
- * Initializes the stored entries. This method does not execute any actions. This is often
- * followed with a call to [executeStoredEntries].
- */
- public void initStoredEntries()
- {
- // Get the most up-to-date appId
- string? appId = null;
- string? maxDatetime = null;
- FileUtils.listFilesRecursiveRelative(File.new_for_path(dir + "/stored-entries"))
- .filter(path => { return !path.is_empty; })
- .@foreach(path => {
- var pathString = FileUtils.pathToString(path);
- try {
- var file = File.new_for_path(dir + "/stored-entries/" + pathString);
- var stream = new DataInputStream(file.read());
- string line;
- while ((line = stream.read_line(null)) != null) {
- var entry = Entry.fromLine(line);
- if (entry == null) {
- continue;
- }
- if (maxDatetime == null || entry.datetime > maxDatetime ||
- path.first() == ownAppId && entry.datetime == maxDatetime) { // Prefer own appId
- maxDatetime = entry.datetime;
- appId = path.first();
- }
- }
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- return true;
- });
- if (appId == null) {
- Log.i("No appId found for initialization");
- return;
- }
-
- // Copy the stored files and update the read bytes
- if (appId != ownAppId) {
- var appIdEncoded = FileUtils.urlencode(appId);
+/**
+ * Gets all stored entries satisfying the predicates and executes the corresponding actions.
+ *
+ * @param executePath path to the entries to executes. This can be either a file or a directory.
+ * If it specifies a file, the entries in that file are executed. If it specifies a directory,
+ * all entries in all subfiles are executed.
+ * @param extra extra data passed to the [listeners].
+ * @param keyPred optional predicate on the keys. The key has to satisfy this predicate to be
+ * executed.
+ * @param valuePred optional predicate on the values. The value has to satisfy this predicate to
+ * be executed.
+ * @param pathPred optional predicate on the subpaths. Each subpath has to satisfy this
+ * predicate to be executed. This holds for directories as well. Furthermore, the path of
+ * specified in [executePath] is not part of the argument.
+ */
+public void executeStoredEntries(string[] executePathArray, T extra,
+ Gee.Predicate? keyPred = null,
+ Gee.Predicate? valuePred = null,
+ Gee.Predicate>? pathPred = null)
+{
+ var executePath = toList(executePathArray);
+ var executePathString = FileUtils.pathToString(executePath);
+ var executeDir = File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded + "/" + executePathString);
+ FileUtils.listFilesRecursiveRelative(executeDir, null, pathPred)
+ .@foreach(path => {
+ path.insert_all(0, executePath);
+ var entriesLocation = new EntriesLocation.getStoredEntriesLocation(this, path);
+ executeEntriesLocation(entriesLocation, extra, keyPred, valuePred);
+ return true;
+ });
+}
+/**
+ * Initializes the stored entries. This method does not execute any actions. This is often
+ * followed with a call to [executeStoredEntries].
+ */
+public void initStoredEntries()
+{
+ // Get the most up-to-date appId
+ string? appId = null;
+ string? maxDatetime = null;
+ FileUtils.listFilesRecursiveRelative(File.new_for_path(dir + "/stored-entries"))
+ .filter(path => { return !path.is_empty; })
+ .@foreach(path => {
+ var pathString = FileUtils.pathToString(path);
try {
- FileUtils.@delete(File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded));
- FileUtils.copy(File.new_for_path(dir + "/stored-entries/" + appIdEncoded), File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded));
+ var file = File.new_for_path(dir + "/stored-entries/" + pathString);
+ var stream = new DataInputStream(file.read());
+ string line;
+ while ((line = stream.read_line(null)) != null) {
+ var entry = Entry.fromLine(line);
+ if (entry == null) {
+ continue;
+ }
+ if (maxDatetime == null || entry.datetime > maxDatetime ||
+ path.first() == ownAppId && entry.datetime == maxDatetime) { // Prefer own appId
+ maxDatetime = entry.datetime;
+ appId = path.first();
+ }
+ }
} catch (GLib.Error e) {
- Log.w(e.message);
+ Log.w(e.message);
}
+ return true;
+ });
+ if (appId == null) {
+ Log.i("No appId found for initialization");
+ return;
+ }
- try {
- FileUtils.@delete(File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded));
- FileUtils.copy(File.new_for_path(dir + "/read-bytes/" + appIdEncoded), File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded));
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- var newEntriesDir = File.new_for_path(dir + "/new-entries/" + appIdEncoded);
- var ownReadBytesDir = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded + "/" + appIdEncoded);
- FileUtils.listFilesRecursiveRelative(newEntriesDir, ownReadBytesDir).@foreach(path => {
+ // Copy the stored files and update the read bytes
+ if (appId != ownAppId) {
+ var appIdEncoded = FileUtils.urlencode(appId);
+
+ try {
+ FileUtils.@delete(File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded));
+ FileUtils.copy(File.new_for_path(dir + "/stored-entries/" + appIdEncoded), File.new_for_path(dir + "/stored-entries/" + ownAppIdEncoded));
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+
+ try {
+ FileUtils.@delete(File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded));
+ FileUtils.copy(File.new_for_path(dir + "/read-bytes/" + appIdEncoded), File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded));
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+ var newEntriesDir = File.new_for_path(dir + "/new-entries/" + appIdEncoded);
+ var ownReadBytesDir = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded + "/" + appIdEncoded);
+ FileUtils.listFilesRecursiveRelative(newEntriesDir, ownReadBytesDir).@foreach(path => {
var pathString = FileUtils.pathToString(path);
try {
- var newEntriesFile = File.new_for_path(dir + "/new-entries/" + appIdEncoded + "/" + pathString);
- var size = newEntriesFile.query_info("standard::size", FileQueryInfoFlags.NONE).get_size();
- var readBytesFile = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded + "/" + appIdEncoded + "/" + pathString);
- FileUtils.writeFile(readBytesFile, size.to_string());
+ var newEntriesFile = File.new_for_path(dir + "/new-entries/" + appIdEncoded + "/" + pathString);
+ var size = newEntriesFile.query_info("standard::size", FileQueryInfoFlags.NONE).get_size();
+ var readBytesFile = File.new_for_path(dir + "/read-bytes/" + ownAppIdEncoded + "/" + appIdEncoded + "/" + pathString);
+ FileUtils.writeFile(readBytesFile, size.to_string());
} catch (GLib.Error e) {
- Log.w(e.message);
+ Log.w(e.message);
}
return true;
});
- }
- }
+ }
+}
- /**
- * Returns the value of the given [key] in the map of the given [path], and in the given
- * [DecSync directory][decsyncDir] without specifying an appId, or `null` if there is no
- * such value. The use of this method is discouraged. It is recommended to use the method
- * [executeStoredEntries] when possible.
- */
- public static Json.Node? getStoredStaticValue(string decsyncDir, string[] pathArray, Json.Node key)
- {
- Log.d("Get value for key " + Json.to_string(key, false) + " for path " + string.joinv("/", pathArray) + " in " + decsyncDir);
- var path = toList(pathArray);
- var pathString = FileUtils.pathToString(path);
- Json.Node? result = null;
- string? maxDatetime = null;
- var storedEntriesDir = File.new_for_path(decsyncDir + "/stored-entries");
- try {
- var enumerator = storedEntriesDir.enumerate_children("standard::*", FileQueryInfoFlags.NONE);
- FileInfo info;
- while ((info = enumerator.next_file(null)) != null) {
- if (info.get_name()[0] == '.') {
- continue;
- }
+/**
+ * Returns the value of the given [key] in the map of the given [path], and in the given
+ * [DecSync directory][decsyncDir] without specifying an appId, or `null` if there is no
+ * such value. The use of this method is discouraged. It is recommended to use the method
+ * [executeStoredEntries] when possible.
+ */
+public static Json.Node? getStoredStaticValue(string decsyncDir, string[] pathArray, Json.Node key)
+{
+ Log.d("Get value for key " + Json.to_string(key, false) + " for path " + string.joinv("/", pathArray) + " in " + decsyncDir);
+ var path = toList(pathArray);
+ var pathString = FileUtils.pathToString(path);
+ Json.Node? result = null;
+ string? maxDatetime = null;
+ var storedEntriesDir = File.new_for_path(decsyncDir + "/stored-entries");
+ try {
+ var enumerator = storedEntriesDir.enumerate_children("standard::*", FileQueryInfoFlags.NONE);
+ FileInfo info;
+ while ((info = enumerator.next_file(null)) != null) {
+ if (info.get_name()[0] == '.') {
+ continue;
+ }
+
+ var appIdEncoded = info.get_name();
+ var file = File.new_for_path(decsyncDir + "/stored-entries/" + appIdEncoded + "/" + pathString);
+ if (!file.query_exists() || file.query_file_type(FileQueryInfoFlags.NONE) != FileType.REGULAR) {
+ continue;
+ }
- var appIdEncoded = info.get_name();
- var file = File.new_for_path(decsyncDir + "/stored-entries/" + appIdEncoded + "/" + pathString);
- if (!file.query_exists() || file.query_file_type(FileQueryInfoFlags.NONE) != FileType.REGULAR) {
+ var stream = new DataInputStream(file.read());
+ string line;
+ while ((line = stream.read_line(null)) != null) {
+ var entry = Entry.fromLine(line);
+ if (entry == null) {
continue;
}
-
- var stream = new DataInputStream(file.read());
- string line;
- while ((line = stream.read_line(null)) != null) {
- var entry = Entry.fromLine(line);
- if (entry == null) {
- continue;
- }
- if (entry.key.equal(key) && (maxDatetime == null || entry.datetime > maxDatetime)) {
- maxDatetime = entry.datetime;
- result = entry.value;
- }
+ if (entry.key.equal(key) && (maxDatetime == null || entry.datetime > maxDatetime)) {
+ maxDatetime = entry.datetime;
+ result = entry.value;
}
}
- } catch (GLib.Error e) {
- Log.w(e.message);
}
-
- return result;
+ } catch (GLib.Error e) {
+ Log.w(e.message);
}
- private OnEntryUpdateListener? getListener(Gee.List path)
- {
- foreach (var listener in listeners) {
- if (listener.matchesPath(path)) {
- return listener;
- }
+ return result;
+}
+
+private OnEntryUpdateListener? getListener(Gee.List path)
+{
+ foreach (var listener in listeners) {
+ if (listener.matchesPath(path)) {
+ return listener;
}
- return null;
}
+ return null;
+}
}
/**
diff -pruN 2.6.1-1/plugins/backend/decsync/libdecsync/src/DirectoryMonitor.vala 2.7.1-1/plugins/backend/decsync/libdecsync/src/DirectoryMonitor.vala
--- 2.6.1-1/plugins/backend/decsync/libdecsync/src/DirectoryMonitor.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/libdecsync/src/DirectoryMonitor.vala 2019-02-01 19:30:50.000000000 +0000
@@ -18,73 +18,73 @@
public class DirectoryMonitor : GLib.Object {
- private File mDir;
- private string mPath;
- private FileMonitor mMonitor;
- private Gee.ArrayList mChilds = new Gee.ArrayList();
-
- public signal void changed(string path);
-
- public DirectoryMonitor(File dir) throws GLib.Error
- {
- this.withPath(dir, "");
- }
+private File mDir;
+private string mPath;
+private FileMonitor mMonitor;
+private Gee.ArrayList mChilds = new Gee.ArrayList();
+
+public signal void changed(string path);
+
+public DirectoryMonitor(File dir) throws GLib.Error
+{
+ this.withPath(dir, "");
+}
- private DirectoryMonitor.withPath(File dir, string path) throws GLib.Error
- {
- mDir = dir;
- mPath = path;
- var currentDir = File.new_for_path(dir.get_path() + path);
- mMonitor = currentDir.monitor_directory(FileMonitorFlags.NONE);
- mMonitor.changed.connect((file, otherFile, event) => {
+private DirectoryMonitor.withPath(File dir, string path) throws GLib.Error
+{
+ mDir = dir;
+ mPath = path;
+ var currentDir = File.new_for_path(dir.get_path() + path);
+ mMonitor = currentDir.monitor_directory(FileMonitorFlags.NONE);
+ mMonitor.changed.connect((file, otherFile, event) => {
if (file.get_path() != mDir.get_path() + path) {
- onEvent(path + "/" + file.get_basename(), event);
+ onEvent(path + "/" + file.get_basename(), event);
}
});
- Log.d("Monitor created for " + currentDir.get_path() + " (folder " + dir.get_path() + ")");
+ Log.d("Monitor created for " + currentDir.get_path() + " (folder " + dir.get_path() + ")");
- var enumerator = currentDir.enumerate_children("standard::*", FileQueryInfoFlags.NONE);
- FileInfo info = null;
- while (((info = enumerator.next_file(null)) != null)) {
- if (info.get_file_type() == FileType.DIRECTORY) {
- var childMonitor = new DirectoryMonitor.withPath(mDir, path + "/" + info.get_name());
- childMonitor.changed.connect((path) => {
+ var enumerator = currentDir.enumerate_children("standard::*", FileQueryInfoFlags.NONE);
+ FileInfo info = null;
+ while (((info = enumerator.next_file(null)) != null)) {
+ if (info.get_file_type() == FileType.DIRECTORY) {
+ var childMonitor = new DirectoryMonitor.withPath(mDir, path + "/" + info.get_name());
+ childMonitor.changed.connect((path) => {
changed(path);
});
- mChilds.add(childMonitor);
- }
+ mChilds.add(childMonitor);
}
}
+}
- private void onEvent(string path, FileMonitorEvent event)
- {
- Log.d("Received inotify event " + event.to_string() + " at " + mDir.get_path() + "/" + path);
- switch (event) {
- case FileMonitorEvent.DELETED:
- foreach (var c in mChilds) {
- if (c.mPath == path) {
- mChilds.remove(c);
- break;
- }
- }
+private void onEvent(string path, FileMonitorEvent event)
+{
+ Log.d("Received inotify event " + event.to_string() + " at " + mDir.get_path() + "/" + path);
+ switch (event) {
+ case FileMonitorEvent.DELETED:
+ foreach (var c in mChilds) {
+ if (c.mPath == path) {
+ mChilds.remove(c);
break;
- case FileMonitorEvent.CREATED:
- case FileMonitorEvent.CHANGED:
- var file = File.new_for_path(mDir.get_path() + path);
- if (file.query_file_type(FileQueryInfoFlags.NONE) == FileType.DIRECTORY) {
- try {
- var childMonitor = new DirectoryMonitor.withPath(mDir, path);
- childMonitor.changed.connect((path) => {
- changed(path);
- });
- mChilds.add(childMonitor);
- } catch (GLib.Error e) {
- Log.w(e.message);
- }
- } else {
- changed(path);
- }
- break;
+ }
+ }
+ break;
+ case FileMonitorEvent.CREATED:
+ case FileMonitorEvent.CHANGED:
+ var file = File.new_for_path(mDir.get_path() + path);
+ if (file.query_file_type(FileQueryInfoFlags.NONE) == FileType.DIRECTORY) {
+ try {
+ var childMonitor = new DirectoryMonitor.withPath(mDir, path);
+ childMonitor.changed.connect((path) => {
+ changed(path);
+ });
+ mChilds.add(childMonitor);
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+ } else {
+ changed(path);
}
+ break;
}
}
+}
diff -pruN 2.6.1-1/plugins/backend/decsync/libdecsync/src/FileUtils.vala 2.7.1-1/plugins/backend/decsync/libdecsync/src/FileUtils.vala
--- 2.6.1-1/plugins/backend/decsync/libdecsync/src/FileUtils.vala 2018-12-07 01:04:46.000000000 +0000
+++ 2.7.1-1/plugins/backend/decsync/libdecsync/src/FileUtils.vala 2019-02-01 19:30:50.000000000 +0000
@@ -18,200 +18,200 @@
public class FileUtils : GLib.Object {
- public static void writeFile(File file, string content, bool append = false) throws GLib.Error
- {
- var parent = file.get_parent();
+public static void writeFile(File file, string content, bool append = false) throws GLib.Error
+{
+ var parent = file.get_parent();
+ if (!parent.query_exists()) {
+ parent.make_directory_with_parents();
+ }
+
+ GLib.FileOutputStream stream;
+ if (append) {
+ stream = file.append_to(FileCreateFlags.NONE);
+ } else {
+ if (file.query_exists()) {
+ file.@delete();
+ }
+ stream = file.create(FileCreateFlags.REPLACE_DESTINATION);
+ }
+ stream.write(content.data);
+}
+
+public static void @delete(File src) throws GLib.Error
+{
+ if (!src.query_exists()) {
+ return;
+ }
+ if (src.query_file_type(FileQueryInfoFlags.NONE) == FileType.DIRECTORY) {
+ var enumerator = src.enumerate_children("standard::name", FileQueryInfoFlags.NONE);
+ FileInfo info;
+ while ((info = enumerator.next_file(null)) != null) {
+ var name = info.get_name();
+ @delete(src.get_child(name));
+ }
+ }
+ src.@delete();
+}
+
+public static void copy(File src, File dst, bool overwrite = false) throws GLib.Error
+{
+ switch (src.query_file_type(FileQueryInfoFlags.NONE)) {
+ case FileType.REGULAR:
+ var parent = dst.get_parent();
if (!parent.query_exists()) {
parent.make_directory_with_parents();
}
+ src.copy(dst, overwrite ? FileCopyFlags.OVERWRITE : FileCopyFlags.NONE);
+ return;
+ case FileType.DIRECTORY:
+ dst.make_directory_with_parents();
+ var enumerator = src.enumerate_children("standard::name", FileQueryInfoFlags.NONE);
+ FileInfo info;
+ while ((info = enumerator.next_file(null)) != null) {
+ var name = info.get_name();
+ copy(src.get_child(name), dst.get_child(name), overwrite);
+ }
+ return;
+ }
+}
- GLib.FileOutputStream stream;
- if (append) {
- stream = file.append_to(FileCreateFlags.NONE);
- } else {
- if (file.query_exists()) {
- file.@delete();
- }
- stream = file.create(FileCreateFlags.REPLACE_DESTINATION);
+public static void filterFile(File file, Gee.Predicate linePred) throws GLib.Error
+{
+ var tempFile = File.new_for_path(file.get_parent().get_path() + "." + file.get_basename() + ".tmp");
+ var instream = new DataInputStream(file.read());
+ var outstream = new DataOutputStream(tempFile.create(FileCreateFlags.NONE));
+ string line;
+ while ((line = instream.read_line(null)) != null) {
+ if (linePred(line)) {
+ outstream.put_string(line + "\n");
}
- stream.write(content.data);
+ }
+ tempFile.move(file, FileCopyFlags.OVERWRITE);
+}
+
+public static Gee.ArrayList> listFilesRecursiveRelative(File src, File? readBytesSrc = null, Gee.Predicate>? pathPred = null)
+{
+ if (src.get_basename()[0] == '.') {
+ return new Gee.ArrayList>();
+ }
+ if (pathPred != null && !pathPred(new Gee.ArrayList())) {
+ return new Gee.ArrayList>();
}
- public static void @delete(File src) throws GLib.Error
- {
- if (!src.query_exists()) {
- return;
+ switch (src.query_file_type(FileQueryInfoFlags.NONE)) {
+ case FileType.REGULAR:
+ var result = new Gee.ArrayList>();
+ result.add(new Gee.ArrayList());
+ return result;
+ case FileType.DIRECTORY:
+ // Skip same versions
+ if (readBytesSrc != null) {
+ var file = src.get_child(".decsync-sequence");
+ string? version = null;
+ if (file.query_exists()) {
+ try {
+ version = new DataInputStream(file.read()).read_line();
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+ }
+ var readBytesFile = readBytesSrc.get_child(".decsync-sequence");
+ string? readBytesVersion = null;
+ if (readBytesFile.query_exists()) {
+ try {
+ readBytesVersion = new DataInputStream(readBytesFile.read()).read_line();
+ } catch (GLib.Error e) {
+ Log.w(e.message);
+ }
+ }
+ if (version != null) {
+ if (version == readBytesVersion) {
+ return new Gee.ArrayList