1
=== modified file 'bin/shutter'
2
--- bin/shutter	2014-12-23 23:02:02 +0000
3
+++ bin/shutter	2017-01-28 09:57:21 +0000
4
@@ -8353,7 +8353,10 @@
5
8353
                        #~ print $name, $folder, $type, "\n";
8353
                        #~ print $name, $folder, $type, "\n";
6
8354
8354
7
8355
                        if (   !exists $accounts{$name}
8355
                        if (   !exists $accounts{$name}
9
8356
                            || !exists $accounts{$name}->{module} )
8356
                            || !exists $accounts{$name}->{module}
10
8357
                            || $accounts{$name}->{supports_anonymous_upload} ne &fct_upload_plugin_get_info( $ukey, 'supports_anonymous_upload' ) ||
11
8358
                               $accounts{$name}->{supports_authorized_upload} ne &fct_upload_plugin_get_info( $ukey, 'supports_authorized_upload' ) ||
12
8359
                               $accounts{$name}->{supports_oauth_upload} ne &fct_upload_plugin_get_info( $ukey, 'supports_oauth_upload' ) )
13
8357
                        {
8360
                        {
14
8358
8361
15
8359
                            #show dialog and progress bar
8362
                            #show dialog and progress bar
16
@@ -10632,7 +10635,7 @@
17
10632
                    my $uploader = $hosting_module->new( $hosting_host, $sc->get_debug, $shutter_root, $d, $window, SHUTTER_VERSION );
10635
                    my $uploader = $hosting_module->new( $hosting_host, $sc->get_debug, $shutter_root, $d, $window, SHUTTER_VERSION );
18
10633
10636
19
10634
                    #init module
10637
                    #init module
21
10635
                    if ( $uploader->init ) {
10638
                    if ( $uploader->init($hosting_username) ) {
22
10636
10639
23
10637
                        my $counter = 1;
10640
                        my $counter = 1;
24
10638
                        $hosting_progress->set_fraction(0);
10641
                        $hosting_progress->set_fraction(0);
25
10639
10642
26
=== modified file 'share/shutter/resources/modules/Shutter/App/Common.pm'
27
--- share/shutter/resources/modules/Shutter/App/Common.pm	2013-08-25 18:40:51 +0000
28
+++ share/shutter/resources/modules/Shutter/App/Common.pm	2017-01-28 09:57:21 +0000
29
@@ -48,7 +48,7 @@
30
48
	my $self = { _shutter_root => shift, _mainwindow => shift, _appname => shift, _version => shift, _rev => shift, _pid => shift };
48
	my $self = { _shutter_root => shift, _mainwindow => shift, _appname => shift, _version => shift, _rev => shift, _pid => shift };
31
49
49
32
50
	#vars
50
	#vars
34
51
	$self->{_debug_cparam}              = FALSE;
51
	$self->{_debug_cparam}              = TRUE;
35
52
	$self->{_clear_cache}               = FALSE;
52
	$self->{_clear_cache}               = FALSE;
36
53
	$self->{_min_cparam}                = FALSE;
53
	$self->{_min_cparam}                = FALSE;
37
54
	$self->{_disable_systray_cparam}    = FALSE;
54
	$self->{_disable_systray_cparam}    = FALSE;
38
55
55
39
=== modified file 'share/shutter/resources/modules/Shutter/App/SimpleDialogs.pm'
40
--- share/shutter/resources/modules/Shutter/App/SimpleDialogs.pm	2013-08-25 18:40:51 +0000
41
+++ share/shutter/resources/modules/Shutter/App/SimpleDialogs.pm	2017-01-28 09:57:21 +0000
42
@@ -59,6 +59,7 @@
43
59
	my $detail_message = shift;
59
	my $detail_message = shift;
44
60
	my $detail_checkbox = shift;
60
	my $detail_checkbox = shift;
45
61
	my $content_widget = shift;
61
	my $content_widget = shift;
46
62
	my $content_widget2 = shift;
47
62
63
48
63
	my $info_dialog = Gtk2::MessageDialog->new( $self->{_window}, [qw/modal destroy-with-parent/], 'info', 'none', undef );
64
	my $info_dialog = Gtk2::MessageDialog->new( $self->{_window}, [qw/modal destroy-with-parent/], 'info', 'none', undef );
49
64
65
50
@@ -71,6 +72,9 @@
51
71
	if($content_widget){
72
	if($content_widget){
52
72
		$info_dialog->get_content_area()->add($content_widget);
73
		$info_dialog->get_content_area()->add($content_widget);
53
73
	}
74
	}
54
75
	if($content_widget2){
55
76
		$info_dialog->get_content_area()->add($content_widget2);
56
77
	}
57
74
78
58
75
	$info_dialog->add_button( $button_text_extra1, 10 ) if $button_text_extra1;
79
	$info_dialog->add_button( $button_text_extra1, 10 ) if $button_text_extra1;
59
76
	$info_dialog->add_button( $button_text_extra2, 20 ) if $button_text_extra2;
80
	$info_dialog->add_button( $button_text_extra2, 20 ) if $button_text_extra2;
60
77
81
61
=== modified file 'share/shutter/resources/system/upload_plugins/upload/Imgur.pm'
62
--- share/shutter/resources/system/upload_plugins/upload/Imgur.pm	2013-08-25 18:40:51 +0000
63
+++ share/shutter/resources/system/upload_plugins/upload/Imgur.pm	2017-01-28 09:57:21 +0000
64
@@ -29,7 +29,8 @@
65
29
use strict;
29
use strict;
66
30
use POSIX qw/setlocale/;
30
use POSIX qw/setlocale/;
67
31
use Locale::gettext;
31
use Locale::gettext;
69
32
use Glib qw/TRUE FALSE/; 
32
use Glib qw/TRUE FALSE/;
70
33
use MIME::Base64;
71
33
34
72
34
use Shutter::Upload::Shared;
35
use Shutter::Upload::Shared;
73
35
our @ISA = qw(Shutter::Upload::Shared);
36
our @ISA = qw(Shutter::Upload::Shared);
74
@@ -38,12 +39,13 @@
75
38
$d->dir( $ENV{'SHUTTER_INTL'} );
39
$d->dir( $ENV{'SHUTTER_INTL'} );
76
39
40
77
40
my %upload_plugin_info = (
41
my %upload_plugin_info = (
79
41
    'module'        => "Imgur",
42
	'module'        => "Imgur",
80
42
	'url'           => "http://imgur.com/",
43
	'url'           => "http://imgur.com/",
81
43
	'registration'  => "https://imgur.com/register",
44
	'registration'  => "https://imgur.com/register",
82
44
	'description'   => $d->get( "Imgur is used to share photos with social networks and online communities, and has the funniest pictures from all over the Internet" ),
45
	'description'   => $d->get( "Imgur is used to share photos with social networks and online communities, and has the funniest pictures from all over the Internet" ),
84
45
	'supports_anonymous_upload'  => TRUE,
46
	'supports_anonymous_upload'	 => TRUE,
85
46
	'supports_authorized_upload' => FALSE,
47
	'supports_authorized_upload' => FALSE,
86
48
	'supports_oauth_upload' => TRUE,
87
47
);
49
);
88
48
50
89
49
binmode( STDOUT, ":utf8" );
51
binmode( STDOUT, ":utf8" );
90
@@ -66,13 +68,128 @@
91
66
68
92
67
sub init {
69
sub init {
93
68
	my $self = shift;
70
	my $self = shift;
94
71
	my $username = shift;
95
69
72
97
70
	#do custom stuff here	
73
	#do custom stuff here
98
71
	use JSON;
74
	use JSON;
99
72
	use LWP::UserAgent;
75
	use LWP::UserAgent;
100
73
	use HTTP::Request::Common;
76
	use HTTP::Request::Common;
103
74
	
77
	use Path::Class;
104
75
	return TRUE;
78
105
79
	$self->{_config} = { };
106
80
	$self->{_config_file} = file( $ENV{'HOME'}, '.imgur-api-config' );
107
81
108
82
	$self->load_config;
109
83
	if ($username eq $d->get("OAuth"))
110
84
	{
111
85
		return $self->connect;
112
86
	}
113
87
114
88
	return TRUE;
115
89
}
116
90
117
91
sub load_config {
118
92
	my $self = shift;
119
93
	
120
94
	if (-f $self->{_config_file}) {
121
95
		eval {
122
96
			$self->{_config} = decode_json($self->{_config_file}->slurp);
123
97
		};
124
98
		if ($@) {
125
99
			$self->{_config}->{client_id} = '9490811e0906b6e';
126
100
			$self->{_config}->{client_secret} = '158b57f13e9a51f064276bd9e31529fb065f741e';
127
101
		}
128
102
	}
129
103
	else {
130
104
		$self->{_config}->{client_id} = '9490811e0906b6e';
131
105
		$self->{_config}->{client_secret} = '158b57f13e9a51f064276bd9e31529fb065f741e';
132
106
	}
133
107
134
108
	return TRUE;
135
109
}
136
110
137
111
sub connect {
138
112
	my $self = shift;
139
113
	return $self->setup;
140
114
}
141
115
142
116
sub setup {
143
117
	my $self = shift;
144
118
	
145
119
	if ($self->{_debug_cparam}) {
146
120
		print "Setting up Imgur...\n";
147
121
	}
148
122
	
149
123
	#some helpers
150
124
	my $sd = Shutter::App::SimpleDialogs->new;
151
125
152
126
	#Authentication
153
127
	my $login_link = 'https://api.imgur.com/oauth2/authorize?response_type=pin&client_id=' . $self->{_config}->{client_id};
154
128
155
129
	my $pin_entry = Gtk2::Entry->new();
156
130
	my $pin = '';
157
131
	$pin_entry->signal_connect(changed => sub {
158
132
		$pin = $pin_entry->get_text;
159
133
	});
160
134
161
135
	my $response = $sd->dlg_info_message(
162
136
		$d->get("Please click on the button below to authorize with Imgur. Input the PIN you receive and press 'Apply' when you are done."), 
163
137
		$d->get("Authorize with Imgur"),
164
138
		'gtk-cancel','gtk-apply', undef,
165
139
		undef, undef, undef, undef, undef,
166
140
		Gtk2::LinkButton->new ($login_link, $d->get("Authorize")),
167
141
		$pin_entry,
168
142
	);
169
143
	if ($response == 20) {
170
144
		
171
145
		if ($self->{_debug_cparam}) {
172
146
			print "Imgur: Authorizing...\n";
173
147
		}
174
148
175
149
		my %params = (
176
150
			'client_id' => $self->{_config}->{client_id},
177
151
			'client_secret' => $self->{_config}->{client_secret},
178
152
			'grant_type' => 'pin',
179
153
			'pin' => $pin,
180
154
		);
181
155
182
156
		my @params = (
183
157
			"https://api.imgur.com/oauth2/token",
184
158
			'Content' => [%params]
185
159
		);
186
160
187
161
		my $req = HTTP::Request::Common::POST(@params, 'Authorization' => 'Client-ID ' . $self->{_config}->{client_id});
188
162
189
163
		my $client = LWP::UserAgent->new(
190
164
			'timeout'    => 20,
191
165
			'keep_alive' => 10,
192
166
			'env_proxy'  => 1,
193
167
		);
194
168
		my $rsp = $client->request($req);
195
169
196
170
		my $json = JSON->new(); 
197
171
		my $json_rsp = $json->decode($rsp->content);
198
172
		
199
173
		if ($self->{_debug_cparam}) {
200
174
			print $pin . ' ' . $rsp->content;
201
175
		}
202
176
		if (exists $json_rsp->{status} && $json_rsp->{status} ne 200) {
203
177
			return $self->setup;
204
178
		}
205
179
206
180
		$self->{_config}->{access_token} = $json_rsp->{access_token};
207
181
		$self->{_config}->{refresh_token} = $json_rsp->{refresh_token};
208
182
		$self->{_config}->{account_id} = $json_rsp->{account_id};
209
183
		$self->{_config}->{account_username} = $json_rsp->{account_username};
210
184
211
185
		$self->{_config_file}->openw->print(encode_json($self->{_config}));
212
186
		chmod 0600, $self->{_config_file};
213
187
214
188
		return TRUE;
215
189
	}
216
190
	else {
217
191
		return FALSE;
218
192
	}
219
76
}
193
}
220
77
194
221
78
sub upload {
195
sub upload {
222
@@ -87,62 +204,66 @@
223
87
	utf8::encode $password;
204
	utf8::encode $password;
224
88
	utf8::encode $username;
205
	utf8::encode $username;
225
89
206
272
90
	#~ if ( $username ne "" && $password ne "" ) {
207
	my $client = LWP::UserAgent->new(
273
91
208
		'timeout'    => 20,
274
92
		my $client = LWP::UserAgent->new(
209
		'keep_alive' => 10,
275
93
			'timeout'    => 20,
210
		'env_proxy'  => 1,
276
94
			'keep_alive' => 10,
211
	);
277
95
			'env_proxy'  => 1,
212
278
96
		);
213
	eval {
279
97
214
280
98
		eval{
215
		my $json = JSON->new();
281
99
216
282
100
			my $json = JSON->new(); 
217
		open( IMAGE, $upload_filename ) or die "$!";
283
101
218
		my $binary_data = do { local $/ = undef; <IMAGE>; };
284
102
			my %params = (
219
		close IMAGE;
285
103
				'image' => [$upload_filename],
220
		my $encoded_image = encode_base64($binary_data);
286
104
				'key'   => '12ea5e932124142c5ef3c8d5a02557de',
221
287
105
			);
222
		my %params = (
288
106
223
			'image' => $encoded_image,
289
107
			my @params = (
224
		);
290
108
				"http://api.imgur.com/1/upload.json",
225
291
109
				'Content_Type' => 'multipart/form-data',
226
		my @params = (
292
110
				'Content' => [%params]
227
			"https://api.imgur.com/3/image",
293
111
			);
228
			'Content' => [%params]
294
112
229
		);
295
113
			my $req = HTTP::Request::Common::POST(@params);
230
296
114
			my $rsp = $client->request($req);
231
		my $req;
297
115
232
		if ($username eq $d->get("OAuth") && $self->{_config}->{access_token}) {
298
116
			#~ print Dumper $json->decode( $rsp->content ); 
233
			$req = HTTP::Request::Common::POST(@params, 'Authorization' => 'Bearer ' . $self->{_config}->{access_token});
299
117
234
		}
300
118
			$self->{_links} = $json->decode( $rsp->content ); 
235
		else {
301
119
			$self->{_links} = $self->{_links}->{'rsp'};
236
			$req = HTTP::Request::Common::POST(@params, 'Authorization' => 'Client-ID ' . $self->{_config}->{client_id});
302
120
			if(defined $self->{_links}->{'stat'} && $self->{_links}->{'stat'} eq 'ok'){
237
		}
303
121
				$self->{_links} = $self->{_links}->{'image'};
238
		my $rsp = $client->request($req);
304
122
				#clean hash
239
305
123
				foreach (keys %{$self->{_links}}){
240
		#~ print Dumper $json->decode( $rsp->content ); 
306
124
					if($_ eq 'delete_hash' || $_ eq 'image_hash'){
241
307
125
						delete $self->{_links}->{$_};
242
		my $json_rsp = $json->decode( $rsp->content );
308
126
						next;
243
309
127
					}
244
		if ($json_rsp->{'status'} ne 200) {
310
128
					if( $self->{_debug_cparam}) {
245
			unlink $self->{_config_file};
311
129
						print $_.": ".$self->{_links}->{$_}, "\n";
246
			$self->{_links}{'status'} = '';
312
130
					}
247
			if (exists $json_rsp->{'data'}->{'error'}) {
313
131
				}
248
				$self->{_links}{'status'} .= $json_rsp->{'data'}->{'error'} . ': ';
268
132
				#set status (success)
269
133
				$self->{_links}{'status'} = 200;
270
134
			}else{
271
135
				$self->{_links}{'status'} = $self->{_links}->{'image'}->{'error_msg'};
314
136
			}
249
			}
320
137
			
250
			$self->{_links}{'status'} .= $d->get("Maybe you or Imgur revoked or expired an access token. Please close this dialog and try again. Your account will be re-authenticated the next time you upload a file.");
321
138
		};
251
			return %{ $self->{_links} };
317
139
		if($@){
318
140
			$self->{_links}{'status'} = $@;
319
141
			#~ print "$@\n";
322
142
		}
252
		}
323
143
253
326
144
	#~ }
254
		$self->{_links}{'status'} = $json_rsp->{'status'};
327
145
	
255
		$self->{_links}->{'direct_link'} = $json_rsp->{'data'}->{'link'};
328
256
		$self->{_links}->{'deletion_link'} = 'https://imgur.com/delete/' . $json_rsp->{'data'}->{'deletehash'};
329
257
		$self->{_links}->{'post_link'} = $json_rsp->{'data'}->{'link'};
330
258
		$self->{_links}->{'post_link'} =~ s/i\.imgur/imgur/;
331
259
		$self->{_links}->{'post_link'} =~ s/\.[^.]+$//;
332
260
333
261
	};
334
262
	if ($@) {
335
263
		$self->{_links}{'status'} = $@;
336
264
		#~ print "$@\n";
337
265
	}
338
266
339
146
	#and return links
267
	#and return links
340
147
	return %{ $self->{_links} };
268
	return %{ $self->{_links} };
341
148
}
269
}
Status:	Merged
Merged at revision:	1279
Proposed branch:	lp:~systemdisc/shutter/imgur-fix
Merge into:	lp:shutter
Diff against target:	341 lines (+190/-62) 4 files modified bin/shutter (+5/-2) share/shutter/resources/modules/Shutter/App/Common.pm (+1/-1) share/shutter/resources/modules/Shutter/App/SimpleDialogs.pm (+4/-0) share/shutter/resources/system/upload_plugins/upload/Imgur.pm (+180/-59)
To merge this branch:	bzr merge lp:~systemdisc/shutter/imgur-fix
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Mario Kemper (Romario)	2017-01-03	Approve on 2017-08-01
Michael Kogan		Approve on 2017-01-28
Manuel Razzari (community)		Approve on 2017-01-13
Review via email: mp+313977@code.launchpad.net