Changeset 18969 for titan/plugins/tmdb

Timestamp:

12/07/12 05:51:04 (11 years ago)

Author:

obi

Message:

fix merge

File:

• titan/plugins/tmdb/tmdb.h (modified) (7 diffs)

titan/plugins/tmdb/tmdb.h

@@ -171 +171 @@
 //flag1: 0 = save pic in tmp
 //flag1: 1 = save pic in mediadb path if pic not exist
+//flag1: 2 = save pic in mediadb path 
 //flag2: 2 = save no pic
 struct tmdb* gettmdb(struct tmdb** first, char* title, int flag, int flag1)
@@ -330 +331 @@
                                 tnode->backdrop = oregex(".*<image type=\"backdrop\" url=\".*(http://.*/poster/.*)\" size=\"poster\".*", tmpstr1);
 
-                                printf("0000022222222222zzzzzzzzzzz\n");
+                        if(ostrstr(tmpstr1, "<imdb_id>") != NULL)
+                                tnode->imdbid = string_resub("<imdb_id>", "</imdb_id>", tmpstr1, 0);
 
                         if(getconfigint("mediadbdebug", NULL) == 1 && tnode->backdrop == NULL)
@@ -365 +367 @@
                                 tnode->id = string_resub("<id>", "</id>", tmpstr1, 0);
 
-                        if(ostrstr(tmpstr1, "<imdb_id>") != NULL)
-                                tnode->imdbid = string_resub("<imdb_id>", "</imdb_id>", tmpstr1, 0);
-
                         if((flag1 == 0 && count == 1) || flag1 == 1)
                         {
@@ -379 +378 @@
 
                                 savefile = savetmdbpic(tnode->imdbid, tnode->postermid, TMPTMDBPIC3, "_postermid.jpg", flag1);
+                                posterurl = ostrcat(posterurl, tnode->postermid, 1, 0);
                                 free(tnode->postermid);
                                 tnode->postermid = savefile;
@@ -390 +390 @@
                         }
 
-                        if(flag1 == 1 && tnode->backdrop != NULL && tnode->imdbid != NULL)
+                        if((flag1 == 1 && tnode->backdrop != NULL && tnode->imdbid != NULL) || (flag1 == 2 && tnode->backdrop != NULL && tnode->imdbid != NULL)) 
                         {
                                 char* tmppath = NULL;
@@ -606 +606 @@
                                 free(tmpstr2), tmpstr2 = NULL;
                         }
-                        else if(flag1 == 1 && tnode->postermid != NULL && tnode->imdbid != NULL && file_exist(savefile))
+                        else if((flag1 == 1 && tnode->postermid != NULL && tnode->imdbid != NULL && file_exist(savefile)) || (flag1 == 2 && tnode->postermid != NULL && tnode->imdbid != NULL && file_exist(savefile)))
                         {
                                 free(tnode->mvi);
@@ -763 +763 @@
                         tmpstr1 = ostrstr(tmpstr1, "<movie>");
 
+                        free(tmpstr1), tmpstr1 = NULL; 
+                        free(posterurl), posterurl = NULL; 
+                        free(logdir), logdir = NULL; 
+                        free(logfile), logfile = NULL; 
+
                         debug(133, "----------------------tmdb start----------------------");
                         debug(133, "title: %s", tnode->title);