fraxinas/photobooth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement imgur uploading

Browse source
This commit is contained in:
Andreas Frisch 2017-04-02 19:13:57 +02:00
parent 38f56589dc
commit 174bc2db78
2 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
default-template.ini
View file

@ -6,9 +6,9 @@ overlay_image = overlay_print_rainbows.png
save_path_template = /home/fraxinas/Desktop/photobooth_%04d.jpg save_path_template = /home/fraxinas/Desktop/photobooth_%04d.jpg
#screensaver_timeout -1 = disable #screensaver_timeout -1 = disable
screensaver_timeout = 30 screensaver_timeout = 60
#screensaver_file can be image, video, audio (or freezes preview if omitted) #screensaver_file can be image, video, audio (or freezes preview if omitted)
screensaver_file = /home/fraxinas/Desktop/Troye Sivan - Youth (1080p AAC).mkv #screensaver_file = /home/fraxinas/Desktop/Troye Sivan - Youth (1080p AAC).mkv
[sounds] [sounds]
countdown_audio_file = beep.m4a countdown_audio_file = beep.m4a
@ -35,20 +35,23 @@ cam_reeinit_before_snapshot = 1
cam_reeinit_after_snapshot = 1 cam_reeinit_after_snapshot = 1
[upload] [upload]
facebook_put_uri = https://graph.facebook.com/testfotobox/photos/CSD?access_token=EAACEdEose0cBAFtlA5S56qFqkA88ZCshxFjdFWwQ00uWX9tsgcDBG0BV4o6EoAhk62KCDwoI1ZBZBZAj4GomYnYn6xkQSXNZAAAkoBsonp6qWaJEBFHWGWY7W3V4dlECUAwraHlf2DjE6GBuXOwhM1ZBB8D3m0IPu7DdvZBKVlkhpKnDpvHueFc #upload_timeout = 15
facebook_put_timeout = 15 #imgur_album_id = ppbyh
#imgur_access_token =
#facebook_put_uri =
[strings] [strings]
No camera connected! = Keine Kamera verbunden! No camera connected! = Keine Kamera verbunden!
Touch screen to take a photo! = Bildschirm berühren zum Fotografieren! Touch screen to take a photo! = Bildschirm berühren zum Fotografieren!
Taking photo in %d seconds... = Aufnahme in %d Sekunden... Taking photo in %d seconds... = Aufnahme in %d Sekunden...
Taking photo failed! = Fotografieren fehlgeschlagen!
SAY CHEESE! = BITTE LÄCHELN :) SAY CHEESE! = BITTE LÄCHELN :)
Focussing... = stelle scharf... Focussing... = stelle scharf...
Taking photo... = fotografiere... Taking photo... = fotografiere...
Taking photo failed! = Fotografieren fehlgeschlagen! Taking photo failed! = Fotografieren fehlgeschlagen!
Processing photo... = verarbeite Foto... Processing photo... = verarbeite Foto...
Print Photo? = Foto Drucken? Print Photo? = Foto Drucken?
Upload photo? = Foto auf unsere Facebook-Seite hochladen? Upload photo? = Foto hochladen?
Please wait... = Bitte warten... Please wait... = Bitte warten...
Printer %s online. %i prints (%s) remaining = Drucker %s bereit. %i Abzüge (%s) übrig Printer %s online. %i prints (%s) remaining = Drucker %s bereit. %i Abzüge (%s) übrig
Can't parse printer backend output = Fehler beim Verarbeiten der Ausgabe vom Drucker-Backend Can't parse printer backend output = Fehler beim Verarbeiten der Ausgabe vom Drucker-Backend

43
photobooth.c
View file

