Plugins-Commits April 2017

plugins-commits@lists.geany.org

1 participants
49 discussions

[geany/geany-plugins] 922f71: geniuspaste: Update fpaste to new paste.fedoraproject.org API
by Colomban Wendling 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 Mar 2017 22:36:32 UTC Commit: 922f71e76fa70b133716e092a68b2bafb163ada6 https://github.com/geany/geany-plugins/commit/922f71e76fa70b133716e092a68b2… Log Message: ----------- geniuspaste: Update fpaste to new paste.fedoraproject.org API Modified Paths: -------------- geniuspaste/data/fpaste.org.conf Modified: geniuspaste/data/fpaste.org.conf 98 lines changed, 43 insertions(+), 55 deletions(-) =================================================================== @@ -1,67 +1,55 @@ [pastebin] name=fpaste.org -url=http://fpaste.org/ +url=https://paste.fedoraproject.org/api/paste/submit +content-type=application/json [format] -paste_data=%contents% -paste_lang=%language% -api_submit=true -mode=xml +contents=%contents% +language=%language% +title=%title% # Optional stuff -paste_user=%user% -# expiration in seconds -#paste_expire=0 +# expiration date in UNIX timestamp +#expiry_time=1453355837 +# Password for accessing the paste +#password=password123 [parse] -search=<id>(.+?)</id> -replace=http://fpaste.org/\1 +search="url" *: *"([^"]+)" +replace=\1 # map GeanyFileType=PastebinFileType [languages] -# map for GeSHi 2015-01-14 -ActionScript=Actionscript -Ada=ADA -ASM=ASM -C=C -C#=C# -C++=C++ -COBOL=COBOL -Conf=INI -CSS=CSS -CUDA=C -Cython=Python -D=D -Diff=Diff -Docbook=XML -F77=Fortran -Fortran=Fortran -FreeBasic=FreeBasic -GLSL=C -Haskell=Haskell -HTML=HTML -Java=Java -Javascript=Javascript -JSON=Javascript -LaTeX=LaTeX -Lisp=Lisp -Lua=Lua -Make=Make -NSIS=NSIS -Objective-C=Objective-C -Pascal=Pascal -Perl=Perl -PHP=PHP -Po=GetText -PowerShell=PowerShell -Prolog=Prolog -Python=Python -Ruby=Ruby -Scala=Scala -Sh=Bash -SQL=SQL -Tcl=TCL -Verilog=Verilog -VHDL=VHDL -XML=XML +# based off the list on the pastebin's web frontend +CMake=cmake +CoffeeScript=coffeescript +CSS=css +D=d +Diff=diff +Elm=elm +Erlang=erlang +Factor=factor +F77=fortran +Fortran=fortran +Go=go +Haskell=haskell +HTML=htmlmixed +Javascript=javascript +Jinja2=jinja2 +Markdown=markdown +Matlab/Octave=octave +PHP=php +Python=python +RPM=rpm +Ruby=ruby +Rust=rust +SASS=sass +Sh=shell +Smalltalk=smalltalk +SQL=sql +Swift=swift +Verilog=verilog +VHDL=vhdl +XML=xml +YAML=yaml -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cbdfcf: geniuspaste: Fix dpaste.de
by Colomban Wendling 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 Mar 2017 22:44:43 UTC Commit: cbdfcfb6ef861ef73baafafd6165d968612b3216 https://github.com/geany/geany-plugins/commit/cbdfcfb6ef861ef73baafafd6165d… Log Message: ----------- geniuspaste: Fix dpaste.de Modified Paths: -------------- geniuspaste/data/dpaste.de.conf Modified: geniuspaste/data/dpaste.de.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,9 @@ [pastebin] name=dpaste.de -url=http://dpaste.de/api/ +url=https://dpaste.de/api/ [format] -title=%title% +filename=%title% content=%contents% lexer=%language% #expires=%expire% -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e9c420: geniuspaste: Fix small typos in the documentation
by Colomban Wendling 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 Mar 2017 21:56:49 UTC Commit: e9c4201943e671148c80d8fcec18e8739ee86320 https://github.com/geany/geany-plugins/commit/e9c4201943e671148c80d8fcec18e… Log Message: ----------- geniuspaste: Fix small typos in the documentation Modified Paths: -------------- geniuspaste/README Modified: geniuspaste/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -67,7 +67,7 @@ Placeholders Values from the `[format] section`_ and the *replace* key in the `[parse] section`_ can contain references to placeholders with the syntax ``%name%`` -(i.e. ``%contents%``). +(e.g. ``%contents%``). Custom placeholders can be defined in the `[defaults] section`_. The builtin placeholders are: @@ -121,7 +121,7 @@ enable response body parsing, and it will use the default *search* and *search* A regular expression (PCRE) pattern to match against the pastebin service's raw response data. - Defaults to ``^[[:space:]]*(.+?)[[:space:]]*$``, e.g. capture everything + Defaults to ``^[[:space:]]*(.+?)[[:space:]]*$``, i.e. capture everything but the leading and trailing whitespaces. *replace* The final URL, with regular expression capture groups from *search* -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 082af7: geniuspaste: Add support for sending JSON-encoded payload
by Colomban Wendling 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 22 Mar 2017 22:35:42 UTC Commit: 082af799ad43dd481622a5f2aa7944650482e0bc https://github.com/geany/geany-plugins/commit/082af799ad43dd481622a5f2aa794… Log Message: ----------- geniuspaste: Add support for sending JSON-encoded payload Modified Paths: -------------- geniuspaste/README geniuspaste/src/geniuspaste.c Modified: geniuspaste/README 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -95,6 +95,10 @@ The *pastebin* section is required, and must contain at least the *name* and The URL to which submit the data. This key is required. *method* The HTTP method to use to submit the data. Defaults to ``POST``. +*content-type* + The Content-Type the request body should be sent in. Currently supported + types include ``application/x-www-form-urlencoded`` and ``application/json``. + Defaults to ``application/x-www-form-urlencoded``. *[format]* section ++++++++++++++++++ Modified: geniuspaste/src/geniuspaste.c 133 lines changed, 118 insertions(+), 15 deletions(-) =================================================================== @@ -50,16 +50,17 @@ #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX #endif -#define PASTEBIN_GROUP_DEFAULTS "defaults" -#define PASTEBIN_GROUP_FORMAT "format" -#define PASTEBIN_GROUP_LANGUAGES "languages" -#define PASTEBIN_GROUP_PARSE "parse" -#define PASTEBIN_GROUP_PARSE_KEY_SEARCH "search" -#define PASTEBIN_GROUP_PARSE_KEY_REPLACE "replace" -#define PASTEBIN_GROUP_PASTEBIN "pastebin" -#define PASTEBIN_GROUP_PASTEBIN_KEY_NAME "name" -#define PASTEBIN_GROUP_PASTEBIN_KEY_URL "url" -#define PASTEBIN_GROUP_PASTEBIN_KEY_METHOD "method" +#define PASTEBIN_GROUP_DEFAULTS "defaults" +#define PASTEBIN_GROUP_FORMAT "format" +#define PASTEBIN_GROUP_LANGUAGES "languages" +#define PASTEBIN_GROUP_PARSE "parse" +#define PASTEBIN_GROUP_PARSE_KEY_SEARCH "search" +#define PASTEBIN_GROUP_PARSE_KEY_REPLACE "replace" +#define PASTEBIN_GROUP_PASTEBIN "pastebin" +#define PASTEBIN_GROUP_PASTEBIN_KEY_NAME "name" +#define PASTEBIN_GROUP_PASTEBIN_KEY_URL "url" +#define PASTEBIN_GROUP_PASTEBIN_KEY_METHOD "method" +#define PASTEBIN_GROUP_PASTEBIN_KEY_CONTENT_TYPE "content-type" GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -73,6 +74,13 @@ typedef struct } Pastebin; +typedef enum +{ + FORMAT_HTML_FORM_URLENCODED, + FORMAT_JSON +} +Format; + GSList *pastebins = NULL; static struct @@ -503,9 +511,93 @@ static gchar *regex_replace(const gchar *pattern, return result; } -static void free_data_item(GQuark id, gpointer data, gpointer user_data) +static Format pastebin_get_format(const Pastebin *pastebin) { - g_free(data); + static const struct + { + const gchar *name; + Format format; + } formats[] = { + { "application/x-www-form-urlencoded", FORMAT_HTML_FORM_URLENCODED }, + { "application/json", FORMAT_JSON } + }; + Format result = FORMAT_HTML_FORM_URLENCODED; + gchar *format = utils_get_setting_string(pastebin->config, PASTEBIN_GROUP_PASTEBIN, + PASTEBIN_GROUP_PASTEBIN_KEY_CONTENT_TYPE, NULL); + + if (format) + { + for (guint i = 0; i < G_N_ELEMENTS(formats); i++) + { + if (strcmp(formats[i].name, format) == 0) + { + result = formats[i].format; + break; + } + } + + g_free(format); + } + + return result; +} + +/* Appends a JSON string. See: + * http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf */ +static void append_json_string(GString *str, const gchar *value) +{ + g_string_append_c(str, '"'); + for (; *value; value++) + { + if (*value == '"' || *value == '\\') + { + g_string_append_c(str, '\\'); + g_string_append_c(str, *value); + } + else if (*value == '\b') + g_string_append(str, "\\b"); + else if (*value == '\f') + g_string_append(str, "\\f"); + else if (*value == '\n') + g_string_append(str, "\\n"); + else if (*value == '\r') + g_string_append(str, "\\r"); + else if (*value == '\t') + g_string_append(str, "\\t"); + else if (*value >= 0x00 && *value <= 0x1F) + g_string_append_printf(str, "\\u%04d", *value); + else + g_string_append_c(str, *value); + } + g_string_append_c(str, '"'); +} + +static void append_json_data_item(GQuark id, gpointer data, gpointer user_data) +{ + GString *str = user_data; + + if (str->len > 1) /* if there's more than the first "{" */ + g_string_append_c(str, ','); + append_json_string(str, g_quark_to_string(id)); + g_string_append_c(str, ':'); + append_json_string(str, data); +} + +static SoupMessage *json_request_new(const gchar *method, + const gchar *url, + GData **fields) +{ + SoupMessage *msg = soup_message_new(method, url); + GString *str = g_string_new(NULL); + + g_string_append_c(str, '{'); + g_datalist_foreach(fields, append_json_data_item, str); + g_string_append_c(str, '}'); + soup_message_set_request(msg, "application/json", SOUP_MEMORY_TAKE, + str->str, str->len); + g_string_free(str, FALSE); + + return msg; } /* sends data to @pastebin and returns the raw response */ @@ -516,6 +608,7 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, SoupMessage *msg; gchar *url; gchar *method; + Format format; gsize n_fields; gchar **fields; GData *data; @@ -527,6 +620,7 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, PASTEBIN_GROUP_PASTEBIN_KEY_URL, NULL); method = utils_get_setting_string(pastebin->config, PASTEBIN_GROUP_PASTEBIN, PASTEBIN_GROUP_PASTEBIN_KEY_METHOD, "POST"); + format = pastebin_get_format(pastebin); /* prepare the form data */ fields = g_key_file_get_keys(pastebin->config, PASTEBIN_GROUP_FORMAT, &n_fields, NULL); g_datalist_init(&data); @@ -536,11 +630,20 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, fields[i], NULL); SETPTR(value, expand_placeholders(value, pastebin, doc, contents)); - g_datalist_set_data(&data, fields[i], value); + g_datalist_set_data_full(&data, fields[i], value, g_free); } g_strfreev(fields); - msg = soup_form_request_new_from_datalist(method, url, &data); - g_datalist_foreach(&data, free_data_item, NULL); + switch (format) + { + case FORMAT_JSON: + msg = json_request_new(method, url, &data); + break; + + default: + case FORMAT_HTML_FORM_URLENCODED: + msg = soup_form_request_new_from_datalist(method, url, &data); + break; + } g_datalist_clear(&data); return msg; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c07e2d: Merge pull request #551 from b4n/geniuspaste/update-pastebins
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:40:14 UTC Commit: c07e2ddce906b121c117076b5e41eb825ff3d6db https://github.com/geany/geany-plugins/commit/c07e2ddce906b121c117076b5e41e… Log Message: ----------- Merge pull request #551 from b4n/geniuspaste/update-pastebins geniuspaste: Update pastebins Modified Paths: -------------- geniuspaste/README geniuspaste/data/Makefile.am geniuspaste/data/dpaste.de.conf geniuspaste/data/fpaste.org.conf geniuspaste/data/tinypaste.com.conf geniuspaste/src/geniuspaste.c Modified: geniuspaste/README 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -15,7 +15,6 @@ services, but more can be added: * pastebin.geany.org * paste.debian.net * sprunge.us - * tinypaste.com GeniusPaste detects automatically the syntax of the code and pastes it with syntax highlighting enabled. @@ -67,7 +66,7 @@ Placeholders Values from the `[format] section`_ and the *replace* key in the `[parse] section`_ can contain references to placeholders with the syntax ``%name%`` -(i.e. ``%contents%``). +(e.g. ``%contents%``). Custom placeholders can be defined in the `[defaults] section`_. The builtin placeholders are: @@ -95,6 +94,10 @@ The *pastebin* section is required, and must contain at least the *name* and The URL to which submit the data. This key is required. *method* The HTTP method to use to submit the data. Defaults to ``POST``. +*content-type* + The Content-Type the request body should be sent in. Currently supported + types include ``application/x-www-form-urlencoded`` and ``application/json``. + Defaults to ``application/x-www-form-urlencoded``. *[format]* section ++++++++++++++++++ @@ -121,7 +124,7 @@ enable response body parsing, and it will use the default *search* and *search* A regular expression (PCRE) pattern to match against the pastebin service's raw response data. - Defaults to ``^[[:space:]]*(.+?)[[:space:]]*$``, e.g. capture everything + Defaults to ``^[[:space:]]*(.+?)[[:space:]]*$``, i.e. capture everything but the leading and trailing whitespaces. *replace* The final URL, with regular expression capture groups from *search* Modified: geniuspaste/data/Makefile.am 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -8,5 +8,4 @@ dist_pastebins_DATA = \ fpaste.org.conf \ pastebin.geany.org.conf \ paste.debian.net.conf \ - sprunge.us.conf \ - tinypaste.com.conf + sprunge.us.conf Modified: geniuspaste/data/dpaste.de.conf 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,9 +1,9 @@ [pastebin] name=dpaste.de -url=http://dpaste.de/api/ +url=https://dpaste.de/api/ [format] -title=%title% +filename=%title% content=%contents% lexer=%language% #expires=%expire% Modified: geniuspaste/data/fpaste.org.conf 98 lines changed, 43 insertions(+), 55 deletions(-) =================================================================== @@ -1,67 +1,55 @@ [pastebin] name=fpaste.org -url=http://fpaste.org/ +url=https://paste.fedoraproject.org/api/paste/submit +content-type=application/json [format] -paste_data=%contents% -paste_lang=%language% -api_submit=true -mode=xml +contents=%contents% +language=%language% +title=%title% # Optional stuff -paste_user=%user% -# expiration in seconds -#paste_expire=0 +# expiration date in UNIX timestamp +#expiry_time=1453355837 +# Password for accessing the paste +#password=password123 [parse] -search=<id>(.+?)</id> -replace=http://fpaste.org/\1 +search="url" *: *"([^"]+)" +replace=\1 # map GeanyFileType=PastebinFileType [languages] -# map for GeSHi 2015-01-14 -ActionScript=Actionscript -Ada=ADA -ASM=ASM -C=C -C#=C# -C++=C++ -COBOL=COBOL -Conf=INI -CSS=CSS -CUDA=C -Cython=Python -D=D -Diff=Diff -Docbook=XML -F77=Fortran -Fortran=Fortran -FreeBasic=FreeBasic -GLSL=C -Haskell=Haskell -HTML=HTML -Java=Java -Javascript=Javascript -JSON=Javascript -LaTeX=LaTeX -Lisp=Lisp -Lua=Lua -Make=Make -NSIS=NSIS -Objective-C=Objective-C -Pascal=Pascal -Perl=Perl -PHP=PHP -Po=GetText -PowerShell=PowerShell -Prolog=Prolog -Python=Python -Ruby=Ruby -Scala=Scala -Sh=Bash -SQL=SQL -Tcl=TCL -Verilog=Verilog -VHDL=VHDL -XML=XML +# based off the list on the pastebin's web frontend +CMake=cmake +CoffeeScript=coffeescript +CSS=css +D=d +Diff=diff +Elm=elm +Erlang=erlang +Factor=factor +F77=fortran +Fortran=fortran +Go=go +Haskell=haskell +HTML=htmlmixed +Javascript=javascript +Jinja2=jinja2 +Markdown=markdown +Matlab/Octave=octave +PHP=php +Python=python +RPM=rpm +Ruby=ruby +Rust=rust +SASS=sass +Sh=shell +Smalltalk=smalltalk +SQL=sql +Swift=swift +Verilog=verilog +VHDL=vhdl +XML=xml +YAML=yaml Modified: geniuspaste/data/tinypaste.com.conf 20 lines changed, 0 insertions(+), 20 deletions(-) =================================================================== @@ -1,20 +0,0 @@ -# FIXME: outdated, this leads to a 404 on http://pasted.co/ -[pastebin] -name=tinypaste.com -url=http://tinypaste.com/api/create.xml - -[format] -paste=%contents% -title=%title% -is_code=%language% - -[parse] -search=<response>(.*)</response> -replace=\1 - -[defaults] -language=1 - -# map GeanyFileType=PastebinFileType -[languages] -None=0 Modified: geniuspaste/src/geniuspaste.c 133 lines changed, 118 insertions(+), 15 deletions(-) =================================================================== @@ -50,16 +50,17 @@ #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX #endif -#define PASTEBIN_GROUP_DEFAULTS "defaults" -#define PASTEBIN_GROUP_FORMAT "format" -#define PASTEBIN_GROUP_LANGUAGES "languages" -#define PASTEBIN_GROUP_PARSE "parse" -#define PASTEBIN_GROUP_PARSE_KEY_SEARCH "search" -#define PASTEBIN_GROUP_PARSE_KEY_REPLACE "replace" -#define PASTEBIN_GROUP_PASTEBIN "pastebin" -#define PASTEBIN_GROUP_PASTEBIN_KEY_NAME "name" -#define PASTEBIN_GROUP_PASTEBIN_KEY_URL "url" -#define PASTEBIN_GROUP_PASTEBIN_KEY_METHOD "method" +#define PASTEBIN_GROUP_DEFAULTS "defaults" +#define PASTEBIN_GROUP_FORMAT "format" +#define PASTEBIN_GROUP_LANGUAGES "languages" +#define PASTEBIN_GROUP_PARSE "parse" +#define PASTEBIN_GROUP_PARSE_KEY_SEARCH "search" +#define PASTEBIN_GROUP_PARSE_KEY_REPLACE "replace" +#define PASTEBIN_GROUP_PASTEBIN "pastebin" +#define PASTEBIN_GROUP_PASTEBIN_KEY_NAME "name" +#define PASTEBIN_GROUP_PASTEBIN_KEY_URL "url" +#define PASTEBIN_GROUP_PASTEBIN_KEY_METHOD "method" +#define PASTEBIN_GROUP_PASTEBIN_KEY_CONTENT_TYPE "content-type" GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -73,6 +74,13 @@ typedef struct } Pastebin; +typedef enum +{ + FORMAT_HTML_FORM_URLENCODED, + FORMAT_JSON +} +Format; + GSList *pastebins = NULL; static struct @@ -503,9 +511,93 @@ static gchar *regex_replace(const gchar *pattern, return result; } -static void free_data_item(GQuark id, gpointer data, gpointer user_data) +static Format pastebin_get_format(const Pastebin *pastebin) { - g_free(data); + static const struct + { + const gchar *name; + Format format; + } formats[] = { + { "application/x-www-form-urlencoded", FORMAT_HTML_FORM_URLENCODED }, + { "application/json", FORMAT_JSON } + }; + Format result = FORMAT_HTML_FORM_URLENCODED; + gchar *format = utils_get_setting_string(pastebin->config, PASTEBIN_GROUP_PASTEBIN, + PASTEBIN_GROUP_PASTEBIN_KEY_CONTENT_TYPE, NULL); + + if (format) + { + for (guint i = 0; i < G_N_ELEMENTS(formats); i++) + { + if (strcmp(formats[i].name, format) == 0) + { + result = formats[i].format; + break; + } + } + + g_free(format); + } + + return result; +} + +/* Appends a JSON string. See: + * http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf */ +static void append_json_string(GString *str, const gchar *value) +{ + g_string_append_c(str, '"'); + for (; *value; value++) + { + if (*value == '"' || *value == '\\') + { + g_string_append_c(str, '\\'); + g_string_append_c(str, *value); + } + else if (*value == '\b') + g_string_append(str, "\\b"); + else if (*value == '\f') + g_string_append(str, "\\f"); + else if (*value == '\n') + g_string_append(str, "\\n"); + else if (*value == '\r') + g_string_append(str, "\\r"); + else if (*value == '\t') + g_string_append(str, "\\t"); + else if (*value >= 0x00 && *value <= 0x1F) + g_string_append_printf(str, "\\u%04d", *value); + else + g_string_append_c(str, *value); + } + g_string_append_c(str, '"'); +} + +static void append_json_data_item(GQuark id, gpointer data, gpointer user_data) +{ + GString *str = user_data; + + if (str->len > 1) /* if there's more than the first "{" */ + g_string_append_c(str, ','); + append_json_string(str, g_quark_to_string(id)); + g_string_append_c(str, ':'); + append_json_string(str, data); +} + +static SoupMessage *json_request_new(const gchar *method, + const gchar *url, + GData **fields) +{ + SoupMessage *msg = soup_message_new(method, url); + GString *str = g_string_new(NULL); + + g_string_append_c(str, '{'); + g_datalist_foreach(fields, append_json_data_item, str); + g_string_append_c(str, '}'); + soup_message_set_request(msg, "application/json", SOUP_MEMORY_TAKE, + str->str, str->len); + g_string_free(str, FALSE); + + return msg; } /* sends data to @pastebin and returns the raw response */ @@ -516,6 +608,7 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, SoupMessage *msg; gchar *url; gchar *method; + Format format; gsize n_fields; gchar **fields; GData *data; @@ -527,6 +620,7 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, PASTEBIN_GROUP_PASTEBIN_KEY_URL, NULL); method = utils_get_setting_string(pastebin->config, PASTEBIN_GROUP_PASTEBIN, PASTEBIN_GROUP_PASTEBIN_KEY_METHOD, "POST"); + format = pastebin_get_format(pastebin); /* prepare the form data */ fields = g_key_file_get_keys(pastebin->config, PASTEBIN_GROUP_FORMAT, &n_fields, NULL); g_datalist_init(&data); @@ -536,11 +630,20 @@ static SoupMessage *pastebin_soup_message_new(const Pastebin *pastebin, fields[i], NULL); SETPTR(value, expand_placeholders(value, pastebin, doc, contents)); - g_datalist_set_data(&data, fields[i], value); + g_datalist_set_data_full(&data, fields[i], value, g_free); } g_strfreev(fields); - msg = soup_form_request_new_from_datalist(method, url, &data); - g_datalist_foreach(&data, free_data_item, NULL); + switch (format) + { + case FORMAT_JSON: + msg = json_request_new(method, url, &data); + break; + + default: + case FORMAT_HTML_FORM_URLENCODED: + msg = soup_form_request_new_from_datalist(method, url, &data); + break; + } g_datalist_clear(&data); return msg; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ca4616: projectorganizer: Make sure project is open before trying to expand the tree
by Jiří Techet 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 23 Mar 2017 02:29:49 UTC Commit: ca4616ece886daa42f656233498df62c6e35e728 https://github.com/geany/geany-plugins/commit/ca4616ece886daa42f656233498df… Log Message: ----------- projectorganizer: Make sure project is open before trying to expand the tree Since expand_on_idle() is called as an idle function, it can happen it's executed after project is closed. Before trying to expand paths it now first checks if the idle call corresponds to the project for which the idle call was created. Should fix crash reported in #549. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 20 insertions(+), 9 deletions(-) =================================================================== @@ -48,6 +48,13 @@ typedef enum MATCH_PATTERN } MatchType; +typedef struct +{ + GeanyProject *project; + GPtrArray *expanded_paths; +} ExpandData; + + static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1210,22 +1217,24 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(gpointer ptr) +static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); - if (ptr) + if (prj_org && geany_data->app->project == expand_data->project && + expand_data->expanded_paths) { - GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expanded_paths) + foreach_ptr_array(item, i, expand_data->expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expanded_paths, TRUE); + g_ptr_array_free(expand_data->expanded_paths, TRUE); } - if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + g_free(expand_data); + + if (!s_follow_editor || !doc || !doc->file_name) return FALSE; expand_path(doc->file_name, TRUE); @@ -1281,11 +1290,13 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - GPtrArray *expanded_paths = NULL; + ExpandData *expand_data = g_new0(ExpandData, 1); + + expand_data->project = geany_data->app->project; if (reload) { - expanded_paths = get_expanded_paths(); + expand_data->expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1295,7 +1306,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 300a91: Merge pull request #555 from techee/prjorg_crash_fix
by Frank Lanitz 08 Apr '17