@ -88,8 +88,10 @@ struct _PhotoBoothPrivate
guint screensaver_timeout_id; guint screensaver_timeout_id;
GstClockTime last_play_pos; GstClockTime last_play_pos;
gint upload_timeout;
gchar *facebook_put_uri; gchar *facebook_put_uri;
gint facebook_put_timeout; gchar *imgur_album_id;
gchar *imgur_access_token;
GThread *upload_thread; GThread *upload_thread;
GMutex upload_mutex; GMutex upload_mutex;
@ -108,6 +110,7 @@ struct _PhotoBoothPrivate
#define PREVIEW_WIDTH 640 #define PREVIEW_WIDTH 640
#define PREVIEW_HEIGHT 424 #define PREVIEW_HEIGHT 424
#define PT_PER_IN 72 #define PT_PER_IN 72
#define IMGUR_UPLOAD_URI "https://api.imgur.com/3/upload"
typedef enum { NONE, ACK_SOUND, ERROR_SOUND } sound_t; typedef enum { NONE, ACK_SOUND, ERROR_SOUND } sound_t;
@ -177,7 +180,7 @@ static void photo_booth_printing_error_dialog (PhotoBoothWindow *window, GError
/* upload functions */ /* upload functions */
void photo_booth_button_upload_clicked (GtkButton *button, PhotoBoothWindow *win); void photo_booth_button_upload_clicked (GtkButton *button, PhotoBoothWindow *win);
static void photo_booth_facebook_post_thread_func (PhotoBooth *pb); static void photo_booth_post_thread_func (PhotoBooth *pb);
static gboolean photo_booth_upload_timedout (PhotoBooth *pb); static gboolean photo_booth_upload_timedout (PhotoBooth *pb);
static void photo_booth_class_init (PhotoBoothClass *klass) static void photo_booth_class_init (PhotoBoothClass *klass)
@ -262,8 +265,10 @@ static void photo_booth_init (PhotoBooth *pb)
priv->save_path_template = g_strdup (DEFAULT_SAVE_PATH_TEMPLATE); priv->save_path_template = g_strdup (DEFAULT_SAVE_PATH_TEMPLATE);
priv->photos_taken = priv->photos_printed = 0; priv->photos_taken = priv->photos_printed = 0;
priv->save_filename_count = 0; priv->save_filename_count = 0;
priv->facebook_put_timeout = 0; priv->upload_timeout = 0;
priv->facebook_put_uri = NULL; priv->facebook_put_uri = NULL;
priv->imgur_album_id = NULL;
priv->imgur_access_token = NULL;
priv->upload_thread = NULL; priv->upload_thread = NULL;
priv->state_change_watchdog_timeout_id = 0; priv->state_change_watchdog_timeout_id = 0;
@ -486,7 +491,10 @@ void photo_booth_load_settings (PhotoBooth *pb, const gchar *filename)
if (g_key_file_has_group (gkf, "upload")) if (g_key_file_has_group (gkf, "upload"))
{ {
priv->facebook_put_uri = g_key_file_get_string (gkf, "upload", "facebook_put_uri", NULL); priv->facebook_put_uri = g_key_file_get_string (gkf, "upload", "facebook_put_uri", NULL);
priv->facebook_put_timeout = g_key_file_get_integer (gkf, "upload", "facebook_put_timeout", NULL); priv->imgur_album_id = g_key_file_get_string (gkf, "upload", "imgur_album_id", NULL);
priv->imgur_access_token = g_key_file_get_string (gkf, "upload", "imgur_access_token", NULL);
priv->upload_timeout = g_key_file_get_integer (gkf, "upload", "upload_timeout", NULL);
GST_INFO ( "facebook_put_uri='%s', priv->imgur_album_id='%s'", priv->facebook_put_uri, priv->imgur_album_id);
} }
} }
@ -1812,7 +1820,7 @@ void photo_booth_button_upload_clicked (GtkButton *button, PhotoBoothWindow *win
_play_event_sound (priv, ACK_SOUND); _play_event_sound (priv, ACK_SOUND);
photo_booth_window_set_spinner (priv->win, TRUE); photo_booth_window_set_spinner (priv->win, TRUE);
gtk_label_set_text (priv->win->status, _("Uploading...")); gtk_label_set_text (priv->win->status, _("Uploading..."));
priv->upload_thread = g_thread_try_new ("upload", (GThreadFunc) photo_booth_facebook_post_thread_func, pb, NULL); priv->upload_thread = g_thread_try_new ("upload", (GThreadFunc) photo_booth_post_thread_func, pb, NULL);
photo_booth_cancel (pb); photo_booth_cancel (pb);
} }
} }
@ -2028,11 +2036,11 @@ static void photo_booth_print_done (GtkPrintOperation *operation, GtkPrintOperat
g_timeout_add_seconds (15, (GSourceFunc) photo_booth_get_printer_status, pb); g_timeout_add_seconds (15, (GSourceFunc) photo_booth_get_printer_status, pb);
if (priv->facebook_put_uri) if ((priv->imgur_album_id && priv->imgur_access_token) || priv->facebook_put_uri)
{ {
gtk_widget_show (GTK_WIDGET (priv->win->button_upload)); gtk_widget_show (GTK_WIDGET (priv->win->button_upload));
gtk_label_set_text (priv->win->status, _("Upload photo?")); gtk_label_set_text (priv->win->status, _("Upload photo?"));
g_timeout_add_seconds (priv->facebook_put_timeout, (GSourceFunc) photo_booth_upload_timedout, pb); g_timeout_add_seconds (priv->upload_timeout, (GSourceFunc) photo_booth_upload_timedout, pb);
photo_booth_change_state (pb, PB_STATE_ASK_UPLOAD); photo_booth_change_state (pb, PB_STATE_ASK_UPLOAD);
} }
else else
@ -2049,7 +2057,7 @@ size_t _curl_write_func (void *ptr, size_t size, size_t nmemb, void *buf)
return i; return i;
} }
void photo_booth_facebook_post_thread_func (PhotoBooth* pb) void photo_booth_post_thread_func (PhotoBooth* pb)
{ {
PhotoBoothPrivate *priv; PhotoBoothPrivate *priv;
CURLcode res; CURLcode res;
@ -2065,10 +2073,25 @@ void photo_booth_facebook_post_thread_func (PhotoBooth* pb)
struct curl_httppost* last = NULL; struct curl_httppost* last = NULL;
GString *buf = g_string_new(""); GString *buf = g_string_new("");
gchar *filename = g_strdup_printf (priv->save_path_template, priv->save_filename_count); gchar *filename = g_strdup_printf (priv->save_path_template, priv->save_filename_count);
GST_INFO_OBJECT (pb, "photo_booth_facebook_post '%s' to '%s'...", filename, priv->facebook_put_uri);
curl_formadd (&post, &last, CURLFORM_COPYNAME, "image", CURLFORM_FILE, filename, CURLFORM_CONTENTTYPE, "image/jpeg", CURLFORM_END); curl_formadd (&post, &last, CURLFORM_COPYNAME, "image", CURLFORM_FILE, filename, CURLFORM_CONTENTTYPE, "image/jpeg", CURLFORM_END);
curl_easy_setopt (curl, CURLOPT_USERAGENT, "Schaffenburg Photobooth"); curl_easy_setopt (curl, CURLOPT_USERAGENT, "Schaffenburg Photobooth");
curl_easy_setopt (curl, CURLOPT_URL, priv->facebook_put_uri); if (priv->imgur_access_token && priv->imgur_album_id)
{
gchar *auth_header;
struct curl_slist *headerlist = NULL;
auth_header = g_strdup_printf ("Authorization: Bearer %s", priv->imgur_access_token);
headerlist = curl_slist_append (headerlist, auth_header);
curl_formadd (&post, &last, CURLFORM_COPYNAME, "album", CURLFORM_COPYCONTENTS, priv->imgur_album_id, CURLFORM_END);
curl_easy_setopt (curl, CURLOPT_HTTPHEADER, headerlist);
curl_easy_setopt (curl, CURLOPT_URL, IMGUR_UPLOAD_URI);
GST_INFO_OBJECT (pb, "imgur posting '%s' to album http://imgur.com/a/%s'...", filename, priv->imgur_album_id);
g_free (auth_header);
}
else if (priv->facebook_put_uri)
{
curl_easy_setopt (curl, CURLOPT_URL, priv->facebook_put_uri);
GST_INFO_OBJECT (pb, "facebook posting '%s' to '%s'...", filename, priv->facebook_put_uri);
}
curl_easy_setopt (curl, CURLOPT_POST, 1L); curl_easy_setopt (curl, CURLOPT_POST, 1L);
curl_easy_setopt (curl, CURLOPT_HTTPPOST, post); curl_easy_setopt (curl, CURLOPT_HTTPPOST, post);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, _curl_write_func); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, _curl_write_func);