08 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 08 Apr 2017 14:38:55 UTC Commit: 300a9117e11ab1602007a83500dd1cfe0df4e725 https://github.com/geany/geany-plugins/commit/300a9117e11ab1602007a83500dd1… Log Message: ----------- Merge pull request #555 from techee/prjorg_crash_fix projectorganizer: Make sure project is open before trying to expand the tree Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 20 insertions(+), 9 deletions(-) =================================================================== @@ -48,6 +48,13 @@ typedef enum MATCH_PATTERN } MatchType; +typedef struct +{ + GeanyProject *project; + GPtrArray *expanded_paths; +} ExpandData; + + static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1210,22 +1217,24 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(gpointer ptr) +static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); - if (ptr) + if (prj_org && geany_data->app->project == expand_data->project && + expand_data->expanded_paths) { - GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expanded_paths) + foreach_ptr_array(item, i, expand_data->expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expanded_paths, TRUE); + g_ptr_array_free(expand_data->expanded_paths, TRUE); } - if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + g_free(expand_data); + + if (!s_follow_editor || !doc || !doc->file_name) return FALSE; expand_path(doc->file_name, TRUE); @@ -1281,11 +1290,13 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - GPtrArray *expanded_paths = NULL; + ExpandData *expand_data = g_new0(ExpandData, 1); + + expand_data->project = geany_data->app->project; if (reload) { - expanded_paths = get_expanded_paths(); + expand_data->expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1295,7 +1306,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4a0002: projectorganizer: Require that prj_org != NULL inside expand_on_idle()
by Jiří Techet 05 Apr '17

05 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 05 Apr 2017 16:04:19 UTC Commit: 4a0002178ad9cee0ff6377b74a9cc6c6ba02b010 https://github.com/geany/geany-plugins/commit/4a0002178ad9cee0ff6377b74a9cc… Log Message: ----------- projectorganizer: Require that prj_org != NULL inside expand_on_idle() The previous code only checked this for paths shown in the sidebar but since the plugins also tries to perform the expansion for the current document when this option is enabled, it needs to be done for this case as well. Just leave the function when prj_org == NULL. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -1221,7 +1221,10 @@ static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); - if (prj_org && geany_data->app->project == expand_data->project && + if (!prj_org) + return FALSE; + + if (geany_data->app->project == expand_data->project && expand_data->expanded_paths) { gchar *item; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] adf01d: projectorganizer: Make sure project is open before trying to expand the tree
by Jiří Techet 05 Apr '17

05 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 05 Apr 2017 16:04:05 UTC Commit: adf01d6d239ad5dd17092640ff762453c0a237f1 https://github.com/geany/geany-plugins/commit/adf01d6d239ad5dd17092640ff762… Log Message: ----------- projectorganizer: Make sure project is open before trying to expand the tree Since expand_on_idle() is called as an idle function, it can happen it's executed after project is closed. Before trying to expand paths it now first checks if the idle call corresponds to the project for which the idle call was created. Should fix crash reported in #549. Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 29 lines changed, 20 insertions(+), 9 deletions(-) =================================================================== @@ -48,6 +48,13 @@ typedef enum MATCH_PATTERN } MatchType; +typedef struct +{ + GeanyProject *project; + GPtrArray *expanded_paths; +} ExpandData; + + static GdkColor s_external_color; static GtkWidget *s_toolbar = NULL; static gboolean s_pending_reload = FALSE; @@ -1210,22 +1217,24 @@ static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) } -static gboolean expand_on_idle(gpointer ptr) +static gboolean expand_on_idle(ExpandData *expand_data) { GeanyDocument *doc = document_get_current(); - if (ptr) + if (prj_org && geany_data->app->project == expand_data->project && + expand_data->expanded_paths) { - GPtrArray *expanded_paths = ptr; gchar *item; guint i; - foreach_ptr_array(item, i, expanded_paths) + foreach_ptr_array(item, i, expand_data->expanded_paths) expand_path(item, FALSE); - g_ptr_array_free(expanded_paths, TRUE); + g_ptr_array_free(expand_data->expanded_paths, TRUE); } - if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + g_free(expand_data); + + if (!s_follow_editor || !doc || !doc->file_name) return FALSE; expand_path(doc->file_name, TRUE); @@ -1281,11 +1290,13 @@ static GPtrArray *get_expanded_paths(void) void prjorg_sidebar_update(gboolean reload) { - GPtrArray *expanded_paths = NULL; + ExpandData *expand_data = g_new0(ExpandData, 1); + + expand_data->project = geany_data->app->project; if (reload) { - expanded_paths = get_expanded_paths(); + expand_data->expanded_paths = get_expanded_paths(); load_project(); /* we get color information only after the sidebar is realized - @@ -1295,7 +1306,7 @@ void prjorg_sidebar_update(gboolean reload) } /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expand_data); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits April 2017